preparing 2.4.16 updated and rebuilt the docs, rebuilt the API and web

* configure.in include/libxml/xmlwin32version.h: preparing 2.4.16
* doc/* python/libxml2class.txt: updated and rebuilt the docs,
  rebuilt the API and web site
* xpath.c: fixed #71978 portability bugs
Daniel
diff --git a/ChangeLog b/ChangeLog
index 286fabd..4ae096b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 20 11:16:15 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in include/libxml/xmlwin32version.h: preparing 2.4.16
+	* doc/* python/libxml2class.txt: updated and rebuilt the docs,
+	  rebuilt the API and web site
+	* xpath.c: fixed #71978 portability bugs
+
 Tue Feb 19 22:49:36 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* SAX.c: oops broke automatic defaulting of namespaces attributes.
diff --git a/configure.in b/configure.in
index 601d75c..765f02a 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=4
-LIBXML_MICRO_VERSION=15
+LIBXML_MICRO_VERSION=16
 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/APIchunk0.html b/doc/APIchunk0.html
index 087ce9f..4d9542c 100644
--- a/doc/APIchunk0.html
+++ b/doc/APIchunk0.html
@@ -146,6 +146,12 @@
 <a href="html/libxml-encoding.html#XMLGETENCODINGALIAS">xmlGetEncodingAlias</a>
 <a href="html/libxml-encoding.html#XMLPARSECHARENCODING">xmlParseCharEncoding</a>
 </dd>
+<dt>ATTRIBUTE</dt>
+<dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
+</dd>
 <dt>Activated</dt>
 <dd>
 <a href="html/libxml-globals.html#XMLGETWARNINGSDEFAULTVALUE">xmlGetWarningsDefaultValue</a>
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index 36ac0d5..4174e14 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -264,6 +264,7 @@
 <a href="html/libxml-sax.html#HASINTERNALSUBSET">hasInternalSubset</a>
 <a href="html/libxml-parser.html#HASINTERNALSUBSETSAXFUNC">hasInternalSubsetSAXFunc</a>
 <a href="html/libxml-debugxml.html#XMLSHELLLIST">xmlShellList</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDOCUMENTFINAL">xmlValidateDocumentFinal</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDTDFINAL">xmlValidateDtdFinal</a>
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index 7b91540..ed36b37 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -334,6 +334,9 @@
 </dd>
 <dt>equal</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-parser.html#XMLSTREQUAL">xmlStrEqual</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEQUALVALUES">xmlXPathEqualValues</a>
 <a href="html/libxml-xpath.html#XMLXPATHEVALPREDICATE">xmlXPathEvalPredicate</a>
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index 0e90a84..a813f01 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -686,6 +686,7 @@
 </dd>
 <dt>inserted</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
 <a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
 <a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLADDSIBLING">xmlAddSibling</a>
@@ -728,6 +729,9 @@
 </dd>
 <dt>instead</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-parser.html#XMLKEEPBLANKSDEFAULT">xmlKeepBlanksDefault</a>
 <a href="html/libxml-xmlio.html#XMLREGISTERHTTPPOSTCALLBACKS">xmlRegisterHTTPPostCallbacks</a>
 <a href="html/libxml-parser.html#XMLSUBSTITUTEENTITIESDEFAULT">xmlSubstituteEntitiesDefault</a>
@@ -804,6 +808,9 @@
 <dd>
 <a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
 <a href="html/libxml-parser.html#ATTRIBUTESAXFUNC">attributeSAXFunc</a>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-encoding.html#XMLCHARENCFIRSTLINE">xmlCharEncFirstLine</a>
 <a href="html/libxml-encoding.html#XMLCHARENCINFUNC">xmlCharEncInFunc</a>
 <a href="html/libxml-encoding.html#XMLCHARENCOUTFUNC">xmlCharEncOutFunc</a>
@@ -821,6 +828,7 @@
 <dt>invalid</dt>
 <dd>
 <a href="html/libxml-tree.html#XMLRECONCILIATENS">xmlReconciliateNs</a>
+<a href="html/libxml-valid.html#XMLVALIDATEDTDFINAL">xmlValidateDtdFinal</a>
 </dd>
 <dt>invited</dt>
 <dd>
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index 209b7dc..bb232fb 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -132,7 +132,6 @@
 <dl>
 <dt>keep</dt>
 <dd>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 <a href="html/libxml-globals.html#XMLKEEPBLANKSDEFAULTVALUE">xmlKeepBlanksDefaultValue</a>
 <a href="html/libxml-parser.html#XMLPARSERINPUTGROW">xmlParserInputGrow</a>
 <a href="html/libxml-parser.html#XMLSUBSTITUTEENTITIESDEFAULT">xmlSubstituteEntitiesDefault</a>
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html
index 297e223..287e9f6 100644
--- a/doc/APIchunk14.html
+++ b/doc/APIchunk14.html
@@ -529,6 +529,7 @@
 <a href="html/libxml-tree.html#XMLSETBUFFERALLOCATIONSCHEME">xmlSetBufferAllocationScheme</a>
 <a href="html/libxml-debugxml.html#XMLSHELLPWD">xmlShellPwd</a>
 <a href="html/libxml-parser.html#XMLSTRNCAT">xmlStrncat</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPOPBOOLEAN">xmlXPathPopBoolean</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPOPEXTERNAL">xmlXPathPopExternal</a>
@@ -689,6 +690,7 @@
 <dt>normalization</dt>
 <dd>
 <a href="html/libxml-uri.html#XMLNORMALIZEURIPATH">xmlNormalizeURIPath</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 </dd>
 <dt>normalization:</dt>
@@ -701,6 +703,7 @@
 </dd>
 <dt>normalized</dt>
 <dd>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNORMALIZEFUNCTION">xmlXPathNormalizeFunction</a>
 </dd>
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html
index 791a5f4..504b4c2 100644
--- a/doc/APIchunk16.html
+++ b/doc/APIchunk16.html
@@ -149,6 +149,7 @@
 <a href="html/libxml-tree.html#XMLGETLASTCHILD">xmlGetLastChild</a>
 <a href="html/libxml-tree.html#XMLNEWCHILD">xmlNewChild</a>
 <a href="html/libxml-tree.html#XMLNEWTEXTCHILD">xmlNewTextChild</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTANCESTOR">xmlXPathNextAncestor</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTANCESTORORSELF">xmlXPathNextAncestorOrSelf</a>
@@ -713,8 +714,15 @@
 <dd>
 <a href="html/libxml-tree.html#XMLRECONCILIATENS">xmlReconciliateNs</a>
 </dd>
+<dt>properties</dt>
+<dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
+</dd>
 <dt>property</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
 <a href="html/libxml-tree.html#XMLFREEPROPLIST">xmlFreePropList</a>
 <a href="html/libxml-tree.html#XMLNEWDOCPROP">xmlNewDocProp</a>
 <a href="html/libxml-tree.html#XMLNEWNSPROP">xmlNewNsProp</a>
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html
index 1e4e1d7..2ebbeee 100644
--- a/doc/APIchunk17.html
+++ b/doc/APIchunk17.html
@@ -451,6 +451,7 @@
 <a href="html/libxml-threads.html#XMLCLEANUPTHREADS">xmlCleanupThreads</a>
 <a href="html/libxml-threads.html#XMLINITTHREADS">xmlInitThreads</a>
 <a href="html/libxml-nanohttp.html#XMLNANOHTTPCLOSE">xmlNanoHTTPClose</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 </dd>
 <dt>relative</dt>
@@ -558,7 +559,6 @@
 <dt>reporting</dt>
 <dd>
 <a href="html/libxml-parserinternals.html#INPUT-CHUNK-CAPS">INPUT_CHUNK</a>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 </dd>
 <dt>reports</dt>
 <dd>
@@ -762,6 +762,7 @@
 <a href="html/libxml-parser.html#XMLPARSEEXTERNALENTITY">xmlParseExternalEntity</a>
 <a href="html/libxml-parser.html#XMLSAXUSERPARSEFILE">xmlSAXUserParseFile</a>
 <a href="html/libxml-parser.html#XMLSAXUSERPARSEMEMORY">xmlSAXUserParseMemory</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-xpath.html#XMLXPATHEVALPREDICATE">xmlXPathEvalPredicate</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALUATEPREDICATERESULT">xmlXPathEvaluatePredicateResult</a>
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html
index 3e5fc5a..d6180b7 100644
--- a/doc/APIchunk18.html
+++ b/doc/APIchunk18.html
@@ -427,12 +427,12 @@
 </dd>
 <dt>sibling</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTPRECEDINGSIBLING">xmlXPathNextPrecedingSibling</a>
 </dd>
 <dt>siblings</dt>
 <dd>
-<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
-<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLADDSIBLING">xmlAddSibling</a>
 <a href="html/libxml-tree.html#XMLFREENODELIST">xmlFreeNodeList</a>
 <a href="html/libxml-tree.html#XMLFREEPROPLIST">xmlFreePropList</a>
@@ -750,6 +750,7 @@
 </dd>
 <dt>step</dt>
 <dd>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDOCUMENTFINAL">xmlValidateDocumentFinal</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDTDFINAL">xmlValidateDtdFinal</a>
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index f55c935..8821d2a 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -254,6 +254,9 @@
 </dd>
 <dt>there</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLENUMERATION">xmlEnumeration</a>
 <a href="html/libxml-xmlerror.html#XMLGENERICERRORFUNC">xmlGenericErrorFunc</a>
 <a href="html/libxml-nanoftp.html#XMLNANOFTPCHECKRESPONSE">xmlNanoFTPCheckResponse</a>
@@ -403,7 +406,6 @@
 </dd>
 <dt>track</dt>
 <dd>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 <a href="html/libxml-parserinternals.html#XMLENTITYREFERENCEFUNC">xmlEntityReferenceFunc</a>
 </dd>
 <dt>tracking</dt>
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html
index 232fa6f..6a71b39 100644
--- a/doc/APIchunk2.html
+++ b/doc/APIchunk2.html
@@ -236,6 +236,37 @@
 <dd>
 <a href="html/libxml-tree.html#XMLNEWDOCFRAGMENT">xmlNewDocFragment</a>
 </dd>
+<dt>Free</dt>
+<dd>
+<a href="html/libxml-docbparser.html#DOCBFREEPARSERCTXT">docbFreeParserCtxt</a>
+<a href="html/libxml-htmlparser.html#HTMLFREEPARSERCTXT">htmlFreeParserCtxt</a>
+<a href="html/libxml-catalog.html#XMLACATALOGDUMP">xmlACatalogDump</a>
+<a href="html/libxml-catalog.html#XMLCATALOGCLEANUP">xmlCatalogCleanup</a>
+<a href="html/libxml-catalog.html#XMLCATALOGDUMP">xmlCatalogDump</a>
+<a href="html/libxml-catalog.html#XMLCATALOGFREELOCAL">xmlCatalogFreeLocal</a>
+<a href="html/libxml-catalog.html#XMLFREECATALOG">xmlFreeCatalog</a>
+<a href="html/libxml-tree.html#XMLFREEDOC">xmlFreeDoc</a>
+<a href="html/libxml-tree.html#XMLFREEDTD">xmlFreeDtd</a>
+<a href="html/libxml-valid.html#XMLFREEELEMENTCONTENT">xmlFreeElementContent</a>
+<a href="html/libxml-parserinternals.html#XMLFREEINPUTSTREAM">xmlFreeInputStream</a>
+<a href="html/libxml-tree.html#XMLFREENODE">xmlFreeNode</a>
+<a href="html/libxml-tree.html#XMLFREENODELIST">xmlFreeNodeList</a>
+<a href="html/libxml-tree.html#XMLFREENS">xmlFreeNs</a>
+<a href="html/libxml-tree.html#XMLFREENSLIST">xmlFreeNsList</a>
+<a href="html/libxml-parser.html#XMLFREEPARSERCTXT">xmlFreeParserCtxt</a>
+<a href="html/libxml-xmlio.html#XMLFREEPARSERINPUTBUFFER">xmlFreeParserInputBuffer</a>
+<a href="html/libxml-tree.html#XMLFREEPROP">xmlFreeProp</a>
+<a href="html/libxml-tree.html#XMLFREEPROPLIST">xmlFreePropList</a>
+<a href="html/libxml-uri.html#XMLFREEURI">xmlFreeURI</a>
+<a href="html/libxml-hash.html#XMLHASHFREE">xmlHashFree</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREECOMPEXPR">xmlXPathFreeCompExpr</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREECONTEXT">xmlXPathFreeContext</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREENODESET">xmlXPathFreeNodeSet</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREENODESETLIST">xmlXPathFreeNodeSetList</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREEOBJECT">xmlXPathFreeObject</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHFREEPARSERCONTEXT">xmlXPathFreeParserContext</a>
+<a href="html/libxml-xpointer.html#XMLXPTRFREELOCATIONSET">xmlXPtrFreeLocationSet</a>
+</dd>
 <dt>Frees</dt>
 <dd>
 <a href="html/libxml-tree.html#XMLBUFFERFREE">xmlBufferFree</a>
@@ -467,12 +498,12 @@
 <dt>Initialize</dt>
 <dd>
 <a href="html/libxml-sax.html#DOCBDEFAULTSAXHANDLERINIT">docbDefaultSAXHandlerInit</a>
-<a href="html/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-parserinternals.html#HTMLINITAUTOCLOSE">htmlInitAutoClose</a>
 <a href="html/libxml-sax.html#INITDOCBDEFAULTSAXHANDLER">initdocbDefaultSAXHandler</a>
 <a href="html/libxml-sax.html#INITHTMLDEFAULTSAXHANDLER">inithtmlDefaultSAXHandler</a>
 <a href="html/libxml-sax.html#INITXMLDEFAULTSAXHANDLER">initxmlDefaultSAXHandler</a>
-<a href="html/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-encoding.html#XMLINITCHARENCODINGHANDLERS">xmlInitCharEncodingHandlers</a>
 <a href="html/libxml-xmlmemory.html#XMLINITMEMORY">xmlInitMemory</a>
 <a href="html/libxml-parser.html#XMLINITNODEINFOSEQ">xmlInitNodeInfoSeq</a>
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index 4070104..537329b 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -184,6 +184,7 @@
 </dd>
 <dt>unlinked</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
 <a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
 <a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLADDSIBLING">xmlAddSibling</a>
@@ -395,6 +396,7 @@
 <a href="html/libxml-valid.html#XMLADDNOTATIONDECL">xmlAddNotationDecl</a>
 <a href="html/libxml-valid.html#XMLADDREF">xmlAddRef</a>
 <a href="html/libxml-debugxml.html#XMLSHELLVALIDATE">xmlShellValidate</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEDECL">xmlValidateAttributeDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDOCUMENT">xmlValidateDocument</a>
@@ -447,6 +449,7 @@
 <dd>
 <a href="html/libxml-tree.html#XMLSETCOMPRESSMODE">xmlSetCompressMode</a>
 <a href="html/libxml-tree.html#XMLSETDOCCOMPRESSMODE">xmlSetDocCompressMode</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 </dd>
 <dt>varags</dt>
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index 7160215..03f37e1 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -149,6 +149,7 @@
 <dd>
 <a href="html/libxml-xpathinternals.html#CHECK-ERROR-CAPS">CHECK_ERROR</a>
 <a href="html/libxml-xpathinternals.html#CHECK-ERROR0-CAPS">CHECK_ERROR0</a>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
 <a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
 <a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLADDSIBLING">xmlAddSibling</a>
@@ -196,6 +197,7 @@
 <a href="html/libxml-parser.html#XMLPARSECTXTEXTERNALENTITY">xmlParseCtxtExternalEntity</a>
 <a href="html/libxml-parser.html#XMLPARSEEXTPARSEDENT">xmlParseExtParsedEnt</a>
 <a href="html/libxml-parser.html#XMLPARSEEXTERNALENTITY">xmlParseExternalEntity</a>
+<a href="html/libxml-valid.html#XMLVALIDATEDTDFINAL">xmlValidateDtdFinal</a>
 </dd>
 <dt>wellformed</dt>
 <dd>
@@ -985,6 +987,37 @@
 <dd>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODETRAILING">xmlXPathNodeTrailing</a>
 </dd>
+<dt>xmlXPathObjectPtr</dt>
+<dd>
+<a href="html/libxml-xpath.html#XMLXPATHCOMPILE">xmlXPathCompile</a>
+<a href="html/libxml-xpath.html#XMLXPATHCOMPILEDEVAL">xmlXPathCompiledEval</a>
+<a href="html/libxml-xpath.html#XMLXPATHEVAL">xmlXPathEval</a>
+<a href="html/libxml-xpath.html#XMLXPATHEVALEXPRESSION">xmlXPathEvalExpression</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREENODESETLIST">xmlXPathFreeNodeSetList</a>
+<a href="html/libxml-xpath.html#XMLXPATHFREEOBJECT">xmlXPathFreeObject</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWBOOLEAN">xmlXPathNewBoolean</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWCSTRING">xmlXPathNewCString</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWFLOAT">xmlXPathNewFloat</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESET">xmlXPathNewNodeSet</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESETLIST">xmlXPathNewNodeSetList</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWSTRING">xmlXPathNewString</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">xmlXPathNewValueTree</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHWRAPNODESET">xmlXPathWrapNodeSet</a>
+<a href="html/libxml-xpointer.html#XMLXPTREVAL">xmlXPtrEval</a>
+<a href="html/libxml-xpointer.html#XMLXPTRLOCATIONSETADD">xmlXPtrLocationSetAdd</a>
+<a href="html/libxml-xpointer.html#XMLXPTRLOCATIONSETCREATE">xmlXPtrLocationSetCreate</a>
+<a href="html/libxml-xpointer.html#XMLXPTRLOCATIONSETDEL">xmlXPtrLocationSetDel</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWCOLLAPSEDRANGE">xmlXPtrNewCollapsedRange</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODESET">xmlXPtrNewLocationSetNodeSet</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODES">xmlXPtrNewLocationSetNodes</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGE">xmlXPtrNewRange</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGENODEOBJECT">xmlXPtrNewRangeNodeObject</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGENODEPOINT">xmlXPtrNewRangeNodePoint</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGENODES">xmlXPtrNewRangeNodes</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTNODE">xmlXPtrNewRangePointNode</a>
+<a href="html/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS">xmlXPtrNewRangePoints</a>
+<a href="html/libxml-xpointer.html#XMLXPTRWRAPLOCATIONSET">xmlXPtrWrapLocationSet</a>
+</dd>
 <dt>xmlXPathParserContext</dt>
 <dd>
 <a href="html/libxml-xpathinternals.html#XMLXPATHFREEPARSERCONTEXT">xmlXPathFreeParserContext</a>
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html
index 5ea19c1..760bff3 100644
--- a/doc/APIchunk3.html
+++ b/doc/APIchunk3.html
@@ -395,6 +395,7 @@
 <dt>Note:</dt>
 <dd>
 <a href="html/libxml-encoding.html#XMLCHARENCODINGOUTPUTFUNC">xmlCharEncodingOutputFunc</a>
+<a href="html/libxml-entities.html#XMLGETDTDENTITY">xmlGetDtdEntity</a>
 <a href="html/libxml-parserinternals.html#XMLPARSEATTVALUE">xmlParseAttValue</a>
 <a href="html/libxml-encoding.html#XMLUTF8STRSUB">xmlUTF8Strsub</a>
 </dd>
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html
index 73ec193..aa62fa5 100644
--- a/doc/APIchunk6.html
+++ b/doc/APIchunk6.html
@@ -257,6 +257,9 @@
 <a href="html/libxml-htmltree.html#HTMLNODEDUMPFORMATOUTPUT">htmlNodeDumpFormatOutput</a>
 <a href="html/libxml-htmltree.html#HTMLSAVEFILEENC">htmlSaveFileEnc</a>
 <a href="html/libxml-htmltree.html#HTMLSAVEFILEFORMAT">htmlSaveFileFormat</a>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLDOCDUMPFORMATMEMORY">xmlDocDumpFormatMemory</a>
 <a href="html/libxml-tree.html#XMLDOCDUMPFORMATMEMORYENC">xmlDocDumpFormatMemoryEnc</a>
 <a href="html/libxml-tree.html#XMLNEWCHILD">xmlNewChild</a>
@@ -427,6 +430,7 @@
 </dd>
 <dt>already</dt>
 <dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
 <a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
 <a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLADDSIBLING">xmlAddSibling</a>
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html
index 9e092f1..2b42929 100644
--- a/doc/APIchunk7.html
+++ b/doc/APIchunk7.html
@@ -301,7 +301,6 @@
 </dd>
 <dt>blocks</dt>
 <dd>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 <a href="html/libxml-parserinternals.html#XMLISCHAR">xmlIsChar</a>
 <a href="html/libxml-xmlmemory.html#XMLMEMDISPLAY">xmlMemDisplay</a>
 <a href="html/libxml-xmlmemory.html#XMLMEMORYDUMP">xmlMemoryDump</a>
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index ebb9405..d48262e 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -414,6 +414,9 @@
 <a href="html/libxml-htmltree.html#HTMLNODEDUMPFILE">htmlNodeDumpFile</a>
 <a href="html/libxml-htmltree.html#HTMLNODEDUMPFILEFORMAT">htmlNodeDumpFileFormat</a>
 <a href="html/libxml-htmltree.html#HTMLNODEDUMPFORMATOUTPUT">htmlNodeDumpFormatOutput</a>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
 <a href="html/libxml-tree.html#XMLDOCGETROOTELEMENT">xmlDocGetRootElement</a>
 <a href="html/libxml-tree.html#XMLDOCSETROOTELEMENT">xmlDocSetRootElement</a>
 <a href="html/libxml-tree.html#XMLELEMDUMP">xmlElemDump</a>
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html
index e7f6e58..6ef9826 100644
--- a/doc/APIchunk9.html
+++ b/doc/APIchunk9.html
@@ -419,6 +419,12 @@
 <a href="html/libxml-xmlio.html#XMLIOHTTPOPENW">xmlIOHTTPOpenW</a>
 <a href="html/libxml-uri.html#XMLURIUNESCAPESTRING">xmlURIUnescapeString</a>
 </dd>
+<dt>destroyed</dt>
+<dd>
+<a href="html/libxml-tree.html#XMLADDCHILD">xmlAddChild</a>
+<a href="html/libxml-tree.html#XMLADDNEXTSIBLING">xmlAddNextSibling</a>
+<a href="html/libxml-tree.html#XMLADDPREVSIBLING">xmlAddPrevSibling</a>
+</dd>
 <dt>detect</dt>
 <dd>
 <a href="html/libxml-xmlio.html#XMLINPUTMATCHCALLBACK">xmlInputMatchCallback</a>
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index 8baa0f3..30cec1a 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -95,8 +95,6 @@
 <h2>Type const xmlChar *:</h2>
 <p>
 <a href="html/libxml-htmltree.html#HTMLGETMETAENCODING">htmlGetMetaEncoding</a>
-<a href="html/libxml-sax.html#GETPUBLICID">getPublicId</a>
-<a href="html/libxml-sax.html#GETSYSTEMID">getSystemId</a>
 <a href="html/libxml-catalog.html#XMLCATALOGGETSYSTEM">xmlCatalogGetSystem</a>
 <a href="html/libxml-catalog.html#XMLCATALOGGETPUBLIC">xmlCatalogGetPublic</a>
 <a href="html/libxml-entities.html#XMLENCODEENTITIES">xmlEncodeEntities</a>
@@ -105,6 +103,8 @@
 <a href="html/libxml-parser.html#XMLSTRCASESTR">xmlStrcasestr</a>
 <a href="html/libxml-tree.html#XMLBUFFERCONTENT">xmlBufferContent</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNSLOOKUP">xmlXPathNsLookup</a>
+<a href="html/libxml-sax.html#GETPUBLICID">getPublicId</a>
+<a href="html/libxml-sax.html#GETSYSTEMID">getSystemId</a>
 </p>
 <h2>Type const xmlParserNodeInfo *:</h2>
 <p>
@@ -291,6 +291,7 @@
 <a href="html/libxml-uri.html#XMLURIESCAPE">xmlURIEscape</a>
 <a href="html/libxml-valid.html#XMLSPLITQNAME2">xmlSplitQName2</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-xpath.html#XMLXPATHCASTBOOLEANTOSTRING">xmlXPathCastBooleanToString</a>
 <a href="html/libxml-xpath.html#XMLXPATHCASTNUMBERTOSTRING">xmlXPathCastNumberToString</a>
 <a href="html/libxml-xpath.html#XMLXPATHCASTNODETOSTRING">xmlXPathCastNodeToString</a>
@@ -363,8 +364,6 @@
 </p>
 <h2>Type xmlEntityPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
-<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
 <a href="html/libxml-entities.html#XMLADDDOCENTITY">xmlAddDocEntity</a>
 <a href="html/libxml-entities.html#XMLADDDTDENTITY">xmlAddDtdEntity</a>
 <a href="html/libxml-entities.html#XMLGETPREDEFINEDENTITY">xmlGetPredefinedEntity</a>
@@ -374,6 +373,8 @@
 <a href="html/libxml-parser.html#GETENTITYSAXFUNC">getEntitySAXFunc</a>
 <a href="html/libxml-parser.html#GETPARAMETERENTITYSAXFUNC">getParameterEntitySAXFunc</a>
 <a href="html/libxml-parserinternals.html#XMLPARSEENTITYREF">xmlParseEntityRef</a>
+<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
+<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
 </p>
 <h2>Type xmlEnumerationPtr:</h2>
 <p>
@@ -484,7 +485,6 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHTRAILINGSORTED">xmlXPathTrailingSorted</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODETRAILING">xmlXPathNodeTrailing</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHTRAILING">xmlXPathTrailing</a>
-<a href="html/libxml-xpath.html#XMLXPATHNODESETCREATE">xmlXPathNodeSetCreate</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
 </p>
 <h2>Type xmlNotationPtr:</h2>
@@ -498,13 +498,13 @@
 </p>
 <h2>Type xmlNsPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#GETNAMESPACE">getNamespace</a>
 <a href="html/libxml-tree.html#XMLNEWGLOBALNS">xmlNewGlobalNs</a>
 <a href="html/libxml-tree.html#XMLNEWNS">xmlNewNs</a>
 <a href="html/libxml-tree.html#XMLSEARCHNS">xmlSearchNs</a>
 <a href="html/libxml-tree.html#XMLSEARCHNSBYHREF">xmlSearchNsByHref</a>
 <a href="html/libxml-tree.html#XMLCOPYNAMESPACE">xmlCopyNamespace</a>
 <a href="html/libxml-tree.html#XMLCOPYNAMESPACELIST">xmlCopyNamespaceList</a>
+<a href="html/libxml-sax.html#GETNAMESPACE">getNamespace</a>
 </p>
 <h2>Type xmlNsPtr *:</h2>
 <p>
@@ -540,7 +540,6 @@
 </p>
 <h2>Type xmlParserInputPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
 <a href="html/libxml-parser.html#RESOLVEENTITYSAXFUNC">resolveEntitySAXFunc</a>
 <a href="html/libxml-parser.html#XMLEXTERNALENTITYLOADER">xmlExternalEntityLoader</a>
 <a href="html/libxml-parser.html#XMLNEWIOINPUTSTREAM">xmlNewIOInputStream</a>
@@ -551,6 +550,7 @@
 <a href="html/libxml-parserinternals.html#XMLNEWINPUTSTREAM">xmlNewInputStream</a>
 <a href="html/libxml-parserinternals.html#INPUTPOP">inputPop</a>
 <a href="html/libxml-xmlio.html#XMLNONETEXTERNALENTITYLOADER">xmlNoNetExternalEntityLoader</a>
+<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
 </p>
 <h2>Type xmlRMutexPtr:</h2>
 <p>
@@ -572,7 +572,6 @@
 <h2>Type xmlXPathContextPtr:</h2>
 <p>
 <a href="html/libxml-xpath.html#XMLXPATHNEWCONTEXT">xmlXPathNewContext</a>
-<a href="html/libxml-xpath.html#XMLXPATHNEWCONTEXT">xmlXPathNewContext</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWCONTEXT">xmlXPtrNewContext</a>
 </p>
 <h2>Type xmlXPathFunction:</h2>
@@ -603,14 +602,9 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWBOOLEAN">xmlXPathNewBoolean</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESET">xmlXPathNewNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">xmlXPathNewValueTree</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESET">xmlXPathNewNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESETLIST">xmlXPathNewNodeSetList</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPNODESET">xmlXPathWrapNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPEXTERNAL">xmlXPathWrapExternal</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWFLOAT">xmlXPathNewFloat</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWBOOLEAN">xmlXPathNewBoolean</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWSTRING">xmlXPathNewString</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWCSTRING">xmlXPathNewCString</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWRANGE">xmlXPtrNewRange</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS">xmlXPtrNewRangePoints</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWRANGENODEPOINT">xmlXPtrNewRangeNodePoint</a>
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index f6796fb..55368a9 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -201,8 +201,8 @@
 <a href="html/libxml-sax.html#INITXMLDEFAULTSAXHANDLER">initxmlDefaultSAXHandler</a>
 <a href="html/libxml-sax.html#INITHTMLDEFAULTSAXHANDLER">inithtmlDefaultSAXHandler</a>
 <a href="html/libxml-sax.html#INITDOCBDEFAULTSAXHANDLER">initdocbDefaultSAXHandler</a>
-<a href="html/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
-<a href="html/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-sax.html#DOCBDEFAULTSAXHANDLERINIT">docbDefaultSAXHandlerInit</a>
 </p>
 <h2>Module catalog:</h2>
@@ -319,8 +319,7 @@
 <h2>Module entities:</h2>
 <p>
 <a href="html/libxml-entities.html#XMLENTITYTYPE">xmlEntityType</a>
-<a href="html/libxml-entities.html#XMLENTITY">xmlEntity</a>
-<a href="html/libxml-entities.html#XMLENTITYPTR">xmlEntityPtr</a>
+<a href="html/libxml-tree.html#XMLENTITY">xmlEntity</a>
 <a href="html/libxml-entities.html#XMLENTITIESTABLEPTR">xmlEntitiesTablePtr</a>
 <a href="html/libxml-entities.html#XMLINITIALIZEPREDEFINEDENTITIES">xmlInitializePredefinedEntities</a>
 <a href="html/libxml-entities.html#XMLADDDOCENTITY">xmlAddDocEntity</a>
@@ -490,7 +489,6 @@
 <a href="html/libxml-parser.html#XML-COMPLETE-ATTRS-CAPS">XML_COMPLETE_ATTRS</a>
 <a href="html/libxml-parser.html#XMLPARSERCTXT">xmlParserCtxt</a>
 <a href="html/libxml-parser.html#XMLSAXLOCATOR">xmlSAXLocator</a>
-<a href="html/libxml-parser.html#XMLSAXLOCATORPTR">xmlSAXLocatorPtr</a>
 <a href="html/libxml-parser.html#RESOLVEENTITYSAXFUNC">resolveEntitySAXFunc</a>
 <a href="html/libxml-parser.html#INTERNALSUBSETSAXFUNC">internalSubsetSAXFunc</a>
 <a href="html/libxml-parser.html#EXTERNALSUBSETSAXFUNC">externalSubsetSAXFunc</a>
@@ -520,7 +518,6 @@
 <a href="html/libxml-parser.html#HASINTERNALSUBSETSAXFUNC">hasInternalSubsetSAXFunc</a>
 <a href="html/libxml-parser.html#HASEXTERNALSUBSETSAXFUNC">hasExternalSubsetSAXFunc</a>
 <a href="html/libxml-parser.html#XMLSAXHANDLER">xmlSAXHandler</a>
-<a href="html/libxml-parser.html#XMLSAXHANDLERPTR">xmlSAXHandlerPtr</a>
 <a href="html/libxml-parser.html#XMLEXTERNALENTITYLOADER">xmlExternalEntityLoader</a>
 <a href="html/libxml-parser.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE">xmlSubstituteEntitiesDefaultValue</a>
 <a href="html/libxml-parser.html#XMLINITPARSER">xmlInitParser</a>
@@ -570,8 +567,6 @@
 <a href="html/libxml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY">xmlParseBalancedChunkMemory</a>
 <a href="html/libxml-parser.html#XMLPARSEEXTERNALENTITY">xmlParseExternalEntity</a>
 <a href="html/libxml-parser.html#XMLPARSECTXTEXTERNALENTITY">xmlParseCtxtExternalEntity</a>
-<a href="html/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
-<a href="html/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-parser.html#XMLINITPARSERCTXT">xmlInitParserCtxt</a>
 <a href="html/libxml-parser.html#XMLCLEARPARSERCTXT">xmlClearParserCtxt</a>
 <a href="html/libxml-parser.html#XMLFREEPARSERCTXT">xmlFreeParserCtxt</a>
@@ -615,8 +610,8 @@
 <a href="html/libxml-parserinternals.html#XMLISLETTER">xmlIsLetter</a>
 <a href="html/libxml-parserinternals.html#XMLISDIGIT">xmlIsDigit</a>
 <a href="html/libxml-parserinternals.html#XMLISIDEOGRAPHIC">xmlIsIdeographic</a>
-<a href="html/libxml-parserinternals.html#XMLISCOMBINING">xmlIsCombining</a>
 <a href="html/libxml-parserinternals.html#XMLISEXTENDER">xmlIsExtender</a>
+<a href="html/libxml-parserinternals.html#XMLISCOMBINING">xmlIsCombining</a>
 <a href="html/libxml-parserinternals.html#XMLISCHAR">xmlIsChar</a>
 <a href="html/libxml-parserinternals.html#XMLCREATEFILEPARSERCTXT">xmlCreateFileParserCtxt</a>
 <a href="html/libxml-parserinternals.html#XMLCREATEMEMORYPARSERCTXT">xmlCreateMemoryParserCtxt</a>
@@ -624,7 +619,6 @@
 <a href="html/libxml-parserinternals.html#XMLCREATEENTITYPARSERCTXT">xmlCreateEntityParserCtxt</a>
 <a href="html/libxml-parserinternals.html#XMLSWITCHENCODING">xmlSwitchEncoding</a>
 <a href="html/libxml-parserinternals.html#XMLSWITCHTOENCODING">xmlSwitchToEncoding</a>
-<a href="html/libxml-parser.html#XMLFREEPARSERCTXT">xmlFreeParserCtxt</a>
 <a href="html/libxml-parserinternals.html#XMLHANDLEENTITY">xmlHandleEntity</a>
 <a href="html/libxml-parserinternals.html#XMLNEWSTRINGINPUTSTREAM">xmlNewStringInputStream</a>
 <a href="html/libxml-parserinternals.html#XMLNEWENTITYINPUTSTREAM">xmlNewEntityInputStream</a>
@@ -716,12 +710,12 @@
 <p>
 <a href="html/libxml-threads.html#XMLMUTEX">xmlMutex</a>
 <a href="html/libxml-threads.html#XMLMUTEXPTR">xmlMutexPtr</a>
+<a href="html/libxml-threads.html#XMLRMUTEX">xmlRMutex</a>
+<a href="html/libxml-threads.html#XMLRMUTEXPTR">xmlRMutexPtr</a>
 <a href="html/libxml-threads.html#XMLNEWMUTEX">xmlNewMutex</a>
 <a href="html/libxml-threads.html#XMLMUTEXLOCK">xmlMutexLock</a>
 <a href="html/libxml-threads.html#XMLMUTEXUNLOCK">xmlMutexUnlock</a>
 <a href="html/libxml-threads.html#XMLFREEMUTEX">xmlFreeMutex</a>
-<a href="html/libxml-threads.html#XMLRMUTEX">xmlRMutex</a>
-<a href="html/libxml-threads.html#XMLRMUTEXPTR">xmlRMutexPtr</a>
 <a href="html/libxml-threads.html#XMLNEWRMUTEX">xmlNewRMutex</a>
 <a href="html/libxml-threads.html#XMLRMUTEXLOCK">xmlRMutexLock</a>
 <a href="html/libxml-threads.html#XMLRMUTEXUNLOCK">xmlRMutexUnlock</a>
@@ -744,6 +738,12 @@
 <a href="html/libxml-tree.html#XMLPARSERINPUTPTR">xmlParserInputPtr</a>
 <a href="html/libxml-parser.html#XMLPARSERCTXT">xmlParserCtxt</a>
 <a href="html/libxml-tree.html#XMLPARSERCTXTPTR">xmlParserCtxtPtr</a>
+<a href="html/libxml-parser.html#XMLSAXLOCATOR">xmlSAXLocator</a>
+<a href="html/libxml-tree.html#XMLSAXLOCATORPTR">xmlSAXLocatorPtr</a>
+<a href="html/libxml-parser.html#XMLSAXHANDLER">xmlSAXHandler</a>
+<a href="html/libxml-tree.html#XMLSAXHANDLERPTR">xmlSAXHandlerPtr</a>
+<a href="html/libxml-tree.html#XMLENTITY">xmlEntity</a>
+<a href="html/libxml-tree.html#XMLENTITYPTR">xmlEntityPtr</a>
 <a href="html/libxml-tree.html#BASE-BUFFER-SIZE-CAPS">BASE_BUFFER_SIZE</a>
 <a href="html/libxml-tree.html#XML-XML-NAMESPACE-CAPS">XML_XML_NAMESPACE</a>
 <a href="html/libxml-tree.html#XMLELEMENTTYPE">xmlElementType</a>
@@ -983,6 +983,7 @@
 <a href="html/libxml-valid.html#XMLVALIDATEROOT">xmlValidateRoot</a>
 <a href="html/libxml-valid.html#XMLVALIDATEELEMENTDECL">xmlValidateElementDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEDECL">xmlValidateAttributeDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEVALUE">xmlValidateAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATENOTATIONDECL">xmlValidateNotationDecl</a>
@@ -1066,7 +1067,6 @@
 <h2>Module xmlmemory:</h2>
 <p>
 <a href="html/libxml-xmlmemory.html#DEBUG-MEMORY-CAPS">DEBUG_MEMORY</a>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 <a href="html/libxml-xmlmemory.html#XMLFREEFUNC">xmlFreeFunc</a>
 <a href="html/libxml-xmlmemory.html#XMLMALLOCFUNC">xmlMallocFunc</a>
 <a href="html/libxml-xmlmemory.html#XMLREALLOCFUNC">xmlReallocFunc</a>
@@ -1258,28 +1258,19 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETSORT">xmlXPathNodeSetSort</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHIDFUNCTION">xmlXPathIdFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHROOT">xmlXPathRoot</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALEXPR">xmlXPathEvalExpr</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPARSENAME">xmlXPathParseName</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPARSENCNAME">xmlXPathParseNCName</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGEVALNUMBER">xmlXPathStringEvalNumber</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALUATEPREDICATERESULT">xmlXPathEvaluatePredicateResult</a>
-<a href="html/libxml-xpath.html#XMLXPATHINIT">xmlXPathInit</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION">xmlXPathStringFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTERALLFUNCTIONS">xmlXPathRegisterAllFunctions</a>
-<a href="html/libxml-xpath.html#XMLXPATHNODESETCREATE">xmlXPathNodeSetCreate</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETDEL">xmlXPathNodeSetDel</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETREMOVE">xmlXPathNodeSetRemove</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREENODESET">xmlXPathFreeNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESETLIST">xmlXPathNewNodeSetList</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPNODESET">xmlXPathWrapNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPEXTERNAL">xmlXPathWrapExternal</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREENODESETLIST">xmlXPathFreeNodeSetList</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREEOBJECT">xmlXPathFreeObject</a>
-<a href="html/libxml-xpath.html#XMLXPATHNEWCONTEXT">xmlXPathNewContext</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREECONTEXT">xmlXPathFreeContext</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEQUALVALUES">xmlXPathEqualValues</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCOMPAREVALUES">xmlXPathCompareValues</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHVALUEFLIPSIGN">xmlXPathValueFlipSign</a>
@@ -1305,8 +1296,10 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHLASTFUNCTION">xmlXPathLastFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPOSITIONFUNCTION">xmlXPathPositionFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCOUNTFUNCTION">xmlXPathCountFunction</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHIDFUNCTION">xmlXPathIdFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHLOCALNAMEFUNCTION">xmlXPathLocalNameFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNAMESPACEURIFUNCTION">xmlXPathNamespaceURIFunction</a>
+<a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION">xmlXPathStringFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGLENGTHFUNCTION">xmlXPathStringLengthFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCONCATFUNCTION">xmlXPathConcatFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCONTAINSFUNCTION">xmlXPathContainsFunction</a>
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index 2a4f1d8..33f964c 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -124,7 +124,6 @@
 <a href="html/libxml-xmlmemory.html#XMLMEMSHOW">xmlMemShow</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">xmlXPathDebugDumpObject</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPCOMPEXPR">xmlXPathDebugDumpCompExpr</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">xmlXPathDebugDumpObject</a>
 </p>
 <h2>Type char **:</h2>
 <p>
@@ -184,46 +183,6 @@
 <a href="html/libxml-htmltree.html#HTMLNEWDOCNODTD">htmlNewDocNoDtD</a>
 <a href="html/libxml-htmltree.html#HTMLNEWDOCNODTD">htmlNewDocNoDtD</a>
 <a href="html/libxml-htmltree.html#HTMLSETMETAENCODING">htmlSetMetaEncoding</a>
-<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
-<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
-<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
-<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
-<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
-<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
-<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
-<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
-<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
-<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
-<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
-<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
-<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
-<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
-<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
-<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
-<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
-<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
-<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
-<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
-<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
-<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
-<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
-<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
-<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
-<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
-<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
-<a href="html/libxml-sax.html#ENDELEMENT">endElement</a>
-<a href="html/libxml-sax.html#REFERENCE">reference</a>
-<a href="html/libxml-sax.html#CHARACTERS">characters</a>
-<a href="html/libxml-sax.html#IGNORABLEWHITESPACE">ignorableWhitespace</a>
-<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
-<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
-<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
-<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
-<a href="html/libxml-sax.html#SETNAMESPACE">setNamespace</a>
-<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
-<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
-<a href="html/libxml-sax.html#COMMENT">comment</a>
-<a href="html/libxml-sax.html#CDATABLOCK">cdataBlock</a>
 <a href="html/libxml-catalog.html#XMLACATALOGADD">xmlACatalogAdd</a>
 <a href="html/libxml-catalog.html#XMLACATALOGADD">xmlACatalogAdd</a>
 <a href="html/libxml-catalog.html#XMLACATALOGADD">xmlACatalogAdd</a>
@@ -464,6 +423,8 @@
 <a href="html/libxml-valid.html#XMLGETREFS">xmlGetRefs</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEVALUE">xmlValidateAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEONEATTRIBUTE">xmlValidateOneAttribute</a>
 <a href="html/libxml-valid.html#XMLVALIDATENOTATIONUSE">xmlValidateNotationUse</a>
@@ -504,16 +465,55 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWPARSERCONTEXT">xmlXPathNewParserContext</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWSTRING">xmlXPathNewString</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGEVALNUMBER">xmlXPathStringEvalNumber</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWSTRING">xmlXPathNewString</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHISNODETYPE">xmlXPathIsNodeType</a>
 <a href="html/libxml-xpointer.html#XMLXPTREVAL">xmlXPtrEval</a>
+<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
+<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
+<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
+<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
+<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
+<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
+<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
+<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
+<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
+<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
+<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
+<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
+<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
+<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
+<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
+<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
+<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
+<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
+<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
+<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
+<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
+<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
+<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
+<a href="html/libxml-sax.html#ENDELEMENT">endElement</a>
+<a href="html/libxml-sax.html#REFERENCE">reference</a>
+<a href="html/libxml-sax.html#CHARACTERS">characters</a>
+<a href="html/libxml-sax.html#IGNORABLEWHITESPACE">ignorableWhitespace</a>
+<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
+<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
+<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
+<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
+<a href="html/libxml-sax.html#SETNAMESPACE">setNamespace</a>
+<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
+<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
+<a href="html/libxml-sax.html#COMMENT">comment</a>
+<a href="html/libxml-sax.html#CDATABLOCK">cdataBlock</a>
 </p>
 <h2>Type const xmlChar **:</h2>
 <p>
-<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
 <a href="html/libxml-parser.html#STARTELEMENTSAXFUNC">startElementSAXFunc</a>
 <a href="html/libxml-valid.html#XMLVALIDGETVALIDELEMENTS">xmlValidGetValidElements</a>
 <a href="html/libxml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">xmlValidGetPotentialChildren</a>
+<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
 </p>
 <h2>Type const xmlChar*:</h2>
 <p>
@@ -561,7 +561,6 @@
 <a href="html/libxml-xpath.html#XMLXPATHCASTNUMBERTOBOOLEAN">xmlXPathCastNumberToBoolean</a>
 <a href="html/libxml-xpath.html#XMLXPATHCASTNUMBERTOSTRING">xmlXPathCastNumberToString</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWFLOAT">xmlXPathNewFloat</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWFLOAT">xmlXPathNewFloat</a>
 </p>
 <h2>Type ftpDataCallback:</h2>
 <p>
@@ -660,40 +659,6 @@
 <a href="html/libxml-htmlparser.html#HTMLSAXPARSEDOC">htmlSAXParseDoc</a>
 <a href="html/libxml-htmlparser.html#HTMLSAXPARSEFILE">htmlSAXParseFile</a>
 <a href="html/libxml-htmlparser.html#HTMLCREATEPUSHPARSERCTXT">htmlCreatePushParserCtxt</a>
-<a href="html/libxml-sax.html#GETPUBLICID">getPublicId</a>
-<a href="html/libxml-sax.html#GETSYSTEMID">getSystemId</a>
-<a href="html/libxml-sax.html#SETDOCUMENTLOCATOR">setDocumentLocator</a>
-<a href="html/libxml-sax.html#GETLINENUMBER">getLineNumber</a>
-<a href="html/libxml-sax.html#GETCOLUMNNUMBER">getColumnNumber</a>
-<a href="html/libxml-sax.html#ISSTANDALONE">isStandalone</a>
-<a href="html/libxml-sax.html#HASINTERNALSUBSET">hasInternalSubset</a>
-<a href="html/libxml-sax.html#HASEXTERNALSUBSET">hasExternalSubset</a>
-<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
-<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
-<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
-<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
-<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
-<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
-<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
-<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
-<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
-<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
-<a href="html/libxml-sax.html#STARTDOCUMENT">startDocument</a>
-<a href="html/libxml-sax.html#ENDDOCUMENT">endDocument</a>
-<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
-<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
-<a href="html/libxml-sax.html#ENDELEMENT">endElement</a>
-<a href="html/libxml-sax.html#REFERENCE">reference</a>
-<a href="html/libxml-sax.html#CHARACTERS">characters</a>
-<a href="html/libxml-sax.html#IGNORABLEWHITESPACE">ignorableWhitespace</a>
-<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
-<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
-<a href="html/libxml-sax.html#SETNAMESPACE">setNamespace</a>
-<a href="html/libxml-sax.html#GETNAMESPACE">getNamespace</a>
-<a href="html/libxml-sax.html#CHECKNAMESPACE">checkNamespace</a>
-<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
-<a href="html/libxml-sax.html#COMMENT">comment</a>
-<a href="html/libxml-sax.html#CDATABLOCK">cdataBlock</a>
 <a href="html/libxml-catalog.html#XMLCATALOGFREELOCAL">xmlCatalogFreeLocal</a>
 <a href="html/libxml-catalog.html#XMLCATALOGADDLOCAL">xmlCatalogAddLocal</a>
 <a href="html/libxml-catalog.html#XMLCATALOGLOCALRESOLVE">xmlCatalogLocalResolve</a>
@@ -808,6 +773,40 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHFUNCLOOKUPFUNC">xmlXPathFuncLookupFunc</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTERFUNCLOOKUP">xmlXPathRegisterFuncLookup</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPEXTERNAL">xmlXPathWrapExternal</a>
+<a href="html/libxml-sax.html#GETPUBLICID">getPublicId</a>
+<a href="html/libxml-sax.html#GETSYSTEMID">getSystemId</a>
+<a href="html/libxml-sax.html#SETDOCUMENTLOCATOR">setDocumentLocator</a>
+<a href="html/libxml-sax.html#GETLINENUMBER">getLineNumber</a>
+<a href="html/libxml-sax.html#GETCOLUMNNUMBER">getColumnNumber</a>
+<a href="html/libxml-sax.html#ISSTANDALONE">isStandalone</a>
+<a href="html/libxml-sax.html#HASINTERNALSUBSET">hasInternalSubset</a>
+<a href="html/libxml-sax.html#HASEXTERNALSUBSET">hasExternalSubset</a>
+<a href="html/libxml-sax.html#INTERNALSUBSET">internalSubset</a>
+<a href="html/libxml-sax.html#EXTERNALSUBSET">externalSubset</a>
+<a href="html/libxml-sax.html#GETENTITY">getEntity</a>
+<a href="html/libxml-sax.html#GETPARAMETERENTITY">getParameterEntity</a>
+<a href="html/libxml-sax.html#RESOLVEENTITY">resolveEntity</a>
+<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
+<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
+<a href="html/libxml-sax.html#NOTATIONDECL">notationDecl</a>
+<a href="html/libxml-sax.html#UNPARSEDENTITYDECL">unparsedEntityDecl</a>
+<a href="html/libxml-sax.html#STARTDOCUMENT">startDocument</a>
+<a href="html/libxml-sax.html#ENDDOCUMENT">endDocument</a>
+<a href="html/libxml-sax.html#ATTRIBUTE">attribute</a>
+<a href="html/libxml-sax.html#STARTELEMENT">startElement</a>
+<a href="html/libxml-sax.html#ENDELEMENT">endElement</a>
+<a href="html/libxml-sax.html#REFERENCE">reference</a>
+<a href="html/libxml-sax.html#CHARACTERS">characters</a>
+<a href="html/libxml-sax.html#IGNORABLEWHITESPACE">ignorableWhitespace</a>
+<a href="html/libxml-sax.html#PROCESSINGINSTRUCTION">processingInstruction</a>
+<a href="html/libxml-sax.html#GLOBALNAMESPACE">globalNamespace</a>
+<a href="html/libxml-sax.html#SETNAMESPACE">setNamespace</a>
+<a href="html/libxml-sax.html#GETNAMESPACE">getNamespace</a>
+<a href="html/libxml-sax.html#CHECKNAMESPACE">checkNamespace</a>
+<a href="html/libxml-sax.html#NAMESPACEDECL">namespaceDecl</a>
+<a href="html/libxml-sax.html#COMMENT">comment</a>
+<a href="html/libxml-sax.html#CDATABLOCK">cdataBlock</a>
 </p>
 <h2>Type xmlAttrPtr:</h2>
 <p>
@@ -922,8 +921,6 @@
 <a href="html/libxml-docbparser.html#DOCBPARSEDOC">docbParseDoc</a>
 <a href="html/libxml-htmlparser.html#HTMLSAXPARSEDOC">htmlSAXParseDoc</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSEDOC">htmlParseDoc</a>
-<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
-<a href="html/libxml-sax.html#CHECKNAMESPACE">checkNamespace</a>
 <a href="html/libxml-hash.html#XMLHASHDEALLOCATOR">xmlHashDeallocator</a>
 <a href="html/libxml-hash.html#XMLHASHCOPIER">xmlHashCopier</a>
 <a href="html/libxml-hash.html#XMLHASHSCANNER">xmlHashScanner</a>
@@ -944,6 +941,8 @@
 <a href="html/libxml-valid.html#XMLNEWELEMENTCONTENT">xmlNewElementContent</a>
 <a href="html/libxml-valid.html#XMLCREATEENUMERATION">xmlCreateEnumeration</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPSTRING">xmlXPathWrapString</a>
+<a href="html/libxml-sax.html#ENTITYDECL">entityDecl</a>
+<a href="html/libxml-sax.html#CHECKNAMESPACE">checkNamespace</a>
 </p>
 <h2>Type xmlChar **:</h2>
 <p>
@@ -1080,6 +1079,7 @@
 <a href="html/libxml-valid.html#XMLVALIDATEROOT">xmlValidateRoot</a>
 <a href="html/libxml-valid.html#XMLVALIDATEELEMENTDECL">xmlValidateElementDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEDECL">xmlValidateAttributeDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATENOTATIONDECL">xmlValidateNotationDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDTD">xmlValidateDtd</a>
@@ -1093,7 +1093,6 @@
 <a href="html/libxml-valid.html#XMLISMIXEDELEMENT">xmlIsMixedElement</a>
 <a href="html/libxml-xinclude.html#XMLXINCLUDEPROCESS">xmlXIncludeProcess</a>
 <a href="html/libxml-xpath.html#XMLXPATHNEWCONTEXT">xmlXPathNewContext</a>
-<a href="html/libxml-xpath.html#XMLXPATHNEWCONTEXT">xmlXPathNewContext</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWCONTEXT">xmlXPtrNewContext</a>
 </p>
 <h2>Type xmlDtdPtr:</h2>
@@ -1117,13 +1116,13 @@
 </p>
 <h2>Type xmlElementContentPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
 <a href="html/libxml-parser.html#ELEMENTDECLSAXFUNC">elementDeclSAXFunc</a>
 <a href="html/libxml-valid.html#XMLCOPYELEMENTCONTENT">xmlCopyElementContent</a>
 <a href="html/libxml-valid.html#XMLFREEELEMENTCONTENT">xmlFreeElementContent</a>
 <a href="html/libxml-valid.html#XMLSNPRINTFELEMENTCONTENT">xmlSnprintfElementContent</a>
 <a href="html/libxml-valid.html#XMLSPRINTFELEMENTCONTENT">xmlSprintfElementContent</a>
 <a href="html/libxml-valid.html#XMLADDELEMENTDECL">xmlAddElementDecl</a>
+<a href="html/libxml-sax.html#ELEMENTDECL">elementDecl</a>
 </p>
 <h2>Type xmlElementContentPtr *:</h2>
 <p>
@@ -1167,11 +1166,11 @@
 </p>
 <h2>Type xmlEnumerationPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
 <a href="html/libxml-parser.html#ATTRIBUTEDECLSAXFUNC">attributeDeclSAXFunc</a>
 <a href="html/libxml-valid.html#XMLFREEENUMERATION">xmlFreeEnumeration</a>
 <a href="html/libxml-valid.html#XMLCOPYENUMERATION">xmlCopyEnumeration</a>
 <a href="html/libxml-valid.html#XMLADDATTRIBUTEDECL">xmlAddAttributeDecl</a>
+<a href="html/libxml-sax.html#ATTRIBUTEDECL">attributeDecl</a>
 </p>
 <h2>Type xmlEnumerationPtr *:</h2>
 <p>
@@ -1451,6 +1450,7 @@
 <a href="html/libxml-valid.html#XMLISID">xmlIsID</a>
 <a href="html/libxml-valid.html#XMLISREF">xmlIsRef</a>
 <a href="html/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">xmlValidNormalizeAttributeValue</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEELEMENT">xmlValidateElement</a>
 <a href="html/libxml-valid.html#XMLVALIDATEONEELEMENT">xmlValidateOneElement</a>
 <a href="html/libxml-valid.html#XMLVALIDATEONEATTRIBUTE">xmlValidateOneAttribute</a>
@@ -1468,10 +1468,7 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">xmlXPathNewValueTree</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
-<a href="html/libxml-xpath.html#XMLXPATHNODESETCREATE">xmlXPathNodeSetCreate</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETDEL">xmlXPathNodeSetDel</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESET">xmlXPathNewNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTSELF">xmlXPathNextSelf</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTCHILD">xmlXPathNextChild</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTDESCENDANT">xmlXPathNextDescendant</a>
@@ -1534,12 +1531,10 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETSORT">xmlXPathNodeSetSort</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETDEL">xmlXPathNodeSetDel</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETREMOVE">xmlXPathNodeSetRemove</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREENODESET">xmlXPathFreeNodeSet</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWNODESETLIST">xmlXPathNewNodeSetList</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHWRAPNODESET">xmlXPathWrapNodeSet</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODESET">xmlXPtrNewLocationSetNodeSet</a>
@@ -1621,7 +1616,6 @@
 <a href="html/libxml-parser.html#XMLLOADEXTERNALENTITY">xmlLoadExternalEntity</a>
 <a href="html/libxml-parserinternals.html#XMLSWITCHENCODING">xmlSwitchEncoding</a>
 <a href="html/libxml-parserinternals.html#XMLSWITCHTOENCODING">xmlSwitchToEncoding</a>
-<a href="html/libxml-parser.html#XMLFREEPARSERCTXT">xmlFreeParserCtxt</a>
 <a href="html/libxml-parserinternals.html#XMLHANDLEENTITY">xmlHandleEntity</a>
 <a href="html/libxml-parserinternals.html#XMLNEWSTRINGINPUTSTREAM">xmlNewStringInputStream</a>
 <a href="html/libxml-parserinternals.html#XMLNEWENTITYINPUTSTREAM">xmlNewEntityInputStream</a>
@@ -1712,6 +1706,8 @@
 <a href="html/libxml-parser.html#XMLPARSERINPUTGROW">xmlParserInputGrow</a>
 <a href="html/libxml-parserinternals.html#XMLPUSHINPUT">xmlPushInput</a>
 <a href="html/libxml-parserinternals.html#XMLFREEINPUTSTREAM">xmlFreeInputStream</a>
+<a href="html/libxml-parserinternals.html#XMLPARSEELEMENTMIXEDCONTENTDECL">xmlParseElementMixedContentDecl</a>
+<a href="html/libxml-parserinternals.html#XMLPARSEELEMENTCHILDRENCONTENTDECL">xmlParseElementChildrenContentDecl</a>
 <a href="html/libxml-parserinternals.html#INPUTPUSH">inputPush</a>
 <a href="html/libxml-parserinternals.html#XMLPARSERINPUTSHRINK">xmlParserInputShrink</a>
 <a href="html/libxml-xmlerror.html#XMLPARSERPRINTFILEINFO">xmlParserPrintFileInfo</a>
@@ -1764,8 +1760,8 @@
 </p>
 <h2>Type xmlSAXLocatorPtr:</h2>
 <p>
-<a href="html/libxml-sax.html#SETDOCUMENTLOCATOR">setDocumentLocator</a>
 <a href="html/libxml-parser.html#SETDOCUMENTLOCATORSAXFUNC">setDocumentLocatorSAXFunc</a>
+<a href="html/libxml-sax.html#SETDOCUMENTLOCATOR">setDocumentLocator</a>
 </p>
 <h2>Type xmlShellCtxtPtr:</h2>
 <p>
@@ -1809,6 +1805,7 @@
 <a href="html/libxml-valid.html#XMLADDREF">xmlAddRef</a>
 <a href="html/libxml-valid.html#XMLVALIDATEROOT">xmlValidateRoot</a>
 <a href="html/libxml-valid.html#XMLVALIDATEELEMENTDECL">xmlValidateElementDecl</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDATEATTRIBUTEDECL">xmlValidateAttributeDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATENOTATIONDECL">xmlValidateNotationDecl</a>
 <a href="html/libxml-valid.html#XMLVALIDATEDTD">xmlValidateDtd</a>
@@ -1850,7 +1847,6 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTEREDVARIABLESCLEANUP">xmlXPathRegisteredVariablesCleanup</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWPARSERCONTEXT">xmlXPathNewParserContext</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTERALLFUNCTIONS">xmlXPathRegisterAllFunctions</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREECONTEXT">xmlXPathFreeContext</a>
 <a href="html/libxml-xpointer.html#XMLXPTREVAL">xmlXPtrEval</a>
 </p>
 <h2>Type xmlXPathFuncLookupFunc:</h2>
@@ -1881,10 +1877,7 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTERVARIABLE">xmlXPathRegisterVariable</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHREGISTERVARIABLENS">xmlXPathRegisterVariableNS</a>
 <a href="html/libxml-xpathinternals.html#VALUEPUSH">valuePush</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">xmlXPathDebugDumpObject</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALUATEPREDICATERESULT">xmlXPathEvaluatePredicateResult</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREENODESETLIST">xmlXPathFreeNodeSetList</a>
-<a href="html/libxml-xpath.html#XMLXPATHFREEOBJECT">xmlXPathFreeObject</a>
 <a href="html/libxml-xpointer.html#XMLXPTRLOCATIONSETCREATE">xmlXPtrLocationSetCreate</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS">xmlXPtrNewRangePoints</a>
 <a href="html/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS">xmlXPtrNewRangePoints</a>
@@ -1909,13 +1902,11 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHFREEPARSERCONTEXT">xmlXPathFreeParserContext</a>
 <a href="html/libxml-xpathinternals.html#VALUEPOP">valuePop</a>
 <a href="html/libxml-xpathinternals.html#VALUEPUSH">valuePush</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHIDFUNCTION">xmlXPathIdFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHROOT">xmlXPathRoot</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALEXPR">xmlXPathEvalExpr</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPARSENAME">xmlXPathParseName</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPARSENCNAME">xmlXPathParseNCName</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALUATEPREDICATERESULT">xmlXPathEvaluatePredicateResult</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION">xmlXPathStringFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEQUALVALUES">xmlXPathEqualValues</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCOMPAREVALUES">xmlXPathCompareValues</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHVALUEFLIPSIGN">xmlXPathValueFlipSign</a>
@@ -1937,7 +1928,6 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTPRECEDING">xmlXPathNextPreceding</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTANCESTOR">xmlXPathNextAncestor</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTPRECEDINGSIBLING">xmlXPathNextPrecedingSibling</a>
-<a href="html/libxml-xpathinternals.html#XMLXPATHROOT">xmlXPathRoot</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHLASTFUNCTION">xmlXPathLastFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHPOSITIONFUNCTION">xmlXPathPositionFunction</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHCOUNTFUNCTION">xmlXPathCountFunction</a>
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 0e1f2f0..68b06f0 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -149,10 +149,23 @@
 </p>
 <h2>Letter M:</h2>
 <p>
-<a href="html/libxml-xmlmemory.html#MEM-LIST-CAPS">MEM_LIST</a>
 <a href="html/libxml-parserinternals.html#MOVETO-ENDTAG-CAPS">MOVETO_ENDTAG</a>
 <a href="html/libxml-parserinternals.html#MOVETO-STARTTAG-CAPS">MOVETO_STARTTAG</a>
 </p>
+<h2>Letter P:</h2>
+<p>
+<a href="html/libxml-index.html#PYFILE-GET">PyFile_Get</a>
+<a href="html/libxml-index.html#PYCATALOG-GET">Pycatalog_Get</a>
+<a href="html/libxml-index.html#PYCATALOG-OBJECT">Pycatalog_Object</a>
+<a href="html/libxml-index.html#PYPARSERCTXT-GET">PyparserCtxt_Get</a>
+<a href="html/libxml-index.html#PYPARSERCTXT-OBJECT">PyparserCtxt_Object</a>
+<a href="html/libxml-index.html#PYXMLNODE-GET">PyxmlNode_Get</a>
+<a href="html/libxml-index.html#PYXMLNODE-OBJECT">PyxmlNode_Object</a>
+<a href="html/libxml-index.html#PYXMLXPATHCONTEXT-GET">PyxmlXPathContext_Get</a>
+<a href="html/libxml-index.html#PYXMLXPATHCONTEXT-OBJECT">PyxmlXPathContext_Object</a>
+<a href="html/libxml-index.html#PYXMLXPATHPARSERCONTEXT-GET">PyxmlXPathParserContext_Get</a>
+<a href="html/libxml-index.html#PYXMLXPATHPARSERCONTEXT-OBJECT">PyxmlXPathParserContext_Object</a>
+</p>
 <h2>Letter S:</h2>
 <p>
 <a href="html/libxml-parserinternals.html#SKIP-EOL-CAPS">SKIP_EOL</a>
@@ -270,7 +283,7 @@
 <a href="html/libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT">htmlCreateFileParserCtxt</a>
 <a href="html/libxml-htmlparser.html#HTMLCREATEPUSHPARSERCTXT">htmlCreatePushParserCtxt</a>
 <a href="html/libxml-globals.html#HTMLDEFAULTSAXHANDLER">htmlDefaultSAXHandler</a>
-<a href="html/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT">htmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-htmltree.html#HTMLDOCCONTENTDUMPFORMATOUTPUT">htmlDocContentDumpFormatOutput</a>
 <a href="html/libxml-htmltree.html#HTMLDOCCONTENTDUMPOUTPUT">htmlDocContentDumpOutput</a>
 <a href="html/libxml-htmltree.html#HTMLDOCDUMP">htmlDocDump</a>
@@ -333,6 +346,30 @@
 <a href="html/libxml-parser.html#ISSTANDALONESAXFUNC">isStandaloneSAXFunc</a>
 <a href="html/libxml-encoding.html#ISOLAT1TOUTF8">isolat1ToUTF8</a>
 </p>
+<h2>Letter l:</h2>
+<p>
+<a href="html/libxml-index.html#LIBXML-CHARPTRCONSTWRAP">libxml_charPtrConstWrap</a>
+<a href="html/libxml-index.html#LIBXML-CHARPTRWRAP">libxml_charPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-CONSTCHARPTRWRAP">libxml_constcharPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-CONSTXMLCHARPTRWRAP">libxml_constxmlCharPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-DOUBLEWRAP">libxml_doubleWrap</a>
+<a href="html/libxml-index.html#LIBXML-INTWRAP">libxml_intWrap</a>
+<a href="html/libxml-index.html#LIBXML-LONGWRAP">libxml_longWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLATTRPTRWRAP">libxml_xmlAttrPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLATTRIBUTEPTRWRAP">libxml_xmlAttributePtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLCATALOGPTRWRAP">libxml_xmlCatalogPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLCHARPTRCONSTWRAP">libxml_xmlCharPtrConstWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLCHARPTRWRAP">libxml_xmlCharPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLDOCPTRWRAP">libxml_xmlDocPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLELEMENTPTRWRAP">libxml_xmlElementPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLNODEPTRWRAP">libxml_xmlNodePtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLNSPTRWRAP">libxml_xmlNsPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLPARSERCTXTPTRWRAP">libxml_xmlParserCtxtPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLXPATHCONTEXTPTRWRAP">libxml_xmlXPathContextPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLXPATHOBJECTPTRCONVERT">libxml_xmlXPathObjectPtrConvert</a>
+<a href="html/libxml-index.html#LIBXML-XMLXPATHOBJECTPTRWRAP">libxml_xmlXPathObjectPtrWrap</a>
+<a href="html/libxml-index.html#LIBXML-XMLXPATHPARSERCONTEXTPTRWRAP">libxml_xmlXPathParserContextPtrWrap</a>
+</p>
 <h2>Letter n:</h2>
 <p>
 <a href="html/libxml-parserinternals.html#NAMEPOP">namePop</a>
@@ -528,7 +565,7 @@
 <a href="html/libxml-parserinternals.html#XMLDECODEENTITIES">xmlDecodeEntities</a>
 <a href="html/libxml-globals.html#XMLDEFAULTBUFFERSIZE">xmlDefaultBufferSize</a>
 <a href="html/libxml-globals.html#XMLDEFAULTSAXHANDLER">xmlDefaultSAXHandler</a>
-<a href="html/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
+<a href="html/libxml-sax.html#XMLDEFAULTSAXHANDLERINIT">xmlDefaultSAXHandlerInit</a>
 <a href="html/libxml-globals.html#XMLDEFAULTSAXLOCATOR">xmlDefaultSAXLocator</a>
 <a href="html/libxml-encoding.html#XMLDELENCODINGALIAS">xmlDelEncodingAlias</a>
 <a href="html/libxml-encoding.html#XMLDETECTCHARENCODING">xmlDetectCharEncoding</a>
@@ -567,8 +604,8 @@
 <a href="html/libxml-entities.html#XMLENCODEENTITIESREENTRANT">xmlEncodeEntitiesReentrant</a>
 <a href="html/libxml-entities.html#XMLENCODESPECIALCHARS">xmlEncodeSpecialChars</a>
 <a href="html/libxml-entities.html#XMLENTITIESTABLEPTR">xmlEntitiesTablePtr</a>
-<a href="html/libxml-entities.html#XMLENTITY">xmlEntity</a>
-<a href="html/libxml-entities.html#XMLENTITYPTR">xmlEntityPtr</a>
+<a href="html/libxml-tree.html#XMLENTITY">xmlEntity</a>
+<a href="html/libxml-tree.html#XMLENTITYPTR">xmlEntityPtr</a>
 <a href="html/libxml-parserinternals.html#XMLENTITYREFERENCEFUNC">xmlEntityReferenceFunc</a>
 <a href="html/libxml-entities.html#XMLENTITYTYPE">xmlEntityType</a>
 <a href="html/libxml-tree.html#XMLENUMERATION">xmlEnumeration</a>
@@ -1006,9 +1043,9 @@
 <a href="html/libxml-tree.html#XMLREPLACENODE">xmlReplaceNode</a>
 <a href="html/libxml-tree.html#XMLROOTNODE">xmlRootNode</a>
 <a href="html/libxml-parser.html#XMLSAXHANDLER">xmlSAXHandler</a>
-<a href="html/libxml-parser.html#XMLSAXHANDLERPTR">xmlSAXHandlerPtr</a>
+<a href="html/libxml-tree.html#XMLSAXHANDLERPTR">xmlSAXHandlerPtr</a>
 <a href="html/libxml-parser.html#XMLSAXLOCATOR">xmlSAXLocator</a>
-<a href="html/libxml-parser.html#XMLSAXLOCATORPTR">xmlSAXLocatorPtr</a>
+<a href="html/libxml-tree.html#XMLSAXLOCATORPTR">xmlSAXLocatorPtr</a>
 <a href="html/libxml-parser.html#XMLSAXPARSEDTD">xmlSAXParseDTD</a>
 <a href="html/libxml-parser.html#XMLSAXPARSEDOC">xmlSAXParseDoc</a>
 <a href="html/libxml-parser.html#XMLSAXPARSEENTITY">xmlSAXParseEntity</a>
@@ -1106,6 +1143,7 @@
 <a href="html/libxml-tree.html#XMLUNSETNSPROP">xmlUnsetNsProp</a>
 <a href="html/libxml-tree.html#XMLUNSETPROP">xmlUnsetProp</a>
 <a href="html/libxml-valid.html#XMLVALIDCTXT">xmlValidCtxt</a>
+<a href="html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">xmlValidCtxtNormalizeAttributeValue</a>
 <a href="html/libxml-valid.html#XMLVALIDCTXTPTR">xmlValidCtxtPtr</a>
 <a href="html/libxml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">xmlValidGetPotentialChildren</a>
 <a href="html/libxml-valid.html#XMLVALIDGETVALIDELEMENTS">xmlValidGetValidElements</a>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4c887ef..de9eb72 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,7 +34,7 @@
 	  $(bindir)/xsltproc --html $(top_srcdir)/doc/api.xsl $(top_srcdir)/doc/xml.html ; fi );
 
 scan:
-	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h xmlwin32version.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h"
+	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h xmlwin32version.h win32config.h trio.h triostr.h triop.h config-mac.h XMLTestPrefix2.h  XMLTestPrefix.h triodef.h trionan.h xlink.h libxml.h libxml2-py.h libxml_wrap.h"
 
 templates: scan
 	gtkdoc-mktmpl --module=libxml
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 04a7f8c..aa07101 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -11,7 +11,6 @@
 <ANCHOR id ="XML-COMPLETE-ATTRS-CAPS" href="libxml/libxml-parser.html#XML-COMPLETE-ATTRS-CAPS">
 <ANCHOR id ="XMLPARSERCTXT" href="libxml/libxml-parser.html#XMLPARSERCTXT">
 <ANCHOR id ="XMLSAXLOCATOR" href="libxml/libxml-parser.html#XMLSAXLOCATOR">
-<ANCHOR id ="XMLSAXLOCATORPTR" href="libxml/libxml-parser.html#XMLSAXLOCATORPTR">
 <ANCHOR id ="RESOLVEENTITYSAXFUNC" href="libxml/libxml-parser.html#RESOLVEENTITYSAXFUNC">
 <ANCHOR id ="INTERNALSUBSETSAXFUNC" href="libxml/libxml-parser.html#INTERNALSUBSETSAXFUNC">
 <ANCHOR id ="EXTERNALSUBSETSAXFUNC" href="libxml/libxml-parser.html#EXTERNALSUBSETSAXFUNC">
@@ -41,7 +40,6 @@
 <ANCHOR id ="HASINTERNALSUBSETSAXFUNC" href="libxml/libxml-parser.html#HASINTERNALSUBSETSAXFUNC">
 <ANCHOR id ="HASEXTERNALSUBSETSAXFUNC" href="libxml/libxml-parser.html#HASEXTERNALSUBSETSAXFUNC">
 <ANCHOR id ="XMLSAXHANDLER" href="libxml/libxml-parser.html#XMLSAXHANDLER">
-<ANCHOR id ="XMLSAXHANDLERPTR" href="libxml/libxml-parser.html#XMLSAXHANDLERPTR">
 <ANCHOR id ="XMLEXTERNALENTITYLOADER" href="libxml/libxml-parser.html#XMLEXTERNALENTITYLOADER">
 <ANCHOR id ="XMLSUBSTITUTEENTITIESDEFAULTVALUE" href="libxml/libxml-parser.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE">
 <ANCHOR id ="XMLINITPARSER" href="libxml/libxml-parser.html#XMLINITPARSER">
@@ -91,8 +89,6 @@
 <ANCHOR id ="XMLPARSEBALANCEDCHUNKMEMORY" href="libxml/libxml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY">
 <ANCHOR id ="XMLPARSEEXTERNALENTITY" href="libxml/libxml-parser.html#XMLPARSEEXTERNALENTITY">
 <ANCHOR id ="XMLPARSECTXTEXTERNALENTITY" href="libxml/libxml-parser.html#XMLPARSECTXTEXTERNALENTITY">
-<ANCHOR id ="XMLDEFAULTSAXHANDLERINIT" href="libxml/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT">
-<ANCHOR id ="HTMLDEFAULTSAXHANDLERINIT" href="libxml/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="XMLINITPARSERCTXT" href="libxml/libxml-parser.html#XMLINITPARSERCTXT">
 <ANCHOR id ="XMLCLEARPARSERCTXT" href="libxml/libxml-parser.html#XMLCLEARPARSERCTXT">
 <ANCHOR id ="XMLFREEPARSERCTXT" href="libxml/libxml-parser.html#XMLFREEPARSERCTXT">
@@ -163,6 +159,12 @@
 <ANCHOR id ="XMLPARSERINPUTPTR" href="libxml/libxml-tree.html#XMLPARSERINPUTPTR">
 <ANCHOR id ="XMLPARSERCTXT" href="libxml/libxml-tree.html#XMLPARSERCTXT">
 <ANCHOR id ="XMLPARSERCTXTPTR" href="libxml/libxml-tree.html#XMLPARSERCTXTPTR">
+<ANCHOR id ="XMLSAXLOCATOR" href="libxml/libxml-tree.html#XMLSAXLOCATOR">
+<ANCHOR id ="XMLSAXLOCATORPTR" href="libxml/libxml-tree.html#XMLSAXLOCATORPTR">
+<ANCHOR id ="XMLSAXHANDLER" href="libxml/libxml-tree.html#XMLSAXHANDLER">
+<ANCHOR id ="XMLSAXHANDLERPTR" href="libxml/libxml-tree.html#XMLSAXHANDLERPTR">
+<ANCHOR id ="XMLENTITY" href="libxml/libxml-tree.html#XMLENTITY">
+<ANCHOR id ="XMLENTITYPTR" href="libxml/libxml-tree.html#XMLENTITYPTR">
 <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">
@@ -338,7 +340,6 @@
 <ANCHOR id ="LIBXML-ENTITIES" href="libxml/libxml-entities.html">
 <ANCHOR id ="XMLENTITYTYPE" href="libxml/libxml-entities.html#XMLENTITYTYPE">
 <ANCHOR id ="XMLENTITY" href="libxml/libxml-entities.html#XMLENTITY">
-<ANCHOR id ="XMLENTITYPTR" href="libxml/libxml-entities.html#XMLENTITYPTR">
 <ANCHOR id ="XMLENTITIESTABLEPTR" href="libxml/libxml-entities.html#XMLENTITIESTABLEPTR">
 <ANCHOR id ="XMLINITIALIZEPREDEFINEDENTITIES" href="libxml/libxml-entities.html#XMLINITIALIZEPREDEFINEDENTITIES">
 <ANCHOR id ="XMLADDDOCENTITY" href="libxml/libxml-entities.html#XMLADDDOCENTITY">
@@ -405,6 +406,7 @@
 <ANCHOR id ="XMLVALIDATEROOT" href="libxml/libxml-valid.html#XMLVALIDATEROOT">
 <ANCHOR id ="XMLVALIDATEELEMENTDECL" href="libxml/libxml-valid.html#XMLVALIDATEELEMENTDECL">
 <ANCHOR id ="XMLVALIDNORMALIZEATTRIBUTEVALUE" href="libxml/libxml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">
+<ANCHOR id ="XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE" href="libxml/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE">
 <ANCHOR id ="XMLVALIDATEATTRIBUTEDECL" href="libxml/libxml-valid.html#XMLVALIDATEATTRIBUTEDECL">
 <ANCHOR id ="XMLVALIDATEATTRIBUTEVALUE" href="libxml/libxml-valid.html#XMLVALIDATEATTRIBUTEVALUE">
 <ANCHOR id ="XMLVALIDATENOTATIONDECL" href="libxml/libxml-valid.html#XMLVALIDATENOTATIONDECL">
@@ -649,28 +651,19 @@
 <ANCHOR id ="XMLXPATHNODESETADD" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETADD">
 <ANCHOR id ="XMLXPATHNODESETADDUNIQUE" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">
 <ANCHOR id ="XMLXPATHNODESETSORT" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETSORT">
-<ANCHOR id ="XMLXPATHIDFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHIDFUNCTION">
 <ANCHOR id ="XMLXPATHROOT" href="libxml/libxml-xpathinternals.html#XMLXPATHROOT">
 <ANCHOR id ="XMLXPATHEVALEXPR" href="libxml/libxml-xpathinternals.html#XMLXPATHEVALEXPR">
 <ANCHOR id ="XMLXPATHPARSENAME" href="libxml/libxml-xpathinternals.html#XMLXPATHPARSENAME">
 <ANCHOR id ="XMLXPATHPARSENCNAME" href="libxml/libxml-xpathinternals.html#XMLXPATHPARSENCNAME">
 <ANCHOR id ="XMLXPATHSTRINGEVALNUMBER" href="libxml/libxml-xpathinternals.html#XMLXPATHSTRINGEVALNUMBER">
 <ANCHOR id ="XMLXPATHEVALUATEPREDICATERESULT" href="libxml/libxml-xpathinternals.html#XMLXPATHEVALUATEPREDICATERESULT">
-<ANCHOR id ="XMLXPATHINIT" href="libxml/libxml-xpathinternals.html#XMLXPATHINIT">
-<ANCHOR id ="XMLXPATHSTRINGFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION">
 <ANCHOR id ="XMLXPATHREGISTERALLFUNCTIONS" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTERALLFUNCTIONS">
-<ANCHOR id ="XMLXPATHNODESETCREATE" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETCREATE">
 <ANCHOR id ="XMLXPATHNODESETMERGE" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">
 <ANCHOR id ="XMLXPATHNODESETDEL" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETDEL">
 <ANCHOR id ="XMLXPATHNODESETREMOVE" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETREMOVE">
-<ANCHOR id ="XMLXPATHFREENODESET" href="libxml/libxml-xpathinternals.html#XMLXPATHFREENODESET">
 <ANCHOR id ="XMLXPATHNEWNODESETLIST" href="libxml/libxml-xpathinternals.html#XMLXPATHNEWNODESETLIST">
 <ANCHOR id ="XMLXPATHWRAPNODESET" href="libxml/libxml-xpathinternals.html#XMLXPATHWRAPNODESET">
 <ANCHOR id ="XMLXPATHWRAPEXTERNAL" href="libxml/libxml-xpathinternals.html#XMLXPATHWRAPEXTERNAL">
-<ANCHOR id ="XMLXPATHFREENODESETLIST" href="libxml/libxml-xpathinternals.html#XMLXPATHFREENODESETLIST">
-<ANCHOR id ="XMLXPATHFREEOBJECT" href="libxml/libxml-xpathinternals.html#XMLXPATHFREEOBJECT">
-<ANCHOR id ="XMLXPATHNEWCONTEXT" href="libxml/libxml-xpathinternals.html#XMLXPATHNEWCONTEXT">
-<ANCHOR id ="XMLXPATHFREECONTEXT" href="libxml/libxml-xpathinternals.html#XMLXPATHFREECONTEXT">
 <ANCHOR id ="XMLXPATHEQUALVALUES" href="libxml/libxml-xpathinternals.html#XMLXPATHEQUALVALUES">
 <ANCHOR id ="XMLXPATHCOMPAREVALUES" href="libxml/libxml-xpathinternals.html#XMLXPATHCOMPAREVALUES">
 <ANCHOR id ="XMLXPATHVALUEFLIPSIGN" href="libxml/libxml-xpathinternals.html#XMLXPATHVALUEFLIPSIGN">
@@ -696,8 +689,10 @@
 <ANCHOR id ="XMLXPATHLASTFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHLASTFUNCTION">
 <ANCHOR id ="XMLXPATHPOSITIONFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHPOSITIONFUNCTION">
 <ANCHOR id ="XMLXPATHCOUNTFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHCOUNTFUNCTION">
+<ANCHOR id ="XMLXPATHIDFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHIDFUNCTION">
 <ANCHOR id ="XMLXPATHLOCALNAMEFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHLOCALNAMEFUNCTION">
 <ANCHOR id ="XMLXPATHNAMESPACEURIFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHNAMESPACEURIFUNCTION">
+<ANCHOR id ="XMLXPATHSTRINGFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION">
 <ANCHOR id ="XMLXPATHSTRINGLENGTHFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHSTRINGLENGTHFUNCTION">
 <ANCHOR id ="XMLXPATHCONCATFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHCONCATFUNCTION">
 <ANCHOR id ="XMLXPATHCONTAINSFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHCONTAINSFUNCTION">
@@ -868,12 +863,12 @@
 <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 ="XMLRMUTEX" href="libxml/libxml-threads.html#XMLRMUTEX">
+<ANCHOR id ="XMLRMUTEXPTR" href="libxml/libxml-threads.html#XMLRMUTEXPTR">
 <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">
@@ -954,8 +949,8 @@
 <ANCHOR id ="XMLISLETTER" href="libxml/libxml-parserinternals.html#XMLISLETTER">
 <ANCHOR id ="XMLISDIGIT" href="libxml/libxml-parserinternals.html#XMLISDIGIT">
 <ANCHOR id ="XMLISIDEOGRAPHIC" href="libxml/libxml-parserinternals.html#XMLISIDEOGRAPHIC">
-<ANCHOR id ="XMLISCOMBINING" href="libxml/libxml-parserinternals.html#XMLISCOMBINING">
 <ANCHOR id ="XMLISEXTENDER" href="libxml/libxml-parserinternals.html#XMLISEXTENDER">
+<ANCHOR id ="XMLISCOMBINING" href="libxml/libxml-parserinternals.html#XMLISCOMBINING">
 <ANCHOR id ="XMLISCHAR" href="libxml/libxml-parserinternals.html#XMLISCHAR">
 <ANCHOR id ="XMLCREATEFILEPARSERCTXT" href="libxml/libxml-parserinternals.html#XMLCREATEFILEPARSERCTXT">
 <ANCHOR id ="XMLCREATEMEMORYPARSERCTXT" href="libxml/libxml-parserinternals.html#XMLCREATEMEMORYPARSERCTXT">
@@ -963,7 +958,6 @@
 <ANCHOR id ="XMLCREATEENTITYPARSERCTXT" href="libxml/libxml-parserinternals.html#XMLCREATEENTITYPARSERCTXT">
 <ANCHOR id ="XMLSWITCHENCODING" href="libxml/libxml-parserinternals.html#XMLSWITCHENCODING">
 <ANCHOR id ="XMLSWITCHTOENCODING" href="libxml/libxml-parserinternals.html#XMLSWITCHTOENCODING">
-<ANCHOR id ="XMLFREEPARSERCTXT" href="libxml/libxml-parserinternals.html#XMLFREEPARSERCTXT">
 <ANCHOR id ="XMLHANDLEENTITY" href="libxml/libxml-parserinternals.html#XMLHANDLEENTITY">
 <ANCHOR id ="XMLNEWSTRINGINPUTSTREAM" href="libxml/libxml-parserinternals.html#XMLNEWSTRINGINPUTSTREAM">
 <ANCHOR id ="XMLNEWENTITYINPUTSTREAM" href="libxml/libxml-parserinternals.html#XMLNEWENTITYINPUTSTREAM">
@@ -1141,7 +1135,6 @@
 <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">
-<ANCHOR id ="MEM-LIST-CAPS" href="libxml/libxml-xmlmemory.html#MEM-LIST-CAPS">
 <ANCHOR id ="XMLFREEFUNC" href="libxml/libxml-xmlmemory.html#XMLFREEFUNC">
 <ANCHOR id ="XMLMALLOCFUNC" href="libxml/libxml-xmlmemory.html#XMLMALLOCFUNC">
 <ANCHOR id ="XMLREALLOCFUNC" href="libxml/libxml-xmlmemory.html#XMLREALLOCFUNC">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index b52e266..2c5fd91 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19049"
+NAME="AEN19030"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19052"
+NAME="AEN19033"
 ></A
 ><H2
 >Synopsis</H2
@@ -506,7 +506,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19153"
+NAME="AEN19134"
 ></A
 ><H2
 >Description</H2
@@ -516,14 +516,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19156"
+NAME="AEN19137"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19158"
+NAME="AEN19139"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19164"
+NAME="AEN19145"
 ></A
 ><H3
 ><A
@@ -572,12 +572,14 @@
 ></TR
 ></TABLE
 ><P
+>the specific XML Catalog Processing Instuction name</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19169"
+NAME="AEN19151"
 ></A
 ><H3
 ><A
@@ -607,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19174"
+NAME="AEN19156"
 ></A
 ><H3
 ><A
@@ -638,7 +640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19179"
+NAME="AEN19161"
 ></A
 ><H3
 ><A
@@ -664,7 +666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19184"
+NAME="AEN19166"
 ></A
 ><H3
 ><A
@@ -690,7 +692,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19189"
+NAME="AEN19171"
 ></A
 ><H3
 ><A
@@ -720,7 +722,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19196"
+NAME="AEN19178"
 ></A
 ><P
 ></P
@@ -773,7 +775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19209"
+NAME="AEN19191"
 ></A
 ><H3
 ><A
@@ -806,7 +808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19216"
+NAME="AEN19198"
 ></A
 ><P
 ></P
@@ -859,7 +861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19229"
+NAME="AEN19211"
 ></A
 ><H3
 ><A
@@ -891,7 +893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19236"
+NAME="AEN19218"
 ></A
 ><P
 ></P
@@ -944,7 +946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19249"
+NAME="AEN19231"
 ></A
 ><H3
 ><A
@@ -974,7 +976,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19256"
+NAME="AEN19238"
 ></A
 ><P
 ></P
@@ -1027,7 +1029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19269"
+NAME="AEN19251"
 ></A
 ><H3
 ><A
@@ -1070,7 +1072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19279"
+NAME="AEN19261"
 ></A
 ><P
 ></P
@@ -1174,7 +1176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19304"
+NAME="AEN19286"
 ></A
 ><H3
 ><A
@@ -1208,7 +1210,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19312"
+NAME="AEN19294"
 ></A
 ><P
 ></P
@@ -1278,7 +1280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19329"
+NAME="AEN19311"
 ></A
 ><H3
 ><A
@@ -1319,7 +1321,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19339"
+NAME="AEN19321"
 ></A
 ><P
 ></P
@@ -1407,7 +1409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19360"
+NAME="AEN19342"
 ></A
 ><H3
 ><A
@@ -1444,7 +1446,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19369"
+NAME="AEN19351"
 ></A
 ><P
 ></P
@@ -1515,7 +1517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19386"
+NAME="AEN19368"
 ></A
 ><H3
 ><A
@@ -1552,7 +1554,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19395"
+NAME="AEN19377"
 ></A
 ><P
 ></P
@@ -1623,7 +1625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19412"
+NAME="AEN19394"
 ></A
 ><H3
 ><A
@@ -1660,7 +1662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19421"
+NAME="AEN19403"
 ></A
 ><P
 ></P
@@ -1731,7 +1733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19438"
+NAME="AEN19420"
 ></A
 ><H3
 ><A
@@ -1765,7 +1767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19446"
+NAME="AEN19428"
 ></A
 ><P
 ></P
@@ -1820,7 +1822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19459"
+NAME="AEN19441"
 ></A
 ><H3
 ><A
@@ -1850,7 +1852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19466"
+NAME="AEN19448"
 ></A
 ><P
 ></P
@@ -1888,7 +1890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19475"
+NAME="AEN19457"
 ></A
 ><H3
 ><A
@@ -1918,7 +1920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19482"
+NAME="AEN19464"
 ></A
 ><P
 ></P
@@ -1971,7 +1973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19495"
+NAME="AEN19477"
 ></A
 ><H3
 ><A
@@ -2001,7 +2003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19501"
+NAME="AEN19483"
 ></A
 ><H3
 ><A
@@ -2031,7 +2033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19507"
+NAME="AEN19489"
 ></A
 ><P
 ></P
@@ -2084,7 +2086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19520"
+NAME="AEN19502"
 ></A
 ><H3
 ><A
@@ -2114,7 +2116,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19526"
+NAME="AEN19508"
 ></A
 ><P
 ></P
@@ -2152,7 +2154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19535"
+NAME="AEN19517"
 ></A
 ><H3
 ><A
@@ -2180,7 +2182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19541"
+NAME="AEN19523"
 ></A
 ><H3
 ><A
@@ -2210,7 +2212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19548"
+NAME="AEN19530"
 ></A
 ><P
 ></P
@@ -2248,7 +2250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19557"
+NAME="AEN19539"
 ></A
 ><H3
 ><A
@@ -2285,7 +2287,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19566"
+NAME="AEN19548"
 ></A
 ><P
 ></P
@@ -2356,7 +2358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19583"
+NAME="AEN19565"
 ></A
 ><H3
 ><A
@@ -2389,7 +2391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19591"
+NAME="AEN19573"
 ></A
 ><P
 ></P
@@ -2443,7 +2445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19604"
+NAME="AEN19586"
 ></A
 ><H3
 ><A
@@ -2476,7 +2478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19612"
+NAME="AEN19594"
 ></A
 ><P
 ></P
@@ -2530,7 +2532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19625"
+NAME="AEN19607"
 ></A
 ><H3
 ><A
@@ -2563,7 +2565,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19633"
+NAME="AEN19615"
 ></A
 ><P
 ></P
@@ -2617,7 +2619,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19646"
+NAME="AEN19628"
 ></A
 ><H3
 ><A
@@ -2661,7 +2663,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19656"
+NAME="AEN19638"
 ></A
 ><P
 ></P
@@ -2748,7 +2750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19677"
+NAME="AEN19659"
 ></A
 ><H3
 ><A
@@ -2778,7 +2780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19684"
+NAME="AEN19666"
 ></A
 ><P
 ></P
@@ -2831,7 +2833,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19697"
+NAME="AEN19679"
 ></A
 ><H3
 ><A
@@ -2865,7 +2867,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19705"
+NAME="AEN19687"
 ></A
 ><P
 ></P
@@ -2918,7 +2920,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19718"
+NAME="AEN19700"
 ></A
 ><H3
 ><A
@@ -2945,7 +2947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19724"
+NAME="AEN19706"
 ></A
 ><P
 ></P
@@ -2981,7 +2983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19733"
+NAME="AEN19715"
 ></A
 ><H3
 ><A
@@ -3008,7 +3010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19739"
+NAME="AEN19721"
 ></A
 ><P
 ></P
@@ -3046,7 +3048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19748"
+NAME="AEN19730"
 ></A
 ><H3
 ><A
@@ -3077,7 +3079,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19755"
+NAME="AEN19737"
 ></A
 ><P
 ></P
@@ -3132,7 +3134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19768"
+NAME="AEN19750"
 ></A
 ><H3
 ><A
@@ -3171,7 +3173,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19777"
+NAME="AEN19759"
 ></A
 ><P
 ></P
@@ -3259,7 +3261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19798"
+NAME="AEN19780"
 ></A
 ><H3
 ><A
@@ -3294,7 +3296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19806"
+NAME="AEN19788"
 ></A
 ><P
 ></P
@@ -3365,7 +3367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19823"
+NAME="AEN19805"
 ></A
 ><H3
 ><A
@@ -3393,7 +3395,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19829"
+NAME="AEN19811"
 ></A
 ><P
 ></P
@@ -3446,7 +3448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19842"
+NAME="AEN19824"
 ></A
 ><H3
 ><A
@@ -3481,7 +3483,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19850"
+NAME="AEN19832"
 ></A
 ><P
 ></P
@@ -3534,7 +3536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19863"
+NAME="AEN19845"
 ></A
 ><H3
 ><A
@@ -3565,7 +3567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19870"
+NAME="AEN19852"
 ></A
 ><P
 ></P
@@ -3603,7 +3605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19879"
+NAME="AEN19861"
 ></A
 ><H3
 ><A
@@ -3634,7 +3636,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19886"
+NAME="AEN19868"
 ></A
 ><P
 ></P
@@ -3670,7 +3672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19895"
+NAME="AEN19877"
 ></A
 ><H3
 ><A
@@ -3707,7 +3709,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19904"
+NAME="AEN19886"
 ></A
 ><P
 ></P
@@ -3760,7 +3762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19917"
+NAME="AEN19899"
 ></A
 ><H3
 ><A
@@ -3797,7 +3799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19926"
+NAME="AEN19908"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index cae6681..96d6b25 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN25312"
+NAME="AEN25314"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN25315"
+NAME="AEN25317"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25409"
+NAME="AEN25411"
 ></A
 ><H2
 >Description</H2
@@ -519,14 +519,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25412"
+NAME="AEN25414"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25414"
+NAME="AEN25416"
 ></A
 ><H3
 ><A
@@ -560,7 +560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25422"
+NAME="AEN25424"
 ></A
 ><P
 ></P
@@ -615,7 +615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25435"
+NAME="AEN25437"
 ></A
 ><H3
 ><A
@@ -650,7 +650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25443"
+NAME="AEN25445"
 ></A
 ><P
 ></P
@@ -722,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25460"
+NAME="AEN25462"
 ></A
 ><H3
 ><A
@@ -757,7 +757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25468"
+NAME="AEN25470"
 ></A
 ><P
 ></P
@@ -829,7 +829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25485"
+NAME="AEN25487"
 ></A
 ><H3
 ><A
@@ -864,7 +864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25493"
+NAME="AEN25495"
 ></A
 ><P
 ></P
@@ -936,7 +936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25510"
+NAME="AEN25512"
 ></A
 ><H3
 ><A
@@ -971,7 +971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25518"
+NAME="AEN25520"
 ></A
 ><P
 ></P
@@ -1043,7 +1043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25535"
+NAME="AEN25537"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25543"
+NAME="AEN25545"
 ></A
 ><P
 ></P
@@ -1150,7 +1150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25560"
+NAME="AEN25562"
 ></A
 ><H3
 ><A
@@ -1184,7 +1184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25568"
+NAME="AEN25570"
 ></A
 ><P
 ></P
@@ -1239,7 +1239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25581"
+NAME="AEN25583"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25589"
+NAME="AEN25591"
 ></A
 ><P
 ></P
@@ -1328,7 +1328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25602"
+NAME="AEN25604"
 ></A
 ><H3
 ><A
@@ -1362,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25610"
+NAME="AEN25612"
 ></A
 ><P
 ></P
@@ -1417,7 +1417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25623"
+NAME="AEN25625"
 ></A
 ><H3
 ><A
@@ -1451,7 +1451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25631"
+NAME="AEN25633"
 ></A
 ><P
 ></P
@@ -1506,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25644"
+NAME="AEN25646"
 ></A
 ><H3
 ><A
@@ -1550,7 +1550,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25654"
+NAME="AEN25656"
 ></A
 ><P
 ></P
@@ -1605,7 +1605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25667"
+NAME="AEN25669"
 ></A
 ><H3
 ><A
@@ -1640,7 +1640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25675"
+NAME="AEN25677"
 ></A
 ><P
 ></P
@@ -1698,7 +1698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25689"
+NAME="AEN25691"
 ></A
 ><H3
 ><A
@@ -1725,7 +1725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25695"
+NAME="AEN25697"
 ></A
 ><P
 ></P
@@ -1778,7 +1778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25708"
+NAME="AEN25710"
 ></A
 ><H3
 ><A
@@ -1815,7 +1815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25714"
+NAME="AEN25716"
 ></A
 ><H3
 ><A
@@ -1841,7 +1841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25719"
+NAME="AEN25721"
 ></A
 ><H3
 ><A
@@ -1880,7 +1880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25728"
+NAME="AEN25730"
 ></A
 ><P
 ></P
@@ -1984,7 +1984,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25753"
+NAME="AEN25755"
 ></A
 ><H3
 ><A
@@ -2012,7 +2012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25759"
+NAME="AEN25761"
 ></A
 ><P
 ></P
@@ -2067,7 +2067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25772"
+NAME="AEN25774"
 ></A
 ><H3
 ><A
@@ -2097,7 +2097,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25779"
+NAME="AEN25781"
 ></A
 ><P
 ></P
@@ -2135,7 +2135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25788"
+NAME="AEN25790"
 ></A
 ><H3
 ><A
@@ -2165,7 +2165,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25795"
+NAME="AEN25797"
 ></A
 ><P
 ></P
@@ -2192,7 +2192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a valid result generated by an xpath evaluation</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2203,7 +2203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25804"
+NAME="AEN25806"
 ></A
 ><H3
 ><A
@@ -2243,7 +2243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25813"
+NAME="AEN25815"
 ></A
 ><P
 ></P
@@ -2347,7 +2347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25838"
+NAME="AEN25840"
 ></A
 ><H3
 ><A
@@ -2387,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25847"
+NAME="AEN25849"
 ></A
 ><P
 ></P
@@ -2491,7 +2491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25872"
+NAME="AEN25874"
 ></A
 ><H3
 ><A
@@ -2531,7 +2531,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25881"
+NAME="AEN25883"
 ></A
 ><P
 ></P
@@ -2635,7 +2635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25906"
+NAME="AEN25908"
 ></A
 ><H3
 ><A
@@ -2675,7 +2675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25915"
+NAME="AEN25917"
 ></A
 ><P
 ></P
@@ -2779,7 +2779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25940"
+NAME="AEN25942"
 ></A
 ><H3
 ><A
@@ -2819,7 +2819,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25949"
+NAME="AEN25951"
 ></A
 ><P
 ></P
@@ -2923,7 +2923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25974"
+NAME="AEN25976"
 ></A
 ><H3
 ><A
@@ -2969,7 +2969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25984"
+NAME="AEN25986"
 ></A
 ><P
 ></P
@@ -3073,7 +3073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26009"
+NAME="AEN26011"
 ></A
 ><H3
 ><A
@@ -3113,7 +3113,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26018"
+NAME="AEN26020"
 ></A
 ><P
 ></P
@@ -3217,7 +3217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26043"
+NAME="AEN26045"
 ></A
 ><H3
 ><A
@@ -3258,7 +3258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26052"
+NAME="AEN26054"
 ></A
 ><P
 ></P
@@ -3362,7 +3362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26077"
+NAME="AEN26079"
 ></A
 ><H3
 ><A
@@ -3413,7 +3413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26088"
+NAME="AEN26090"
 ></A
 ><P
 ></P
@@ -3517,7 +3517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26113"
+NAME="AEN26115"
 ></A
 ><H3
 ><A
@@ -3559,7 +3559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26122"
+NAME="AEN26124"
 ></A
 ><P
 ></P
@@ -3620,7 +3620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node </TD
 ></TR
 ><TR
 ><TD
@@ -3663,7 +3663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26147"
+NAME="AEN26149"
 ></A
 ><H3
 ><A
@@ -3704,7 +3704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26156"
+NAME="AEN26158"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index f9b8ac0..ea2d360 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20447"
+NAME="AEN20450"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20450"
+NAME="AEN20453"
 ></A
 ><H2
 >Synopsis</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20487"
+NAME="AEN20490"
 ></A
 ><H2
 >Description</H2
@@ -305,14 +305,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20490"
+NAME="AEN20493"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20492"
+NAME="AEN20495"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20497"
+NAME="AEN20500"
 ></A
 ><H3
 ><A
@@ -364,7 +364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20502"
+NAME="AEN20505"
 ></A
 ><H3
 ><A
@@ -390,7 +390,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20507"
+NAME="AEN20510"
 ></A
 ><H3
 ><A
@@ -416,7 +416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20512"
+NAME="AEN20515"
 ></A
 ><H3
 ><A
@@ -442,7 +442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20517"
+NAME="AEN20520"
 ></A
 ><H3
 ><A
@@ -468,7 +468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20522"
+NAME="AEN20525"
 ></A
 ><H3
 ><A
@@ -494,7 +494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20527"
+NAME="AEN20530"
 ></A
 ><H3
 ><A
@@ -520,7 +520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20532"
+NAME="AEN20535"
 ></A
 ><H3
 ><A
@@ -546,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20537"
+NAME="AEN20540"
 ></A
 ><H3
 ><A
@@ -578,7 +578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20543"
+NAME="AEN20546"
 ></A
 ><P
 ></P
@@ -722,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20576"
+NAME="AEN20579"
 ></A
 ><H3
 ><A
@@ -763,7 +763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20585"
+NAME="AEN20588"
 ></A
 ><P
 ></P
@@ -867,7 +867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20610"
+NAME="AEN20613"
 ></A
 ><H3
 ><A
@@ -901,7 +901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20618"
+NAME="AEN20621"
 ></A
 ><P
 ></P
@@ -971,7 +971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20635"
+NAME="AEN20638"
 ></A
 ><H3
 ><A
@@ -1010,7 +1010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20643"
+NAME="AEN20646"
 ></A
 ><P
 ></P
@@ -1114,7 +1114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20668"
+NAME="AEN20671"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20675"
+NAME="AEN20678"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20692"
+NAME="AEN20695"
 ></A
 ><H3
 ><A
@@ -1248,7 +1248,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20699"
+NAME="AEN20702"
 ></A
 ><P
 ></P
@@ -1286,7 +1286,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20708"
+NAME="AEN20711"
 ></A
 ><H3
 ><A
@@ -1340,7 +1340,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20719"
+NAME="AEN20722"
 ></A
 ><P
 ></P
@@ -1478,7 +1478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20752"
+NAME="AEN20755"
 ></A
 ><H3
 ><A
@@ -1511,7 +1511,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20759"
+NAME="AEN20762"
 ></A
 ><P
 ></P
@@ -1615,7 +1615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20784"
+NAME="AEN20787"
 ></A
 ><H3
 ><A
@@ -1648,7 +1648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20791"
+NAME="AEN20794"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20808"
+NAME="AEN20811"
 ></A
 ><H3
 ><A
@@ -1749,7 +1749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20815"
+NAME="AEN20818"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 6d521c5..98a5a15 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23697"
+NAME="AEN23695"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23700"
+NAME="AEN23698"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23760"
+NAME="AEN23758"
 ></A
 ><H2
 >Description</H2
@@ -392,14 +392,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23763"
+NAME="AEN23761"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23765"
+NAME="AEN23763"
 ></A
 ><H3
 ><A
@@ -465,7 +465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23772"
+NAME="AEN23770"
 ></A
 ><H3
 ><A
@@ -496,7 +496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23778"
+NAME="AEN23776"
 ></A
 ><P
 ></P
@@ -624,7 +624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23807"
+NAME="AEN23805"
 ></A
 ><H3
 ><A
@@ -657,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23813"
+NAME="AEN23811"
 ></A
 ><P
 ></P
@@ -785,7 +785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23842"
+NAME="AEN23840"
 ></A
 ><H3
 ><A
@@ -819,7 +819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23847"
+NAME="AEN23845"
 ></A
 ><H3
 ><A
@@ -845,7 +845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23852"
+NAME="AEN23850"
 ></A
 ><H3
 ><A
@@ -876,7 +876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23858"
+NAME="AEN23856"
 ></A
 ><H3
 ><A
@@ -905,7 +905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23864"
+NAME="AEN23862"
 ></A
 ><H3
 ><A
@@ -935,7 +935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23871"
+NAME="AEN23869"
 ></A
 ><P
 ></P
@@ -973,7 +973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23880"
+NAME="AEN23878"
 ></A
 ><H3
 ><A
@@ -1007,7 +1007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23888"
+NAME="AEN23886"
 ></A
 ><P
 ></P
@@ -1060,7 +1060,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23901"
+NAME="AEN23899"
 ></A
 ><H3
 ><A
@@ -1091,7 +1091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23908"
+NAME="AEN23906"
 ></A
 ><P
 ></P
@@ -1144,7 +1144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23921"
+NAME="AEN23919"
 ></A
 ><H3
 ><A
@@ -1183,7 +1183,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23929"
+NAME="AEN23927"
 ></A
 ><P
 ></P
@@ -1253,7 +1253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23946"
+NAME="AEN23944"
 ></A
 ><H3
 ><A
@@ -1285,7 +1285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23953"
+NAME="AEN23951"
 ></A
 ><P
 ></P
@@ -1338,7 +1338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23966"
+NAME="AEN23964"
 ></A
 ><H3
 ><A
@@ -1365,7 +1365,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23972"
+NAME="AEN23970"
 ></A
 ><P
 ></P
@@ -1418,7 +1418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23985"
+NAME="AEN23983"
 ></A
 ><H3
 ><A
@@ -1446,7 +1446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23991"
+NAME="AEN23989"
 ></A
 ><H3
 ><A
@@ -1478,7 +1478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23998"
+NAME="AEN23996"
 ></A
 ><P
 ></P
@@ -1532,7 +1532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24011"
+NAME="AEN24009"
 ></A
 ><H3
 ><A
@@ -1567,7 +1567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24019"
+NAME="AEN24017"
 ></A
 ><P
 ></P
@@ -1620,7 +1620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24032"
+NAME="AEN24030"
 ></A
 ><H3
 ><A
@@ -1652,7 +1652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24039"
+NAME="AEN24037"
 ></A
 ><P
 ></P
@@ -1723,7 +1723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24056"
+NAME="AEN24054"
 ></A
 ><H3
 ><A
@@ -1771,7 +1771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24066"
+NAME="AEN24064"
 ></A
 ><P
 ></P
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24087"
+NAME="AEN24085"
 ></A
 ><H3
 ><A
@@ -1899,7 +1899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24096"
+NAME="AEN24094"
 ></A
 ><P
 ></P
@@ -1989,7 +1989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24117"
+NAME="AEN24115"
 ></A
 ><H3
 ><A
@@ -2028,7 +2028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24126"
+NAME="AEN24124"
 ></A
 ><P
 ></P
@@ -2118,7 +2118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24147"
+NAME="AEN24145"
 ></A
 ><H3
 ><A
@@ -2148,7 +2148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24154"
+NAME="AEN24152"
 ></A
 ><P
 ></P
@@ -2201,7 +2201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24167"
+NAME="AEN24165"
 ></A
 ><H3
 ><A
@@ -2232,7 +2232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24173"
+NAME="AEN24171"
 ></A
 ><P
 ></P
@@ -2359,7 +2359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24202"
+NAME="AEN24200"
 ></A
 ><H3
 ><A
@@ -2390,7 +2390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24208"
+NAME="AEN24206"
 ></A
 ><P
 ></P
@@ -2517,7 +2517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24237"
+NAME="AEN24235"
 ></A
 ><H3
 ><A
@@ -2559,7 +2559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24245"
+NAME="AEN24243"
 ></A
 ><P
 ></P
@@ -2617,7 +2617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24259"
+NAME="AEN24257"
 ></A
 ><H3
 ><A
@@ -2648,7 +2648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24266"
+NAME="AEN24264"
 ></A
 ><P
 ></P
@@ -2719,7 +2719,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24283"
+NAME="AEN24281"
 ></A
 ><H3
 ><A
@@ -2753,7 +2753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24291"
+NAME="AEN24289"
 ></A
 ><P
 ></P
@@ -2828,7 +2828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24309"
+NAME="AEN24307"
 ></A
 ><H3
 ><A
@@ -2863,7 +2863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24317"
+NAME="AEN24315"
 ></A
 ><P
 ></P
@@ -2933,7 +2933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24334"
+NAME="AEN24332"
 ></A
 ><H3
 ><A
@@ -2967,7 +2967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24342"
+NAME="AEN24340"
 ></A
 ><P
 ></P
@@ -3038,7 +3038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24359"
+NAME="AEN24357"
 ></A
 ><H3
 ><A
@@ -3073,7 +3073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24367"
+NAME="AEN24365"
 ></A
 ><P
 ></P
@@ -3161,7 +3161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24388"
+NAME="AEN24386"
 ></A
 ><H3
 ><A
@@ -3192,7 +3192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24395"
+NAME="AEN24393"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 273a8c7..693871b 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7858"
+NAME="AEN7905"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7861"
+NAME="AEN7908"
 ></A
 ><H2
 >Synopsis</H2
@@ -151,14 +151,10 @@
 >xmlEntityType</A
 >;
 struct      <A
-HREF="libxml-entities.html#XMLENTITY"
+HREF="libxml-tree.html#XMLENTITY"
 >xmlEntity</A
 >;
 typedef     <A
-HREF="libxml-entities.html#XMLENTITYPTR"
->xmlEntityPtr</A
->;
-typedef     <A
 HREF="libxml-entities.html#XMLENTITIESTABLEPTR"
 >xmlEntitiesTablePtr</A
 >;
@@ -167,7 +163,7 @@
 >xmlInitializePredefinedEntities</A
 > (void);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLADDDOCENTITY"
@@ -194,7 +190,7 @@
 >xmlChar</A
 > *content);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLADDDTDENTITY"
@@ -221,7 +217,7 @@
 >xmlChar</A
 > *content);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLGETPREDEFINEDENTITY"
@@ -231,7 +227,7 @@
 >xmlChar</A
 > *name);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLGETDOCENTITY"
@@ -245,7 +241,7 @@
 >xmlChar</A
 > *name);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLGETDTDENTITY"
@@ -259,7 +255,7 @@
 >xmlChar</A
 > *name);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-entities.html#XMLGETPARAMETERENTITY"
@@ -357,7 +353,7 @@
 >xmlBufferPtr</A
 > buf,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > ent);
 void        <A
@@ -371,7 +367,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7924"
+NAME="AEN7970"
 ></A
 ><H2
 >Description</H2
@@ -381,14 +377,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7927"
+NAME="AEN7973"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7929"
+NAME="AEN7975"
 ></A
 ><H3
 ><A
@@ -421,7 +417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7934"
+NAME="AEN7980"
 ></A
 ><H3
 ><A
@@ -440,9 +436,9 @@
 >struct xmlEntity {
     void           *_private;	        /* application data */
     xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
-    const xmlChar          *name;	/* Attribute name */
-    struct _xmlNode    *children;	/* NULL */
-    struct _xmlNode        *last;	/* NULL */
+    const xmlChar          *name;	/* Entity name */
+    struct _xmlNode    *children;	/* First child link */
+    struct _xmlNode        *last;	/* Last child link */
     struct _xmlDtd       *parent;	/* -&gt; DTD */
     struct _xmlNode        *next;	/* next sibling link  */
     struct _xmlNode        *prev;	/* previous sibling link  */
@@ -467,33 +463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7939"
-></A
-><H3
-><A
-NAME="XMLENTITYPTR"
-></A
->&#62;xmlEntityPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEntity *xmlEntityPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7944"
+NAME="AEN7985"
 ></A
 ><H3
 ><A
@@ -519,7 +489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7949"
+NAME="AEN7990"
 ></A
 ><H3
 ><A
@@ -547,7 +517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7955"
+NAME="AEN7996"
 ></A
 ><H3
 ><A
@@ -564,7 +534,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlAddDocEntity                (<A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -597,7 +567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7967"
+NAME="AEN8008"
 ></A
 ><P
 ></P
@@ -735,7 +705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8000"
+NAME="AEN8041"
 ></A
 ><H3
 ><A
@@ -752,7 +722,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlAddDtdEntity                (<A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -785,7 +755,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8012"
+NAME="AEN8053"
 ></A
 ><P
 ></P
@@ -923,7 +893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8045"
+NAME="AEN8086"
 ></A
 ><H3
 ><A
@@ -940,7 +910,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlGetPredefinedEntity         (const <A
 HREF="libxml-tree.html#XMLCHAR"
@@ -956,7 +926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8053"
+NAME="AEN8094"
 ></A
 ><P
 ></P
@@ -1009,7 +979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8066"
+NAME="AEN8107"
 ></A
 ><H3
 ><A
@@ -1026,7 +996,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlGetDocEntity                (<A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -1048,7 +1018,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8075"
+NAME="AEN8116"
 ></A
 ><P
 ></P
@@ -1118,7 +1088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8092"
+NAME="AEN8133"
 ></A
 ><H3
 ><A
@@ -1135,7 +1105,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlGetDtdEntity                (<A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -1150,13 +1120,14 @@
 ></TABLE
 ><P
 >Do an entity lookup in the DTD entity hash table and
-returns the corresponding entity, if found.</P
+returns the corresponding entity, if found.
+Note: the first argument is the document node, not the DTD node.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8101"
+NAME="AEN8142"
 ></A
 ><P
 ></P
@@ -1226,7 +1197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8118"
+NAME="AEN8159"
 ></A
 ><H3
 ><A
@@ -1243,7 +1214,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlGetParameterEntity          (<A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -1264,7 +1235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8127"
+NAME="AEN8168"
 ></A
 ><P
 ></P
@@ -1334,7 +1305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8144"
+NAME="AEN8185"
 ></A
 ><H3
 ><A
@@ -1378,7 +1349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8155"
+NAME="AEN8196"
 ></A
 ><P
 ></P
@@ -1448,7 +1419,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8172"
+NAME="AEN8213"
 ></A
 ><H3
 ><A
@@ -1488,7 +1459,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8181"
+NAME="AEN8222"
 ></A
 ><P
 ></P
@@ -1558,7 +1529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8198"
+NAME="AEN8239"
 ></A
 ><H3
 ><A
@@ -1596,7 +1567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8207"
+NAME="AEN8248"
 ></A
 ><P
 ></P
@@ -1666,7 +1637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8224"
+NAME="AEN8265"
 ></A
 ><H3
 ><A
@@ -1696,7 +1667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8231"
+NAME="AEN8272"
 ></A
 ><P
 ></P
@@ -1732,7 +1703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8240"
+NAME="AEN8281"
 ></A
 ><H3
 ><A
@@ -1765,7 +1736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8248"
+NAME="AEN8289"
 ></A
 ><P
 ></P
@@ -1818,7 +1789,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8261"
+NAME="AEN8302"
 ></A
 ><H3
 ><A
@@ -1848,7 +1819,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8268"
+NAME="AEN8309"
 ></A
 ><P
 ></P
@@ -1886,7 +1857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8277"
+NAME="AEN8318"
 ></A
 ><H3
 ><A
@@ -1920,7 +1891,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8285"
+NAME="AEN8326"
 ></A
 ><P
 ></P
@@ -1975,7 +1946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8298"
+NAME="AEN8339"
 ></A
 ><H3
 ><A
@@ -1996,7 +1967,7 @@
 >xmlBufferPtr</A
 > buf,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > ent);</PRE
 ></TD
@@ -2009,7 +1980,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8306"
+NAME="AEN8347"
 ></A
 ><P
 ></P
@@ -2064,7 +2035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8319"
+NAME="AEN8360"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index 7b0b6a7..d9a6b20 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20217"
+NAME="AEN20199"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20220"
+NAME="AEN20202"
 ></A
 ><H2
 >Synopsis</H2
@@ -264,7 +264,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20251"
+NAME="AEN20233"
 ></A
 ><H2
 >Description</H2
@@ -274,14 +274,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20254"
+NAME="AEN20236"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20256"
+NAME="AEN20238"
 ></A
 ><H3
 ><A
@@ -340,7 +340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20261"
+NAME="AEN20243"
 ></A
 ><H3
 ><A
@@ -366,7 +366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20266"
+NAME="AEN20248"
 ></A
 ><H3
 ><A
@@ -400,7 +400,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20274"
+NAME="AEN20256"
 ></A
 ><P
 ></P
@@ -438,7 +438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20283"
+NAME="AEN20265"
 ></A
 ><H3
 ><A
@@ -468,7 +468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20290"
+NAME="AEN20272"
 ></A
 ><P
 ></P
@@ -506,7 +506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20299"
+NAME="AEN20281"
 ></A
 ><H3
 ><A
@@ -536,7 +536,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20306"
+NAME="AEN20288"
 ></A
 ><P
 ></P
@@ -591,7 +591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20319"
+NAME="AEN20301"
 ></A
 ><H3
 ><A
@@ -612,12 +612,17 @@
 ></TR
 ></TABLE
 ><P
+>The variable holding the libxml <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() implementation</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20324"
+NAME="AEN20308"
 ></A
 ><H3
 ><A
@@ -650,7 +655,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20332"
+NAME="AEN20316"
 ></A
 ><P
 ></P
@@ -688,7 +693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20341"
+NAME="AEN20325"
 ></A
 ><H3
 ><A
@@ -709,12 +714,14 @@
 ></TR
 ></TABLE
 ><P
+>Default handler for SGML DocBook, builds the DOM tree</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20346"
+NAME="AEN20331"
 ></A
 ><H3
 ><A
@@ -735,12 +742,14 @@
 ></TR
 ></TABLE
 ><P
+>Default handler for HTML, builds the DOM tree</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20351"
+NAME="AEN20337"
 ></A
 ><H3
 ><A
@@ -761,12 +770,14 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, DEPRECATED.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20356"
+NAME="AEN20343"
 ></A
 ><H3
 ><A
@@ -787,12 +798,15 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, default allocation policy for buffers, default is
+XML_BUFFER_ALLOC_EXACT</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20361"
+NAME="AEN20349"
 ></A
 ><H3
 ><A
@@ -813,12 +827,14 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, default buffer size. Default value is BASE_BUFFER_SIZE</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20366"
+NAME="AEN20355"
 ></A
 ><H3
 ><A
@@ -839,12 +855,14 @@
 ></TR
 ></TABLE
 ><P
+>Default handler for XML, builds the DOM tree</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20371"
+NAME="AEN20361"
 ></A
 ><H3
 ><A
@@ -865,12 +883,15 @@
 ></TR
 ></TABLE
 ><P
+>The default SAX Locator
+{ getPublicId, getSystemId, getLineNumber, getColumnNumber}</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20376"
+NAME="AEN20367"
 ></A
 ><H3
 ><A
@@ -891,12 +912,15 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser should work in validating mode.
+Disabled by default.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20381"
+NAME="AEN20373"
 ></A
 ><H3
 ><A
@@ -917,12 +941,14 @@
 ></TR
 ></TABLE
 ><P
+>Global setting: function used for generic error callbacks</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20386"
+NAME="AEN20379"
 ></A
 ><H3
 ><A
@@ -943,12 +969,14 @@
 ></TR
 ></TABLE
 ><P
+>Global setting passed to generic error callbacks</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20391"
+NAME="AEN20385"
 ></A
 ><H3
 ><A
@@ -969,12 +997,15 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser should provide warnings.
+Activated by default.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20396"
+NAME="AEN20391"
 ></A
 ><H3
 ><A
@@ -995,12 +1026,15 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, asking the serializer to indent the output tree by default
+Disabled by default</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20401"
+NAME="AEN20397"
 ></A
 ><H3
 ><A
@@ -1021,12 +1055,18 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser should keep all blanks
+nodes found in the content
+Activated by default, this is actually needed to have the parser
+conformant to the XML Recommendation, however the option is kept
+for some applications since this was libxml1 default behaviour.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20406"
+NAME="AEN20403"
 ></A
 ><H3
 ><A
@@ -1047,12 +1087,17 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser should store the line number
+in the content field of elements in the DOM tree. 
+Disabled by default since this may not be safe for old classes of
+applicaton.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20411"
+NAME="AEN20409"
 ></A
 ><H3
 ><A
@@ -1073,12 +1118,16 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser should load DTD while not
+validating.
+Disabled by default.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20416"
+NAME="AEN20415"
 ></A
 ><H3
 ><A
@@ -1099,6 +1148,10 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, asking the parser to print out debugging informations.
+while handling entities.
+Disabled by default</P
+><P
 ></P
 ></DIV
 ><HR><DIV
@@ -1125,12 +1178,14 @@
 ></TR
 ></TABLE
 ><P
+>Constant string describing the internal version of the library</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20426"
+NAME="AEN20427"
 ></A
 ><H3
 ><A
@@ -1151,12 +1206,15 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, indicate that the parser be pedantic
+Disabled by default.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20431"
+NAME="AEN20433"
 ></A
 ><H3
 ><A
@@ -1177,12 +1235,17 @@
 ></TR
 ></TABLE
 ><P
+>Global setting, asking the serializer to not output empty tags
+as &lt;empty/&gt; but &lt;empty&gt;&lt;/empty&gt;. those two forms are undistinguishable
+once parsed.
+Disabled by default</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20436"
+NAME="AEN20439"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 735fc05..66b4afe 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN24413"
+NAME="AEN24411"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN24416"
+NAME="AEN24414"
 ></A
 ><H2
 >Synopsis</H2
@@ -170,7 +170,7 @@
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *name);
-void*       (<A
+void        (<A
 HREF="libxml-hash.html#XMLHASHSCANNER"
 >*xmlHashScanner</A
 >)               (void *payload,
@@ -524,7 +524,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24514"
+NAME="AEN24512"
 ></A
 ><H2
 >Description</H2
@@ -534,14 +534,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24517"
+NAME="AEN24515"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24519"
+NAME="AEN24517"
 ></A
 ><H3
 ><A
@@ -567,7 +567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24524"
+NAME="AEN24522"
 ></A
 ><H3
 ><A
@@ -593,7 +593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24529"
+NAME="AEN24527"
 ></A
 ><H3
 ><A
@@ -618,11 +618,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback to free data from a hash</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24535"
+NAME="AEN24534"
 ></A
 ><P
 ></P
@@ -649,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the data in the hash</TD
 ></TR
 ><TR
 ><TD
@@ -666,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name associated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -677,7 +679,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24548"
+NAME="AEN24547"
 ></A
 ><H3
 ><A
@@ -702,6 +704,8 @@
 ></TR
 ></TABLE
 ><P
+>Callback to copy data from a hash</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -733,7 +737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the data in the hash</TD
 ></TR
 ><TR
 ><TD
@@ -750,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name associated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -777,7 +781,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void*       (*xmlHashScanner)               (void *payload,
+>void        (*xmlHashScanner)               (void *payload,
                                              void *data,
                                              <A
 HREF="libxml-tree.html#XMLCHAR"
@@ -787,11 +791,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback when scanning data in a hash with the simple scanner</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24573"
+NAME="AEN24574"
 ></A
 ><P
 ></P
@@ -818,7 +824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the data in the hash</TD
 ></TR
 ><TR
 ><TD
@@ -835,7 +841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra scannner data</TD
 ></TR
 ><TR
 ><TD
@@ -852,7 +858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name associated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -863,7 +869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24590"
+NAME="AEN24591"
 ></A
 ><H3
 ><A
@@ -897,11 +903,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback when scanning data in a hash with the full scanner</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24598"
+NAME="AEN24600"
 ></A
 ><P
 ></P
@@ -928,7 +936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the data in the hash</TD
 ></TR
 ><TR
 ><TD
@@ -945,7 +953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra scannner data</TD
 ></TR
 ><TR
 ><TD
@@ -962,7 +970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name associated</TD
 ></TR
 ><TR
 ><TD
@@ -979,7 +987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second name associated</TD
 ></TR
 ><TR
 ><TD
@@ -996,7 +1004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the third name associated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1007,7 +1015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24623"
+NAME="AEN24625"
 ></A
 ><H3
 ><A
@@ -1037,7 +1045,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24630"
+NAME="AEN24632"
 ></A
 ><P
 ></P
@@ -1090,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24643"
+NAME="AEN24645"
 ></A
 ><H3
 ><A
@@ -1135,7 +1143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24653"
+NAME="AEN24655"
 ></A
 ><P
 ></P
@@ -1190,7 +1198,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24666"
+NAME="AEN24668"
 ></A
 ><H3
 ><A
@@ -1241,7 +1249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24677"
+NAME="AEN24679"
 ></A
 ><P
 ></P
@@ -1328,7 +1336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24698"
+NAME="AEN24700"
 ></A
 ><H3
 ><A
@@ -1394,7 +1402,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24712"
+NAME="AEN24714"
 ></A
 ><P
 ></P
@@ -1498,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24737"
+NAME="AEN24739"
 ></A
 ><H3
 ><A
@@ -1558,7 +1566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24750"
+NAME="AEN24752"
 ></A
 ><P
 ></P
@@ -1662,7 +1670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24775"
+NAME="AEN24777"
 ></A
 ><H3
 ><A
@@ -1732,7 +1740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24790"
+NAME="AEN24792"
 ></A
 ><P
 ></P
@@ -1853,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24819"
+NAME="AEN24821"
 ></A
 ><H3
 ><A
@@ -1923,7 +1931,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24834"
+NAME="AEN24836"
 ></A
 ><P
 ></P
@@ -2044,7 +2052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24863"
+NAME="AEN24865"
 ></A
 ><H3
 ><A
@@ -2123,7 +2131,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24880"
+NAME="AEN24882"
 ></A
 ><P
 ></P
@@ -2261,7 +2269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24913"
+NAME="AEN24915"
 ></A
 ><H3
 ><A
@@ -2316,7 +2324,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24925"
+NAME="AEN24927"
 ></A
 ><P
 ></P
@@ -2403,7 +2411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24946"
+NAME="AEN24948"
 ></A
 ><H3
 ><A
@@ -2467,7 +2475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24960"
+NAME="AEN24962"
 ></A
 ><P
 ></P
@@ -2571,7 +2579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24985"
+NAME="AEN24987"
 ></A
 ><H3
 ><A
@@ -2644,7 +2652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25001"
+NAME="AEN25003"
 ></A
 ><P
 ></P
@@ -2765,7 +2773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25030"
+NAME="AEN25032"
 ></A
 ><H3
 ><A
@@ -2804,7 +2812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25039"
+NAME="AEN25041"
 ></A
 ><P
 ></P
@@ -2859,7 +2867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25052"
+NAME="AEN25054"
 ></A
 ><H3
 ><A
@@ -2907,7 +2915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25063"
+NAME="AEN25065"
 ></A
 ><P
 ></P
@@ -2979,7 +2987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25080"
+NAME="AEN25082"
 ></A
 ><H3
 ><A
@@ -3036,7 +3044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25093"
+NAME="AEN25095"
 ></A
 ><P
 ></P
@@ -3125,7 +3133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25114"
+NAME="AEN25116"
 ></A
 ><H3
 ><A
@@ -3172,7 +3180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25125"
+NAME="AEN25127"
 ></A
 ><P
 ></P
@@ -3242,7 +3250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25142"
+NAME="AEN25144"
 ></A
 ><H3
 ><A
@@ -3277,7 +3285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25150"
+NAME="AEN25152"
 ></A
 ><P
 ></P
@@ -3331,7 +3339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25163"
+NAME="AEN25165"
 ></A
 ><H3
 ><A
@@ -3376,7 +3384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25173"
+NAME="AEN25175"
 ></A
 ><P
 ></P
@@ -3448,7 +3456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25190"
+NAME="AEN25192"
 ></A
 ><H3
 ><A
@@ -3522,7 +3530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25206"
+NAME="AEN25208"
 ></A
 ><P
 ></P
@@ -3645,7 +3653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25235"
+NAME="AEN25237"
 ></A
 ><H3
 ><A
@@ -3690,7 +3698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25245"
+NAME="AEN25247"
 ></A
 ><P
 ></P
@@ -3762,7 +3770,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25262"
+NAME="AEN25264"
 ></A
 ><H3
 ><A
@@ -3836,7 +3844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25278"
+NAME="AEN25280"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 949d081..933637d 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10699"
+NAME="AEN10798"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10702"
+NAME="AEN10801"
 ></A
 ><H2
 >Synopsis</H2
@@ -395,7 +395,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10766"
+NAME="AEN10865"
 ></A
 ><H2
 >Description</H2
@@ -405,14 +405,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10769"
+NAME="AEN10868"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10771"
+NAME="AEN10870"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10776"
+NAME="AEN10875"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10781"
+NAME="AEN10880"
 ></A
 ><H3
 ><A
@@ -490,7 +490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10786"
+NAME="AEN10885"
 ></A
 ><H3
 ><A
@@ -516,7 +516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10791"
+NAME="AEN10890"
 ></A
 ><H3
 ><A
@@ -542,7 +542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10796"
+NAME="AEN10895"
 ></A
 ><H3
 ><A
@@ -568,7 +568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10801"
+NAME="AEN10900"
 ></A
 ><H3
 ><A
@@ -594,7 +594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10806"
+NAME="AEN10905"
 ></A
 ><H3
 ><A
@@ -620,7 +620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10811"
+NAME="AEN10910"
 ></A
 ><H3
 ><A
@@ -646,7 +646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10816"
+NAME="AEN10915"
 ></A
 ><H3
 ><A
@@ -682,7 +682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10821"
+NAME="AEN10920"
 ></A
 ><H3
 ><A
@@ -708,7 +708,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10826"
+NAME="AEN10925"
 ></A
 ><H3
 ><A
@@ -738,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10831"
+NAME="AEN10930"
 ></A
 ><H3
 ><A
@@ -764,7 +764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10836"
+NAME="AEN10935"
 ></A
 ><H3
 ><A
@@ -797,7 +797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10844"
+NAME="AEN10943"
 ></A
 ><P
 ></P
@@ -850,7 +850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10857"
+NAME="AEN10956"
 ></A
 ><H3
 ><A
@@ -885,7 +885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10866"
+NAME="AEN10965"
 ></A
 ><P
 ></P
@@ -938,7 +938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10879"
+NAME="AEN10978"
 ></A
 ><H3
 ><A
@@ -970,7 +970,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10887"
+NAME="AEN10986"
 ></A
 ><P
 ></P
@@ -1023,7 +1023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10900"
+NAME="AEN10999"
 ></A
 ><H3
 ><A
@@ -1059,7 +1059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10908"
+NAME="AEN11007"
 ></A
 ><P
 ></P
@@ -1129,7 +1129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10925"
+NAME="AEN11024"
 ></A
 ><H3
 ><A
@@ -1170,7 +1170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10934"
+NAME="AEN11033"
 ></A
 ><P
 ></P
@@ -1257,7 +1257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10955"
+NAME="AEN11054"
 ></A
 ><H3
 ><A
@@ -1296,7 +1296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10965"
+NAME="AEN11064"
 ></A
 ><P
 ></P
@@ -1367,7 +1367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10982"
+NAME="AEN11081"
 ></A
 ><H3
 ><A
@@ -1403,7 +1403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10991"
+NAME="AEN11090"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11004"
+NAME="AEN11103"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11013"
+NAME="AEN11112"
 ></A
 ><P
 ></P
@@ -1528,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11022"
+NAME="AEN11121"
 ></A
 ><H3
 ><A
@@ -1569,7 +1569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11031"
+NAME="AEN11130"
 ></A
 ><P
 ></P
@@ -1674,7 +1674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11056"
+NAME="AEN11155"
 ></A
 ><H3
 ><A
@@ -1708,7 +1708,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11064"
+NAME="AEN11163"
 ></A
 ><P
 ></P
@@ -1778,7 +1778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11081"
+NAME="AEN11180"
 ></A
 ><H3
 ><A
@@ -1817,7 +1817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11089"
+NAME="AEN11188"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11114"
+NAME="AEN11213"
 ></A
 ><H3
 ><A
@@ -1954,7 +1954,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11121"
+NAME="AEN11220"
 ></A
 ><P
 ></P
@@ -2024,7 +2024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11138"
+NAME="AEN11237"
 ></A
 ><H3
 ><A
@@ -2055,7 +2055,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11144"
+NAME="AEN11243"
 ></A
 ><P
 ></P
@@ -2182,7 +2182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11173"
+NAME="AEN11272"
 ></A
 ><H3
 ><A
@@ -2214,7 +2214,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11179"
+NAME="AEN11278"
 ></A
 ><P
 ></P
@@ -2358,7 +2358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11212"
+NAME="AEN11311"
 ></A
 ><H3
 ><A
@@ -2388,7 +2388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11219"
+NAME="AEN11318"
 ></A
 ><P
 ></P
@@ -2441,7 +2441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11232"
+NAME="AEN11331"
 ></A
 ><H3
 ><A
@@ -2468,7 +2468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11238"
+NAME="AEN11337"
 ></A
 ><P
 ></P
@@ -2521,7 +2521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11251"
+NAME="AEN11350"
 ></A
 ><H3
 ><A
@@ -2552,7 +2552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11258"
+NAME="AEN11357"
 ></A
 ><P
 ></P
@@ -2590,7 +2590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11267"
+NAME="AEN11366"
 ></A
 ><H3
 ><A
@@ -2644,7 +2644,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11278"
+NAME="AEN11377"
 ></A
 ><P
 ></P
@@ -2782,7 +2782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11311"
+NAME="AEN11410"
 ></A
 ><H3
 ><A
@@ -2815,7 +2815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11318"
+NAME="AEN11417"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index 0a66ffe..72bc9eb 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11348"
+NAME="AEN11447"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11351"
+NAME="AEN11450"
 ></A
 ><H2
 >Synopsis</H2
@@ -361,7 +361,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11407"
+NAME="AEN11506"
 ></A
 ><H2
 >Description</H2
@@ -371,14 +371,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11410"
+NAME="AEN11509"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11412"
+NAME="AEN11511"
 ></A
 ><H3
 ><A
@@ -407,7 +407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11418"
+NAME="AEN11517"
 ></A
 ><H3
 ><A
@@ -436,7 +436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11424"
+NAME="AEN11523"
 ></A
 ><H3
 ><A
@@ -465,7 +465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11430"
+NAME="AEN11529"
 ></A
 ><H3
 ><A
@@ -494,7 +494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11436"
+NAME="AEN11535"
 ></A
 ><H3
 ><A
@@ -523,7 +523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11442"
+NAME="AEN11541"
 ></A
 ><H3
 ><A
@@ -560,7 +560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11451"
+NAME="AEN11550"
 ></A
 ><P
 ></P
@@ -630,7 +630,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11468"
+NAME="AEN11567"
 ></A
 ><H3
 ><A
@@ -678,7 +678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11479"
+NAME="AEN11578"
 ></A
 ><P
 ></P
@@ -748,7 +748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11496"
+NAME="AEN11595"
 ></A
 ><H3
 ><A
@@ -781,7 +781,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11504"
+NAME="AEN11603"
 ></A
 ><P
 ></P
@@ -834,7 +834,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11517"
+NAME="AEN11616"
 ></A
 ><H3
 ><A
@@ -870,7 +870,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11525"
+NAME="AEN11624"
 ></A
 ><P
 ></P
@@ -940,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11542"
+NAME="AEN11641"
 ></A
 ><H3
 ><A
@@ -976,7 +976,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11550"
+NAME="AEN11649"
 ></A
 ><P
 ></P
@@ -1048,7 +1048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11567"
+NAME="AEN11666"
 ></A
 ><H3
 ><A
@@ -1082,7 +1082,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11575"
+NAME="AEN11674"
 ></A
 ><P
 ></P
@@ -1152,7 +1152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11592"
+NAME="AEN11691"
 ></A
 ><H3
 ><A
@@ -1189,7 +1189,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11600"
+NAME="AEN11699"
 ></A
 ><P
 ></P
@@ -1259,7 +1259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11617"
+NAME="AEN11716"
 ></A
 ><H3
 ><A
@@ -1298,7 +1298,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11626"
+NAME="AEN11725"
 ></A
 ><P
 ></P
@@ -1370,7 +1370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11643"
+NAME="AEN11742"
 ></A
 ><H3
 ><A
@@ -1409,7 +1409,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11652"
+NAME="AEN11751"
 ></A
 ><P
 ></P
@@ -1481,7 +1481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11669"
+NAME="AEN11768"
 ></A
 ><H3
 ><A
@@ -1523,7 +1523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11679"
+NAME="AEN11778"
 ></A
 ><P
 ></P
@@ -1644,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11708"
+NAME="AEN11807"
 ></A
 ><H3
 ><A
@@ -1677,7 +1677,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11715"
+NAME="AEN11814"
 ></A
 ><P
 ></P
@@ -1764,7 +1764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11736"
+NAME="AEN11835"
 ></A
 ><H3
 ><A
@@ -1797,7 +1797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11743"
+NAME="AEN11842"
 ></A
 ><P
 ></P
@@ -1901,7 +1901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11768"
+NAME="AEN11867"
 ></A
 ><H3
 ><A
@@ -1941,7 +1941,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11777"
+NAME="AEN11876"
 ></A
 ><P
 ></P
@@ -2047,7 +2047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11802"
+NAME="AEN11901"
 ></A
 ><H3
 ><A
@@ -2082,7 +2082,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11810"
+NAME="AEN11909"
 ></A
 ><P
 ></P
@@ -2154,7 +2154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11827"
+NAME="AEN11926"
 ></A
 ><H3
 ><A
@@ -2190,7 +2190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11835"
+NAME="AEN11934"
 ></A
 ><P
 ></P
@@ -2268,7 +2268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index 6747558..9716a55 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17565"
+NAME="AEN17538"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17568"
+NAME="AEN17541"
 ></A
 ><H2
 >Synopsis</H2
@@ -283,7 +283,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17597"
+NAME="AEN17570"
 ></A
 ><H2
 >Description</H2
@@ -293,14 +293,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17600"
+NAME="AEN17573"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17602"
+NAME="AEN17575"
 ></A
 ><H3
 ><A
@@ -342,7 +342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17609"
+NAME="AEN17582"
 ></A
 ><P
 ></P
@@ -567,7 +567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17662"
+NAME="AEN17635"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17668"
+NAME="AEN17641"
 ></A
 ><P
 ></P
@@ -668,7 +668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17685"
+NAME="AEN17658"
 ></A
 ><H3
 ><A
@@ -698,7 +698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17691"
+NAME="AEN17664"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17697"
+NAME="AEN17670"
 ></A
 ><H3
 ><A
@@ -753,7 +753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17703"
+NAME="AEN17676"
 ></A
 ><P
 ></P
@@ -791,7 +791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17712"
+NAME="AEN17685"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17718"
+NAME="AEN17691"
 ></A
 ><P
 ></P
@@ -856,7 +856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17727"
+NAME="AEN17700"
 ></A
 ><H3
 ><A
@@ -884,7 +884,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17733"
+NAME="AEN17706"
 ></A
 ><P
 ></P
@@ -939,7 +939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17746"
+NAME="AEN17719"
 ></A
 ><H3
 ><A
@@ -966,7 +966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17752"
+NAME="AEN17725"
 ></A
 ><P
 ></P
@@ -1004,7 +1004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17761"
+NAME="AEN17734"
 ></A
 ><H3
 ><A
@@ -1031,7 +1031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17767"
+NAME="AEN17740"
 ></A
 ><P
 ></P
@@ -1084,7 +1084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17780"
+NAME="AEN17753"
 ></A
 ><H3
 ><A
@@ -1111,7 +1111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17786"
+NAME="AEN17759"
 ></A
 ><P
 ></P
@@ -1164,7 +1164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17799"
+NAME="AEN17772"
 ></A
 ><H3
 ><A
@@ -1191,7 +1191,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17805"
+NAME="AEN17778"
 ></A
 ><P
 ></P
@@ -1244,7 +1244,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17818"
+NAME="AEN17791"
 ></A
 ><H3
 ><A
@@ -1274,7 +1274,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17824"
+NAME="AEN17797"
 ></A
 ><P
 ></P
@@ -1312,7 +1312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17833"
+NAME="AEN17806"
 ></A
 ><H3
 ><A
@@ -1345,7 +1345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17839"
+NAME="AEN17812"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17865"
+NAME="AEN17838"
 ></A
 ><H3
 ><A
@@ -1488,7 +1488,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17871"
+NAME="AEN17844"
 ></A
 ><P
 ></P
@@ -1558,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17888"
+NAME="AEN17861"
 ></A
 ><H3
 ><A
@@ -1585,7 +1585,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17894"
+NAME="AEN17867"
 ></A
 ><P
 ></P
@@ -1638,7 +1638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17907"
+NAME="AEN17880"
 ></A
 ><H3
 ><A
@@ -1665,7 +1665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17913"
+NAME="AEN17886"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17926"
+NAME="AEN17899"
 ></A
 ><H3
 ><A
@@ -1746,7 +1746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17932"
+NAME="AEN17905"
 ></A
 ><P
 ></P
@@ -1816,7 +1816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17949"
+NAME="AEN17922"
 ></A
 ><H3
 ><A
@@ -1844,7 +1844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17955"
+NAME="AEN17928"
 ></A
 ><P
 ></P
@@ -1897,7 +1897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17968"
+NAME="AEN17941"
 ></A
 ><H3
 ><A
@@ -1924,7 +1924,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17974"
+NAME="AEN17947"
 ></A
 ><P
 ></P
@@ -1977,7 +1977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17987"
+NAME="AEN17960"
 ></A
 ><H3
 ><A
@@ -2011,7 +2011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17994"
+NAME="AEN17967"
 ></A
 ><P
 ></P
@@ -2115,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18019"
+NAME="AEN17992"
 ></A
 ><H3
 ><A
@@ -2143,7 +2143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18025"
+NAME="AEN17998"
 ></A
 ><P
 ></P
@@ -2213,7 +2213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18042"
+NAME="AEN18015"
 ></A
 ><H3
 ><A
@@ -2247,7 +2247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18049"
+NAME="AEN18022"
 ></A
 ><P
 ></P
@@ -2351,7 +2351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18074"
+NAME="AEN18047"
 ></A
 ><H3
 ><A
@@ -2391,7 +2391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18082"
+NAME="AEN18055"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index f559e12..fee7208 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17259"
+NAME="AEN17232"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17262"
+NAME="AEN17235"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17278"
+NAME="AEN17251"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +234,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17281"
+NAME="AEN17254"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17283"
+NAME="AEN17256"
 ></A
 ><H3
 ><A
@@ -270,7 +270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17289"
+NAME="AEN17262"
 ></A
 ><H3
 ><A
@@ -298,7 +298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17295"
+NAME="AEN17268"
 ></A
 ><H3
 ><A
@@ -328,7 +328,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17301"
+NAME="AEN17274"
 ></A
 ><P
 ></P
@@ -366,7 +366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17310"
+NAME="AEN17283"
 ></A
 ><H3
 ><A
@@ -396,7 +396,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17316"
+NAME="AEN17289"
 ></A
 ><P
 ></P
@@ -485,7 +485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17337"
+NAME="AEN17310"
 ></A
 ><H3
 ><A
@@ -524,7 +524,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17344"
+NAME="AEN17317"
 ></A
 ><P
 ></P
@@ -647,7 +647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17373"
+NAME="AEN17346"
 ></A
 ><H3
 ><A
@@ -687,7 +687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17380"
+NAME="AEN17353"
 ></A
 ><P
 ></P
@@ -827,7 +827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17413"
+NAME="AEN17386"
 ></A
 ><H3
 ><A
@@ -856,7 +856,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17419"
+NAME="AEN17392"
 ></A
 ><P
 ></P
@@ -912,7 +912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17432"
+NAME="AEN17405"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17438"
+NAME="AEN17411"
 ></A
 ><P
 ></P
@@ -1015,7 +1015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17455"
+NAME="AEN17428"
 ></A
 ><H3
 ><A
@@ -1042,7 +1042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17461"
+NAME="AEN17434"
 ></A
 ><P
 ></P
@@ -1095,7 +1095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17474"
+NAME="AEN17447"
 ></A
 ><H3
 ><A
@@ -1122,7 +1122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17480"
+NAME="AEN17453"
 ></A
 ><P
 ></P
@@ -1176,7 +1176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17493"
+NAME="AEN17466"
 ></A
 ><H3
 ><A
@@ -1216,7 +1216,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17501"
+NAME="AEN17474"
 ></A
 ><P
 ></P
@@ -1304,7 +1304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17522"
+NAME="AEN17495"
 ></A
 ><H3
 ><A
@@ -1333,7 +1333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17528"
+NAME="AEN17501"
 ></A
 ><P
 ></P
@@ -1403,7 +1403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17545"
+NAME="AEN17518"
 ></A
 ><H3
 ><A
@@ -1431,7 +1431,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17551"
+NAME="AEN17524"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 7ba20a9..0c4a930 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -156,7 +156,7 @@
 >)     (<A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
->*);
+> *str);
 struct      <A
 HREF="libxml-parser.html#XMLPARSERINPUT"
 >xmlParserInput</A
@@ -197,10 +197,6 @@
 HREF="libxml-parser.html#XMLSAXLOCATOR"
 >xmlSAXLocator</A
 >;
-typedef     <A
-HREF="libxml-parser.html#XMLSAXLOCATORPTR"
->xmlSAXLocatorPtr</A
->;
 <A
 HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 >xmlParserInputPtr</A
@@ -249,7 +245,7 @@
 >xmlChar</A
 > *SystemID);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > (<A
 HREF="libxml-parser.html#GETENTITYSAXFUNC"
@@ -260,7 +256,7 @@
 >xmlChar</A
 > *name);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > (<A
 HREF="libxml-parser.html#GETPARAMETERENTITYSAXFUNC"
@@ -318,7 +314,7 @@
                                              const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
-> *name,
+> *fullname,
                                              int type,
                                              int def,
                                              const <A
@@ -367,7 +363,7 @@
 >*setDocumentLocatorSAXFunc</A
 >)    (void *ctx,
                                              <A
-HREF="libxml-parser.html#XMLSAXLOCATORPTR"
+HREF="libxml-tree.html#XMLSAXLOCATORPTR"
 >xmlSAXLocatorPtr</A
 > loc);
 void        (<A
@@ -499,10 +495,6 @@
 HREF="libxml-parser.html#XMLSAXHANDLER"
 >xmlSAXHandler</A
 >;
-typedef     <A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
->;
 <A
 HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 >xmlParserInputPtr</A
@@ -821,7 +813,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEDOC"
 >xmlSAXParseDoc</A
 >                  (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              <A
@@ -833,7 +825,7 @@
 HREF="libxml-parser.html#XMLSAXUSERPARSEFILE"
 >xmlSAXUserParseFile</A
 >             (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -842,7 +834,7 @@
 HREF="libxml-parser.html#XMLSAXUSERPARSEMEMORY"
 >xmlSAXUserParseMemory</A
 >           (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -855,7 +847,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEMEMORY"
 >xmlSAXParseMemory</A
 >               (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *buffer,
@@ -868,7 +860,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEFILE"
 >xmlSAXParseFile</A
 >                 (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename,
@@ -880,7 +872,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEFILEWITHDATA"
 >xmlSAXParseFileWithData</A
 >         (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename,
@@ -893,7 +885,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEENTITY"
 >xmlSAXParseEntity</A
 >               (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename);
@@ -925,7 +917,7 @@
 HREF="libxml-parser.html#XMLSAXPARSEDTD"
 >xmlSAXParseDTD</A
 >                  (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const <A
@@ -943,7 +935,7 @@
 HREF="libxml-parser.html#XMLIOPARSEDTD"
 >xmlIOParseDTD</A
 >                   (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              <A
@@ -962,7 +954,7 @@
 >xmlDocPtr</A
 > doc,
                                              <A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -983,7 +975,7 @@
 >xmlDocPtr</A
 > doc,
                                              <A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -1020,14 +1012,6 @@
 >xmlNodePtr</A
 > *lst);
 void        <A
-HREF="libxml-parser.html#XMLDEFAULTSAXHANDLERINIT"
->xmlDefaultSAXHandlerInit</A
->        (void);
-void        <A
-HREF="libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT"
->htmlDefaultSAXHandlerInit</A
->       (void);
-void        <A
 HREF="libxml-parser.html#XMLINITPARSERCTXT"
 >xmlInitParserCtxt</A
 >               (<A
@@ -1100,7 +1084,7 @@
 HREF="libxml-parser.html#XMLCREATEPUSHPARSERCTXT"
 >xmlCreatePushParserCtxt</A
 >    (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -1124,7 +1108,7 @@
 HREF="libxml-parser.html#XMLCREATEIOPARSERCTXT"
 >xmlCreateIOParserCtxt</A
 >      (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -1239,7 +1223,7 @@
                                              <A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> context);</PRE
+> ctxt);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1247,7 +1231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN317"
+NAME="AEN313"
 ></A
 ><H2
 >Description</H2
@@ -1257,14 +1241,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN320"
+NAME="AEN316"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN322"
+NAME="AEN318"
 ></A
 ><H3
 ><A
@@ -1292,7 +1276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN328"
+NAME="AEN324"
 ></A
 ><H3
 ><A
@@ -1311,16 +1295,18 @@
 >void        (*xmlParserInputDeallocate)     (<A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
->*);</PRE
+> *str);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Callback for freeing some parser input allocations</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN334"
+NAME="AEN331"
 ></A
 ><P
 ></P
@@ -1340,14 +1326,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param1</I
+>str</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to deallocate</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1358,7 +1344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN343"
+NAME="AEN340"
 ></A
 ><H3
 ><A
@@ -1408,7 +1394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN349"
+NAME="AEN346"
 ></A
 ><H3
 ><A
@@ -1445,7 +1431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN355"
+NAME="AEN352"
 ></A
 ><H3
 ><A
@@ -1471,7 +1457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN360"
+NAME="AEN357"
 ></A
 ><H3
 ><A
@@ -1501,7 +1487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN365"
+NAME="AEN362"
 ></A
 ><H3
 ><A
@@ -1527,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN370"
+NAME="AEN367"
 ></A
 ><H3
 ><A
@@ -1560,7 +1546,8 @@
     XML_PARSER_ATTRIBUTE_VALUE,	/* within an attribute value */
     XML_PARSER_SYSTEM_LITERAL,	/* within a SYSTEM value */
     XML_PARSER_EPILOG, 		/* the Misc* after the last end tag */
-    XML_PARSER_IGNORE		/* within an IGNORED section */
+    XML_PARSER_IGNORE,		/* within an IGNORED section */
+    XML_PARSER_PUBLIC_LITERAL 	/* within a PUBLIC value */
 } xmlParserInputState;</PRE
 ></TD
 ></TR
@@ -1574,7 +1561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN376"
+NAME="AEN373"
 ></A
 ><H3
 ><A
@@ -1603,7 +1590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN382"
+NAME="AEN379"
 ></A
 ><H3
 ><A
@@ -1633,7 +1620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN388"
+NAME="AEN385"
 ></A
 ><H3
 ><A
@@ -1742,7 +1729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN394"
+NAME="AEN391"
 ></A
 ><H3
 ><A
@@ -1775,33 +1762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN400"
-></A
-><H3
-><A
-NAME="XMLSAXLOCATORPTR"
-></A
->&#62;xmlSAXLocatorPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN405"
+NAME="AEN397"
 ></A
 ><H3
 ><A
@@ -1833,11 +1794,24 @@
 ></TR
 ></TABLE
 ><P
+>Callback:
+The entity loader, to control the loading of external entities,
+the application can either:
+   - override this <A
+HREF="libxml-sax.html#RESOLVEENTITY"
+>resolveEntity</A
+>() callback in the SAX block
+   - or better use the <A
+HREF="libxml-parser.html#XMLSETEXTERNALENTITYLOADER"
+>xmlSetExternalEntityLoader</A
+>() function to
+     set up it's own entity resolution routine</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN413"
+NAME="AEN408"
 ></A
 ><P
 ></P
@@ -1864,7 +1838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1881,7 +1855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1898,7 +1872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1913,7 +1887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1924,7 +1898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN434"
+NAME="AEN429"
 ></A
 ><H3
 ><A
@@ -1957,11 +1931,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback on internal subset declaration.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN442"
+NAME="AEN438"
 ></A
 ><P
 ></P
@@ -1988,7 +1964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2005,7 +1981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the root element name</TD
 ></TR
 ><TR
 ><TD
@@ -2022,7 +1998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -2039,7 +2015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SYSTEM ID (e.g. filename or URL)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2050,7 +2026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN463"
+NAME="AEN459"
 ></A
 ><H3
 ><A
@@ -2083,11 +2059,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback on external subset declaration.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN471"
+NAME="AEN468"
 ></A
 ><P
 ></P
@@ -2114,7 +2092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2131,7 +2109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the root element name</TD
 ></TR
 ><TR
 ><TD
@@ -2148,7 +2126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -2165,7 +2143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SYSTEM ID (e.g. filename or URL)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2176,7 +2154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN492"
+NAME="AEN489"
 ></A
 ><H3
 ><A
@@ -2193,7 +2171,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > (*getEntitySAXFunc)            (void *ctx,
                                              const <A
@@ -2204,11 +2182,13 @@
 ></TR
 ></TABLE
 ><P
+>Get an entity by name</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN499"
+NAME="AEN497"
 ></A
 ><P
 ></P
@@ -2235,7 +2215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2252,7 +2232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -2267,7 +2247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2278,7 +2258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN516"
+NAME="AEN514"
 ></A
 ><H3
 ><A
@@ -2295,7 +2275,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > (*getParameterEntitySAXFunc)   (void *ctx,
                                              const <A
@@ -2306,11 +2286,13 @@
 ></TR
 ></TABLE
 ><P
+>Get a parameter entity by name</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN523"
+NAME="AEN522"
 ></A
 ><P
 ></P
@@ -2337,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2354,7 +2336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -2369,7 +2351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2380,7 +2362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN540"
+NAME="AEN539"
 ></A
 ><H3
 ><A
@@ -2418,6 +2400,8 @@
 ></TR
 ></TABLE
 ><P
+>An entity definition has been parsed</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -2449,7 +2433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2466,7 +2450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name </TD
 ></TR
 ><TR
 ><TD
@@ -2483,7 +2467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type </TD
 ></TR
 ><TR
 ><TD
@@ -2500,7 +2484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2517,7 +2501,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2534,7 +2518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity value (without processing).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2578,11 +2562,13 @@
 ></TR
 ></TABLE
 ><P
+>What to do when a notation declaration has been parsed.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN586"
+NAME="AEN587"
 ></A
 ><P
 ></P
@@ -2609,7 +2595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2626,7 +2612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the notation</TD
 ></TR
 ><TR
 ><TD
@@ -2643,7 +2629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2660,7 +2646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2671,7 +2657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN607"
+NAME="AEN608"
 ></A
 ><H3
 ><A
@@ -2695,7 +2681,7 @@
                                              const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
-> *name,
+> *fullname,
                                              int type,
                                              int def,
                                              const <A
@@ -2710,11 +2696,13 @@
 ></TR
 ></TABLE
 ><P
+>An attribute definition has been parsed</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN616"
+NAME="AEN618"
 ></A
 ><P
 ></P
@@ -2741,7 +2729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2758,7 +2746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the element</TD
 ></TR
 ><TR
 ><TD
@@ -2768,14 +2756,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->name</I
+>fullname</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name </TD
 ></TR
 ><TR
 ><TD
@@ -2792,7 +2780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute type </TD
 ></TR
 ><TR
 ><TD
@@ -2809,7 +2797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of default value</TD
 ></TR
 ><TR
 ><TD
@@ -2826,7 +2814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the attribute default value</TD
 ></TR
 ><TR
 ><TD
@@ -2843,7 +2831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree of enumerated value set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2854,7 +2842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN649"
+NAME="AEN651"
 ></A
 ><H3
 ><A
@@ -2884,11 +2872,13 @@
 ></TR
 ></TABLE
 ><P
+>An element definition has been parsed</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN656"
+NAME="AEN659"
 ></A
 ><P
 ></P
@@ -2915,7 +2905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2932,7 +2922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name </TD
 ></TR
 ><TR
 ><TD
@@ -2949,7 +2939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element type </TD
 ></TR
 ><TR
 ><TD
@@ -2966,7 +2956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the element value tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2977,7 +2967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN677"
+NAME="AEN680"
 ></A
 ><H3
 ><A
@@ -3014,11 +3004,13 @@
 ></TR
 ></TABLE
 ><P
+>What to do when an unparsed entity declaration is parsed</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN686"
+NAME="AEN690"
 ></A
 ><P
 ></P
@@ -3045,7 +3037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3062,7 +3054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -3079,7 +3071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -3096,7 +3088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -3113,7 +3105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the name of the notation</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3124,7 +3116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN711"
+NAME="AEN715"
 ></A
 ><H3
 ><A
@@ -3142,18 +3134,21 @@
 CLASS="PROGRAMLISTING"
 >void        (*setDocumentLocatorSAXFunc)    (void *ctx,
                                              <A
-HREF="libxml-parser.html#XMLSAXLOCATORPTR"
+HREF="libxml-tree.html#XMLSAXLOCATORPTR"
 >xmlSAXLocatorPtr</A
 > loc);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Receive the document locator at startup, actually xmlDefaultSAXLocator
+Everything is available on the context, so this is useless in our case.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN717"
+NAME="AEN722"
 ></A
 ><P
 ></P
@@ -3180,7 +3175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3197,7 +3192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> A SAX Locator</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3208,7 +3203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN730"
+NAME="AEN735"
 ></A
 ><H3
 ><A
@@ -3229,11 +3224,13 @@
 ></TR
 ></TABLE
 ><P
+>called when the document start being processed.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN735"
+NAME="AEN741"
 ></A
 ><P
 ></P
@@ -3260,7 +3257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3271,7 +3268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN744"
+NAME="AEN750"
 ></A
 ><H3
 ><A
@@ -3292,11 +3289,13 @@
 ></TR
 ></TABLE
 ><P
+>called when the document end has been detected.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN749"
+NAME="AEN756"
 ></A
 ><P
 ></P
@@ -3323,7 +3322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3334,7 +3333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN758"
+NAME="AEN765"
 ></A
 ><H3
 ><A
@@ -3363,11 +3362,13 @@
 ></TR
 ></TABLE
 ><P
+>called when an opening tag has been processed.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN765"
+NAME="AEN773"
 ></A
 ><P
 ></P
@@ -3394,7 +3395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3411,7 +3412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -3428,7 +3429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An array of name/value attributes pairs, NULL terminated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3439,7 +3440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN782"
+NAME="AEN790"
 ></A
 ><H3
 ><A
@@ -3464,11 +3465,13 @@
 ></TR
 ></TABLE
 ><P
+>called when the end of an element has been detected.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN788"
+NAME="AEN797"
 ></A
 ><P
 ></P
@@ -3495,7 +3498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3512,7 +3515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3523,7 +3526,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN801"
+NAME="AEN810"
 ></A
 ><H3
 ><A
@@ -3552,11 +3555,16 @@
 ></TR
 ></TABLE
 ><P
+>Handle an attribute that has been read by the parser.
+The default handling is to convert the attribute into an
+DOM subtree and past it in a new xmlAttr element added to
+the element.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN808"
+NAME="AEN818"
 ></A
 ><P
 ></P
@@ -3583,7 +3591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3600,7 +3608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -3617,7 +3625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3628,7 +3636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN825"
+NAME="AEN835"
 ></A
 ><H3
 ><A
@@ -3653,11 +3661,13 @@
 ></TR
 ></TABLE
 ><P
+>called when an entity reference is detected.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN831"
+NAME="AEN842"
 ></A
 ><P
 ></P
@@ -3684,7 +3694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3701,7 +3711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The entity name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3712,7 +3722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN844"
+NAME="AEN855"
 ></A
 ><H3
 ><A
@@ -3738,11 +3748,13 @@
 ></TR
 ></TABLE
 ><P
+>receiving some chars from the parser.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN850"
+NAME="AEN862"
 ></A
 ><P
 ></P
@@ -3769,7 +3781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3786,7 +3798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3803,7 +3815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3814,7 +3826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN867"
+NAME="AEN879"
 ></A
 ><H3
 ><A
@@ -3840,11 +3852,14 @@
 ></TR
 ></TABLE
 ><P
+>receiving some ignorable whitespaces from the parser.
+UNUSED: by default the DOM building will use characters</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN873"
+NAME="AEN886"
 ></A
 ><P
 ></P
@@ -3871,7 +3886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3888,7 +3903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3905,7 +3920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3916,7 +3931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN890"
+NAME="AEN903"
 ></A
 ><H3
 ><A
@@ -3945,11 +3960,13 @@
 ></TR
 ></TABLE
 ><P
+>A processing instruction has been parsed.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN897"
+NAME="AEN911"
 ></A
 ><P
 ></P
@@ -3976,7 +3993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3993,7 +4010,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the target name</TD
 ></TR
 ><TR
 ><TD
@@ -4010,7 +4027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the PI data's</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4021,7 +4038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN914"
+NAME="AEN928"
 ></A
 ><H3
 ><A
@@ -4046,11 +4063,13 @@
 ></TR
 ></TABLE
 ><P
+>A comment has been parsed.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN920"
+NAME="AEN935"
 ></A
 ><P
 ></P
@@ -4077,7 +4096,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4094,7 +4113,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4105,7 +4124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN933"
+NAME="AEN948"
 ></A
 ><H3
 ><A
@@ -4131,11 +4150,13 @@
 ></TR
 ></TABLE
 ><P
+>called when a pcdata block has been parsed</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN939"
+NAME="AEN955"
 ></A
 ><P
 ></P
@@ -4162,7 +4183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4179,7 +4200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The pcdata content</TD
 ></TR
 ><TR
 ><TD
@@ -4196,7 +4217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the block length</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4207,7 +4228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN956"
+NAME="AEN972"
 ></A
 ><H3
 ><A
@@ -4230,11 +4251,13 @@
 ></TR
 ></TABLE
 ><P
+>Display and format a warning messages, callback</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN961"
+NAME="AEN978"
 ></A
 ><P
 ></P
@@ -4261,7 +4284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4278,7 +4301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -4295,7 +4318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4306,7 +4329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN978"
+NAME="AEN995"
 ></A
 ><H3
 ><A
@@ -4329,11 +4352,13 @@
 ></TR
 ></TABLE
 ><P
+>Display and format an error messages, callback</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN983"
+NAME="AEN1001"
 ></A
 ><P
 ></P
@@ -4360,7 +4385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4377,7 +4402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -4394,7 +4419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4405,7 +4430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1000"
+NAME="AEN1018"
 ></A
 ><H3
 ><A
@@ -4428,11 +4453,13 @@
 ></TR
 ></TABLE
 ><P
+>Display and format fatal error messages, callback</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1005"
+NAME="AEN1024"
 ></A
 ><P
 ></P
@@ -4459,7 +4486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4476,7 +4503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -4493,7 +4520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4504,7 +4531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1022"
+NAME="AEN1041"
 ></A
 ><H3
 ><A
@@ -4525,11 +4552,13 @@
 ></TR
 ></TABLE
 ><P
+>Is this document tagged standalone ?</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1027"
+NAME="AEN1047"
 ></A
 ><P
 ></P
@@ -4556,7 +4585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4571,7 +4600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4582,7 +4611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1040"
+NAME="AEN1060"
 ></A
 ><H3
 ><A
@@ -4603,11 +4632,13 @@
 ></TR
 ></TABLE
 ><P
+>Does this document has an internal subset</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1045"
+NAME="AEN1066"
 ></A
 ><P
 ></P
@@ -4634,7 +4665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4649,7 +4680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4660,7 +4691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1058"
+NAME="AEN1079"
 ></A
 ><H3
 ><A
@@ -4681,11 +4712,13 @@
 ></TR
 ></TABLE
 ><P
+>Does this document has an external subset</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1063"
+NAME="AEN1085"
 ></A
 ><P
 ></P
@@ -4712,7 +4745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4727,7 +4760,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4738,7 +4771,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1076"
+NAME="AEN1098"
 ></A
 ><H3
 ><A
@@ -4796,33 +4829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1082"
-></A
-><H3
-><A
-NAME="XMLSAXHANDLERPTR"
-></A
->&#62;xmlSAXHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1087"
+NAME="AEN1104"
 ></A
 ><H3
 ><A
@@ -4858,7 +4865,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1095"
+NAME="AEN1112"
 ></A
 ><P
 ></P
@@ -4945,7 +4952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1116"
+NAME="AEN1133"
 ></A
 ><H3
 ><A
@@ -4973,7 +4980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1122"
+NAME="AEN1139"
 ></A
 ><H3
 ><A
@@ -5003,7 +5010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1128"
+NAME="AEN1145"
 ></A
 ><H3
 ><A
@@ -5034,7 +5041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1151"
 ></A
 ><H3
 ><A
@@ -5066,7 +5073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1141"
+NAME="AEN1158"
 ></A
 ><P
 ></P
@@ -5137,7 +5144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1158"
+NAME="AEN1175"
 ></A
 ><H3
 ><A
@@ -5169,7 +5176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1165"
+NAME="AEN1182"
 ></A
 ><P
 ></P
@@ -5240,7 +5247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1182"
+NAME="AEN1199"
 ></A
 ><H3
 ><A
@@ -5275,7 +5282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1190"
+NAME="AEN1207"
 ></A
 ><P
 ></P
@@ -5328,7 +5335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1203"
+NAME="AEN1220"
 ></A
 ><H3
 ><A
@@ -5362,7 +5369,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1211"
+NAME="AEN1228"
 ></A
 ><P
 ></P
@@ -5437,7 +5444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1229"
+NAME="AEN1246"
 ></A
 ><H3
 ><A
@@ -5468,7 +5475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1236"
+NAME="AEN1253"
 ></A
 ><P
 ></P
@@ -5543,7 +5550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1254"
+NAME="AEN1271"
 ></A
 ><H3
 ><A
@@ -5573,7 +5580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1261"
+NAME="AEN1278"
 ></A
 ><P
 ></P
@@ -5626,7 +5633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1274"
+NAME="AEN1291"
 ></A
 ><H3
 ><A
@@ -5661,7 +5668,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1282"
+NAME="AEN1299"
 ></A
 ><P
 ></P
@@ -5748,7 +5755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1303"
+NAME="AEN1320"
 ></A
 ><H3
 ><A
@@ -5785,7 +5792,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1312"
+NAME="AEN1329"
 ></A
 ><P
 ></P
@@ -5855,7 +5862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1329"
+NAME="AEN1346"
 ></A
 ><H3
 ><A
@@ -5892,7 +5899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1338"
+NAME="AEN1355"
 ></A
 ><P
 ></P
@@ -5962,7 +5969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1355"
+NAME="AEN1372"
 ></A
 ><H3
 ><A
@@ -5999,7 +6006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1364"
+NAME="AEN1381"
 ></A
 ><P
 ></P
@@ -6069,7 +6076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1381"
+NAME="AEN1398"
 ></A
 ><H3
 ><A
@@ -6103,7 +6110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1389"
+NAME="AEN1406"
 ></A
 ><P
 ></P
@@ -6173,7 +6180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1406"
+NAME="AEN1423"
 ></A
 ><H3
 ><A
@@ -6208,7 +6215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1414"
+NAME="AEN1431"
 ></A
 ><P
 ></P
@@ -6295,7 +6302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1435"
+NAME="AEN1452"
 ></A
 ><H3
 ><A
@@ -6329,7 +6336,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1443"
+NAME="AEN1460"
 ></A
 ><P
 ></P
@@ -6399,7 +6406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1460"
+NAME="AEN1477"
 ></A
 ><H3
 ><A
@@ -6434,7 +6441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1468"
+NAME="AEN1485"
 ></A
 ><P
 ></P
@@ -6521,7 +6528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1489"
+NAME="AEN1506"
 ></A
 ><H3
 ><A
@@ -6559,7 +6566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1498"
+NAME="AEN1515"
 ></A
 ><P
 ></P
@@ -6629,7 +6636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1515"
+NAME="AEN1532"
 ></A
 ><H3
 ><A
@@ -6659,7 +6666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1522"
+NAME="AEN1539"
 ></A
 ><P
 ></P
@@ -6712,7 +6719,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1535"
+NAME="AEN1552"
 ></A
 ><H3
 ><A
@@ -6751,7 +6758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1544"
+NAME="AEN1561"
 ></A
 ><P
 ></P
@@ -6821,7 +6828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1561"
+NAME="AEN1578"
 ></A
 ><H3
 ><A
@@ -6870,7 +6877,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1572"
+NAME="AEN1589"
 ></A
 ><P
 ></P
@@ -6968,7 +6975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1595"
+NAME="AEN1612"
 ></A
 ><H3
 ><A
@@ -7001,7 +7008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1603"
+NAME="AEN1620"
 ></A
 ><P
 ></P
@@ -7054,7 +7061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1616"
+NAME="AEN1633"
 ></A
 ><H3
 ><A
@@ -7085,7 +7092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1623"
+NAME="AEN1640"
 ></A
 ><P
 ></P
@@ -7155,7 +7162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1640"
+NAME="AEN1657"
 ></A
 ><H3
 ><A
@@ -7186,7 +7193,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1647"
+NAME="AEN1664"
 ></A
 ><P
 ></P
@@ -7240,7 +7247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1660"
+NAME="AEN1677"
 ></A
 ><H3
 ><A
@@ -7275,7 +7282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1667"
+NAME="AEN1684"
 ></A
 ><P
 ></P
@@ -7328,7 +7335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1680"
+NAME="AEN1697"
 ></A
 ><H3
 ><A
@@ -7382,7 +7389,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1690"
+NAME="AEN1707"
 ></A
 ><P
 ></P
@@ -7435,7 +7442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1703"
+NAME="AEN1720"
 ></A
 ><H3
 ><A
@@ -7465,7 +7472,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1710"
+NAME="AEN1727"
 ></A
 ><P
 ></P
@@ -7503,7 +7510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1719"
+NAME="AEN1736"
 ></A
 ><H3
 ><A
@@ -7530,7 +7537,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1725"
+NAME="AEN1742"
 ></A
 ><P
 ></P
@@ -7583,7 +7590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1738"
+NAME="AEN1755"
 ></A
 ><H3
 ><A
@@ -7611,7 +7618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1744"
+NAME="AEN1761"
 ></A
 ><P
 ></P
@@ -7664,7 +7671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1757"
+NAME="AEN1774"
 ></A
 ><H3
 ><A
@@ -7698,7 +7705,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1765"
+NAME="AEN1782"
 ></A
 ><P
 ></P
@@ -7751,7 +7758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1778"
+NAME="AEN1795"
 ></A
 ><H3
 ><A
@@ -7783,7 +7790,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1785"
+NAME="AEN1802"
 ></A
 ><P
 ></P
@@ -7853,7 +7860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1802"
+NAME="AEN1819"
 ></A
 ><H3
 ><A
@@ -7885,7 +7892,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1809"
+NAME="AEN1826"
 ></A
 ><P
 ></P
@@ -7938,7 +7945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1822"
+NAME="AEN1839"
 ></A
 ><H3
 ><A
@@ -7973,7 +7980,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1831"
+NAME="AEN1848"
 ></A
 ><P
 ></P
@@ -8027,7 +8034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1844"
+NAME="AEN1861"
 ></A
 ><H3
 ><A
@@ -8061,7 +8068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1852"
+NAME="AEN1869"
 ></A
 ><P
 ></P
@@ -8115,7 +8122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1865"
+NAME="AEN1882"
 ></A
 ><H3
 ><A
@@ -8135,7 +8142,7 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >   xmlSAXParseDoc                  (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              <A
@@ -8155,7 +8162,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1874"
+NAME="AEN1891"
 ></A
 ><P
 ></P
@@ -8243,7 +8250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1895"
+NAME="AEN1912"
 ></A
 ><H3
 ><A
@@ -8260,7 +8267,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >int         xmlSAXUserParseFile             (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -8276,7 +8283,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1902"
+NAME="AEN1919"
 ></A
 ><P
 ></P
@@ -8363,7 +8370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1923"
+NAME="AEN1940"
 ></A
 ><H3
 ><A
@@ -8380,7 +8387,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >int         xmlSAXUserParseMemory           (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -8397,7 +8404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1930"
+NAME="AEN1947"
 ></A
 ><P
 ></P
@@ -8501,7 +8508,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1955"
+NAME="AEN1972"
 ></A
 ><H3
 ><A
@@ -8521,7 +8528,7 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >   xmlSAXParseMemory               (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *buffer,
@@ -8539,7 +8546,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1963"
+NAME="AEN1980"
 ></A
 ><P
 ></P
@@ -8644,7 +8651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1988"
+NAME="AEN2005"
 ></A
 ><H3
 ><A
@@ -8664,7 +8671,7 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >   xmlSAXParseFile                 (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename,
@@ -8682,7 +8689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1996"
+NAME="AEN2013"
 ></A
 ><P
 ></P
@@ -8770,7 +8777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2017"
+NAME="AEN2034"
 ></A
 ><H3
 ><A
@@ -8790,7 +8797,7 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >   xmlSAXParseFileWithData         (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename,
@@ -8812,7 +8819,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2026"
+NAME="AEN2043"
 ></A
 ><P
 ></P
@@ -8917,7 +8924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2051"
+NAME="AEN2068"
 ></A
 ><H3
 ><A
@@ -8937,7 +8944,7 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >   xmlSAXParseEntity               (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const char *filename);</PRE
@@ -8957,7 +8964,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2061"
+NAME="AEN2078"
 ></A
 ><P
 ></P
@@ -9027,7 +9034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2078"
+NAME="AEN2095"
 ></A
 ><H3
 ><A
@@ -9061,7 +9068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2087"
+NAME="AEN2104"
 ></A
 ><P
 ></P
@@ -9114,7 +9121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2100"
+NAME="AEN2117"
 ></A
 ><H3
 ><A
@@ -9151,7 +9158,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2109"
+NAME="AEN2126"
 ></A
 ><P
 ></P
@@ -9221,7 +9228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2126"
+NAME="AEN2143"
 ></A
 ><H3
 ><A
@@ -9241,7 +9248,7 @@
 HREF="libxml-tree.html#XMLDTDPTR"
 >xmlDtdPtr</A
 >   xmlSAXParseDTD                  (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              const <A
@@ -9262,7 +9269,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2136"
+NAME="AEN2153"
 ></A
 ><P
 ></P
@@ -9349,7 +9356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2157"
+NAME="AEN2174"
 ></A
 ><H3
 ><A
@@ -9369,7 +9376,7 @@
 HREF="libxml-tree.html#XMLDTDPTR"
 >xmlDtdPtr</A
 >   xmlIOParseDTD                   (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              <A
@@ -9390,7 +9397,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2167"
+NAME="AEN2184"
 ></A
 ><P
 ></P
@@ -9483,7 +9490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2189"
+NAME="AEN2206"
 ></A
 ><H3
 ><A
@@ -9504,7 +9511,7 @@
 >xmlDocPtr</A
 > doc,
                                              <A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -9532,7 +9539,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2200"
+NAME="AEN2217"
 ></A
 ><P
 ></P
@@ -9671,7 +9678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2233"
+NAME="AEN2250"
 ></A
 ><H3
 ><A
@@ -9692,7 +9699,7 @@
 >xmlDocPtr</A
 > doc,
                                              <A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -9723,7 +9730,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2245"
+NAME="AEN2262"
 ></A
 ><P
 ></P
@@ -9879,7 +9886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2282"
+NAME="AEN2299"
 ></A
 ><H3
 ><A
@@ -9925,7 +9932,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2293"
+NAME="AEN2310"
 ></A
 ><P
 ></P
@@ -10030,63 +10037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2318"
-></A
-><H3
-><A
-NAME="XMLDEFAULTSAXHANDLERINIT"
-></A
->&#62;xmlDefaultSAXHandlerInit ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDefaultSAXHandlerInit        (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the default SAX handler</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN2324"
-></A
-><H3
-><A
-NAME="HTMLDEFAULTSAXHANDLERINIT"
-></A
->&#62;htmlDefaultSAXHandlerInit ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        htmlDefaultSAXHandlerInit       (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the default SAX handler</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN2330"
+NAME="AEN2335"
 ></A
 ><H3
 ><A
@@ -10116,7 +10067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2337"
+NAME="AEN2342"
 ></A
 ><P
 ></P
@@ -10154,7 +10105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2346"
+NAME="AEN2351"
 ></A
 ><H3
 ><A
@@ -10184,7 +10135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2353"
+NAME="AEN2358"
 ></A
 ><P
 ></P
@@ -10222,7 +10173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2362"
+NAME="AEN2367"
 ></A
 ><H3
 ><A
@@ -10253,7 +10204,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2369"
+NAME="AEN2374"
 ></A
 ><P
 ></P
@@ -10291,7 +10242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2378"
+NAME="AEN2383"
 ></A
 ><H3
 ><A
@@ -10328,7 +10279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2386"
+NAME="AEN2391"
 ></A
 ><P
 ></P
@@ -10400,7 +10351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2403"
+NAME="AEN2408"
 ></A
 ><H3
 ><A
@@ -10433,7 +10384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2411"
+NAME="AEN2416"
 ></A
 ><P
 ></P
@@ -10486,7 +10437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2424"
+NAME="AEN2429"
 ></A
 ><H3
 ><A
@@ -10524,7 +10475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2432"
+NAME="AEN2437"
 ></A
 ><P
 ></P
@@ -10596,7 +10547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2449"
+NAME="AEN2454"
 ></A
 ><H3
 ><A
@@ -10628,7 +10579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2456"
+NAME="AEN2461"
 ></A
 ><P
 ></P
@@ -10715,7 +10666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2477"
+NAME="AEN2482"
 ></A
 ><H3
 ><A
@@ -10747,7 +10698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2484"
+NAME="AEN2489"
 ></A
 ><P
 ></P
@@ -10834,7 +10785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2505"
+NAME="AEN2510"
 ></A
 ><H3
 ><A
@@ -10854,7 +10805,7 @@
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 > xmlCreatePushParserCtxt    (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -10884,7 +10835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2515"
+NAME="AEN2520"
 ></A
 ><P
 ></P
@@ -11005,7 +10956,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2544"
+NAME="AEN2549"
 ></A
 ><H3
 ><A
@@ -11038,7 +10989,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2551"
+NAME="AEN2556"
 ></A
 ><P
 ></P
@@ -11142,7 +11093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2576"
+NAME="AEN2581"
 ></A
 ><H3
 ><A
@@ -11162,7 +11113,7 @@
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 > xmlCreateIOParserCtxt      (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
                                              void *user_data,
@@ -11190,7 +11141,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2587"
+NAME="AEN2592"
 ></A
 ><P
 ></P
@@ -11328,7 +11279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2620"
+NAME="AEN2625"
 ></A
 ><H3
 ><A
@@ -11375,7 +11326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2631"
+NAME="AEN2636"
 ></A
 ><P
 ></P
@@ -11462,7 +11413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2652"
+NAME="AEN2657"
 ></A
 ><H3
 ><A
@@ -11500,7 +11451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2661"
+NAME="AEN2666"
 ></A
 ><P
 ></P
@@ -11570,7 +11521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2678"
+NAME="AEN2683"
 ></A
 ><H3
 ><A
@@ -11600,7 +11551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2685"
+NAME="AEN2690"
 ></A
 ><P
 ></P
@@ -11638,7 +11589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2694"
+NAME="AEN2699"
 ></A
 ><H3
 ><A
@@ -11669,7 +11620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2701"
+NAME="AEN2706"
 ></A
 ><P
 ></P
@@ -11707,7 +11658,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2710"
+NAME="AEN2715"
 ></A
 ><H3
 ><A
@@ -11745,7 +11696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2719"
+NAME="AEN2724"
 ></A
 ><P
 ></P
@@ -11815,7 +11766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2736"
+NAME="AEN2741"
 ></A
 ><H3
 ><A
@@ -11849,7 +11800,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2744"
+NAME="AEN2749"
 ></A
 ><P
 ></P
@@ -11904,7 +11855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2757"
+NAME="AEN2762"
 ></A
 ><H3
 ><A
@@ -11934,7 +11885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2764"
+NAME="AEN2769"
 ></A
 ><P
 ></P
@@ -11972,7 +11923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2773"
+NAME="AEN2778"
 ></A
 ><H3
 ><A
@@ -12003,7 +11954,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2780"
+NAME="AEN2785"
 ></A
 ><P
 ></P
@@ -12039,7 +11990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2789"
+NAME="AEN2794"
 ></A
 ><H3
 ><A
@@ -12063,7 +12014,7 @@
                                              <A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> context);</PRE
+> ctxt);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -12076,7 +12027,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2797"
+NAME="AEN2802"
 ></A
 ><P
 ></P
@@ -12130,14 +12081,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->context</I
+>ctxt</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the context in which the entity is called or NULL</TD
 ></TR
 ><TR
 ><TD
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index d86bde5..3177e20 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20833"
+NAME="AEN20836"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20836"
+NAME="AEN20839"
 ></A
 ><H2
 >Synopsis</H2
@@ -227,14 +227,14 @@
 >xmlIsIdeographic</A
 >                (int c);
 int         <A
-HREF="libxml-parserinternals.html#XMLISCOMBINING"
->xmlIsCombining</A
->                  (int c);
-int         <A
 HREF="libxml-parserinternals.html#XMLISEXTENDER"
 >xmlIsExtender</A
 >                   (int c);
 int         <A
+HREF="libxml-parserinternals.html#XMLISCOMBINING"
+>xmlIsCombining</A
+>                  (int c);
+int         <A
 HREF="libxml-parserinternals.html#XMLISCHAR"
 >xmlIsChar</A
 >                       (int c);
@@ -301,13 +301,6 @@
 >xmlCharEncodingHandlerPtr</A
 > handler);
 void        <A
-HREF="libxml-parser.html#XMLFREEPARSERCTXT"
->xmlFreeParserCtxt</A
->               (<A
-HREF="libxml-tree.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);
-void        <A
 HREF="libxml-parserinternals.html#XMLHANDLEENTITY"
 >xmlHandleEntity</A
 >                 (<A
@@ -315,7 +308,7 @@
 >xmlParserCtxtPtr</A
 > ctxt,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > entity);
 <A
@@ -343,7 +336,7 @@
 >xmlParserCtxtPtr</A
 > ctxt,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > entity);
 void        <A
@@ -669,7 +662,11 @@
                                             (<A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> ctxt);
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> inputchk);
 <A
 HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 >xmlElementContentPtr</A
@@ -691,7 +688,11 @@
                                             (<A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> ctxt);
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> inputchk);
 int         <A
 HREF="libxml-parserinternals.html#XMLPARSEELEMENTCONTENTDECL"
 >xmlParseElementContentDecl</A
@@ -729,7 +730,7 @@
 >xmlParserCtxtPtr</A
 > ctxt);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-parserinternals.html#XMLPARSEENTITYREF"
@@ -1119,7 +1120,7 @@
 HREF="libxml-parserinternals.html#XMLENTITYREFERENCEFUNC"
 >*xmlEntityReferenceFunc</A
 >)       (<A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > ent,
                                              <A
@@ -1144,7 +1145,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21114"
+NAME="AEN21117"
 ></A
 ><H2
 >Description</H2
@@ -1154,14 +1155,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21117"
+NAME="AEN21120"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21119"
+NAME="AEN21122"
 ></A
 ><H3
 ><A
@@ -1190,7 +1191,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21125"
+NAME="AEN21128"
 ></A
 ><H3
 ><A
@@ -1219,7 +1220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21131"
+NAME="AEN21134"
 ></A
 ><H3
 ><A
@@ -1277,7 +1278,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21147"
+NAME="AEN21150"
 ></A
 ><P
 ></P
@@ -1315,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21156"
+NAME="AEN21159"
 ></A
 ><H3
 ><A
@@ -1356,7 +1357,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21167"
+NAME="AEN21170"
 ></A
 ><P
 ></P
@@ -1394,7 +1395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21176"
+NAME="AEN21179"
 ></A
 ><H3
 ><A
@@ -1423,7 +1424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21183"
+NAME="AEN21186"
 ></A
 ><P
 ></P
@@ -1461,7 +1462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21192"
+NAME="AEN21195"
 ></A
 ><H3
 ><A
@@ -1490,7 +1491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21199"
+NAME="AEN21202"
 ></A
 ><P
 ></P
@@ -1528,7 +1529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21208"
+NAME="AEN21211"
 ></A
 ><H3
 ><A
@@ -1557,7 +1558,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21215"
+NAME="AEN21218"
 ></A
 ><P
 ></P
@@ -1595,7 +1596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21224"
+NAME="AEN21227"
 ></A
 ><H3
 ><A
@@ -1668,7 +1669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21245"
+NAME="AEN21248"
 ></A
 ><P
 ></P
@@ -1706,7 +1707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21254"
+NAME="AEN21257"
 ></A
 ><H3
 ><A
@@ -1750,7 +1751,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21266"
+NAME="AEN21269"
 ></A
 ><P
 ></P
@@ -1788,7 +1789,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21275"
+NAME="AEN21278"
 ></A
 ><H3
 ><A
@@ -1817,7 +1818,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21282"
+NAME="AEN21285"
 ></A
 ><P
 ></P
@@ -1855,7 +1856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21291"
+NAME="AEN21294"
 ></A
 ><H3
 ><A
@@ -1893,7 +1894,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21301"
+NAME="AEN21304"
 ></A
 ><P
 ></P
@@ -1931,7 +1932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21310"
+NAME="AEN21313"
 ></A
 ><H3
 ><A
@@ -1958,7 +1959,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21316"
+NAME="AEN21319"
 ></A
 ><P
 ></P
@@ -1996,7 +1997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21325"
+NAME="AEN21328"
 ></A
 ><H3
 ><A
@@ -2023,7 +2024,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21331"
+NAME="AEN21334"
 ></A
 ><P
 ></P
@@ -2061,7 +2062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21340"
+NAME="AEN21343"
 ></A
 ><H3
 ><A
@@ -2088,7 +2089,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21346"
+NAME="AEN21349"
 ></A
 ><P
 ></P
@@ -2126,7 +2127,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21355"
+NAME="AEN21358"
 ></A
 ><H3
 ><A
@@ -2168,7 +2169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21365"
+NAME="AEN21368"
 ></A
 ><P
 ></P
@@ -2221,7 +2222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21378"
+NAME="AEN21381"
 ></A
 ><H3
 ><A
@@ -2265,7 +2266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21389"
+NAME="AEN21392"
 ></A
 ><P
 ></P
@@ -2318,7 +2319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21402"
+NAME="AEN21405"
 ></A
 ><H3
 ><A
@@ -2355,7 +2356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21411"
+NAME="AEN21414"
 ></A
 ><P
 ></P
@@ -2408,7 +2409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21424"
+NAME="AEN21427"
 ></A
 ><H3
 ><A
@@ -2436,7 +2437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21430"
+NAME="AEN21433"
 ></A
 ><P
 ></P
@@ -2489,7 +2490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21443"
+NAME="AEN21446"
 ></A
 ><H3
 ><A
@@ -2517,7 +2518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21449"
+NAME="AEN21452"
 ></A
 ><P
 ></P
@@ -2570,7 +2571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21462"
+NAME="AEN21465"
 ></A
 ><H3
 ><A
@@ -2613,7 +2614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21473"
+NAME="AEN21476"
 ></A
 ><P
 ></P
@@ -2666,88 +2667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21486"
-></A
-><H3
-><A
-NAME="XMLISCOMBINING"
-></A
->&#62;xmlIsCombining ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlIsCombining                  (int c);</PRE
-></TD
-></TR
-></TABLE
-><P
->Check whether the character is allowed by the production
-[87] CombiningChar ::= ... long list see REC ...</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN21492"
-></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
->c</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an unicode character (int)</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 not, non-zero otherwise</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN21505"
+NAME="AEN21489"
 ></A
 ><H3
 ><A
@@ -2819,7 +2739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21525"
+NAME="AEN21509"
 ></A
 ><P
 ></P
@@ -2872,7 +2792,88 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21538"
+NAME="AEN21522"
+></A
+><H3
+><A
+NAME="XMLISCOMBINING"
+></A
+>&#62;xmlIsCombining ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlIsCombining                  (int c);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Check whether the character is allowed by the production
+[87] CombiningChar ::= ... long list see REC ...</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN21528"
+></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
+>c</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an unicode character (int)</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 not, non-zero otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN21541"
 ></A
 ><H3
 ><A
@@ -2933,7 +2934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21554"
+NAME="AEN21557"
 ></A
 ><P
 ></P
@@ -2986,7 +2987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21567"
+NAME="AEN21570"
 ></A
 ><H3
 ><A
@@ -3018,7 +3019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21574"
+NAME="AEN21577"
 ></A
 ><P
 ></P
@@ -3071,7 +3072,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21587"
+NAME="AEN21590"
 ></A
 ><H3
 ><A
@@ -3102,7 +3103,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21594"
+NAME="AEN21597"
 ></A
 ><P
 ></P
@@ -3172,7 +3173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21611"
+NAME="AEN21614"
 ></A
 ><H3
 ><A
@@ -3202,7 +3203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21618"
+NAME="AEN21621"
 ></A
 ><P
 ></P
@@ -3238,7 +3239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21627"
+NAME="AEN21630"
 ></A
 ><H3
 ><A
@@ -3281,7 +3282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21637"
+NAME="AEN21640"
 ></A
 ><P
 ></P
@@ -3368,7 +3369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21658"
+NAME="AEN21661"
 ></A
 ><H3
 ><A
@@ -3403,7 +3404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21666"
+NAME="AEN21669"
 ></A
 ><P
 ></P
@@ -3473,7 +3474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21683"
+NAME="AEN21686"
 ></A
 ><H3
 ><A
@@ -3508,7 +3509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21691"
+NAME="AEN21694"
 ></A
 ><P
 ></P
@@ -3578,76 +3579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21708"
-></A
-><H3
-><A
-NAME="XMLFREEPARSERCTXT"
-></A
->&#62;xmlFreeParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlFreeParserCtxt               (<A
-HREF="libxml-tree.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN21715"
-></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"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN21724"
+NAME="AEN21711"
 ></A
 ><H3
 ><A
@@ -3668,7 +3600,7 @@
 >xmlParserCtxtPtr</A
 > ctxt,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > entity);</PRE
 ></TD
@@ -3684,7 +3616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21733"
+NAME="AEN21720"
 ></A
 ><P
 ></P
@@ -3739,7 +3671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21746"
+NAME="AEN21733"
 ></A
 ><H3
 ><A
@@ -3776,7 +3708,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21755"
+NAME="AEN21742"
 ></A
 ><P
 ></P
@@ -3846,7 +3778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21772"
+NAME="AEN21759"
 ></A
 ><H3
 ><A
@@ -3870,7 +3802,7 @@
 >xmlParserCtxtPtr</A
 > ctxt,
                                              <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > entity);</PRE
 ></TD
@@ -3883,7 +3815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21781"
+NAME="AEN21768"
 ></A
 ><P
 ></P
@@ -3953,7 +3885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21798"
+NAME="AEN21785"
 ></A
 ><H3
 ><A
@@ -3988,7 +3920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21806"
+NAME="AEN21793"
 ></A
 ><P
 ></P
@@ -4043,7 +3975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21819"
+NAME="AEN21806"
 ></A
 ><H3
 ><A
@@ -4077,7 +4009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21827"
+NAME="AEN21814"
 ></A
 ><P
 ></P
@@ -4130,7 +4062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21840"
+NAME="AEN21827"
 ></A
 ><H3
 ><A
@@ -4160,7 +4092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21847"
+NAME="AEN21834"
 ></A
 ><P
 ></P
@@ -4198,7 +4130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21856"
+NAME="AEN21843"
 ></A
 ><H3
 ><A
@@ -4232,7 +4164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21864"
+NAME="AEN21851"
 ></A
 ><P
 ></P
@@ -4302,7 +4234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21881"
+NAME="AEN21868"
 ></A
 ><H3
 ><A
@@ -4335,7 +4267,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21889"
+NAME="AEN21876"
 ></A
 ><P
 ></P
@@ -4388,7 +4320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21902"
+NAME="AEN21889"
 ></A
 ><H3
 ><A
@@ -4435,7 +4367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21915"
+NAME="AEN21902"
 ></A
 ><P
 ></P
@@ -4523,7 +4455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21936"
+NAME="AEN21923"
 ></A
 ><H3
 ><A
@@ -4564,7 +4496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21947"
+NAME="AEN21934"
 ></A
 ><P
 ></P
@@ -4617,7 +4549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21960"
+NAME="AEN21947"
 ></A
 ><H3
 ><A
@@ -4663,7 +4595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21973"
+NAME="AEN21960"
 ></A
 ><P
 ></P
@@ -4734,7 +4666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21990"
+NAME="AEN21977"
 ></A
 ><H3
 ><A
@@ -4774,7 +4706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22001"
+NAME="AEN21988"
 ></A
 ><P
 ></P
@@ -4827,7 +4759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22014"
+NAME="AEN22001"
 ></A
 ><H3
 ><A
@@ -4862,7 +4794,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22023"
+NAME="AEN22010"
 ></A
 ><P
 ></P
@@ -4915,7 +4847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22036"
+NAME="AEN22023"
 ></A
 ><H3
 ><A
@@ -4953,7 +4885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22046"
+NAME="AEN22033"
 ></A
 ><P
 ></P
@@ -4991,7 +4923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22055"
+NAME="AEN22042"
 ></A
 ><H3
 ><A
@@ -5035,7 +4967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22067"
+NAME="AEN22054"
 ></A
 ><P
 ></P
@@ -5088,7 +5020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22080"
+NAME="AEN22067"
 ></A
 ><H3
 ><A
@@ -5128,7 +5060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22091"
+NAME="AEN22078"
 ></A
 ><P
 ></P
@@ -5181,7 +5113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22104"
+NAME="AEN22091"
 ></A
 ><H3
 ><A
@@ -5218,7 +5150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22114"
+NAME="AEN22101"
 ></A
 ><P
 ></P
@@ -5271,7 +5203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22127"
+NAME="AEN22114"
 ></A
 ><H3
 ><A
@@ -5311,7 +5243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22137"
+NAME="AEN22124"
 ></A
 ><P
 ></P
@@ -5381,7 +5313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22154"
+NAME="AEN22141"
 ></A
 ><H3
 ><A
@@ -5471,7 +5403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22175"
+NAME="AEN22162"
 ></A
 ><P
 ></P
@@ -5524,7 +5456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22188"
+NAME="AEN22175"
 ></A
 ><H3
 ><A
@@ -5559,7 +5491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22197"
+NAME="AEN22184"
 ></A
 ><P
 ></P
@@ -5612,7 +5544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22210"
+NAME="AEN22197"
 ></A
 ><H3
 ><A
@@ -5647,7 +5579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22219"
+NAME="AEN22206"
 ></A
 ><P
 ></P
@@ -5700,7 +5632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22232"
+NAME="AEN22219"
 ></A
 ><H3
 ><A
@@ -5739,7 +5671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22241"
+NAME="AEN22228"
 ></A
 ><P
 ></P
@@ -5794,7 +5726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22254"
+NAME="AEN22241"
 ></A
 ><H3
 ><A
@@ -5840,7 +5772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22266"
+NAME="AEN22253"
 ></A
 ><P
 ></P
@@ -5930,7 +5862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22287"
+NAME="AEN22274"
 ></A
 ><H3
 ><A
@@ -5964,7 +5896,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22295"
+NAME="AEN22282"
 ></A
 ><P
 ></P
@@ -6002,7 +5934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22304"
+NAME="AEN22291"
 ></A
 ><H3
 ><A
@@ -6037,7 +5969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22313"
+NAME="AEN22300"
 ></A
 ><P
 ></P
@@ -6090,7 +6022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22326"
+NAME="AEN22313"
 ></A
 ><H3
 ><A
@@ -6124,7 +6056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22335"
+NAME="AEN22322"
 ></A
 ><P
 ></P
@@ -6162,7 +6094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22344"
+NAME="AEN22331"
 ></A
 ><H3
 ><A
@@ -6204,7 +6136,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22355"
+NAME="AEN22342"
 ></A
 ><P
 ></P
@@ -6242,7 +6174,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22364"
+NAME="AEN22351"
 ></A
 ><H3
 ><A
@@ -6287,7 +6219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22378"
+NAME="AEN22365"
 ></A
 ><P
 ></P
@@ -6325,7 +6257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22387"
+NAME="AEN22374"
 ></A
 ><H3
 ><A
@@ -6398,7 +6330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22407"
+NAME="AEN22394"
 ></A
 ><P
 ></P
@@ -6469,7 +6401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22424"
+NAME="AEN22411"
 ></A
 ><H3
 ><A
@@ -6510,7 +6442,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22435"
+NAME="AEN22422"
 ></A
 ><P
 ></P
@@ -6563,7 +6495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22448"
+NAME="AEN22435"
 ></A
 ><H3
 ><A
@@ -6602,7 +6534,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22458"
+NAME="AEN22445"
 ></A
 ><P
 ></P
@@ -6655,7 +6587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22471"
+NAME="AEN22458"
 ></A
 ><H3
 ><A
@@ -6693,7 +6625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22481"
+NAME="AEN22468"
 ></A
 ><P
 ></P
@@ -6763,7 +6695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22498"
+NAME="AEN22485"
 ></A
 ><H3
 ><A
@@ -6842,7 +6774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22519"
+NAME="AEN22506"
 ></A
 ><P
 ></P
@@ -6912,7 +6844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22536"
+NAME="AEN22523"
 ></A
 ><H3
 ><A
@@ -6946,7 +6878,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22545"
+NAME="AEN22532"
 ></A
 ><P
 ></P
@@ -6984,7 +6916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22554"
+NAME="AEN22541"
 ></A
 ><H3
 ><A
@@ -7007,7 +6939,11 @@
                                             (<A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> ctxt);</PRE
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> inputchk);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7034,7 +6970,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22567"
+NAME="AEN22555"
 ></A
 ><P
 ></P
@@ -7068,6 +7004,23 @@
 WIDTH="20%"
 ALIGN="RIGHT"
 VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>inputchk</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
@@ -7087,7 +7040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22580"
+NAME="AEN22572"
 ></A
 ><H3
 ><A
@@ -7124,7 +7077,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22589"
+NAME="AEN22581"
 ></A
 ><P
 ></P
@@ -7178,7 +7131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22602"
+NAME="AEN22594"
 ></A
 ><H3
 ><A
@@ -7201,7 +7154,11 @@
                                             (<A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> ctxt);</PRE
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> inputchk);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7232,7 +7189,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22615"
+NAME="AEN22608"
 ></A
 ><P
 ></P
@@ -7266,6 +7223,23 @@
 WIDTH="20%"
 ALIGN="RIGHT"
 VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>inputchk</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
@@ -7286,7 +7260,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22628"
+NAME="AEN22625"
 ></A
 ><H3
 ><A
@@ -7327,7 +7301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22638"
+NAME="AEN22635"
 ></A
 ><P
 ></P
@@ -7414,7 +7388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22659"
+NAME="AEN22656"
 ></A
 ><H3
 ><A
@@ -7449,7 +7423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22668"
+NAME="AEN22665"
 ></A
 ><P
 ></P
@@ -7502,7 +7476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22681"
+NAME="AEN22678"
 ></A
 ><H3
 ><A
@@ -7548,7 +7522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22691"
+NAME="AEN22688"
 ></A
 ><P
 ></P
@@ -7586,7 +7560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22700"
+NAME="AEN22697"
 ></A
 ><H3
 ><A
@@ -7626,7 +7600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22710"
+NAME="AEN22707"
 ></A
 ><P
 ></P
@@ -7679,7 +7653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22723"
+NAME="AEN22720"
 ></A
 ><H3
 ><A
@@ -7696,7 +7670,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > xmlParseEntityRef              (<A
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
@@ -7732,7 +7706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22734"
+NAME="AEN22731"
 ></A
 ><P
 ></P
@@ -7785,7 +7759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22747"
+NAME="AEN22744"
 ></A
 ><H3
 ><A
@@ -7826,7 +7800,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22757"
+NAME="AEN22754"
 ></A
 ><P
 ></P
@@ -7864,7 +7838,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22766"
+NAME="AEN22763"
 ></A
 ><H3
 ><A
@@ -7917,7 +7891,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22778"
+NAME="AEN22775"
 ></A
 ><P
 ></P
@@ -7955,7 +7929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22787"
+NAME="AEN22784"
 ></A
 ><H3
 ><A
@@ -7992,7 +7966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22796"
+NAME="AEN22793"
 ></A
 ><P
 ></P
@@ -8030,7 +8004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22805"
+NAME="AEN22802"
 ></A
 ><H3
 ><A
@@ -8090,7 +8064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22822"
+NAME="AEN22819"
 ></A
 ><P
 ></P
@@ -8160,7 +8134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22839"
+NAME="AEN22836"
 ></A
 ><H3
 ><A
@@ -8212,7 +8186,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22854"
+NAME="AEN22851"
 ></A
 ><P
 ></P
@@ -8265,7 +8239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22867"
+NAME="AEN22864"
 ></A
 ><H3
 ><A
@@ -8301,7 +8275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22877"
+NAME="AEN22874"
 ></A
 ><P
 ></P
@@ -8339,7 +8313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22886"
+NAME="AEN22883"
 ></A
 ><H3
 ><A
@@ -8377,7 +8351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22897"
+NAME="AEN22894"
 ></A
 ><P
 ></P
@@ -8415,7 +8389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22906"
+NAME="AEN22903"
 ></A
 ><H3
 ><A
@@ -8447,7 +8421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22914"
+NAME="AEN22911"
 ></A
 ><P
 ></P
@@ -8485,7 +8459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22923"
+NAME="AEN22920"
 ></A
 ><H3
 ><A
@@ -8534,7 +8508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22933"
+NAME="AEN22930"
 ></A
 ><P
 ></P
@@ -8572,7 +8546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22942"
+NAME="AEN22939"
 ></A
 ><H3
 ><A
@@ -8607,7 +8581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22951"
+NAME="AEN22948"
 ></A
 ><P
 ></P
@@ -8660,7 +8634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22964"
+NAME="AEN22961"
 ></A
 ><H3
 ><A
@@ -8697,7 +8671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22974"
+NAME="AEN22971"
 ></A
 ><P
 ></P
@@ -8750,7 +8724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22987"
+NAME="AEN22984"
 ></A
 ><H3
 ><A
@@ -8785,7 +8759,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22996"
+NAME="AEN22993"
 ></A
 ><P
 ></P
@@ -8838,7 +8812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23009"
+NAME="AEN23006"
 ></A
 ><H3
 ><A
@@ -8875,7 +8849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23019"
+NAME="AEN23016"
 ></A
 ><P
 ></P
@@ -8928,7 +8902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23032"
+NAME="AEN23029"
 ></A
 ><H3
 ><A
@@ -8975,7 +8949,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23041"
+NAME="AEN23038"
 ></A
 ><P
 ></P
@@ -9028,7 +9002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23054"
+NAME="AEN23051"
 ></A
 ><H3
 ><A
@@ -9060,7 +9034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23062"
+NAME="AEN23059"
 ></A
 ><P
 ></P
@@ -9098,7 +9072,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23071"
+NAME="AEN23068"
 ></A
 ><H3
 ><A
@@ -9132,7 +9106,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23080"
+NAME="AEN23077"
 ></A
 ><P
 ></P
@@ -9170,7 +9144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23089"
+NAME="AEN23086"
 ></A
 ><H3
 ><A
@@ -9202,7 +9176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23097"
+NAME="AEN23094"
 ></A
 ><P
 ></P
@@ -9240,7 +9214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23106"
+NAME="AEN23103"
 ></A
 ><H3
 ><A
@@ -9282,7 +9256,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23117"
+NAME="AEN23114"
 ></A
 ><P
 ></P
@@ -9354,7 +9328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23134"
+NAME="AEN23131"
 ></A
 ><H3
 ><A
@@ -9382,7 +9356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23140"
+NAME="AEN23137"
 ></A
 ><H3
 ><A
@@ -9410,7 +9384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23146"
+NAME="AEN23143"
 ></A
 ><H3
 ><A
@@ -9438,7 +9412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23152"
+NAME="AEN23149"
 ></A
 ><H3
 ><A
@@ -9466,7 +9440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23158"
+NAME="AEN23155"
 ></A
 ><H3
 ><A
@@ -9520,7 +9494,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23172"
+NAME="AEN23169"
 ></A
 ><P
 ></P
@@ -9659,7 +9633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23205"
+NAME="AEN23202"
 ></A
 ><H3
 ><A
@@ -9713,7 +9687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23219"
+NAME="AEN23216"
 ></A
 ><P
 ></P
@@ -9852,7 +9826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23252"
+NAME="AEN23249"
 ></A
 ><H3
 ><A
@@ -9886,7 +9860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23260"
+NAME="AEN23257"
 ></A
 ><P
 ></P
@@ -9930,7 +9904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element node</TD
 ></TR
 ><TR
 ><TD
@@ -9945,7 +9919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of error, the index in the stack otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9956,7 +9930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23277"
+NAME="AEN23274"
 ></A
 ><H3
 ><A
@@ -9989,7 +9963,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23285"
+NAME="AEN23282"
 ></A
 ><P
 ></P
@@ -10042,7 +10016,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23298"
+NAME="AEN23295"
 ></A
 ><H3
 ><A
@@ -10076,7 +10050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23306"
+NAME="AEN23303"
 ></A
 ><P
 ></P
@@ -10120,7 +10094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser input</TD
 ></TR
 ><TR
 ><TD
@@ -10135,7 +10109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of error, the index in the stack otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10146,7 +10120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23323"
+NAME="AEN23320"
 ></A
 ><H3
 ><A
@@ -10179,7 +10153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23331"
+NAME="AEN23328"
 ></A
 ><P
 ></P
@@ -10232,7 +10206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23344"
+NAME="AEN23341"
 ></A
 ><H3
 ><A
@@ -10265,7 +10239,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23352"
+NAME="AEN23349"
 ></A
 ><P
 ></P
@@ -10318,7 +10292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23365"
+NAME="AEN23362"
 ></A
 ><H3
 ><A
@@ -10352,7 +10326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23373"
+NAME="AEN23370"
 ></A
 ><P
 ></P
@@ -10396,7 +10370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -10411,7 +10385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of error, the index in the stack otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10422,7 +10396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23390"
+NAME="AEN23387"
 ></A
 ><H3
 ><A
@@ -10453,7 +10427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23397"
+NAME="AEN23394"
 ></A
 ><P
 ></P
@@ -10506,7 +10480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23410"
+NAME="AEN23407"
 ></A
 ><H3
 ><A
@@ -10542,7 +10516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23418"
+NAME="AEN23415"
 ></A
 ><P
 ></P
@@ -10629,7 +10603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23439"
+NAME="AEN23436"
 ></A
 ><H3
 ><A
@@ -10688,7 +10662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23452"
+NAME="AEN23449"
 ></A
 ><P
 ></P
@@ -10726,7 +10700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23461"
+NAME="AEN23458"
 ></A
 ><H3
 ><A
@@ -10783,7 +10757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23476"
+NAME="AEN23473"
 ></A
 ><P
 ></P
@@ -10821,7 +10795,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23485"
+NAME="AEN23482"
 ></A
 ><H3
 ><A
@@ -10861,7 +10835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23494"
+NAME="AEN23491"
 ></A
 ><P
 ></P
@@ -10914,7 +10888,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23507"
+NAME="AEN23504"
 ></A
 ><H3
 ><A
@@ -10968,7 +10942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23519"
+NAME="AEN23516"
 ></A
 ><P
 ></P
@@ -11038,7 +11012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23536"
+NAME="AEN23533"
 ></A
 ><H3
 ><A
@@ -11069,7 +11043,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23543"
+NAME="AEN23540"
 ></A
 ><P
 ></P
@@ -11139,7 +11113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23560"
+NAME="AEN23557"
 ></A
 ><H3
 ><A
@@ -11171,7 +11145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23567"
+NAME="AEN23564"
 ></A
 ><P
 ></P
@@ -11258,7 +11232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23588"
+NAME="AEN23585"
 ></A
 ><H3
 ><A
@@ -11288,7 +11262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23595"
+NAME="AEN23592"
 ></A
 ><P
 ></P
@@ -11326,7 +11300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23604"
+NAME="AEN23601"
 ></A
 ><H3
 ><A
@@ -11356,7 +11330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23611"
+NAME="AEN23608"
 ></A
 ><P
 ></P
@@ -11394,7 +11368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23620"
+NAME="AEN23617"
 ></A
 ><H3
 ><A
@@ -11427,7 +11401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23627"
+NAME="AEN23624"
 ></A
 ><H3
 ><A
@@ -11460,7 +11434,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23634"
+NAME="AEN23631"
 ></A
 ><P
 ></P
@@ -11530,7 +11504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23651"
+NAME="AEN23648"
 ></A
 ><H3
 ><A
@@ -11547,7 +11521,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        (*xmlEntityReferenceFunc)       (<A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > ent,
                                              <A
@@ -11562,11 +11536,14 @@
 ></TR
 ></TABLE
 ><P
+>Callback function used when one need to be able to track back the
+provenance of a chunk of nodes inherited from an entity replacement</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23659"
+NAME="AEN23657"
 ></A
 ><P
 ></P
@@ -11593,7 +11570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity</TD
 ></TR
 ><TR
 ><TD
@@ -11610,7 +11587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the fist node in the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -11627,7 +11604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the last nod in the chunk</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11638,7 +11615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23676"
+NAME="AEN23674"
 ></A
 ><H3
 ><A
@@ -11668,7 +11645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23683"
+NAME="AEN23681"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index 04df52a..de40be8 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2823"
+NAME="AEN2828"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2826"
+NAME="AEN2831"
 ></A
 ><H2
 >Synopsis</H2
@@ -165,7 +165,7 @@
 >setDocumentLocator</A
 >              (void *ctx,
                                              <A
-HREF="libxml-parser.html#XMLSAXLOCATORPTR"
+HREF="libxml-tree.html#XMLSAXLOCATORPTR"
 >xmlSAXLocatorPtr</A
 > loc);
 int         <A
@@ -221,7 +221,7 @@
 >xmlChar</A
 > *SystemID);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-sax.html#GETENTITY"
@@ -232,7 +232,7 @@
 >xmlChar</A
 > *name);
 <A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > <A
 HREF="libxml-sax.html#GETPARAMETERENTITY"
@@ -514,11 +514,11 @@
 >xmlSAXHandler</A
 > *hdlr);
 void        <A
-HREF="libxml-parser.html#XMLDEFAULTSAXHANDLERINIT"
+HREF="libxml-sax.html#XMLDEFAULTSAXHANDLERINIT"
 >xmlDefaultSAXHandlerInit</A
 >        (void);
 void        <A
-HREF="libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT"
+HREF="libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT"
 >htmlDefaultSAXHandlerInit</A
 >       (void);
 void        <A
@@ -532,7 +532,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2924"
+NAME="AEN2929"
 ></A
 ><H2
 >Description</H2
@@ -542,14 +542,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2927"
+NAME="AEN2932"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2929"
+NAME="AEN2934"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2936"
+NAME="AEN2941"
 ></A
 ><P
 ></P
@@ -632,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2949"
+NAME="AEN2954"
 ></A
 ><H3
 ><A
@@ -663,7 +663,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2956"
+NAME="AEN2961"
 ></A
 ><P
 ></P
@@ -716,7 +716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2969"
+NAME="AEN2974"
 ></A
 ><H3
 ><A
@@ -734,7 +734,7 @@
 CLASS="PROGRAMLISTING"
 >void        setDocumentLocator              (void *ctx,
                                              <A
-HREF="libxml-parser.html#XMLSAXLOCATORPTR"
+HREF="libxml-tree.html#XMLSAXLOCATORPTR"
 >xmlSAXLocatorPtr</A
 > loc);</PRE
 ></TD
@@ -748,7 +748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2976"
+NAME="AEN2981"
 ></A
 ><P
 ></P
@@ -803,7 +803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2989"
+NAME="AEN2994"
 ></A
 ><H3
 ><A
@@ -830,7 +830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2995"
+NAME="AEN3000"
 ></A
 ><P
 ></P
@@ -883,7 +883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3008"
+NAME="AEN3013"
 ></A
 ><H3
 ><A
@@ -910,7 +910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3014"
+NAME="AEN3019"
 ></A
 ><P
 ></P
@@ -963,7 +963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3027"
+NAME="AEN3032"
 ></A
 ><H3
 ><A
@@ -990,7 +990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3033"
+NAME="AEN3038"
 ></A
 ><P
 ></P
@@ -1043,7 +1043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3046"
+NAME="AEN3051"
 ></A
 ><H3
 ><A
@@ -1070,7 +1070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3052"
+NAME="AEN3057"
 ></A
 ><P
 ></P
@@ -1123,7 +1123,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3065"
+NAME="AEN3070"
 ></A
 ><H3
 ><A
@@ -1150,7 +1150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3071"
+NAME="AEN3076"
 ></A
 ><P
 ></P
@@ -1203,7 +1203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3084"
+NAME="AEN3089"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3093"
+NAME="AEN3098"
 ></A
 ><P
 ></P
@@ -1331,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3114"
+NAME="AEN3119"
 ></A
 ><H3
 ><A
@@ -1370,7 +1370,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3123"
+NAME="AEN3128"
 ></A
 ><P
 ></P
@@ -1459,7 +1459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3144"
+NAME="AEN3149"
 ></A
 ><H3
 ><A
@@ -1476,7 +1476,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > getEntity                      (void *ctx,
                                              const <A
@@ -1493,7 +1493,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3152"
+NAME="AEN3157"
 ></A
 ><P
 ></P
@@ -1563,7 +1563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3169"
+NAME="AEN3174"
 ></A
 ><H3
 ><A
@@ -1580,7 +1580,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 ><A
-HREF="libxml-entities.html#XMLENTITYPTR"
+HREF="libxml-tree.html#XMLENTITYPTR"
 >xmlEntityPtr</A
 > getParameterEntity             (void *ctx,
                                              const <A
@@ -1597,7 +1597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3177"
+NAME="AEN3182"
 ></A
 ><P
 ></P
@@ -1667,7 +1667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3194"
+NAME="AEN3199"
 ></A
 ><H3
 ><A
@@ -1715,7 +1715,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3205"
+NAME="AEN3210"
 ></A
 ><P
 ></P
@@ -1802,7 +1802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3226"
+NAME="AEN3231"
 ></A
 ><H3
 ><A
@@ -1846,7 +1846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3236"
+NAME="AEN3241"
 ></A
 ><P
 ></P
@@ -1969,7 +1969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3265"
+NAME="AEN3270"
 ></A
 ><H3
 ><A
@@ -2014,7 +2014,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3275"
+NAME="AEN3280"
 ></A
 ><P
 ></P
@@ -2154,7 +2154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3308"
+NAME="AEN3313"
 ></A
 ><H3
 ><A
@@ -2190,7 +2190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3316"
+NAME="AEN3321"
 ></A
 ><P
 ></P
@@ -2279,7 +2279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3337"
+NAME="AEN3342"
 ></A
 ><H3
 ><A
@@ -2318,7 +2318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3346"
+NAME="AEN3351"
 ></A
 ><P
 ></P
@@ -2407,7 +2407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3367"
+NAME="AEN3372"
 ></A
 ><H3
 ><A
@@ -2450,7 +2450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3377"
+NAME="AEN3382"
 ></A
 ><P
 ></P
@@ -2556,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3402"
+NAME="AEN3407"
 ></A
 ><H3
 ><A
@@ -2583,7 +2583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3408"
+NAME="AEN3413"
 ></A
 ><P
 ></P
@@ -2621,7 +2621,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3417"
+NAME="AEN3422"
 ></A
 ><H3
 ><A
@@ -2648,7 +2648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3423"
+NAME="AEN3428"
 ></A
 ><P
 ></P
@@ -2686,7 +2686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3432"
+NAME="AEN3437"
 ></A
 ><H3
 ><A
@@ -2724,7 +2724,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3440"
+NAME="AEN3445"
 ></A
 ><P
 ></P
@@ -2796,7 +2796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3457"
+NAME="AEN3462"
 ></A
 ><H3
 ><A
@@ -2831,7 +2831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3465"
+NAME="AEN3470"
 ></A
 ><P
 ></P
@@ -2903,7 +2903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3482"
+NAME="AEN3487"
 ></A
 ><H3
 ><A
@@ -2934,7 +2934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3489"
+NAME="AEN3494"
 ></A
 ><P
 ></P
@@ -2989,7 +2989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3502"
+NAME="AEN3507"
 ></A
 ><H3
 ><A
@@ -3020,7 +3020,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3509"
+NAME="AEN3514"
 ></A
 ><P
 ></P
@@ -3075,7 +3075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3522"
+NAME="AEN3527"
 ></A
 ><H3
 ><A
@@ -3107,7 +3107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3529"
+NAME="AEN3534"
 ></A
 ><P
 ></P
@@ -3179,7 +3179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3546"
+NAME="AEN3551"
 ></A
 ><H3
 ><A
@@ -3212,7 +3212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3553"
+NAME="AEN3558"
 ></A
 ><P
 ></P
@@ -3284,7 +3284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3570"
+NAME="AEN3575"
 ></A
 ><H3
 ><A
@@ -3319,7 +3319,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3578"
+NAME="AEN3583"
 ></A
 ><P
 ></P
@@ -3391,7 +3391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3595"
+NAME="AEN3600"
 ></A
 ><H3
 ><A
@@ -3426,7 +3426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3603"
+NAME="AEN3608"
 ></A
 ><P
 ></P
@@ -3498,7 +3498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3620"
+NAME="AEN3625"
 ></A
 ><H3
 ><A
@@ -3529,7 +3529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3627"
+NAME="AEN3632"
 ></A
 ><P
 ></P
@@ -3584,7 +3584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3640"
+NAME="AEN3645"
 ></A
 ><H3
 ><A
@@ -3614,7 +3614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3647"
+NAME="AEN3652"
 ></A
 ><P
 ></P
@@ -3667,7 +3667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3660"
+NAME="AEN3665"
 ></A
 ><H3
 ><A
@@ -3699,7 +3699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3667"
+NAME="AEN3672"
 ></A
 ><P
 ></P
@@ -3769,7 +3769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3684"
+NAME="AEN3689"
 ></A
 ><H3
 ><A
@@ -3804,7 +3804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3692"
+NAME="AEN3697"
 ></A
 ><P
 ></P
@@ -3876,7 +3876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3709"
+NAME="AEN3714"
 ></A
 ><H3
 ><A
@@ -3907,7 +3907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3716"
+NAME="AEN3721"
 ></A
 ><P
 ></P
@@ -3962,7 +3962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3729"
+NAME="AEN3734"
 ></A
 ><H3
 ><A
@@ -3994,7 +3994,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3736"
+NAME="AEN3741"
 ></A
 ><P
 ></P
@@ -4066,7 +4066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3753"
+NAME="AEN3758"
 ></A
 ><H3
 ><A
@@ -4091,11 +4091,13 @@
 ></TR
 ></TABLE
 ><P
+>Initialize the default XML SAX handler</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3759"
+NAME="AEN3765"
 ></A
 ><P
 ></P
@@ -4122,7 +4124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -4139,7 +4141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  flag if non-zero sets the handler warning procedure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4150,7 +4152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3772"
+NAME="AEN3778"
 ></A
 ><H3
 ><A
@@ -4174,11 +4176,13 @@
 ></TR
 ></TABLE
 ><P
+>Initialize the default HTML SAX handler</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3778"
+NAME="AEN3785"
 ></A
 ><P
 ></P
@@ -4205,7 +4209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4216,7 +4220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3787"
+NAME="AEN3794"
 ></A
 ><H3
 ><A
@@ -4240,11 +4244,13 @@
 ></TR
 ></TABLE
 ><P
+>Initialize the default DocBook SAX handler</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3793"
+NAME="AEN3801"
 ></A
 ><P
 ></P
@@ -4271,7 +4277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4282,7 +4288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3802"
+NAME="AEN3810"
 ></A
 ><H3
 ><A
@@ -4310,7 +4316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3808"
+NAME="AEN3816"
 ></A
 ><H3
 ><A
@@ -4338,7 +4344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3814"
+NAME="AEN3822"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-threads.html b/doc/html/libxml-threads.html
index 726aee9..df4afd4 100644
--- a/doc/html/libxml-threads.html
+++ b/doc/html/libxml-threads.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19944"
+NAME="AEN19926"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19947"
+NAME="AEN19929"
 ></A
 ><H2
 >Synopsis</H2
@@ -154,6 +154,14 @@
 HREF="libxml-threads.html#XMLMUTEXPTR"
 >xmlMutexPtr</A
 >;
+struct      <A
+HREF="libxml-threads.html#XMLRMUTEX"
+>xmlRMutex</A
+>;
+typedef     <A
+HREF="libxml-threads.html#XMLRMUTEXPTR"
+>xmlRMutexPtr</A
+>;
 <A
 HREF="libxml-threads.html#XMLMUTEXPTR"
 >xmlMutexPtr</A
@@ -182,14 +190,6 @@
 HREF="libxml-threads.html#XMLMUTEXPTR"
 >xmlMutexPtr</A
 > tok);
-struct      <A
-HREF="libxml-threads.html#XMLRMUTEX"
->xmlRMutex</A
->;
-typedef     <A
-HREF="libxml-threads.html#XMLRMUTEXPTR"
->xmlRMutexPtr</A
->;
 <A
 HREF="libxml-threads.html#XMLRMUTEXPTR"
 >xmlRMutexPtr</A
@@ -256,7 +256,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19978"
+NAME="AEN19960"
 ></A
 ><H2
 >Description</H2
@@ -266,14 +266,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19981"
+NAME="AEN19963"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19983"
+NAME="AEN19965"
 ></A
 ><H3
 ><A
@@ -299,7 +299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19988"
+NAME="AEN19970"
 ></A
 ><H3
 ><A
@@ -331,7 +331,59 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19995"
+NAME="AEN19977"
+></A
+><H3
+><A
+NAME="XMLRMUTEX"
+></A
+>&#62;struct xmlRMutex</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlRMutex;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19982"
+></A
+><H3
+><A
+NAME="XMLRMUTEXPTR"
+></A
+>&#62;xmlRMutexPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRMutex *xmlRMutexPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19987"
 ></A
 ><H3
 ><A
@@ -359,7 +411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20001"
+NAME="AEN19993"
 ></A
 ><P
 ></P
@@ -395,7 +447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20010"
+NAME="AEN20002"
 ></A
 ><H3
 ><A
@@ -428,7 +480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20018"
+NAME="AEN20010"
 ></A
 ><P
 ></P
@@ -466,7 +518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20027"
+NAME="AEN20019"
 ></A
 ><H3
 ><A
@@ -499,7 +551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20035"
+NAME="AEN20027"
 ></A
 ><P
 ></P
@@ -537,7 +589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20044"
+NAME="AEN20036"
 ></A
 ><H3
 ><A
@@ -571,7 +623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20052"
+NAME="AEN20044"
 ></A
 ><P
 ></P
@@ -609,59 +661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20061"
-></A
-><H3
-><A
-NAME="XMLRMUTEX"
-></A
->&#62;struct xmlRMutex</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlRMutex;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN20066"
-></A
-><H3
-><A
-NAME="XMLRMUTEXPTR"
-></A
->&#62;xmlRMutexPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRMutex *xmlRMutexPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN20071"
+NAME="AEN20053"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20077"
+NAME="AEN20059"
 ></A
 ><P
 ></P
@@ -725,7 +725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20086"
+NAME="AEN20068"
 ></A
 ><H3
 ><A
@@ -758,7 +758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20094"
+NAME="AEN20076"
 ></A
 ><P
 ></P
@@ -796,7 +796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20103"
+NAME="AEN20085"
 ></A
 ><H3
 ><A
@@ -829,7 +829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20111"
+NAME="AEN20093"
 ></A
 ><P
 ></P
@@ -867,7 +867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20120"
+NAME="AEN20102"
 ></A
 ><H3
 ><A
@@ -895,7 +895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20126"
+NAME="AEN20108"
 ></A
 ><P
 ></P
@@ -933,7 +933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20135"
+NAME="AEN20117"
 ></A
 ><H3
 ><A
@@ -965,7 +965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20142"
+NAME="AEN20124"
 ></A
 ><H3
 ><A
@@ -997,7 +997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20149"
+NAME="AEN20131"
 ></A
 ><H3
 ><A
@@ -1029,7 +1029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20156"
+NAME="AEN20138"
 ></A
 ><H3
 ><A
@@ -1059,7 +1059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20163"
+NAME="AEN20145"
 ></A
 ><P
 ></P
@@ -1095,7 +1095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20172"
+NAME="AEN20154"
 ></A
 ><H3
 ><A
@@ -1125,7 +1125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20179"
+NAME="AEN20161"
 ></A
 ><P
 ></P
@@ -1161,7 +1161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20188"
+NAME="AEN20170"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20195"
+NAME="AEN20177"
 ></A
 ><H3
 ><A
@@ -1226,7 +1226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20203"
+NAME="AEN20185"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 2daa5a2..9352b9a 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3825"
+NAME="AEN3833"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3828"
+NAME="AEN3836"
 ></A
 ><H2
 >Synopsis</H2
@@ -178,6 +178,30 @@
 HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 >;
+struct      <A
+HREF="libxml-parser.html#XMLSAXLOCATOR"
+>xmlSAXLocator</A
+>;
+typedef     <A
+HREF="libxml-tree.html#XMLSAXLOCATORPTR"
+>xmlSAXLocatorPtr</A
+>;
+struct      <A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+>;
+typedef     <A
+HREF="libxml-tree.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+>;
+struct      <A
+HREF="libxml-tree.html#XMLENTITY"
+>xmlEntity</A
+>;
+typedef     <A
+HREF="libxml-tree.html#XMLENTITYPTR"
+>xmlEntityPtr</A
+>;
 #define     <A
 HREF="libxml-tree.html#BASE-BUFFER-SIZE-CAPS"
 >BASE_BUFFER_SIZE</A
@@ -1912,7 +1936,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4307"
+NAME="AEN4321"
 ></A
 ><H2
 >Description</H2
@@ -1922,14 +1946,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4310"
+NAME="AEN4324"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4312"
+NAME="AEN4326"
 ></A
 ><H3
 ><A
@@ -1964,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4317"
+NAME="AEN4331"
 ></A
 ><H3
 ><A
@@ -1990,7 +2014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4322"
+NAME="AEN4336"
 ></A
 ><H3
 ><A
@@ -2026,7 +2050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4327"
+NAME="AEN4341"
 ></A
 ><H3
 ><A
@@ -2052,7 +2076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4332"
+NAME="AEN4346"
 ></A
 ><H3
 ><A
@@ -2102,7 +2126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4338"
+NAME="AEN4352"
 ></A
 ><H3
 ><A
@@ -2128,7 +2152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4343"
+NAME="AEN4357"
 ></A
 ><H3
 ><A
@@ -2237,7 +2261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4349"
+NAME="AEN4363"
 ></A
 ><H3
 ><A
@@ -2263,7 +2287,222 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4354"
+NAME="AEN4368"
+></A
+><H3
+><A
+NAME="XMLSAXLOCATOR"
+></A
+>&#62;struct xmlSAXLocator</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlSAXLocator {
+    const xmlChar *(*getPublicId)(void *ctx);
+    const xmlChar *(*getSystemId)(void *ctx);
+    int (*getLineNumber)(void *ctx);
+    int (*getColumnNumber)(void *ctx);
+};</PRE
+></TD
+></TR
+></TABLE
+><P
+>a SAX Locator.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4374"
+></A
+><H3
+><A
+NAME="XMLSAXLOCATORPTR"
+></A
+>&#62;xmlSAXLocatorPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4379"
+></A
+><H3
+><A
+NAME="XMLSAXHANDLER"
+></A
+>&#62;struct xmlSAXHandler</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlSAXHandler {
+    internalSubsetSAXFunc internalSubset;
+    isStandaloneSAXFunc isStandalone;
+    hasInternalSubsetSAXFunc hasInternalSubset;
+    hasExternalSubsetSAXFunc hasExternalSubset;
+    resolveEntitySAXFunc resolveEntity;
+    getEntitySAXFunc getEntity;
+    entityDeclSAXFunc entityDecl;
+    notationDeclSAXFunc notationDecl;
+    attributeDeclSAXFunc attributeDecl;
+    elementDeclSAXFunc elementDecl;
+    unparsedEntityDeclSAXFunc unparsedEntityDecl;
+    setDocumentLocatorSAXFunc setDocumentLocator;
+    startDocumentSAXFunc startDocument;
+    endDocumentSAXFunc endDocument;
+    startElementSAXFunc startElement;
+    endElementSAXFunc endElement;
+    referenceSAXFunc reference;
+    charactersSAXFunc characters;
+    ignorableWhitespaceSAXFunc ignorableWhitespace;
+    processingInstructionSAXFunc processingInstruction;
+    commentSAXFunc comment;
+    warningSAXFunc warning;
+    errorSAXFunc error;
+    fatalErrorSAXFunc fatalError;
+    getParameterEntitySAXFunc getParameterEntity;
+    cdataBlockSAXFunc cdataBlock;
+    externalSubsetSAXFunc externalSubset;
+    int initialized;
+};</PRE
+></TD
+></TR
+></TABLE
+><P
+>a SAX handler is bunch of callbacks called by the parser when processing
+of the input generate data or structure informations.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4385"
+></A
+><H3
+><A
+NAME="XMLSAXHANDLERPTR"
+></A
+>&#62;xmlSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4390"
+></A
+><H3
+><A
+NAME="XMLENTITY"
+></A
+>&#62;struct xmlEntity</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlEntity {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
+    const xmlChar          *name;	/* Entity name */
+    struct _xmlNode    *children;	/* First child link */
+    struct _xmlNode        *last;	/* Last child link */
+    struct _xmlDtd       *parent;	/* -&gt; DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    xmlChar                *orig;	/* content without ref substitution */
+    xmlChar             *content;	/* content or ndata if unparsed */
+    int                   length;	/* the content length */
+    xmlEntityType          etype;	/* The entity type */
+    const xmlChar    *ExternalID;	/* External identifier for PUBLIC */
+    const xmlChar      *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
+
+    struct _xmlEntity     *nexte;	/* unused */
+    const xmlChar           *URI;	/* the full URI as computed */
+};</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4395"
+></A
+><H3
+><A
+NAME="XMLENTITYPTR"
+></A
+>&#62;xmlEntityPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntity *xmlEntityPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4400"
 ></A
 ><H3
 ><A
@@ -2284,12 +2523,14 @@
 ></TR
 ></TABLE
 ><P
+>default buffer size 4000</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4359"
+NAME="AEN4406"
 ></A
 ><H3
 ><A
@@ -2318,7 +2559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4365"
+NAME="AEN4412"
 ></A
 ><H3
 ><A
@@ -2368,7 +2609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4370"
+NAME="AEN4417"
 ></A
 ><H3
 ><A
@@ -2398,7 +2639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4376"
+NAME="AEN4423"
 ></A
 ><H3
 ><A
@@ -2426,7 +2667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4382"
+NAME="AEN4429"
 ></A
 ><H3
 ><A
@@ -2458,7 +2699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4388"
+NAME="AEN4435"
 ></A
 ><H3
 ><A
@@ -2484,7 +2725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4393"
+NAME="AEN4440"
 ></A
 ><H3
 ><A
@@ -2523,7 +2764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4399"
+NAME="AEN4446"
 ></A
 ><H3
 ><A
@@ -2556,7 +2797,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4405"
+NAME="AEN4452"
 ></A
 ><H3
 ><A
@@ -2587,7 +2828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4411"
+NAME="AEN4458"
 ></A
 ><H3
 ><A
@@ -2613,7 +2854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4416"
+NAME="AEN4463"
 ></A
 ><H3
 ><A
@@ -2659,7 +2900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4422"
+NAME="AEN4469"
 ></A
 ><H3
 ><A
@@ -2685,7 +2926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4427"
+NAME="AEN4474"
 ></A
 ><H3
 ><A
@@ -2718,7 +2959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4433"
+NAME="AEN4480"
 ></A
 ><H3
 ><A
@@ -2751,7 +2992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4439"
+NAME="AEN4486"
 ></A
 ><H3
 ><A
@@ -2788,7 +3029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4445"
+NAME="AEN4492"
 ></A
 ><H3
 ><A
@@ -2814,7 +3055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4450"
+NAME="AEN4497"
 ></A
 ><H3
 ><A
@@ -2848,7 +3089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4456"
+NAME="AEN4503"
 ></A
 ><H3
 ><A
@@ -2891,7 +3132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4462"
+NAME="AEN4509"
 ></A
 ><H3
 ><A
@@ -2917,7 +3158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4467"
+NAME="AEN4514"
 ></A
 ><H3
 ><A
@@ -2945,7 +3186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4473"
+NAME="AEN4520"
 ></A
 ><H3
 ><A
@@ -2971,7 +3212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4478"
+NAME="AEN4525"
 ></A
 ><H3
 ><A
@@ -3008,7 +3249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4485"
+NAME="AEN4532"
 ></A
 ><H3
 ><A
@@ -3034,7 +3275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4490"
+NAME="AEN4537"
 ></A
 ><H3
 ><A
@@ -3082,7 +3323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4496"
+NAME="AEN4543"
 ></A
 ><H3
 ><A
@@ -3108,7 +3349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4501"
+NAME="AEN4548"
 ></A
 ><H3
 ><A
@@ -3148,7 +3389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4507"
+NAME="AEN4554"
 ></A
 ><H3
 ><A
@@ -3174,7 +3415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4512"
+NAME="AEN4559"
 ></A
 ><H3
 ><A
@@ -3206,7 +3447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4518"
+NAME="AEN4565"
 ></A
 ><H3
 ><A
@@ -3232,7 +3473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4523"
+NAME="AEN4570"
 ></A
 ><H3
 ><A
@@ -3264,7 +3505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4529"
+NAME="AEN4576"
 ></A
 ><H3
 ><A
@@ -3290,7 +3531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4534"
+NAME="AEN4581"
 ></A
 ><H3
 ><A
@@ -3322,7 +3563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4540"
+NAME="AEN4587"
 ></A
 ><H3
 ><A
@@ -3355,7 +3596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4546"
+NAME="AEN4593"
 ></A
 ><H3
 ><A
@@ -3381,7 +3622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4551"
+NAME="AEN4598"
 ></A
 ><H3
 ><A
@@ -3429,7 +3670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4557"
+NAME="AEN4604"
 ></A
 ><H3
 ><A
@@ -3455,7 +3696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4562"
+NAME="AEN4609"
 ></A
 ><H3
 ><A
@@ -3482,7 +3723,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4568"
+NAME="AEN4615"
 ></A
 ><P
 ></P
@@ -3520,7 +3761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4577"
+NAME="AEN4624"
 ></A
 ><H3
 ><A
@@ -3549,7 +3790,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4583"
+NAME="AEN4630"
 ></A
 ><P
 ></P
@@ -3587,7 +3828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4592"
+NAME="AEN4639"
 ></A
 ><H3
 ><A
@@ -3639,7 +3880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4598"
+NAME="AEN4645"
 ></A
 ><H3
 ><A
@@ -3665,7 +3906,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4603"
+NAME="AEN4650"
 ></A
 ><H3
 ><A
@@ -3693,7 +3934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4609"
+NAME="AEN4656"
 ></A
 ><H3
 ><A
@@ -3721,7 +3962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4615"
+NAME="AEN4662"
 ></A
 ><H3
 ><A
@@ -3754,7 +3995,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4622"
+NAME="AEN4669"
 ></A
 ><P
 ></P
@@ -3792,7 +4033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4631"
+NAME="AEN4678"
 ></A
 ><H3
 ><A
@@ -3826,7 +4067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4638"
+NAME="AEN4685"
 ></A
 ><P
 ></P
@@ -3862,7 +4103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4647"
+NAME="AEN4694"
 ></A
 ><H3
 ><A
@@ -3892,7 +4133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4654"
+NAME="AEN4701"
 ></A
 ><P
 ></P
@@ -3928,7 +4169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4663"
+NAME="AEN4710"
 ></A
 ><H3
 ><A
@@ -3961,7 +4202,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4671"
+NAME="AEN4718"
 ></A
 ><P
 ></P
@@ -4014,7 +4255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4684"
+NAME="AEN4731"
 ></A
 ><H3
 ><A
@@ -4050,7 +4291,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4692"
+NAME="AEN4739"
 ></A
 ><P
 ></P
@@ -4120,7 +4361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4709"
+NAME="AEN4756"
 ></A
 ><H3
 ><A
@@ -4144,13 +4385,14 @@
 ></TR
 ></TABLE
 ><P
->Frees an XML buffer.</P
+>Frees an XML buffer. It frees both the content and the structure which
+encapsulate it.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4716"
+NAME="AEN4763"
 ></A
 ><P
 ></P
@@ -4188,7 +4430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4725"
+NAME="AEN4772"
 ></A
 ><H3
 ><A
@@ -4222,7 +4464,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4733"
+NAME="AEN4780"
 ></A
 ><P
 ></P
@@ -4295,7 +4537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4751"
+NAME="AEN4798"
 ></A
 ><H3
 ><A
@@ -4331,7 +4573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4759"
+NAME="AEN4806"
 ></A
 ><P
 ></P
@@ -4409,7 +4651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4778"
+NAME="AEN4825"
 ></A
 ><H3
 ><A
@@ -4450,7 +4692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4787"
+NAME="AEN4834"
 ></A
 ><P
 ></P
@@ -4528,7 +4770,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4806"
+NAME="AEN4853"
 ></A
 ><H3
 ><A
@@ -4562,7 +4804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4814"
+NAME="AEN4861"
 ></A
 ><P
 ></P
@@ -4620,7 +4862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4828"
+NAME="AEN4875"
 ></A
 ><H3
 ><A
@@ -4651,7 +4893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4835"
+NAME="AEN4882"
 ></A
 ><P
 ></P
@@ -4706,7 +4948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4848"
+NAME="AEN4895"
 ></A
 ><H3
 ><A
@@ -4737,7 +4979,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4855"
+NAME="AEN4902"
 ></A
 ><P
 ></P
@@ -4810,7 +5052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4873"
+NAME="AEN4920"
 ></A
 ><H3
 ><A
@@ -4841,7 +5083,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4880"
+NAME="AEN4927"
 ></A
 ><P
 ></P
@@ -4911,7 +5153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4897"
+NAME="AEN4944"
 ></A
 ><H3
 ><A
@@ -4941,7 +5183,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4904"
+NAME="AEN4951"
 ></A
 ><P
 ></P
@@ -4979,7 +5221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4913"
+NAME="AEN4960"
 ></A
 ><H3
 ><A
@@ -5012,7 +5254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4921"
+NAME="AEN4968"
 ></A
 ><P
 ></P
@@ -5065,7 +5307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4934"
+NAME="AEN4981"
 ></A
 ><H3
 ><A
@@ -5099,7 +5341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4942"
+NAME="AEN4989"
 ></A
 ><P
 ></P
@@ -5154,7 +5396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4955"
+NAME="AEN5002"
 ></A
 ><H3
 ><A
@@ -5184,7 +5426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4962"
+NAME="AEN5009"
 ></A
 ><P
 ></P
@@ -5237,7 +5479,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4975"
+NAME="AEN5022"
 ></A
 ><H3
 ><A
@@ -5282,7 +5524,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4986"
+NAME="AEN5033"
 ></A
 ><P
 ></P
@@ -5386,7 +5628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5011"
+NAME="AEN5058"
 ></A
 ><H3
 ><A
@@ -5435,7 +5677,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5023"
+NAME="AEN5070"
 ></A
 ><P
 ></P
@@ -5539,7 +5781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5048"
+NAME="AEN5095"
 ></A
 ><H3
 ><A
@@ -5572,7 +5814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5056"
+NAME="AEN5103"
 ></A
 ><P
 ></P
@@ -5625,7 +5867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5069"
+NAME="AEN5116"
 ></A
 ><H3
 ><A
@@ -5655,7 +5897,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5076"
+NAME="AEN5123"
 ></A
 ><P
 ></P
@@ -5693,7 +5935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5085"
+NAME="AEN5132"
 ></A
 ><H3
 ><A
@@ -5736,7 +5978,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5095"
+NAME="AEN5142"
 ></A
 ><P
 ></P
@@ -5823,7 +6065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5116"
+NAME="AEN5163"
 ></A
 ><H3
 ><A
@@ -5868,7 +6110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5126"
+NAME="AEN5173"
 ></A
 ><P
 ></P
@@ -5955,7 +6197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5147"
+NAME="AEN5194"
 ></A
 ><H3
 ><A
@@ -5985,7 +6227,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5154"
+NAME="AEN5201"
 ></A
 ><P
 ></P
@@ -6023,7 +6265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5163"
+NAME="AEN5210"
 ></A
 ><H3
 ><A
@@ -6053,7 +6295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5170"
+NAME="AEN5217"
 ></A
 ><P
 ></P
@@ -6091,7 +6333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5179"
+NAME="AEN5226"
 ></A
 ><H3
 ><A
@@ -6124,7 +6366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5187"
+NAME="AEN5234"
 ></A
 ><P
 ></P
@@ -6177,7 +6419,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5200"
+NAME="AEN5247"
 ></A
 ><H3
 ><A
@@ -6207,7 +6449,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5207"
+NAME="AEN5254"
 ></A
 ><P
 ></P
@@ -6245,7 +6487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5216"
+NAME="AEN5263"
 ></A
 ><H3
 ><A
@@ -6286,7 +6528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5226"
+NAME="AEN5273"
 ></A
 ><P
 ></P
@@ -6373,7 +6615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5247"
+NAME="AEN5294"
 ></A
 ><H3
 ><A
@@ -6414,7 +6656,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5257"
+NAME="AEN5304"
 ></A
 ><P
 ></P
@@ -6501,7 +6743,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5278"
+NAME="AEN5325"
 ></A
 ><H3
 ><A
@@ -6546,7 +6788,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5289"
+NAME="AEN5336"
 ></A
 ><P
 ></P
@@ -6650,7 +6892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5314"
+NAME="AEN5361"
 ></A
 ><H3
 ><A
@@ -6680,7 +6922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5321"
+NAME="AEN5368"
 ></A
 ><P
 ></P
@@ -6718,7 +6960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5330"
+NAME="AEN5377"
 ></A
 ><H3
 ><A
@@ -6748,7 +6990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5337"
+NAME="AEN5384"
 ></A
 ><P
 ></P
@@ -6786,7 +7028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5346"
+NAME="AEN5393"
 ></A
 ><H3
 ><A
@@ -6823,7 +7065,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5355"
+NAME="AEN5402"
 ></A
 ><P
 ></P
@@ -6896,7 +7138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5373"
+NAME="AEN5420"
 ></A
 ><H3
 ><A
@@ -6933,7 +7175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5382"
+NAME="AEN5429"
 ></A
 ><P
 ></P
@@ -7006,7 +7248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5400"
+NAME="AEN5447"
 ></A
 ><H3
 ><A
@@ -7039,7 +7281,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5408"
+NAME="AEN5455"
 ></A
 ><P
 ></P
@@ -7095,7 +7337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5422"
+NAME="AEN5469"
 ></A
 ><H3
 ><A
@@ -7130,7 +7372,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5430"
+NAME="AEN5477"
 ></A
 ><P
 ></P
@@ -7203,7 +7445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5448"
+NAME="AEN5495"
 ></A
 ><H3
 ><A
@@ -7274,7 +7516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5464"
+NAME="AEN5511"
 ></A
 ><P
 ></P
@@ -7378,7 +7620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5489"
+NAME="AEN5536"
 ></A
 ><H3
 ><A
@@ -7434,7 +7676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5502"
+NAME="AEN5549"
 ></A
 ><P
 ></P
@@ -7538,7 +7780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5527"
+NAME="AEN5574"
 ></A
 ><H3
 ><A
@@ -7580,7 +7822,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5537"
+NAME="AEN5584"
 ></A
 ><P
 ></P
@@ -7650,7 +7892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5554"
+NAME="AEN5601"
 ></A
 ><H3
 ><A
@@ -7727,7 +7969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5571"
+NAME="AEN5618"
 ></A
 ><P
 ></P
@@ -7831,7 +8073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5596"
+NAME="AEN5643"
 ></A
 ><H3
 ><A
@@ -7893,7 +8135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5610"
+NAME="AEN5657"
 ></A
 ><P
 ></P
@@ -7997,7 +8239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5635"
+NAME="AEN5682"
 ></A
 ><H3
 ><A
@@ -8034,7 +8276,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5644"
+NAME="AEN5691"
 ></A
 ><P
 ></P
@@ -8104,7 +8346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5661"
+NAME="AEN5708"
 ></A
 ><H3
 ><A
@@ -8137,7 +8379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5669"
+NAME="AEN5716"
 ></A
 ><P
 ></P
@@ -8190,7 +8432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5682"
+NAME="AEN5729"
 ></A
 ><H3
 ><A
@@ -8227,7 +8469,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5691"
+NAME="AEN5738"
 ></A
 ><P
 ></P
@@ -8297,7 +8539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5708"
+NAME="AEN5755"
 ></A
 ><H3
 ><A
@@ -8336,7 +8578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5717"
+NAME="AEN5764"
 ></A
 ><P
 ></P
@@ -8423,7 +8665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5738"
+NAME="AEN5785"
 ></A
 ><H3
 ><A
@@ -8457,7 +8699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5746"
+NAME="AEN5793"
 ></A
 ><P
 ></P
@@ -8527,7 +8769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5763"
+NAME="AEN5810"
 ></A
 ><H3
 ><A
@@ -8564,7 +8806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5772"
+NAME="AEN5819"
 ></A
 ><P
 ></P
@@ -8634,7 +8876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5789"
+NAME="AEN5836"
 ></A
 ><H3
 ><A
@@ -8667,7 +8909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5797"
+NAME="AEN5844"
 ></A
 ><P
 ></P
@@ -8720,7 +8962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5810"
+NAME="AEN5857"
 ></A
 ><H3
 ><A
@@ -8758,7 +9000,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5819"
+NAME="AEN5866"
 ></A
 ><P
 ></P
@@ -8845,7 +9087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5840"
+NAME="AEN5887"
 ></A
 ><H3
 ><A
@@ -8882,7 +9124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5849"
+NAME="AEN5896"
 ></A
 ><P
 ></P
@@ -8952,7 +9194,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5866"
+NAME="AEN5913"
 ></A
 ><H3
 ><A
@@ -8989,7 +9231,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5875"
+NAME="AEN5922"
 ></A
 ><P
 ></P
@@ -9059,7 +9301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5892"
+NAME="AEN5939"
 ></A
 ><H3
 ><A
@@ -9093,7 +9335,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5900"
+NAME="AEN5947"
 ></A
 ><P
 ></P
@@ -9166,7 +9408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5918"
+NAME="AEN5965"
 ></A
 ><H3
 ><A
@@ -9204,7 +9446,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5927"
+NAME="AEN5974"
 ></A
 ><P
 ></P
@@ -9294,7 +9536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5949"
+NAME="AEN5996"
 ></A
 ><H3
 ><A
@@ -9327,7 +9569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5957"
+NAME="AEN6004"
 ></A
 ><P
 ></P
@@ -9383,7 +9625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5971"
+NAME="AEN6018"
 ></A
 ><H3
 ><A
@@ -9416,7 +9658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5979"
+NAME="AEN6026"
 ></A
 ><P
 ></P
@@ -9469,7 +9711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5992"
+NAME="AEN6039"
 ></A
 ><H3
 ><A
@@ -9503,7 +9745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6000"
+NAME="AEN6047"
 ></A
 ><P
 ></P
@@ -9556,7 +9798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6013"
+NAME="AEN6060"
 ></A
 ><H3
 ><A
@@ -9589,7 +9831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6021"
+NAME="AEN6068"
 ></A
 ><P
 ></P
@@ -9643,7 +9885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6034"
+NAME="AEN6081"
 ></A
 ><H3
 ><A
@@ -9677,7 +9919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6042"
+NAME="AEN6089"
 ></A
 ><P
 ></P
@@ -9733,7 +9975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6056"
+NAME="AEN6103"
 ></A
 ><H3
 ><A
@@ -9766,7 +10008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6064"
+NAME="AEN6111"
 ></A
 ><P
 ></P
@@ -9819,7 +10061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6077"
+NAME="AEN6124"
 ></A
 ><H3
 ><A
@@ -9849,7 +10091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6084"
+NAME="AEN6131"
 ></A
 ><P
 ></P
@@ -9902,7 +10144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6097"
+NAME="AEN6144"
 ></A
 ><H3
 ><A
@@ -9933,7 +10175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6104"
+NAME="AEN6151"
 ></A
 ><P
 ></P
@@ -9986,7 +10228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6117"
+NAME="AEN6164"
 ></A
 ><H3
 ><A
@@ -10024,7 +10266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6126"
+NAME="AEN6173"
 ></A
 ><P
 ></P
@@ -10094,7 +10336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6143"
+NAME="AEN6190"
 ></A
 ><H3
 ><A
@@ -10128,7 +10370,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6151"
+NAME="AEN6198"
 ></A
 ><P
 ></P
@@ -10183,7 +10425,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6164"
+NAME="AEN6211"
 ></A
 ><H3
 ><A
@@ -10214,24 +10456,28 @@
 ></TR
 ></TABLE
 ><P
->Add a new child element, to <TT
+>Add a new node to <TT
 CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->, at the end of the child list
+>, at the end of the child (or property) list
 merging adjacent TEXT nodes (in which case <TT
 CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
-> is freed)</P
+> is freed)
+If the new node was already inserted in a document it is
+first unlinked from its existing context.
+If the new node is ATTRIBUTE, it is added into properties instead of children.
+If there is an attribute with equal name, it is first destroyed.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6175"
+NAME="AEN6222"
 ></A
 ><P
 ></P
@@ -10301,7 +10547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6192"
+NAME="AEN6239"
 ></A
 ><H3
 ><A
@@ -10344,7 +10590,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6202"
+NAME="AEN6249"
 ></A
 ><P
 ></P
@@ -10414,7 +10660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6219"
+NAME="AEN6266"
 ></A
 ><H3
 ><A
@@ -10458,7 +10704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6229"
+NAME="AEN6276"
 ></A
 ><P
 ></P
@@ -10533,7 +10779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6247"
+NAME="AEN6294"
 ></A
 ><H3
 ><A
@@ -10588,7 +10834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6259"
+NAME="AEN6306"
 ></A
 ><P
 ></P
@@ -10658,7 +10904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6276"
+NAME="AEN6323"
 ></A
 ><H3
 ><A
@@ -10689,12 +10935,12 @@
 ></TR
 ></TABLE
 ><P
->Add a new element <TT
+>Add a new node <TT
 CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
-> as the previous siblings of <TT
+> as the previous sibling of <TT
 CLASS="PARAMETER"
 ><I
 >cur</I
@@ -10706,14 +10952,16 @@
 >elem</I
 ></TT
 > may be freed)
-If the new element was already inserted in a document it is
-first unlinked from its existing context.</P
+If the new node was already inserted in a document it is
+first unlinked from its existing context.
+If the new node is ATTRIBUTE, it is added into properties instead of children.
+If there is an attribute with equal name, it is first destroyed.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6288"
+NAME="AEN6335"
 ></A
 ><P
 ></P
@@ -10772,7 +11020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>the new node or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10783,7 +11031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6305"
+NAME="AEN6352"
 ></A
 ><H3
 ><A
@@ -10814,31 +11062,33 @@
 ></TR
 ></TABLE
 ><P
->Add a new element <TT
+>Add a new node <TT
 CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
-> as the next siblings of <TT
+> as the next sibling of <TT
 CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
 >
-If the new element was already inserted in a document it is
+If the new node was already inserted in a document it is
 first unlinked from its existing context.
 As a result of text merging <TT
 CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
-> may be freed.</P
+> may be freed.
+If the new node is ATTRIBUTE, it is added into properties instead of children.
+If there is an attribute with equal name, it is first destroyed.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6317"
+NAME="AEN6364"
 ></A
 ><P
 ></P
@@ -10897,7 +11147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>the new node or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10908,7 +11158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6334"
+NAME="AEN6381"
 ></A
 ><H3
 ><A
@@ -10938,7 +11188,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6341"
+NAME="AEN6388"
 ></A
 ><P
 ></P
@@ -10976,7 +11226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6350"
+NAME="AEN6397"
 ></A
 ><H3
 ><A
@@ -11013,7 +11263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6359"
+NAME="AEN6406"
 ></A
 ><P
 ></P
@@ -11083,7 +11333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6376"
+NAME="AEN6423"
 ></A
 ><H3
 ><A
@@ -11118,7 +11368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6384"
+NAME="AEN6431"
 ></A
 ><P
 ></P
@@ -11195,7 +11445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6402"
+NAME="AEN6449"
 ></A
 ><H3
 ><A
@@ -11226,7 +11476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6409"
+NAME="AEN6456"
 ></A
 ><P
 ></P
@@ -11264,7 +11514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6418"
+NAME="AEN6465"
 ></A
 ><H3
 ><A
@@ -11298,7 +11548,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6426"
+NAME="AEN6473"
 ></A
 ><P
 ></P
@@ -11336,7 +11586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6435"
+NAME="AEN6482"
 ></A
 ><H3
 ><A
@@ -11370,7 +11620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6443"
+NAME="AEN6490"
 ></A
 ><P
 ></P
@@ -11425,7 +11675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6456"
+NAME="AEN6503"
 ></A
 ><H3
 ><A
@@ -11459,7 +11709,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6464"
+NAME="AEN6511"
 ></A
 ><P
 ></P
@@ -11514,7 +11764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6477"
+NAME="AEN6524"
 ></A
 ><H3
 ><A
@@ -11566,7 +11816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6488"
+NAME="AEN6535"
 ></A
 ><P
 ></P
@@ -11653,7 +11903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6509"
+NAME="AEN6556"
 ></A
 ><H3
 ><A
@@ -11695,7 +11945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6519"
+NAME="AEN6566"
 ></A
 ><P
 ></P
@@ -11782,7 +12032,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6540"
+NAME="AEN6587"
 ></A
 ><H3
 ><A
@@ -11819,7 +12069,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6549"
+NAME="AEN6596"
 ></A
 ><P
 ></P
@@ -11894,7 +12144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6567"
+NAME="AEN6614"
 ></A
 ><H3
 ><A
@@ -11928,7 +12178,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6575"
+NAME="AEN6622"
 ></A
 ><P
 ></P
@@ -11983,7 +12233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6588"
+NAME="AEN6635"
 ></A
 ><H3
 ><A
@@ -12016,7 +12266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6596"
+NAME="AEN6643"
 ></A
 ><P
 ></P
@@ -12072,7 +12322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6610"
+NAME="AEN6657"
 ></A
 ><H3
 ><A
@@ -12105,7 +12355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6618"
+NAME="AEN6665"
 ></A
 ><P
 ></P
@@ -12161,7 +12411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6632"
+NAME="AEN6679"
 ></A
 ><H3
 ><A
@@ -12202,7 +12452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6642"
+NAME="AEN6689"
 ></A
 ><P
 ></P
@@ -12289,7 +12539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6663"
+NAME="AEN6710"
 ></A
 ><H3
 ><A
@@ -12332,7 +12582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6673"
+NAME="AEN6720"
 ></A
 ><P
 ></P
@@ -12403,7 +12653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6690"
+NAME="AEN6737"
 ></A
 ><H3
 ><A
@@ -12445,7 +12695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6700"
+NAME="AEN6747"
 ></A
 ><P
 ></P
@@ -12516,7 +12766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6717"
+NAME="AEN6764"
 ></A
 ><H3
 ><A
@@ -12564,7 +12814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6728"
+NAME="AEN6775"
 ></A
 ><P
 ></P
@@ -12652,7 +12902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6749"
+NAME="AEN6796"
 ></A
 ><H3
 ><A
@@ -12698,7 +12948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6760"
+NAME="AEN6807"
 ></A
 ><P
 ></P
@@ -12802,7 +13052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6785"
+NAME="AEN6832"
 ></A
 ><H3
 ><A
@@ -12850,7 +13100,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6796"
+NAME="AEN6843"
 ></A
 ><P
 ></P
@@ -12938,7 +13188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6817"
+NAME="AEN6864"
 ></A
 ><H3
 ><A
@@ -12976,7 +13226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6826"
+NAME="AEN6873"
 ></A
 ><P
 ></P
@@ -13046,7 +13296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6843"
+NAME="AEN6890"
 ></A
 ><H3
 ><A
@@ -13085,7 +13335,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6852"
+NAME="AEN6899"
 ></A
 ><P
 ></P
@@ -13172,7 +13422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6873"
+NAME="AEN6920"
 ></A
 ><H3
 ><A
@@ -13211,7 +13461,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6882"
+NAME="AEN6929"
 ></A
 ><P
 ></P
@@ -13298,7 +13548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6903"
+NAME="AEN6950"
 ></A
 ><H3
 ><A
@@ -13341,7 +13591,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6913"
+NAME="AEN6960"
 ></A
 ><P
 ></P
@@ -13428,7 +13678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6934"
+NAME="AEN6981"
 ></A
 ><H3
 ><A
@@ -13462,207 +13712,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6942"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node being modified</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new value of the content</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6955"
-></A
-><H3
-><A
-NAME="XMLNODESETCONTENTLEN"
-></A
->&#62;xmlNodeSetContentLen ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlNodeSetContentLen            (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *content,
-                                             int len);</PRE
-></TD
-></TR
-></TABLE
-><P
->Replace the content of a node.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN6963"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node being modified</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new value of the content</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6981"
-></A
-><H3
-><A
-NAME="XMLNODEADDCONTENT"
-></A
->&#62;xmlNodeAddContent ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlNodeAddContent               (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *content);</PRE
-></TD
-></TR
-></TABLE
-><P
->Append the extra substring to the node content.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN6989"
 ></A
 ><P
@@ -13707,7 +13756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>  the new value of the content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13722,6 +13771,207 @@
 ></A
 ><H3
 ><A
+NAME="XMLNODESETCONTENTLEN"
+></A
+>&#62;xmlNodeSetContentLen ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlNodeSetContentLen            (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *content,
+                                             int len);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Replace the content of a node.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN7010"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node being modified</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the new value of the content</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN7028"
+></A
+><H3
+><A
+NAME="XMLNODEADDCONTENT"
+></A
+>&#62;xmlNodeAddContent ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlNodeAddContent               (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *content);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Append the extra substring to the node content.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN7036"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node being modified</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  extra content</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN7049"
+></A
+><H3
+><A
 NAME="XMLNODEADDCONTENTLEN"
 ></A
 >&#62;xmlNodeAddContentLen ()</H3
@@ -13753,7 +14003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7010"
+NAME="AEN7057"
 ></A
 ><P
 ></P
@@ -13830,7 +14080,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7028"
+NAME="AEN7075"
 ></A
 ><H3
 ><A
@@ -13866,7 +14116,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7036"
+NAME="AEN7083"
 ></A
 ><P
 ></P
@@ -13923,7 +14173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7050"
+NAME="AEN7097"
 ></A
 ><H3
 ><A
@@ -13957,7 +14207,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7058"
+NAME="AEN7105"
 ></A
 ><P
 ></P
@@ -14011,7 +14261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7071"
+NAME="AEN7118"
 ></A
 ><H3
 ><A
@@ -14046,7 +14296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7079"
+NAME="AEN7126"
 ></A
 ><P
 ></P
@@ -14101,7 +14351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7092"
+NAME="AEN7139"
 ></A
 ><H3
 ><A
@@ -14133,7 +14383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7099"
+NAME="AEN7146"
 ></A
 ><P
 ></P
@@ -14186,7 +14436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7112"
+NAME="AEN7159"
 ></A
 ><H3
 ><A
@@ -14218,7 +14468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7119"
+NAME="AEN7166"
 ></A
 ><P
 ></P
@@ -14273,7 +14523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7132"
+NAME="AEN7179"
 ></A
 ><H3
 ><A
@@ -14320,7 +14570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7142"
+NAME="AEN7189"
 ></A
 ><P
 ></P
@@ -14391,7 +14641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7159"
+NAME="AEN7206"
 ></A
 ><H3
 ><A
@@ -14426,7 +14676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7167"
+NAME="AEN7214"
 ></A
 ><P
 ></P
@@ -14481,7 +14731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7180"
+NAME="AEN7227"
 ></A
 ><H3
 ><A
@@ -14512,7 +14762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7187"
+NAME="AEN7234"
 ></A
 ><P
 ></P
@@ -14565,7 +14815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7200"
+NAME="AEN7247"
 ></A
 ><H3
 ><A
@@ -14599,7 +14849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7208"
+NAME="AEN7255"
 ></A
 ><P
 ></P
@@ -14669,7 +14919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7225"
+NAME="AEN7272"
 ></A
 ><H3
 ><A
@@ -14707,7 +14957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7234"
+NAME="AEN7281"
 ></A
 ><P
 ></P
@@ -14794,7 +15044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7255"
+NAME="AEN7302"
 ></A
 ><H3
 ><A
@@ -14830,7 +15080,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7263"
+NAME="AEN7310"
 ></A
 ><P
 ></P
@@ -14885,7 +15135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7276"
+NAME="AEN7323"
 ></A
 ><H3
 ><A
@@ -14920,7 +15170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7284"
+NAME="AEN7331"
 ></A
 ><P
 ></P
@@ -14975,7 +15225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7297"
+NAME="AEN7344"
 ></A
 ><H3
 ><A
@@ -15007,7 +15257,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7304"
+NAME="AEN7351"
 ></A
 ><P
 ></P
@@ -15062,7 +15312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7317"
+NAME="AEN7364"
 ></A
 ><H3
 ><A
@@ -15101,7 +15351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7326"
+NAME="AEN7373"
 ></A
 ><P
 ></P
@@ -15156,7 +15406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7339"
+NAME="AEN7386"
 ></A
 ><H3
 ><A
@@ -15201,7 +15451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7348"
+NAME="AEN7395"
 ></A
 ><P
 ></P
@@ -15271,7 +15521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7365"
+NAME="AEN7412"
 ></A
 ><H3
 ><A
@@ -15311,7 +15561,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7374"
+NAME="AEN7421"
 ></A
 ><P
 ></P
@@ -15400,7 +15650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7395"
+NAME="AEN7442"
 ></A
 ><H3
 ><A
@@ -15439,7 +15689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7404"
+NAME="AEN7451"
 ></A
 ><P
 ></P
@@ -15511,7 +15761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7421"
+NAME="AEN7468"
 ></A
 ><H3
 ><A
@@ -15549,7 +15799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7429"
+NAME="AEN7476"
 ></A
 ><P
 ></P
@@ -15638,7 +15888,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7450"
+NAME="AEN7497"
 ></A
 ><H3
 ><A
@@ -15677,7 +15927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7458"
+NAME="AEN7505"
 ></A
 ><P
 ></P
@@ -15783,7 +16033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7483"
+NAME="AEN7530"
 ></A
 ><H3
 ><A
@@ -15817,7 +16067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7491"
+NAME="AEN7538"
 ></A
 ><P
 ></P
@@ -15887,7 +16137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7508"
+NAME="AEN7555"
 ></A
 ><H3
 ><A
@@ -15925,7 +16175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7517"
+NAME="AEN7564"
 ></A
 ><P
 ></P
@@ -15997,7 +16247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7534"
+NAME="AEN7581"
 ></A
 ><H3
 ><A
@@ -16035,7 +16285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7542"
+NAME="AEN7589"
 ></A
 ><P
 ></P
@@ -16105,7 +16355,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7559"
+NAME="AEN7606"
 ></A
 ><H3
 ><A
@@ -16149,7 +16399,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7568"
+NAME="AEN7615"
 ></A
 ><P
 ></P
@@ -16236,7 +16486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7589"
+NAME="AEN7636"
 ></A
 ><H3
 ><A
@@ -16276,7 +16526,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7598"
+NAME="AEN7645"
 ></A
 ><P
 ></P
@@ -16382,7 +16632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7623"
+NAME="AEN7670"
 ></A
 ><H3
 ><A
@@ -16417,7 +16667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7631"
+NAME="AEN7678"
 ></A
 ><P
 ></P
@@ -16504,7 +16754,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7652"
+NAME="AEN7699"
 ></A
 ><H3
 ><A
@@ -16540,7 +16790,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7660"
+NAME="AEN7707"
 ></A
 ><P
 ></P
@@ -16644,7 +16894,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7685"
+NAME="AEN7732"
 ></A
 ><H3
 ><A
@@ -16685,7 +16935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7694"
+NAME="AEN7741"
 ></A
 ><P
 ></P
@@ -16808,7 +17058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7723"
+NAME="AEN7770"
 ></A
 ><H3
 ><A
@@ -16841,7 +17091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7730"
+NAME="AEN7777"
 ></A
 ><P
 ></P
@@ -16945,7 +17195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7755"
+NAME="AEN7802"
 ></A
 ><H3
 ><A
@@ -16977,7 +17227,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7762"
+NAME="AEN7809"
 ></A
 ><P
 ></P
@@ -17064,7 +17314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7783"
+NAME="AEN7830"
 ></A
 ><H3
 ><A
@@ -17094,7 +17344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7790"
+NAME="AEN7837"
 ></A
 ><P
 ></P
@@ -17147,7 +17397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7803"
+NAME="AEN7850"
 ></A
 ><H3
 ><A
@@ -17179,7 +17429,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7810"
+NAME="AEN7857"
 ></A
 ><P
 ></P
@@ -17234,7 +17484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7823"
+NAME="AEN7870"
 ></A
 ><H3
 ><A
@@ -17261,7 +17511,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7829"
+NAME="AEN7876"
 ></A
 ><P
 ></P
@@ -17297,7 +17547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7838"
+NAME="AEN7885"
 ></A
 ><H3
 ><A
@@ -17325,7 +17575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7844"
+NAME="AEN7891"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index f03cc91..54ef11e 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10178"
+NAME="AEN10275"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10181"
+NAME="AEN10278"
 ></A
 ><H2
 >Synopsis</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10213"
+NAME="AEN10310"
 ></A
 ><H2
 >Description</H2
@@ -269,14 +269,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10216"
+NAME="AEN10313"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10218"
+NAME="AEN10315"
 ></A
 ><H3
 ><A
@@ -316,7 +316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10224"
+NAME="AEN10321"
 ></A
 ><H3
 ><A
@@ -342,7 +342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10229"
+NAME="AEN10326"
 ></A
 ><H3
 ><A
@@ -372,7 +372,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10236"
+NAME="AEN10333"
 ></A
 ><P
 ></P
@@ -408,7 +408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10245"
+NAME="AEN10342"
 ></A
 ><H3
 ><A
@@ -450,7 +450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10255"
+NAME="AEN10352"
 ></A
 ><P
 ></P
@@ -521,7 +521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10272"
+NAME="AEN10369"
 ></A
 ><H3
 ><A
@@ -553,7 +553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10280"
+NAME="AEN10377"
 ></A
 ><P
 ></P
@@ -606,7 +606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10293"
+NAME="AEN10390"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10302"
+NAME="AEN10399"
 ></A
 ><P
 ></P
@@ -715,7 +715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10319"
+NAME="AEN10416"
 ></A
 ><H3
 ><A
@@ -748,7 +748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10327"
+NAME="AEN10424"
 ></A
 ><P
 ></P
@@ -801,7 +801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10340"
+NAME="AEN10437"
 ></A
 ><H3
 ><A
@@ -840,7 +840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10349"
+NAME="AEN10446"
 ></A
 ><P
 ></P
@@ -895,7 +895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10362"
+NAME="AEN10459"
 ></A
 ><H3
 ><A
@@ -933,7 +933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10371"
+NAME="AEN10468"
 ></A
 ><P
 ></P
@@ -1003,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10388"
+NAME="AEN10485"
 ></A
 ><H3
 ><A
@@ -1036,7 +1036,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10395"
+NAME="AEN10492"
 ></A
 ><P
 ></P
@@ -1123,7 +1123,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10416"
+NAME="AEN10513"
 ></A
 ><H3
 ><A
@@ -1153,7 +1153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10423"
+NAME="AEN10520"
 ></A
 ><P
 ></P
@@ -1206,7 +1206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10436"
+NAME="AEN10533"
 ></A
 ><H3
 ><A
@@ -1241,7 +1241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10444"
+NAME="AEN10541"
 ></A
 ><P
 ></P
@@ -1299,7 +1299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10457"
+NAME="AEN10554"
 ></A
 ><H3
 ><A
@@ -1329,7 +1329,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10464"
+NAME="AEN10561"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index afdafdc..25daa22 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8330"
+NAME="AEN8371"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8333"
+NAME="AEN8374"
 ></A
 ><H2
 >Synopsis</H2
@@ -682,6 +682,33 @@
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *value);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE"
+>xmlValidCtxtNormalizeAttributeValue</A
+>
+                                            (<A
+HREF="libxml-valid.html#XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> elem,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);
 int         <A
 HREF="libxml-valid.html#XMLVALIDATEATTRIBUTEDECL"
 >xmlValidateAttributeDecl</A
@@ -972,7 +999,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8557"
+NAME="AEN8605"
 ></A
 ><H2
 >Description</H2
@@ -982,14 +1009,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8560"
+NAME="AEN8608"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8562"
+NAME="AEN8610"
 ></A
 ><H3
 ><A
@@ -1015,7 +1042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8567"
+NAME="AEN8615"
 ></A
 ><H3
 ><A
@@ -1041,7 +1068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8572"
+NAME="AEN8620"
 ></A
 ><H3
 ><A
@@ -1064,11 +1091,14 @@
 ></TR
 ></TABLE
 ><P
+>Callback called when a validity error is found, this is a message
+oriented function similar to an *printf function.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8577"
+NAME="AEN8626"
 ></A
 ><P
 ></P
@@ -1095,7 +1125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlValidCtxtPtr validity error context</TD
 ></TR
 ><TR
 ><TD
@@ -1112,7 +1142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to format *printf like vararg</TD
 ></TR
 ><TR
 ><TD
@@ -1129,7 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  remaining arguments to the format</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1140,7 +1170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8594"
+NAME="AEN8643"
 ></A
 ><H3
 ><A
@@ -1163,11 +1193,14 @@
 ></TR
 ></TABLE
 ><P
+>Callback called when a validity warning is found, this is a message
+oriented function similar to an *printf function.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8599"
+NAME="AEN8649"
 ></A
 ><P
 ></P
@@ -1194,7 +1227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlValidCtxtPtr validity error context</TD
 ></TR
 ><TR
 ><TD
@@ -1211,7 +1244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to format *printf like vararg</TD
 ></TR
 ><TR
 ><TD
@@ -1228,7 +1261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  remaining arguments to the format</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1239,7 +1272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8616"
+NAME="AEN8666"
 ></A
 ><H3
 ><A
@@ -1281,11 +1314,13 @@
 ></TABLE
 ><P
 ></P
+><P
+></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8621"
+NAME="AEN8672"
 ></A
 ><H3
 ><A
@@ -1311,7 +1346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8626"
+NAME="AEN8677"
 ></A
 ><H3
 ><A
@@ -1337,7 +1372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8631"
+NAME="AEN8682"
 ></A
 ><H3
 ><A
@@ -1363,7 +1398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8636"
+NAME="AEN8687"
 ></A
 ><H3
 ><A
@@ -1389,7 +1424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8641"
+NAME="AEN8692"
 ></A
 ><H3
 ><A
@@ -1415,7 +1450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8646"
+NAME="AEN8697"
 ></A
 ><H3
 ><A
@@ -1441,7 +1476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8651"
+NAME="AEN8702"
 ></A
 ><H3
 ><A
@@ -1484,7 +1519,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8663"
+NAME="AEN8714"
 ></A
 ><P
 ></P
@@ -1555,7 +1590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8680"
+NAME="AEN8731"
 ></A
 ><H3
 ><A
@@ -1604,7 +1639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8692"
+NAME="AEN8743"
 ></A
 ><P
 ></P
@@ -1725,7 +1760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8721"
+NAME="AEN8772"
 ></A
 ><H3
 ><A
@@ -1758,7 +1793,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8729"
+NAME="AEN8780"
 ></A
 ><P
 ></P
@@ -1811,7 +1846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8742"
+NAME="AEN8793"
 ></A
 ><H3
 ><A
@@ -1841,7 +1876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8749"
+NAME="AEN8800"
 ></A
 ><P
 ></P
@@ -1879,7 +1914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8758"
+NAME="AEN8809"
 ></A
 ><H3
 ><A
@@ -1913,7 +1948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8766"
+NAME="AEN8817"
 ></A
 ><P
 ></P
@@ -1968,7 +2003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8779"
+NAME="AEN8830"
 ></A
 ><H3
 ><A
@@ -2002,7 +2037,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8787"
+NAME="AEN8838"
 ></A
 ><P
 ></P
@@ -2057,7 +2092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8800"
+NAME="AEN8851"
 ></A
 ><H3
 ><A
@@ -2094,7 +2129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8809"
+NAME="AEN8860"
 ></A
 ><P
 ></P
@@ -2164,7 +2199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8826"
+NAME="AEN8877"
 ></A
 ><H3
 ><A
@@ -2197,7 +2232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8834"
+NAME="AEN8885"
 ></A
 ><P
 ></P
@@ -2250,7 +2285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8847"
+NAME="AEN8898"
 ></A
 ><H3
 ><A
@@ -2280,7 +2315,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8854"
+NAME="AEN8905"
 ></A
 ><P
 ></P
@@ -2318,7 +2353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8863"
+NAME="AEN8914"
 ></A
 ><H3
 ><A
@@ -2352,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8870"
+NAME="AEN8921"
 ></A
 ><P
 ></P
@@ -2441,7 +2476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8891"
+NAME="AEN8942"
 ></A
 ><H3
 ><A
@@ -2473,7 +2508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8898"
+NAME="AEN8949"
 ></A
 ><P
 ></P
@@ -2545,7 +2580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8915"
+NAME="AEN8966"
 ></A
 ><H3
 ><A
@@ -2594,7 +2629,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8927"
+NAME="AEN8978"
 ></A
 ><P
 ></P
@@ -2715,7 +2750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8956"
+NAME="AEN9007"
 ></A
 ><H3
 ><A
@@ -2748,7 +2783,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8964"
+NAME="AEN9015"
 ></A
 ><P
 ></P
@@ -2801,7 +2836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8977"
+NAME="AEN9028"
 ></A
 ><H3
 ><A
@@ -2831,7 +2866,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8984"
+NAME="AEN9035"
 ></A
 ><P
 ></P
@@ -2869,7 +2904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8993"
+NAME="AEN9044"
 ></A
 ><H3
 ><A
@@ -2903,7 +2938,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9001"
+NAME="AEN9052"
 ></A
 ><P
 ></P
@@ -2958,7 +2993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9014"
+NAME="AEN9065"
 ></A
 ><H3
 ><A
@@ -2993,7 +3028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9022"
+NAME="AEN9073"
 ></A
 ><P
 ></P
@@ -3048,7 +3083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9035"
+NAME="AEN9086"
 ></A
 ><H3
 ><A
@@ -3081,7 +3116,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9043"
+NAME="AEN9094"
 ></A
 ><P
 ></P
@@ -3135,7 +3170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9056"
+NAME="AEN9107"
 ></A
 ><H3
 ><A
@@ -3165,7 +3200,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9063"
+NAME="AEN9114"
 ></A
 ><P
 ></P
@@ -3203,7 +3238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9072"
+NAME="AEN9123"
 ></A
 ><H3
 ><A
@@ -3236,7 +3271,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9080"
+NAME="AEN9131"
 ></A
 ><P
 ></P
@@ -3290,7 +3325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9093"
+NAME="AEN9144"
 ></A
 ><H3
 ><A
@@ -3361,7 +3396,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9110"
+NAME="AEN9161"
 ></A
 ><P
 ></P
@@ -3550,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9155"
+NAME="AEN9206"
 ></A
 ><H3
 ><A
@@ -3583,7 +3618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9163"
+NAME="AEN9214"
 ></A
 ><P
 ></P
@@ -3636,7 +3671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9176"
+NAME="AEN9227"
 ></A
 ><H3
 ><A
@@ -3666,7 +3701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9183"
+NAME="AEN9234"
 ></A
 ><P
 ></P
@@ -3704,7 +3739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9192"
+NAME="AEN9243"
 ></A
 ><H3
 ><A
@@ -3738,7 +3773,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9200"
+NAME="AEN9251"
 ></A
 ><P
 ></P
@@ -3793,7 +3828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9213"
+NAME="AEN9264"
 ></A
 ><H3
 ><A
@@ -3828,7 +3863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9221"
+NAME="AEN9272"
 ></A
 ><P
 ></P
@@ -3883,7 +3918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9234"
+NAME="AEN9285"
 ></A
 ><H3
 ><A
@@ -3928,7 +3963,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9245"
+NAME="AEN9296"
 ></A
 ><P
 ></P
@@ -4032,7 +4067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9270"
+NAME="AEN9321"
 ></A
 ><H3
 ><A
@@ -4062,7 +4097,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9277"
+NAME="AEN9328"
 ></A
 ><P
 ></P
@@ -4100,7 +4135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9286"
+NAME="AEN9337"
 ></A
 ><H3
 ><A
@@ -4137,7 +4172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9295"
+NAME="AEN9346"
 ></A
 ><P
 ></P
@@ -4207,7 +4242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9312"
+NAME="AEN9363"
 ></A
 ><H3
 ><A
@@ -4247,7 +4282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9321"
+NAME="AEN9372"
 ></A
 ><P
 ></P
@@ -4334,7 +4369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9342"
+NAME="AEN9393"
 ></A
 ><H3
 ><A
@@ -4368,7 +4403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9350"
+NAME="AEN9401"
 ></A
 ><P
 ></P
@@ -4438,7 +4473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9367"
+NAME="AEN9418"
 ></A
 ><H3
 ><A
@@ -4483,7 +4518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9378"
+NAME="AEN9429"
 ></A
 ><P
 ></P
@@ -4587,7 +4622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9403"
+NAME="AEN9454"
 ></A
 ><H3
 ><A
@@ -4617,7 +4652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9410"
+NAME="AEN9461"
 ></A
 ><P
 ></P
@@ -4655,7 +4690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9419"
+NAME="AEN9470"
 ></A
 ><H3
 ><A
@@ -4695,7 +4730,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9428"
+NAME="AEN9479"
 ></A
 ><P
 ></P
@@ -4782,7 +4817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9449"
+NAME="AEN9500"
 ></A
 ><H3
 ><A
@@ -4816,7 +4851,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9457"
+NAME="AEN9508"
 ></A
 ><P
 ></P
@@ -4886,7 +4921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9474"
+NAME="AEN9525"
 ></A
 ><H3
 ><A
@@ -4923,7 +4958,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9483"
+NAME="AEN9534"
 ></A
 ><P
 ></P
@@ -4993,7 +5028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9500"
+NAME="AEN9551"
 ></A
 ><H3
 ><A
@@ -5031,7 +5066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9508"
+NAME="AEN9559"
 ></A
 ><P
 ></P
@@ -5101,7 +5136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9525"
+NAME="AEN9576"
 ></A
 ><H3
 ><A
@@ -5144,7 +5179,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9534"
+NAME="AEN9585"
 ></A
 ><P
 ></P
@@ -5231,7 +5266,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9555"
+NAME="AEN9606"
 ></A
 ><H3
 ><A
@@ -5291,7 +5326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9570"
+NAME="AEN9621"
 ></A
 ><P
 ></P
@@ -5396,7 +5431,197 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9595"
+NAME="AEN9646"
+></A
+><H3
+><A
+NAME="XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE"
+></A
+>&#62;xmlValidCtxtNormalizeAttributeValue ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlValidCtxtNormalizeAttributeValue
+                                            (<A
+HREF="libxml-valid.html#XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> elem,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Does the validation related extra step of the normalization of attribute
+values:</P
+><P
+>If the declared value is not CDATA, then the XML processor must further
+process the normalized attribute value by discarding any leading and
+trailing space (<GTKDOCLINK
+HREF="X20"
+>x20</GTKDOCLINK
+>) characters, and by replacing sequences of space
+(<GTKDOCLINK
+HREF="X20"
+>x20</GTKDOCLINK
+>) characters by single space (<GTKDOCLINK
+HREF="X20"
+>x20</GTKDOCLINK
+>) character.</P
+><P
+>Also  check VC: Standalone Document Declaration in P32, and update
+ ctxt-&gt;valid accordingly</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN9663"
+></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 validation context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>doc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the document</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>elem</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the parent</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the attribute name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the attribute value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>a new normalized string if normalization is needed, NULL otherwise
+     the caller must free the returned value.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9692"
 ></A
 ><H3
 ><A
@@ -5441,7 +5666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9605"
+NAME="AEN9702"
 ></A
 ><P
 ></P
@@ -5528,7 +5753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9626"
+NAME="AEN9723"
 ></A
 ><H3
 ><A
@@ -5577,7 +5802,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9638"
+NAME="AEN9735"
 ></A
 ><P
 ></P
@@ -5647,7 +5872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9655"
+NAME="AEN9752"
 ></A
 ><H3
 ><A
@@ -5689,7 +5914,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9664"
+NAME="AEN9761"
 ></A
 ><P
 ></P
@@ -5776,7 +6001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9685"
+NAME="AEN9782"
 ></A
 ><H3
 ><A
@@ -5816,7 +6041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9695"
+NAME="AEN9792"
 ></A
 ><P
 ></P
@@ -5903,7 +6128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9716"
+NAME="AEN9813"
 ></A
 ><H3
 ><A
@@ -5944,7 +6169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9725"
+NAME="AEN9822"
 ></A
 ><P
 ></P
@@ -6003,7 +6228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>1 if valid or 0 if invalid and -1 if not well-formed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6014,7 +6239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9742"
+NAME="AEN9839"
 ></A
 ><H3
 ><A
@@ -6052,7 +6277,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9751"
+NAME="AEN9848"
 ></A
 ><P
 ></P
@@ -6122,7 +6347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9768"
+NAME="AEN9865"
 ></A
 ><H3
 ><A
@@ -6160,7 +6385,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9777"
+NAME="AEN9874"
 ></A
 ><P
 ></P
@@ -6247,7 +6472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9798"
+NAME="AEN9895"
 ></A
 ><H3
 ><A
@@ -6295,7 +6520,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9809"
+NAME="AEN9906"
 ></A
 ><P
 ></P
@@ -6382,7 +6607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9830"
+NAME="AEN9927"
 ></A
 ><H3
 ><A
@@ -6440,7 +6665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9842"
+NAME="AEN9939"
 ></A
 ><P
 ></P
@@ -6561,7 +6786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9871"
+NAME="AEN9968"
 ></A
 ><H3
 ><A
@@ -6598,7 +6823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9880"
+NAME="AEN9977"
 ></A
 ><P
 ></P
@@ -6668,7 +6893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9897"
+NAME="AEN9994"
 ></A
 ><H3
 ><A
@@ -6707,7 +6932,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9906"
+NAME="AEN10003"
 ></A
 ><P
 ></P
@@ -6794,7 +7019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9927"
+NAME="AEN10024"
 ></A
 ><H3
 ><A
@@ -6829,7 +7054,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9935"
+NAME="AEN10032"
 ></A
 ><P
 ></P
@@ -6899,7 +7124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9952"
+NAME="AEN10049"
 ></A
 ><H3
 ><A
@@ -6941,7 +7166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9962"
+NAME="AEN10059"
 ></A
 ><P
 ></P
@@ -7028,7 +7253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9983"
+NAME="AEN10080"
 ></A
 ><H3
 ><A
@@ -7074,7 +7299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9994"
+NAME="AEN10091"
 ></A
 ><P
 ></P
@@ -7178,7 +7403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10019"
+NAME="AEN10116"
 ></A
 ><H3
 ><A
@@ -7215,7 +7440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10028"
+NAME="AEN10125"
 ></A
 ><P
 ></P
@@ -7285,7 +7510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10045"
+NAME="AEN10142"
 ></A
 ><H3
 ><A
@@ -7326,7 +7551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10055"
+NAME="AEN10152"
 ></A
 ><P
 ></P
@@ -7413,7 +7638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10076"
+NAME="AEN10173"
 ></A
 ><H3
 ><A
@@ -7450,7 +7675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10085"
+NAME="AEN10182"
 ></A
 ><P
 ></P
@@ -7520,7 +7745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10102"
+NAME="AEN10199"
 ></A
 ><H3
 ><A
@@ -7580,7 +7805,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10114"
+NAME="AEN10211"
 ></A
 ><P
 ></P
@@ -7691,7 +7916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10140"
+NAME="AEN10237"
 ></A
 ><H3
 ><A
@@ -7727,7 +7952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10148"
+NAME="AEN10245"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 715db5e..dd78f67 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17220"
+NAME="AEN17193"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17223"
+NAME="AEN17196"
 ></A
 ><H2
 >Synopsis</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17228"
+NAME="AEN17201"
 ></A
 ><H2
 >Description</H2
@@ -170,14 +170,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17231"
+NAME="AEN17204"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17233"
+NAME="AEN17206"
 ></A
 ><H3
 ><A
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17241"
+NAME="AEN17214"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index 1fcf81a..e966aef 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10478"
+NAME="AEN10575"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10481"
+NAME="AEN10578"
 ></A
 ><H2
 >Synopsis</H2
@@ -216,7 +216,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10498"
+NAME="AEN10595"
 ></A
 ><H2
 >Description</H2
@@ -226,14 +226,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10501"
+NAME="AEN10598"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10503"
+NAME="AEN10600"
 ></A
 ><H3
 ><A
@@ -388,7 +388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10508"
+NAME="AEN10605"
 ></A
 ><H3
 ><A
@@ -411,11 +411,14 @@
 ></TR
 ></TABLE
 ><P
+>Signature of the function to use when there is an error and
+no parsing or validity context available</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10513"
+NAME="AEN10611"
 ></A
 ><P
 ></P
@@ -442,7 +445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a parsing context</TD
 ></TR
 ><TR
 ><TD
@@ -459,7 +462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message</TD
 ></TR
 ><TR
 ><TD
@@ -476,7 +479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra arguments of the varags to format the message</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -487,7 +490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10530"
+NAME="AEN10628"
 ></A
 ><H3
 ><A
@@ -549,7 +552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10542"
+NAME="AEN10640"
 ></A
 ><P
 ></P
@@ -604,7 +607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10555"
+NAME="AEN10653"
 ></A
 ><H3
 ><A
@@ -628,11 +631,13 @@
 ></TR
 ></TABLE
 ><P
+>Set or reset (if NULL) the default handler for generic errors</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10561"
+NAME="AEN10660"
 ></A
 ><P
 ></P
@@ -659,7 +664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the handler</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -670,7 +675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10570"
+NAME="AEN10669"
 ></A
 ><H3
 ><A
@@ -700,7 +705,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10576"
+NAME="AEN10675"
 ></A
 ><P
 ></P
@@ -772,7 +777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10593"
+NAME="AEN10692"
 ></A
 ><H3
 ><A
@@ -802,7 +807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10599"
+NAME="AEN10698"
 ></A
 ><P
 ></P
@@ -874,7 +879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10616"
+NAME="AEN10715"
 ></A
 ><H3
 ><A
@@ -904,7 +909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10622"
+NAME="AEN10721"
 ></A
 ><P
 ></P
@@ -976,7 +981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10639"
+NAME="AEN10738"
 ></A
 ><H3
 ><A
@@ -1006,7 +1011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10645"
+NAME="AEN10744"
 ></A
 ><P
 ></P
@@ -1078,7 +1083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10662"
+NAME="AEN10761"
 ></A
 ><H3
 ><A
@@ -1108,7 +1113,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10669"
+NAME="AEN10768"
 ></A
 ><P
 ></P
@@ -1146,7 +1151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10678"
+NAME="AEN10777"
 ></A
 ><H3
 ><A
@@ -1176,7 +1181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10685"
+NAME="AEN10784"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index b728117..05a669d 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18108"
+NAME="AEN18081"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18111"
+NAME="AEN18084"
 ></A
 ><H2
 >Synopsis</H2
@@ -505,7 +505,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18202"
+NAME="AEN18175"
 ></A
 ><H2
 >Description</H2
@@ -515,14 +515,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18205"
+NAME="AEN18178"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18207"
+NAME="AEN18180"
 ></A
 ><H3
 ><A
@@ -543,11 +543,14 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Input API to detect if the current handler 
+can provide input fonctionnalities for this resource.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18212"
+NAME="AEN18186"
 ></A
 ><P
 ></P
@@ -574,7 +577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the filename or URI</TD
 ></TR
 ><TR
 ><TD
@@ -589,7 +592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if yes and 0 if another Input module should be used</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -600,7 +603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18225"
+NAME="AEN18199"
 ></A
 ><H3
 ><A
@@ -621,11 +624,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Input API to open the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18230"
+NAME="AEN18205"
 ></A
 ><P
 ></P
@@ -652,7 +657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the filename or URI</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -663,7 +668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18239"
+NAME="AEN18214"
 ></A
 ><H3
 ><A
@@ -686,11 +691,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Input API to read the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18244"
+NAME="AEN18220"
 ></A
 ><P
 ></P
@@ -717,7 +724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Input context</TD
 ></TR
 ><TR
 ><TD
@@ -734,7 +741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to store data read</TD
 ></TR
 ><TR
 ><TD
@@ -751,7 +758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the buffer in bytes</TD
 ></TR
 ><TR
 ><TD
@@ -766,7 +773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of bytes read or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -777,7 +784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18265"
+NAME="AEN18241"
 ></A
 ><H3
 ><A
@@ -798,11 +805,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Input API to close the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18270"
+NAME="AEN18247"
 ></A
 ><P
 ></P
@@ -829,7 +838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Input context</TD
 ></TR
 ><TR
 ><TD
@@ -844,7 +853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -855,7 +864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18283"
+NAME="AEN18260"
 ></A
 ><H3
 ><A
@@ -890,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18288"
+NAME="AEN18265"
 ></A
 ><H3
 ><A
@@ -911,11 +920,14 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Output API to detect if the current handler 
+can provide output fonctionnalities for this resource.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18293"
+NAME="AEN18271"
 ></A
 ><P
 ></P
@@ -942,7 +954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the filename or URI</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if yes and 0 if another Output module should be used</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -968,7 +980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18306"
+NAME="AEN18284"
 ></A
 ><H3
 ><A
@@ -989,11 +1001,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Output API to open the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18311"
+NAME="AEN18290"
 ></A
 ><P
 ></P
@@ -1020,7 +1034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the filename or URI</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1031,7 +1045,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18320"
+NAME="AEN18299"
 ></A
 ><H3
 ><A
@@ -1054,11 +1068,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Output API to write to the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18325"
+NAME="AEN18305"
 ></A
 ><P
 ></P
@@ -1085,7 +1101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Output context</TD
 ></TR
 ><TR
 ><TD
@@ -1102,7 +1118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer of data to write</TD
 ></TR
 ><TR
 ><TD
@@ -1119,7 +1135,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the buffer in bytes</TD
 ></TR
 ><TR
 ><TD
@@ -1134,7 +1150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of bytes written or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1145,7 +1161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18346"
+NAME="AEN18326"
 ></A
 ><H3
 ><A
@@ -1166,11 +1182,13 @@
 ></TR
 ></TABLE
 ><P
+>Callback used in the I/O Output API to close the resource</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18351"
+NAME="AEN18332"
 ></A
 ><P
 ></P
@@ -1197,7 +1215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Output context</TD
 ></TR
 ><TR
 ><TD
@@ -1212,7 +1230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1223,7 +1241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18364"
+NAME="AEN18345"
 ></A
 ><H3
 ><A
@@ -1259,7 +1277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18369"
+NAME="AEN18350"
 ></A
 ><H3
 ><A
@@ -1288,7 +1306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18375"
+NAME="AEN18356"
 ></A
 ><H3
 ><A
@@ -1317,7 +1335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18381"
+NAME="AEN18362"
 ></A
 ><H3
 ><A
@@ -1346,7 +1364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18387"
+NAME="AEN18368"
 ></A
 ><H3
 ><A
@@ -1380,7 +1398,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18395"
+NAME="AEN18376"
 ></A
 ><P
 ></P
@@ -1433,7 +1451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18408"
+NAME="AEN18389"
 ></A
 ><H3
 ><A
@@ -1471,7 +1489,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18417"
+NAME="AEN18398"
 ></A
 ><P
 ></P
@@ -1541,7 +1559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18434"
+NAME="AEN18415"
 ></A
 ><H3
 ><A
@@ -1580,7 +1598,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18442"
+NAME="AEN18423"
 ></A
 ><P
 ></P
@@ -1650,7 +1668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18459"
+NAME="AEN18440"
 ></A
 ><H3
 ><A
@@ -1689,7 +1707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18468"
+NAME="AEN18449"
 ></A
 ><P
 ></P
@@ -1759,7 +1777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18485"
+NAME="AEN18466"
 ></A
 ><H3
 ><A
@@ -1795,7 +1813,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18493"
+NAME="AEN18474"
 ></A
 ><P
 ></P
@@ -1865,7 +1883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18510"
+NAME="AEN18491"
 ></A
 ><H3
 ><A
@@ -1902,7 +1920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18518"
+NAME="AEN18499"
 ></A
 ><P
 ></P
@@ -1989,7 +2007,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18539"
+NAME="AEN18520"
 ></A
 ><H3
 ><A
@@ -2033,7 +2051,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18549"
+NAME="AEN18530"
 ></A
 ><P
 ></P
@@ -2137,7 +2155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18574"
+NAME="AEN18555"
 ></A
 ><H3
 ><A
@@ -2170,7 +2188,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18581"
+NAME="AEN18562"
 ></A
 ><P
 ></P
@@ -2241,7 +2259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18598"
+NAME="AEN18579"
 ></A
 ><H3
 ><A
@@ -2277,7 +2295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18606"
+NAME="AEN18587"
 ></A
 ><P
 ></P
@@ -2348,7 +2366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18623"
+NAME="AEN18604"
 ></A
 ><H3
 ><A
@@ -2382,7 +2400,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18630"
+NAME="AEN18611"
 ></A
 ><P
 ></P
@@ -2470,7 +2488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18651"
+NAME="AEN18632"
 ></A
 ><H3
 ><A
@@ -2500,7 +2518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18658"
+NAME="AEN18639"
 ></A
 ><P
 ></P
@@ -2538,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18667"
+NAME="AEN18648"
 ></A
 ><H3
 ><A
@@ -2565,7 +2583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18673"
+NAME="AEN18654"
 ></A
 ><P
 ></P
@@ -2618,7 +2636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18686"
+NAME="AEN18667"
 ></A
 ><H3
 ><A
@@ -2660,7 +2678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18696"
+NAME="AEN18677"
 ></A
 ><P
 ></P
@@ -2764,7 +2782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18721"
+NAME="AEN18702"
 ></A
 ><H3
 ><A
@@ -2793,7 +2811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18727"
+NAME="AEN18708"
 ></A
 ><H3
 ><A
@@ -2826,7 +2844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18735"
+NAME="AEN18716"
 ></A
 ><P
 ></P
@@ -2879,7 +2897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18748"
+NAME="AEN18729"
 ></A
 ><H3
 ><A
@@ -2920,7 +2938,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18756"
+NAME="AEN18737"
 ></A
 ><P
 ></P
@@ -3007,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18777"
+NAME="AEN18758"
 ></A
 ><H3
 ><A
@@ -3046,7 +3064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18786"
+NAME="AEN18767"
 ></A
 ><P
 ></P
@@ -3116,7 +3134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18803"
+NAME="AEN18784"
 ></A
 ><H3
 ><A
@@ -3151,7 +3169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18811"
+NAME="AEN18792"
 ></A
 ><P
 ></P
@@ -3221,7 +3239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18828"
+NAME="AEN18809"
 ></A
 ><H3
 ><A
@@ -3264,7 +3282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18838"
+NAME="AEN18819"
 ></A
 ><P
 ></P
@@ -3342,7 +3360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -3368,7 +3386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18863"
+NAME="AEN18844"
 ></A
 ><H3
 ><A
@@ -3403,7 +3421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18870"
+NAME="AEN18851"
 ></A
 ><P
 ></P
@@ -3491,7 +3509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18891"
+NAME="AEN18872"
 ></A
 ><H3
 ><A
@@ -3525,7 +3543,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18898"
+NAME="AEN18879"
 ></A
 ><P
 ></P
@@ -3596,7 +3614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18915"
+NAME="AEN18896"
 ></A
 ><H3
 ><A
@@ -3626,7 +3644,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18922"
+NAME="AEN18903"
 ></A
 ><P
 ></P
@@ -3679,7 +3697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18935"
+NAME="AEN18916"
 ></A
 ><H3
 ><A
@@ -3710,7 +3728,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18942"
+NAME="AEN18923"
 ></A
 ><P
 ></P
@@ -3763,7 +3781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18955"
+NAME="AEN18936"
 ></A
 ><H3
 ><A
@@ -3805,7 +3823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18965"
+NAME="AEN18946"
 ></A
 ><P
 ></P
@@ -3909,7 +3927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18990"
+NAME="AEN18971"
 ></A
 ><H3
 ><A
@@ -3938,7 +3956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18996"
+NAME="AEN18977"
 ></A
 ><P
 ></P
@@ -3993,7 +4011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19009"
+NAME="AEN18990"
 ></A
 ><H3
 ><A
@@ -4023,7 +4041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19015"
+NAME="AEN18996"
 ></A
 ><H3
 ><A
@@ -4060,7 +4078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19023"
+NAME="AEN19004"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index e563638..c185461 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN26182"
+NAME="AEN26184"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN26185"
+NAME="AEN26187"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,33 +138,29 @@
 HREF="libxml-xmlmemory.html#DEBUG-MEMORY-CAPS"
 >DEBUG_MEMORY</A
 >
-#define     <A
-HREF="libxml-xmlmemory.html#MEM-LIST-CAPS"
->MEM_LIST</A
->
 void        (<A
 HREF="libxml-xmlmemory.html#XMLFREEFUNC"
 >*xmlFreeFunc</A
->)                  (void*);
+>)                  (void *mem);
 void*       (<A
 HREF="libxml-xmlmemory.html#XMLMALLOCFUNC"
 >*xmlMallocFunc</A
 >)                (<GTKDOCLINK
 HREF="SIZE-T"
 >size_t</GTKDOCLINK
->);
+> size);
 void*       (<A
 HREF="libxml-xmlmemory.html#XMLREALLOCFUNC"
 >*xmlReallocFunc</A
->)               (void*,
+>)               (void *mem,
                                              <GTKDOCLINK
 HREF="SIZE-T"
 >size_t</GTKDOCLINK
->);
+> size);
 char*       (<A
 HREF="libxml-xmlmemory.html#XMLSTRDUPFUNC"
 >*xmlStrdupFunc</A
->)                (const char*);
+>)                (const char *str);
 int         <A
 HREF="libxml-xmlmemory.html#XMLMEMSETUP"
 >xmlMemSetup</A
@@ -274,7 +270,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26221"
+NAME="AEN26222"
 ></A
 ><H2
 >Description</H2
@@ -284,14 +280,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26224"
+NAME="AEN26225"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26226"
+NAME="AEN26227"
 ></A
 ><H3
 ><A
@@ -322,35 +318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26232"
-></A
-><H3
-><A
-NAME="MEM-LIST-CAPS"
-></A
->&#62;MEM_LIST</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
-></TD
-></TR
-></TABLE
-><P
->keep track of all allocated blocks for error reporting</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN26238"
+NAME="AEN26233"
 ></A
 ><H3
 ><A
@@ -366,16 +334,21 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        (*xmlFreeFunc)                  (void*);</PRE
+>void        (*xmlFreeFunc)                  (void *mem);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Signature for a <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() implementation</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26243"
+NAME="AEN26240"
 ></A
 ><P
 ></P
@@ -395,14 +368,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param1</I
+>mem</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an already allocated block of memory</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -413,7 +386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26252"
+NAME="AEN26249"
 ></A
 ><H3
 ><A
@@ -432,16 +405,21 @@
 >void*       (*xmlMallocFunc)                (<GTKDOCLINK
 HREF="SIZE-T"
 >size_t</GTKDOCLINK
->);</PRE
+> size);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Signature for a <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() implementation</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26258"
+NAME="AEN26257"
 ></A
 ><P
 ></P
@@ -461,14 +439,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param1</I
+>size</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size requested in bytes</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -479,7 +457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26267"
+NAME="AEN26266"
 ></A
 ><H3
 ><A
@@ -495,20 +473,25 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void*       (*xmlReallocFunc)               (void*,
+>void*       (*xmlReallocFunc)               (void *mem,
                                              <GTKDOCLINK
 HREF="SIZE-T"
 >size_t</GTKDOCLINK
->);</PRE
+> size);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Signature for a <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() implementation</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26273"
+NAME="AEN26274"
 ></A
 ><P
 ></P
@@ -528,14 +511,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param1</I
+>mem</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an already allocated block of memory</TD
 ></TR
 ><TR
 ><TD
@@ -545,14 +528,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param2</I
+>size</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new size requested in bytes</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -563,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26286"
+NAME="AEN26287"
 ></A
 ><H3
 ><A
@@ -579,16 +562,21 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->char*       (*xmlStrdupFunc)                (const char*);</PRE
+>char*       (*xmlStrdupFunc)                (const char *str);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Signature for an <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() implementation</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26291"
+NAME="AEN26294"
 ></A
 ><P
 ></P
@@ -608,14 +596,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param1</I
+>str</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a zero terminated string</TD
 ></TR
 ><TR
 ><TD
@@ -630,7 +618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the copy of the string or NULL in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -641,7 +629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26304"
+NAME="AEN26307"
 ></A
 ><H3
 ><A
@@ -687,7 +675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26315"
+NAME="AEN26318"
 ></A
 ><P
 ></P
@@ -803,7 +791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26344"
+NAME="AEN26347"
 ></A
 ><H3
 ><A
@@ -845,7 +833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26354"
+NAME="AEN26357"
 ></A
 ><P
 ></P
@@ -961,7 +949,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26383"
+NAME="AEN26386"
 ></A
 ><H3
 ><A
@@ -988,7 +976,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26389"
+NAME="AEN26392"
 ></A
 ><P
 ></P
@@ -1024,7 +1012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26398"
+NAME="AEN26401"
 ></A
 ><H3
 ><A
@@ -1051,7 +1039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26404"
+NAME="AEN26407"
 ></A
 ><P
 ></P
@@ -1087,7 +1075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26413"
+NAME="AEN26416"
 ></A
 ><H3
 ><A
@@ -1117,7 +1105,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26420"
+NAME="AEN26423"
 ></A
 ><P
 ></P
@@ -1156,7 +1144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26429"
+NAME="AEN26432"
 ></A
 ><H3
 ><A
@@ -1193,7 +1181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26437"
+NAME="AEN26440"
 ></A
 ><P
 ></P
@@ -1248,7 +1236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26450"
+NAME="AEN26453"
 ></A
 ><H3
 ><A
@@ -1276,7 +1264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26456"
+NAME="AEN26459"
 ></A
 ><H3
 ><A
@@ -1306,7 +1294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26463"
+NAME="AEN26466"
 ></A
 ><P
 ></P
@@ -1344,7 +1332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26472"
+NAME="AEN26475"
 ></A
 ><H3
 ><A
@@ -1374,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26479"
+NAME="AEN26482"
 ></A
 ><P
 ></P
@@ -1429,7 +1417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26492"
+NAME="AEN26495"
 ></A
 ><H3
 ><A
@@ -1462,7 +1450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26500"
+NAME="AEN26503"
 ></A
 ><P
 ></P
@@ -1500,7 +1488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26509"
+NAME="AEN26512"
 ></A
 ><H3
 ><A
@@ -1535,7 +1523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26517"
+NAME="AEN26520"
 ></A
 ><P
 ></P
@@ -1607,7 +1595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26534"
+NAME="AEN26537"
 ></A
 ><H3
 ><A
@@ -1643,7 +1631,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26542"
+NAME="AEN26545"
 ></A
 ><P
 ></P
@@ -1732,7 +1720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26563"
+NAME="AEN26566"
 ></A
 ><H3
 ><A
@@ -1764,7 +1752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26570"
+NAME="AEN26573"
 ></A
 ><P
 ></P
@@ -1791,7 +1779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial string pointer</TD
 ></TR
 ><TR
 ><TD
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index dcb58d3..88040a7 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11861"
+NAME="AEN11960"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11864"
+NAME="AEN11963"
 ></A
 ><H2
 >Synopsis</H2
@@ -592,7 +592,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11990"
+NAME="AEN12089"
 ></A
 ><H2
 >Description</H2
@@ -602,14 +602,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11993"
+NAME="AEN12092"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11995"
+NAME="AEN12094"
 ></A
 ><H3
 ><A
@@ -698,7 +698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12001"
+NAME="AEN12100"
 ></A
 ><H3
 ><A
@@ -724,7 +724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12006"
+NAME="AEN12105"
 ></A
 ><H3
 ><A
@@ -768,7 +768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12012"
+NAME="AEN12111"
 ></A
 ><H3
 ><A
@@ -794,7 +794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12017"
+NAME="AEN12116"
 ></A
 ><H3
 ><A
@@ -843,7 +843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12022"
+NAME="AEN12121"
 ></A
 ><H3
 ><A
@@ -873,7 +873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12027"
+NAME="AEN12126"
 ></A
 ><H3
 ><A
@@ -899,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12032"
+NAME="AEN12131"
 ></A
 ><H3
 ><A
@@ -936,7 +936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12037"
+NAME="AEN12136"
 ></A
 ><H3
 ><A
@@ -972,7 +972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12042"
+NAME="AEN12141"
 ></A
 ><H3
 ><A
@@ -998,7 +998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12047"
+NAME="AEN12146"
 ></A
 ><H3
 ><A
@@ -1023,11 +1023,14 @@
 ></TR
 ></TABLE
 ><P
+>A conversion function is associated to a type and used to cast
+the new type to primitive values.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12053"
+NAME="AEN12153"
 ></A
 ><P
 ></P
@@ -1054,7 +1057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath object</TD
 ></TR
 ><TR
 ><TD
@@ -1071,7 +1074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of the target type</TD
 ></TR
 ><TR
 ><TD
@@ -1086,7 +1089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1097,7 +1100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12070"
+NAME="AEN12170"
 ></A
 ><H3
 ><A
@@ -1126,7 +1129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12075"
+NAME="AEN12175"
 ></A
 ><H3
 ><A
@@ -1152,7 +1155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12080"
+NAME="AEN12180"
 ></A
 ><H3
 ><A
@@ -1181,7 +1184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12085"
+NAME="AEN12185"
 ></A
 ><H3
 ><A
@@ -1207,7 +1210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12090"
+NAME="AEN12190"
 ></A
 ><H3
 ><A
@@ -1238,7 +1241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12097"
+NAME="AEN12197"
 ></A
 ><P
 ></P
@@ -1293,7 +1296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12110"
+NAME="AEN12210"
 ></A
 ><H3
 ><A
@@ -1322,7 +1325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12115"
+NAME="AEN12215"
 ></A
 ><H3
 ><A
@@ -1348,7 +1351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12120"
+NAME="AEN12220"
 ></A
 ><H3
 ><A
@@ -1379,11 +1382,15 @@
 ></TR
 ></TABLE
 ><P
+>An axis traversal function. To traverse an axis, the engine calls
+the first time with cur == NULL and repeat until the function returns
+NULL indicating the end of the axis traversal.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12128"
+NAME="AEN12229"
 ></A
 ><P
 ></P
@@ -1410,7 +1417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath interpreter context</TD
 ></TR
 ><TR
 ><TD
@@ -1427,7 +1434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the previous node being explored on that axis</TD
 ></TR
 ><TR
 ><TD
@@ -1442,7 +1449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next node in that axis or NULL if at the end of the axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1453,7 +1460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12145"
+NAME="AEN12246"
 ></A
 ><H3
 ><A
@@ -1482,7 +1489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12150"
+NAME="AEN12251"
 ></A
 ><H3
 ><A
@@ -1508,7 +1515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12155"
+NAME="AEN12256"
 ></A
 ><H3
 ><A
@@ -1540,7 +1547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12162"
+NAME="AEN12263"
 ></A
 ><H3
 ><A
@@ -1566,7 +1573,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12167"
+NAME="AEN12268"
 ></A
 ><H3
 ><A
@@ -1592,14 +1599,14 @@
 ></TABLE
 ><P
 >An XPath function
-The arguments (if any) are popped out of the context stack
+The arguments (if any) are popped out from the context stack
 and the result is pushed on the stack.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12174"
+NAME="AEN12275"
 ></A
 ><P
 ></P
@@ -1626,7 +1633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath interprestation context</TD
 ></TR
 ><TR
 ><TD
@@ -1643,7 +1650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1654,7 +1661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12187"
+NAME="AEN12288"
 ></A
 ><H3
 ><A
@@ -1689,7 +1696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12195"
+NAME="AEN12296"
 ></A
 ><P
 ></P
@@ -1742,7 +1749,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12208"
+NAME="AEN12309"
 ></A
 ><H3
 ><A
@@ -1777,7 +1784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12216"
+NAME="AEN12317"
 ></A
 ><P
 ></P
@@ -1830,7 +1837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12229"
+NAME="AEN12330"
 ></A
 ><H3
 ><A
@@ -1857,7 +1864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12235"
+NAME="AEN12336"
 ></A
 ><P
 ></P
@@ -1895,7 +1902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12244"
+NAME="AEN12345"
 ></A
 ><H3
 ><A
@@ -1925,7 +1932,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12251"
+NAME="AEN12352"
 ></A
 ><P
 ></P
@@ -1980,7 +1987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12264"
+NAME="AEN12365"
 ></A
 ><H3
 ><A
@@ -2012,7 +2019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12271"
+NAME="AEN12372"
 ></A
 ><P
 ></P
@@ -2050,7 +2057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12280"
+NAME="AEN12381"
 ></A
 ><H3
 ><A
@@ -2080,7 +2087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12287"
+NAME="AEN12388"
 ></A
 ><P
 ></P
@@ -2118,7 +2125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12296"
+NAME="AEN12397"
 ></A
 ><H3
 ><A
@@ -2156,7 +2163,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12305"
+NAME="AEN12406"
 ></A
 ><P
 ></P
@@ -2209,7 +2216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12318"
+NAME="AEN12419"
 ></A
 ><H3
 ><A
@@ -2248,7 +2255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12327"
+NAME="AEN12428"
 ></A
 ><P
 ></P
@@ -2286,7 +2293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12336"
+NAME="AEN12437"
 ></A
 ><H3
 ><A
@@ -2316,7 +2323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12343"
+NAME="AEN12444"
 ></A
 ><P
 ></P
@@ -2354,7 +2361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12352"
+NAME="AEN12453"
 ></A
 ><H3
 ><A
@@ -2387,7 +2394,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12360"
+NAME="AEN12461"
 ></A
 ><P
 ></P
@@ -2440,7 +2447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12373"
+NAME="AEN12474"
 ></A
 ><H3
 ><A
@@ -2474,7 +2481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12381"
+NAME="AEN12482"
 ></A
 ><P
 ></P
@@ -2545,7 +2552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12398"
+NAME="AEN12499"
 ></A
 ><H3
 ><A
@@ -2575,424 +2582,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12405"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a number</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the boolean value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12418"
-></A
-><H3
-><A
-NAME="XMLXPATHCASTSTRINGTOBOOLEAN"
-></A
->&#62;xmlXPathCastStringToBoolean ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlXPathCastStringToBoolean     (const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts a string to its boolean value</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12425"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a 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 boolean value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12438"
-></A
-><H3
-><A
-NAME="XMLXPATHCASTNODESETTOBOOLEAN"
-></A
->&#62;xmlXPathCastNodeSetToBoolean ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlXPathCastNodeSetToBoolean    (<A
-HREF="libxml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> ns);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts a node-set to its boolean value</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12445"
-></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
->ns</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a node-set</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the boolean value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12458"
-></A
-><H3
-><A
-NAME="XMLXPATHCASTTOBOOLEAN"
-></A
->&#62;xmlXPathCastToBoolean ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlXPathCastToBoolean           (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts an XPath object to its boolean value</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12465"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XPath object</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the boolean value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12478"
-></A
-><H3
-><A
-NAME="XMLXPATHCASTBOOLEANTONUMBER"
-></A
->&#62;xmlXPathCastBooleanToNumber ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><GTKDOCLINK
-HREF="DOUBLE"
->double</GTKDOCLINK
->      xmlXPathCastBooleanToNumber     (int val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts a boolean to its number value</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12485"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a boolean</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 value</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12498"
-></A
-><H3
-><A
-NAME="XMLXPATHCASTSTRINGTONUMBER"
-></A
->&#62;xmlXPathCastStringToNumber ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><GTKDOCLINK
-HREF="DOUBLE"
->double</GTKDOCLINK
->      xmlXPathCastStringToNumber      (const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts a string to its number value</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN12506"
 ></A
 ><P
@@ -3020,6 +2609,424 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
+>  a number</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the boolean value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12519"
+></A
+><H3
+><A
+NAME="XMLXPATHCASTSTRINGTOBOOLEAN"
+></A
+>&#62;xmlXPathCastStringToBoolean ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathCastStringToBoolean     (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts a string to its boolean value</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12526"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a 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 boolean value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12539"
+></A
+><H3
+><A
+NAME="XMLXPATHCASTNODESETTOBOOLEAN"
+></A
+>&#62;xmlXPathCastNodeSetToBoolean ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathCastNodeSetToBoolean    (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> ns);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts a node-set to its boolean value</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12546"
+></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
+>ns</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node-set</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the boolean value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12559"
+></A
+><H3
+><A
+NAME="XMLXPATHCASTTOBOOLEAN"
+></A
+>&#62;xmlXPathCastToBoolean ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathCastToBoolean           (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts an XPath object to its boolean value</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12566"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XPath object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the boolean value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12579"
+></A
+><H3
+><A
+NAME="XMLXPATHCASTBOOLEANTONUMBER"
+></A
+>&#62;xmlXPathCastBooleanToNumber ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+>      xmlXPathCastBooleanToNumber     (int val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts a boolean to its number value</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12586"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a boolean</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 value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12599"
+></A
+><H3
+><A
+NAME="XMLXPATHCASTSTRINGTONUMBER"
+></A
+>&#62;xmlXPathCastStringToNumber ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+>      xmlXPathCastStringToNumber      (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts a string to its number value</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12607"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
 >  a string</TD
 ></TR
 ><TR
@@ -3046,7 +3053,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12519"
+NAME="AEN12620"
 ></A
 ><H3
 ><A
@@ -3079,7 +3086,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12527"
+NAME="AEN12628"
 ></A
 ><P
 ></P
@@ -3132,7 +3139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12540"
+NAME="AEN12641"
 ></A
 ><H3
 ><A
@@ -3165,7 +3172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12548"
+NAME="AEN12649"
 ></A
 ><P
 ></P
@@ -3218,7 +3225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12561"
+NAME="AEN12662"
 ></A
 ><H3
 ><A
@@ -3251,7 +3258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12569"
+NAME="AEN12670"
 ></A
 ><P
 ></P
@@ -3304,7 +3311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12582"
+NAME="AEN12683"
 ></A
 ><H3
 ><A
@@ -3334,7 +3341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12589"
+NAME="AEN12690"
 ></A
 ><P
 ></P
@@ -3387,7 +3394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12602"
+NAME="AEN12703"
 ></A
 ><H3
 ><A
@@ -3420,7 +3427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12610"
+NAME="AEN12711"
 ></A
 ><P
 ></P
@@ -3473,7 +3480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12623"
+NAME="AEN12724"
 ></A
 ><H3
 ><A
@@ -3506,7 +3513,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12631"
+NAME="AEN12732"
 ></A
 ><P
 ></P
@@ -3559,7 +3566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12644"
+NAME="AEN12745"
 ></A
 ><H3
 ><A
@@ -3592,7 +3599,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12652"
+NAME="AEN12753"
 ></A
 ><P
 ></P
@@ -3645,7 +3652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12665"
+NAME="AEN12766"
 ></A
 ><H3
 ><A
@@ -3681,7 +3688,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12674"
+NAME="AEN12775"
 ></A
 ><P
 ></P
@@ -3741,7 +3748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12688"
+NAME="AEN12789"
 ></A
 ><H3
 ><A
@@ -3777,7 +3784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12697"
+NAME="AEN12798"
 ></A
 ><P
 ></P
@@ -3836,7 +3843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12711"
+NAME="AEN12812"
 ></A
 ><H3
 ><A
@@ -3872,7 +3879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12720"
+NAME="AEN12821"
 ></A
 ><P
 ></P
@@ -3931,7 +3938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12734"
+NAME="AEN12835"
 ></A
 ><H3
 ><A
@@ -3967,7 +3974,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12743"
+NAME="AEN12844"
 ></A
 ><P
 ></P
@@ -4026,7 +4033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12757"
+NAME="AEN12858"
 ></A
 ><H3
 ><A
@@ -4054,7 +4061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12763"
+NAME="AEN12864"
 ></A
 ><H3
 ><A
@@ -4087,7 +4094,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12771"
+NAME="AEN12872"
 ></A
 ><P
 ></P
@@ -4140,7 +4147,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12784"
+NAME="AEN12885"
 ></A
 ><H3
 ><A
@@ -4170,7 +4177,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12791"
+NAME="AEN12892"
 ></A
 ><P
 ></P
@@ -4208,7 +4215,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12800"
+NAME="AEN12901"
 ></A
 ><H3
 ><A
@@ -4245,7 +4252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12809"
+NAME="AEN12910"
 ></A
 ><P
 ></P
@@ -4316,7 +4323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12826"
+NAME="AEN12927"
 ></A
 ><H3
 ><A
@@ -4353,7 +4360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12835"
+NAME="AEN12936"
 ></A
 ><P
 ></P
@@ -4424,7 +4431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12852"
+NAME="AEN12953"
 ></A
 ><H3
 ><A
@@ -4465,7 +4472,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12860"
+NAME="AEN12961"
 ></A
 ><P
 ></P
@@ -4535,7 +4542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12877"
+NAME="AEN12978"
 ></A
 ><H3
 ><A
@@ -4568,7 +4575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12885"
+NAME="AEN12986"
 ></A
 ><P
 ></P
@@ -4622,7 +4629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12898"
+NAME="AEN12999"
 ></A
 ><H3
 ><A
@@ -4659,7 +4666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12907"
+NAME="AEN13008"
 ></A
 ><P
 ></P
@@ -4730,7 +4737,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12924"
+NAME="AEN13025"
 ></A
 ><H3
 ><A
@@ -4765,7 +4772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12932"
+NAME="AEN13033"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 79fe940..922ce86 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12946"
+NAME="AEN13047"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12949"
+NAME="AEN13050"
 ></A
 ><H2
 >Synopsis</H2
@@ -904,14 +904,6 @@
 >xmlNodeSetPtr</A
 > set);
 void        <A
-HREF="libxml-xpathinternals.html#XMLXPATHIDFUNCTION"
->xmlXPathIdFunction</A
->              (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);
-void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHROOT"
 >xmlXPathRoot</A
 >                    (<A
@@ -967,18 +959,6 @@
 >xmlXPathObjectPtr</A
 > res);
 void        <A
-HREF="libxml-xpath.html#XMLXPATHINIT"
->xmlXPathInit</A
->                    (void);
-void        <A
-HREF="libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION"
->xmlXPathStringFunction</A
->          (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);
-void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHREGISTERALLFUNCTIONS"
 >xmlXPathRegisterAllFunctions</A
 >    (<A
@@ -989,16 +969,6 @@
 HREF="libxml-xpath.html#XMLNODESETPTR"
 >xmlNodeSetPtr</A
 > <A
-HREF="libxml-xpath.html#XMLXPATHNODESETCREATE"
->xmlXPathNodeSetCreate</A
->         (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);
-<A
-HREF="libxml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> <A
 HREF="libxml-xpathinternals.html#XMLXPATHNODESETMERGE"
 >xmlXPathNodeSetMerge</A
 >          (<A
@@ -1028,13 +998,6 @@
 >xmlNodeSetPtr</A
 > cur,
                                              int val);
-void        <A
-HREF="libxml-xpath.html#XMLXPATHFREENODESET"
->xmlXPathFreeNodeSet</A
->             (<A
-HREF="libxml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> obj);
 <A
 HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
@@ -1062,37 +1025,6 @@
 HREF="libxml-xpathinternals.html#XMLXPATHWRAPEXTERNAL"
 >xmlXPathWrapExternal</A
 >      (void *val);
-void        <A
-HREF="libxml-xpath.html#XMLXPATHFREENODESETLIST"
->xmlXPathFreeNodeSetList</A
->         (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);
-void        <A
-HREF="libxml-xpath.html#XMLXPATHFREEOBJECT"
->xmlXPathFreeObject</A
->              (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);
-<A
-HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
-> <A
-HREF="libxml-xpath.html#XMLXPATHNEWCONTEXT"
->xmlXPathNewContext</A
->       (<A
-HREF="libxml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-void        <A
-HREF="libxml-xpath.html#XMLXPATHFREECONTEXT"
->xmlXPathFreeContext</A
->             (<A
-HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
-> ctxt);
 int         <A
 HREF="libxml-xpathinternals.html#XMLXPATHEQUALVALUES"
 >xmlXPathEqualValues</A
@@ -1365,6 +1297,14 @@
 > ctxt,
                                              int nargs);
 void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHIDFUNCTION"
+>xmlXPathIdFunction</A
+>              (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);
+void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHLOCALNAMEFUNCTION"
 >xmlXPathLocalNameFunction</A
 >       (<A
@@ -1381,6 +1321,14 @@
 > ctxt,
                                              int nargs);
 void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHSTRINGFUNCTION"
+>xmlXPathStringFunction</A
+>          (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);
+void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHSTRINGLENGTHFUNCTION"
 >xmlXPathStringLengthFunction</A
 >    (<A
@@ -1539,7 +1487,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13331"
+NAME="AEN13417"
 ></A
 ><H2
 >Description</H2
@@ -1549,14 +1497,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13334"
+NAME="AEN13420"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13336"
+NAME="AEN13422"
 ></A
 ><H3
 ><A
@@ -1583,7 +1531,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13342"
+NAME="AEN13428"
 ></A
 ><P
 ></P
@@ -1638,7 +1586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13355"
+NAME="AEN13441"
 ></A
 ><H3
 ><A
@@ -1665,7 +1613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13361"
+NAME="AEN13447"
 ></A
 ><P
 ></P
@@ -1703,7 +1651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13370"
+NAME="AEN13456"
 ></A
 ><H3
 ><A
@@ -1730,7 +1678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13376"
+NAME="AEN13462"
 ></A
 ><P
 ></P
@@ -1768,7 +1716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13385"
+NAME="AEN13471"
 ></A
 ><H3
 ><A
@@ -1795,7 +1743,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13391"
+NAME="AEN13477"
 ></A
 ><P
 ></P
@@ -1833,7 +1781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13400"
+NAME="AEN13486"
 ></A
 ><H3
 ><A
@@ -1860,7 +1808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13406"
+NAME="AEN13492"
 ></A
 ><P
 ></P
@@ -1898,7 +1846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13415"
+NAME="AEN13501"
 ></A
 ><H3
 ><A
@@ -1925,7 +1873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13421"
+NAME="AEN13507"
 ></A
 ><P
 ></P
@@ -1963,7 +1911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13430"
+NAME="AEN13516"
 ></A
 ><H3
 ><A
@@ -1990,7 +1938,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13436"
+NAME="AEN13522"
 ></A
 ><P
 ></P
@@ -2028,7 +1976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13445"
+NAME="AEN13531"
 ></A
 ><H3
 ><A
@@ -2062,7 +2010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13453"
+NAME="AEN13539"
 ></A
 ><P
 ></P
@@ -2115,7 +2063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13466"
+NAME="AEN13552"
 ></A
 ><H3
 ><A
@@ -2152,7 +2100,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13475"
+NAME="AEN13561"
 ></A
 ><P
 ></P
@@ -2205,7 +2153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13488"
+NAME="AEN13574"
 ></A
 ><H3
 ><A
@@ -2242,7 +2190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13497"
+NAME="AEN13583"
 ></A
 ><P
 ></P
@@ -2295,7 +2243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13510"
+NAME="AEN13596"
 ></A
 ><H3
 ><A
@@ -2332,7 +2280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13519"
+NAME="AEN13605"
 ></A
 ><P
 ></P
@@ -2385,7 +2333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13532"
+NAME="AEN13618"
 ></A
 ><H3
 ><A
@@ -2419,7 +2367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13540"
+NAME="AEN13626"
 ></A
 ><P
 ></P
@@ -2457,7 +2405,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13549"
+NAME="AEN13635"
 ></A
 ><H3
 ><A
@@ -2489,7 +2437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13556"
+NAME="AEN13642"
 ></A
 ><P
 ></P
@@ -2544,7 +2492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13569"
+NAME="AEN13655"
 ></A
 ><H3
 ><A
@@ -2571,7 +2519,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13575"
+NAME="AEN13661"
 ></A
 ><P
 ></P
@@ -2609,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13584"
+NAME="AEN13670"
 ></A
 ><H3
 ><A
@@ -2636,7 +2584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13590"
+NAME="AEN13676"
 ></A
 ><P
 ></P
@@ -2674,7 +2622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13599"
+NAME="AEN13685"
 ></A
 ><H3
 ><A
@@ -2706,7 +2654,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13606"
+NAME="AEN13692"
 ></A
 ><P
 ></P
@@ -2761,7 +2709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13619"
+NAME="AEN13705"
 ></A
 ><H3
 ><A
@@ -2793,7 +2741,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13626"
+NAME="AEN13712"
 ></A
 ><P
 ></P
@@ -2848,7 +2796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13639"
+NAME="AEN13725"
 ></A
 ><H3
 ><A
@@ -2875,7 +2823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13645"
+NAME="AEN13731"
 ></A
 ><P
 ></P
@@ -2913,7 +2861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13654"
+NAME="AEN13740"
 ></A
 ><H3
 ><A
@@ -2945,7 +2893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13661"
+NAME="AEN13747"
 ></A
 ><P
 ></P
@@ -3000,7 +2948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13674"
+NAME="AEN13760"
 ></A
 ><H3
 ><A
@@ -3027,7 +2975,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13680"
+NAME="AEN13766"
 ></A
 ><P
 ></P
@@ -3065,7 +3013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13689"
+NAME="AEN13775"
 ></A
 ><H3
 ><A
@@ -3092,7 +3040,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13695"
+NAME="AEN13781"
 ></A
 ><P
 ></P
@@ -3147,7 +3095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13708"
+NAME="AEN13794"
 ></A
 ><H3
 ><A
@@ -3175,7 +3123,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13714"
+NAME="AEN13800"
 ></A
 ><P
 ></P
@@ -3213,7 +3161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13723"
+NAME="AEN13809"
 ></A
 ><H3
 ><A
@@ -3241,7 +3189,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13729"
+NAME="AEN13815"
 ></A
 ><P
 ></P
@@ -3279,7 +3227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13738"
+NAME="AEN13824"
 ></A
 ><H3
 ><A
@@ -3306,7 +3254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13744"
+NAME="AEN13830"
 ></A
 ><P
 ></P
@@ -3344,7 +3292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13753"
+NAME="AEN13839"
 ></A
 ><H3
 ><A
@@ -3372,7 +3320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13759"
+NAME="AEN13845"
 ></A
 ><H3
 ><A
@@ -3400,7 +3348,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13765"
+NAME="AEN13851"
 ></A
 ><H3
 ><A
@@ -3427,7 +3375,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13771"
+NAME="AEN13857"
 ></A
 ><P
 ></P
@@ -3465,7 +3413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13780"
+NAME="AEN13866"
 ></A
 ><H3
 ><A
@@ -3492,7 +3440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13786"
+NAME="AEN13872"
 ></A
 ><P
 ></P
@@ -3530,7 +3478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13795"
+NAME="AEN13881"
 ></A
 ><H3
 ><A
@@ -3558,7 +3506,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13801"
+NAME="AEN13887"
 ></A
 ><P
 ></P
@@ -3596,7 +3544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13810"
+NAME="AEN13896"
 ></A
 ><H3
 ><A
@@ -3624,7 +3572,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13816"
+NAME="AEN13902"
 ></A
 ><P
 ></P
@@ -3662,7 +3610,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13825"
+NAME="AEN13911"
 ></A
 ><H3
 ><A
@@ -3689,7 +3637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13831"
+NAME="AEN13917"
 ></A
 ><P
 ></P
@@ -3727,7 +3675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13840"
+NAME="AEN13926"
 ></A
 ><H3
 ><A
@@ -3755,7 +3703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13846"
+NAME="AEN13932"
 ></A
 ><H3
 ><A
@@ -3783,7 +3731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13852"
+NAME="AEN13938"
 ></A
 ><H3
 ><A
@@ -3811,7 +3759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13858"
+NAME="AEN13944"
 ></A
 ><H3
 ><A
@@ -3844,11 +3792,14 @@
 ></TR
 ></TABLE
 ><P
+>Prototype for callbacks used to plug variable lookup in the XPath
+engine</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13866"
+NAME="AEN13953"
 ></A
 ><P
 ></P
@@ -3875,7 +3826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3892,7 +3843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  name of the variable</TD
 ></TR
 ><TR
 ><TD
@@ -3909,7 +3860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace name hosting this variable</TD
 ></TR
 ><TR
 ><TD
@@ -3924,7 +3875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the XPath object value or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3935,7 +3886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13887"
+NAME="AEN13974"
 ></A
 ><H3
 ><A
@@ -3970,7 +3921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13895"
+NAME="AEN13982"
 ></A
 ><P
 ></P
@@ -4042,7 +3993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13912"
+NAME="AEN13999"
 ></A
 ><H3
 ><A
@@ -4074,11 +4025,14 @@
 ></TR
 ></TABLE
 ><P
+>Prototype for callbacks used to plug function lookup in the XPath
+engine</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13920"
+NAME="AEN14008"
 ></A
 ><P
 ></P
@@ -4105,7 +4059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -4122,7 +4076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  name of the function</TD
 ></TR
 ><TR
 ><TD
@@ -4139,7 +4093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace name hosting this function</TD
 ></TR
 ><TR
 ><TD
@@ -4154,7 +4108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the XPath function or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4165,7 +4119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13941"
+NAME="AEN14029"
 ></A
 ><H3
 ><A
@@ -4200,7 +4154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13949"
+NAME="AEN14037"
 ></A
 ><P
 ></P
@@ -4272,7 +4226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13966"
+NAME="AEN14054"
 ></A
 ><H3
 ><A
@@ -4305,7 +4259,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13973"
+NAME="AEN14061"
 ></A
 ><P
 ></P
@@ -4394,7 +4348,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13994"
+NAME="AEN14082"
 ></A
 ><H3
 ><A
@@ -4429,7 +4383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14002"
+NAME="AEN14090"
 ></A
 ><P
 ></P
@@ -4501,7 +4455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14019"
+NAME="AEN14107"
 ></A
 ><H3
 ><A
@@ -4536,7 +4490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14027"
+NAME="AEN14115"
 ></A
 ><P
 ></P
@@ -4608,7 +4562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14044"
+NAME="AEN14132"
 ></A
 ><H3
 ><A
@@ -4652,7 +4606,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14054"
+NAME="AEN14142"
 ></A
 ><P
 ></P
@@ -4732,7 +4686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14073"
+NAME="AEN14161"
 ></A
 ><H3
 ><A
@@ -4773,7 +4727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14083"
+NAME="AEN14171"
 ></A
 ><P
 ></P
@@ -4844,7 +4798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14100"
+NAME="AEN14188"
 ></A
 ><H3
 ><A
@@ -4885,7 +4839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14110"
+NAME="AEN14198"
 ></A
 ><P
 ></P
@@ -4956,7 +4910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14127"
+NAME="AEN14215"
 ></A
 ><H3
 ><A
@@ -4993,7 +4947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14136"
+NAME="AEN14224"
 ></A
 ><P
 ></P
@@ -5057,7 +5011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14151"
+NAME="AEN14239"
 ></A
 ><H3
 ><A
@@ -5104,7 +5058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14162"
+NAME="AEN14250"
 ></A
 ><P
 ></P
@@ -5168,7 +5122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14177"
+NAME="AEN14265"
 ></A
 ><H3
 ><A
@@ -5203,7 +5157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14185"
+NAME="AEN14273"
 ></A
 ><P
 ></P
@@ -5284,7 +5238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14204"
+NAME="AEN14292"
 ></A
 ><H3
 ><A
@@ -5325,7 +5279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14214"
+NAME="AEN14302"
 ></A
 ><P
 ></P
@@ -5427,7 +5381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14237"
+NAME="AEN14325"
 ></A
 ><H3
 ><A
@@ -5468,7 +5422,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14247"
+NAME="AEN14335"
 ></A
 ><P
 ></P
@@ -5570,7 +5524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14270"
+NAME="AEN14358"
 ></A
 ><H3
 ><A
@@ -5621,7 +5575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14282"
+NAME="AEN14370"
 ></A
 ><P
 ></P
@@ -5723,7 +5677,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14305"
+NAME="AEN14393"
 ></A
 ><H3
 ><A
@@ -5779,7 +5733,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14318"
+NAME="AEN14406"
 ></A
 ><P
 ></P
@@ -5881,7 +5835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14341"
+NAME="AEN14429"
 ></A
 ><H3
 ><A
@@ -5922,7 +5876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14351"
+NAME="AEN14439"
 ></A
 ><P
 ></P
@@ -6024,7 +5978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14374"
+NAME="AEN14462"
 ></A
 ><H3
 ><A
@@ -6065,7 +6019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14384"
+NAME="AEN14472"
 ></A
 ><P
 ></P
@@ -6167,7 +6121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14407"
+NAME="AEN14495"
 ></A
 ><H3
 ><A
@@ -6218,7 +6172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14419"
+NAME="AEN14507"
 ></A
 ><P
 ></P
@@ -6320,7 +6274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14442"
+NAME="AEN14530"
 ></A
 ><H3
 ><A
@@ -6376,7 +6330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14455"
+NAME="AEN14543"
 ></A
 ><P
 ></P
@@ -6478,7 +6432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14478"
+NAME="AEN14566"
 ></A
 ><H3
 ><A
@@ -6522,7 +6476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14488"
+NAME="AEN14576"
 ></A
 ><P
 ></P
@@ -6609,7 +6563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14509"
+NAME="AEN14597"
 ></A
 ><H3
 ><A
@@ -6647,7 +6601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14518"
+NAME="AEN14606"
 ></A
 ><P
 ></P
@@ -6717,7 +6671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14535"
+NAME="AEN14623"
 ></A
 ><H3
 ><A
@@ -6747,7 +6701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14542"
+NAME="AEN14630"
 ></A
 ><P
 ></P
@@ -6785,7 +6739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14551"
+NAME="AEN14639"
 ></A
 ><H3
 ><A
@@ -6828,7 +6782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14561"
+NAME="AEN14649"
 ></A
 ><P
 ></P
@@ -6915,7 +6869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14582"
+NAME="AEN14670"
 ></A
 ><H3
 ><A
@@ -6962,7 +6916,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14593"
+NAME="AEN14681"
 ></A
 ><P
 ></P
@@ -7066,7 +7020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14618"
+NAME="AEN14706"
 ></A
 ><H3
 ><A
@@ -7110,7 +7064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14628"
+NAME="AEN14716"
 ></A
 ><P
 ></P
@@ -7197,7 +7151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14649"
+NAME="AEN14737"
 ></A
 ><H3
 ><A
@@ -7245,7 +7199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14660"
+NAME="AEN14748"
 ></A
 ><P
 ></P
@@ -7349,7 +7303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14685"
+NAME="AEN14773"
 ></A
 ><H3
 ><A
@@ -7387,7 +7341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14694"
+NAME="AEN14782"
 ></A
 ><P
 ></P
@@ -7457,7 +7411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14711"
+NAME="AEN14799"
 ></A
 ><H3
 ><A
@@ -7499,7 +7453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14721"
+NAME="AEN14809"
 ></A
 ><P
 ></P
@@ -7586,7 +7540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14742"
+NAME="AEN14830"
 ></A
 ><H3
 ><A
@@ -7616,7 +7570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14749"
+NAME="AEN14837"
 ></A
 ><P
 ></P
@@ -7654,7 +7608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14758"
+NAME="AEN14846"
 ></A
 ><H3
 ><A
@@ -7692,7 +7646,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14767"
+NAME="AEN14855"
 ></A
 ><P
 ></P
@@ -7762,7 +7716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14784"
+NAME="AEN14872"
 ></A
 ><H3
 ><A
@@ -7804,7 +7758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14794"
+NAME="AEN14882"
 ></A
 ><P
 ></P
@@ -7891,7 +7845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14815"
+NAME="AEN14903"
 ></A
 ><H3
 ><A
@@ -7922,7 +7876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14822"
+NAME="AEN14910"
 ></A
 ><P
 ></P
@@ -7960,7 +7914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14831"
+NAME="AEN14919"
 ></A
 ><H3
 ><A
@@ -7998,7 +7952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14840"
+NAME="AEN14928"
 ></A
 ><P
 ></P
@@ -8068,7 +8022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14857"
+NAME="AEN14945"
 ></A
 ><H3
 ><A
@@ -8098,7 +8052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14864"
+NAME="AEN14952"
 ></A
 ><P
 ></P
@@ -8136,7 +8090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14873"
+NAME="AEN14961"
 ></A
 ><H3
 ><A
@@ -8169,7 +8123,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14881"
+NAME="AEN14969"
 ></A
 ><P
 ></P
@@ -8222,7 +8176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14894"
+NAME="AEN14982"
 ></A
 ><H3
 ><A
@@ -8256,7 +8210,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14902"
+NAME="AEN14990"
 ></A
 ><P
 ></P
@@ -8326,7 +8280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14919"
+NAME="AEN15007"
 ></A
 ><H3
 ><A
@@ -8364,7 +8318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14928"
+NAME="AEN15016"
 ></A
 ><P
 ></P
@@ -8417,7 +8371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14941"
+NAME="AEN15029"
 ></A
 ><H3
 ><A
@@ -8452,7 +8406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14949"
+NAME="AEN15037"
 ></A
 ><P
 ></P
@@ -8505,7 +8459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14962"
+NAME="AEN15050"
 ></A
 ><H3
 ><A
@@ -8543,7 +8497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14971"
+NAME="AEN15059"
 ></A
 ><P
 ></P
@@ -8596,7 +8550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14984"
+NAME="AEN15072"
 ></A
 ><H3
 ><A
@@ -8626,7 +8580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14991"
+NAME="AEN15079"
 ></A
 ><P
 ></P
@@ -8679,7 +8633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15004"
+NAME="AEN15092"
 ></A
 ><H3
 ><A
@@ -8717,7 +8671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15013"
+NAME="AEN15101"
 ></A
 ><P
 ></P
@@ -8770,7 +8724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15026"
+NAME="AEN15114"
 ></A
 ><H3
 ><A
@@ -8805,7 +8759,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15034"
+NAME="AEN15122"
 ></A
 ><P
 ></P
@@ -8858,7 +8812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15047"
+NAME="AEN15135"
 ></A
 ><H3
 ><A
@@ -8897,7 +8851,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15056"
+NAME="AEN15144"
 ></A
 ><P
 ></P
@@ -8950,7 +8904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15069"
+NAME="AEN15157"
 ></A
 ><H3
 ><A
@@ -8989,7 +8943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15078"
+NAME="AEN15166"
 ></A
 ><P
 ></P
@@ -9042,7 +8996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15091"
+NAME="AEN15179"
 ></A
 ><H3
 ><A
@@ -9076,7 +9030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15099"
+NAME="AEN15187"
 ></A
 ><P
 ></P
@@ -9131,7 +9085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15112"
+NAME="AEN15200"
 ></A
 ><H3
 ><A
@@ -9166,7 +9120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15120"
+NAME="AEN15208"
 ></A
 ><P
 ></P
@@ -9221,7 +9175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15133"
+NAME="AEN15221"
 ></A
 ><H3
 ><A
@@ -9251,7 +9205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15140"
+NAME="AEN15228"
 ></A
 ><P
 ></P
@@ -9289,107 +9243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15149"
-></A
-><H3
-><A
-NAME="XMLXPATHIDFUNCTION"
-></A
->&#62;xmlXPathIdFunction ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathIdFunction              (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);</PRE
-></TD
-></TR
-></TABLE
-><P
->Implement the <GTKDOCLINK
-HREF="ID"
->id</GTKDOCLINK
->() XPath function
-   node-set id(object)
-The id function selects elements by their unique ID
-(see [5.2.1 Unique IDs]). When the argument to id is of type node-set,
-then the result is the union of the result of applying id to the
-string value of each of the nodes in the argument node-set. When the
-argument to id is of any other type, the argument is converted to a
-string as if by a call to the string function; the string is split
-into a whitespace-separated list of tokens (whitespace is any sequence
-of characters matching the production S); the result is a node-set
-containing the elements in the same document as the context node that
-have a unique ID equal to any of the tokens in the list.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15157"
-></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
->nargs</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the number of arguments</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15170"
+NAME="AEN15237"
 ></A
 ><H3
 ><A
@@ -9419,7 +9273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15177"
+NAME="AEN15244"
 ></A
 ><P
 ></P
@@ -9457,7 +9311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15186"
+NAME="AEN15253"
 ></A
 ><H3
 ><A
@@ -9488,7 +9342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15193"
+NAME="AEN15260"
 ></A
 ><P
 ></P
@@ -9526,7 +9380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15202"
+NAME="AEN15269"
 ></A
 ><H3
 ><A
@@ -9564,7 +9418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15212"
+NAME="AEN15279"
 ></A
 ><P
 ></P
@@ -9617,7 +9471,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15225"
+NAME="AEN15292"
 ></A
 ><H3
 ><A
@@ -9655,7 +9509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15235"
+NAME="AEN15302"
 ></A
 ><P
 ></P
@@ -9708,7 +9562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15248"
+NAME="AEN15315"
 ></A
 ><H3
 ><A
@@ -9749,7 +9603,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15258"
+NAME="AEN15325"
 ></A
 ><P
 ></P
@@ -9802,7 +9656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15271"
+NAME="AEN15338"
 ></A
 ><H3
 ><A
@@ -9843,7 +9697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15279"
+NAME="AEN15346"
 ></A
 ><P
 ></P
@@ -9913,153 +9767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15296"
-></A
-><H3
-><A
-NAME="XMLXPATHINIT"
-></A
->&#62;xmlXPathInit ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathInit                    (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the XPath environment</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15302"
-></A
-><H3
-><A
-NAME="XMLXPATHSTRINGFUNCTION"
-></A
->&#62;xmlXPathStringFunction ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathStringFunction          (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);</PRE
-></TD
-></TR
-></TABLE
-><P
->Implement the <GTKDOCLINK
-HREF="STRING"
->string</GTKDOCLINK
->() XPath function
-   string string(object?)
-he string function converts an object to a string as follows:
-   - A node-set is converted to a string by returning the value of
-     the node in the node-set that is first in document order.
-     If the node-set is empty, an empty string is returned.
-   - A number is converted to a string as follows
-     + NaN is converted to the string NaN 
-     + positive zero is converted to the string 0 
-     + negative zero is converted to the string 0 
-     + positive infinity is converted to the string Infinity 
-     + negative infinity is converted to the string -Infinity 
-     + if the number is an integer, the number is represented in
-       decimal form as a Number with no decimal point and no leading
-       zeros, preceded by a minus sign (-) if the number is negative
-     + otherwise, the number is represented in decimal form as a
-       Number including a decimal point with at least one digit
-       before the decimal point and at least one digit after the
-       decimal point, preceded by a minus sign (-) if the number
-       is negative; there must be no leading zeros before the decimal
-       point apart possibly from the one required digit immediately
-       before the decimal point; beyond the one required digit
-       after the decimal point there must be as many, but only as
-       many, more digits as are needed to uniquely distinguish the
-       number from all other IEEE 754 numeric values.
-   - The boolean false value is converted to the string false.
-     The boolean true value is converted to the string true.</P
-><P
->If the argument is omitted, it defaults to a node-set with the
-context node as its only member.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15311"
-></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
->nargs</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the number of arguments</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15324"
+NAME="AEN15363"
 ></A
 ><H3
 ><A
@@ -10089,7 +9797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15331"
+NAME="AEN15370"
 ></A
 ><P
 ></P
@@ -10127,98 +9835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15340"
-></A
-><H3
-><A
-NAME="XMLXPATHNODESETCREATE"
-></A
->&#62;xmlXPathNodeSetCreate ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> xmlXPathNodeSetCreate         (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlNodeSetPtr of type double and of value <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-></P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15349"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&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="AEN15362"
+NAME="AEN15379"
 ></A
 ><H3
 ><A
@@ -10276,7 +9893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15375"
+NAME="AEN15392"
 ></A
 ><P
 ></P
@@ -10351,7 +9968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15393"
+NAME="AEN15410"
 ></A
 ><H3
 ><A
@@ -10385,7 +10002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15401"
+NAME="AEN15418"
 ></A
 ><P
 ></P
@@ -10440,7 +10057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15414"
+NAME="AEN15431"
 ></A
 ><H3
 ><A
@@ -10471,7 +10088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15421"
+NAME="AEN15438"
 ></A
 ><P
 ></P
@@ -10526,75 +10143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15434"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESET"
-></A
->&#62;xmlXPathFreeNodeSet ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeNodeSet             (<A
-HREF="libxml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free the NodeSet compound (not the actual nodes !).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15441"
-></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
->obj</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="AEN15450"
+NAME="AEN15451"
 ></A
 ><H3
 ><A
@@ -10633,7 +10182,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15459"
+NAME="AEN15460"
 ></A
 ><P
 ></P
@@ -10686,7 +10235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15472"
+NAME="AEN15473"
 ></A
 ><H3
 ><A
@@ -10724,7 +10273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15481"
+NAME="AEN15482"
 ></A
 ><P
 ></P
@@ -10777,7 +10326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15494"
+NAME="AEN15495"
 ></A
 ><H3
 ><A
@@ -10812,7 +10361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15502"
+NAME="AEN15503"
 ></A
 ><P
 ></P
@@ -10865,306 +10414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15515"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESETLIST"
-></A
->&#62;xmlXPathFreeNodeSetList ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeNodeSetList         (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free up the xmlXPathObjectPtr <TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
-> but don't deallocate the objects in
-the list contrary to <A
-HREF="libxml-xpath.html#XMLXPATHFREEOBJECT"
->xmlXPathFreeObject</A
->().</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15524"
-></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
->obj</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="AEN15533"
-></A
-><H3
-><A
-NAME="XMLXPATHFREEOBJECT"
-></A
->&#62;xmlXPathFreeObject ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeObject              (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free up an xmlXPathObjectPtr object.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15540"
-></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
->obj</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="AEN15549"
-></A
-><H3
-><A
-NAME="XMLXPATHNEWCONTEXT"
-></A
->&#62;xmlXPathNewContext ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
-> xmlXPathNewContext       (<A
-HREF="libxml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlXPathContext</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15557"
-></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
->doc</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="AEN15570"
-></A
-><H3
-><A
-NAME="XMLXPATHFREECONTEXT"
-></A
->&#62;xmlXPathFreeContext ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeContext             (<A
-HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free up an xmlXPathContext</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15577"
-></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"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15586"
+NAME="AEN15516"
 ></A
 ><H3
 ><A
@@ -11204,7 +10454,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15595"
+NAME="AEN15525"
 ></A
 ><P
 ></P
@@ -11257,7 +10507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15608"
+NAME="AEN15538"
 ></A
 ><H3
 ><A
@@ -11343,7 +10593,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15624"
+NAME="AEN15554"
 ></A
 ><P
 ></P
@@ -11430,7 +10680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15645"
+NAME="AEN15575"
 ></A
 ><H3
 ><A
@@ -11462,7 +10712,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15652"
+NAME="AEN15582"
 ></A
 ><P
 ></P
@@ -11500,7 +10750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15661"
+NAME="AEN15591"
 ></A
 ><H3
 ><A
@@ -11532,7 +10782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15668"
+NAME="AEN15598"
 ></A
 ><P
 ></P
@@ -11570,7 +10820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15677"
+NAME="AEN15607"
 ></A
 ><H3
 ><A
@@ -11602,7 +10852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15684"
+NAME="AEN15614"
 ></A
 ><P
 ></P
@@ -11640,7 +10890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15693"
+NAME="AEN15623"
 ></A
 ><H3
 ><A
@@ -11672,7 +10922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15700"
+NAME="AEN15630"
 ></A
 ><P
 ></P
@@ -11710,7 +10960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15709"
+NAME="AEN15639"
 ></A
 ><H3
 ><A
@@ -11752,7 +11002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15718"
+NAME="AEN15648"
 ></A
 ><P
 ></P
@@ -11790,7 +11040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15727"
+NAME="AEN15657"
 ></A
 ><H3
 ><A
@@ -11832,7 +11082,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15736"
+NAME="AEN15666"
 ></A
 ><P
 ></P
@@ -11870,7 +11120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15745"
+NAME="AEN15675"
 ></A
 ><H3
 ><A
@@ -11905,7 +11155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15753"
+NAME="AEN15683"
 ></A
 ><P
 ></P
@@ -11958,7 +11208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15766"
+NAME="AEN15696"
 ></A
 ><H3
 ><A
@@ -11996,7 +11246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15775"
+NAME="AEN15705"
 ></A
 ><P
 ></P
@@ -12066,7 +11316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15792"
+NAME="AEN15722"
 ></A
 ><H3
 ><A
@@ -12104,7 +11354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15801"
+NAME="AEN15731"
 ></A
 ><P
 ></P
@@ -12174,7 +11424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15818"
+NAME="AEN15748"
 ></A
 ><H3
 ><A
@@ -12213,7 +11463,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15827"
+NAME="AEN15757"
 ></A
 ><P
 ></P
@@ -12283,7 +11533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15844"
+NAME="AEN15774"
 ></A
 ><H3
 ><A
@@ -12324,7 +11574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15853"
+NAME="AEN15783"
 ></A
 ><P
 ></P
@@ -12394,7 +11644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15870"
+NAME="AEN15800"
 ></A
 ><H3
 ><A
@@ -12432,7 +11682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15879"
+NAME="AEN15809"
 ></A
 ><P
 ></P
@@ -12502,7 +11752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15896"
+NAME="AEN15826"
 ></A
 ><H3
 ><A
@@ -12543,7 +11793,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15905"
+NAME="AEN15835"
 ></A
 ><P
 ></P
@@ -12613,7 +11863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15922"
+NAME="AEN15852"
 ></A
 ><H3
 ><A
@@ -12652,7 +11902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15931"
+NAME="AEN15861"
 ></A
 ><P
 ></P
@@ -12722,7 +11972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15948"
+NAME="AEN15878"
 ></A
 ><H3
 ><A
@@ -12763,7 +12013,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15957"
+NAME="AEN15887"
 ></A
 ><P
 ></P
@@ -12833,7 +12083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15974"
+NAME="AEN15904"
 ></A
 ><H3
 ><A
@@ -12875,7 +12125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15984"
+NAME="AEN15914"
 ></A
 ><P
 ></P
@@ -12945,7 +12195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16001"
+NAME="AEN15931"
 ></A
 ><H3
 ><A
@@ -12983,7 +12233,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16010"
+NAME="AEN15940"
 ></A
 ><P
 ></P
@@ -13053,7 +12303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16027"
+NAME="AEN15957"
 ></A
 ><H3
 ><A
@@ -13094,7 +12344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16036"
+NAME="AEN15966"
 ></A
 ><P
 ></P
@@ -13164,7 +12414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16053"
+NAME="AEN15983"
 ></A
 ><H3
 ><A
@@ -13206,7 +12456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16062"
+NAME="AEN15992"
 ></A
 ><P
 ></P
@@ -13276,7 +12526,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16079"
+NAME="AEN16009"
 ></A
 ><H3
 ><A
@@ -13316,7 +12566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16088"
+NAME="AEN16018"
 ></A
 ><P
 ></P
@@ -13386,7 +12636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16105"
+NAME="AEN16035"
 ></A
 ><H3
 ><A
@@ -13425,7 +12675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16114"
+NAME="AEN16044"
 ></A
 ><P
 ></P
@@ -13480,7 +12730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16127"
+NAME="AEN16057"
 ></A
 ><H3
 ><A
@@ -13524,7 +12774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16137"
+NAME="AEN16067"
 ></A
 ><P
 ></P
@@ -13579,7 +12829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16150"
+NAME="AEN16080"
 ></A
 ><H3
 ><A
@@ -13614,7 +12864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16158"
+NAME="AEN16088"
 ></A
 ><P
 ></P
@@ -13669,7 +12919,107 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16171"
+NAME="AEN16101"
+></A
+><H3
+><A
+NAME="XMLXPATHIDFUNCTION"
+></A
+>&#62;xmlXPathIdFunction ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathIdFunction              (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implement the <GTKDOCLINK
+HREF="ID"
+>id</GTKDOCLINK
+>() XPath function
+   node-set id(object)
+The id function selects elements by their unique ID
+(see [5.2.1 Unique IDs]). When the argument to id is of type node-set,
+then the result is the union of the result of applying id to the
+string value of each of the nodes in the argument node-set. When the
+argument to id is of any other type, the argument is converted to a
+string as if by a call to the string function; the string is split
+into a whitespace-separated list of tokens (whitespace is any sequence
+of characters matching the production S); the result is a node-set
+containing the elements in the same document as the context node that
+have a unique ID equal to any of the tokens in the list.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16109"
+></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
+>nargs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the number of arguments</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN16122"
 ></A
 ><H3
 ><A
@@ -13709,7 +13059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16179"
+NAME="AEN16130"
 ></A
 ><P
 ></P
@@ -13764,7 +13114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16192"
+NAME="AEN16143"
 ></A
 ><H3
 ><A
@@ -13805,7 +13155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16200"
+NAME="AEN16151"
 ></A
 ><P
 ></P
@@ -13860,7 +13210,125 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16213"
+NAME="AEN16164"
+></A
+><H3
+><A
+NAME="XMLXPATHSTRINGFUNCTION"
+></A
+>&#62;xmlXPathStringFunction ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathStringFunction          (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implement the <GTKDOCLINK
+HREF="STRING"
+>string</GTKDOCLINK
+>() XPath function
+   string string(object?)
+he string function converts an object to a string as follows:
+   - A node-set is converted to a string by returning the value of
+     the node in the node-set that is first in document order.
+     If the node-set is empty, an empty string is returned.
+   - A number is converted to a string as follows
+     + NaN is converted to the string NaN 
+     + positive zero is converted to the string 0 
+     + negative zero is converted to the string 0 
+     + positive infinity is converted to the string Infinity 
+     + negative infinity is converted to the string -Infinity 
+     + if the number is an integer, the number is represented in
+       decimal form as a Number with no decimal point and no leading
+       zeros, preceded by a minus sign (-) if the number is negative
+     + otherwise, the number is represented in decimal form as a
+       Number including a decimal point with at least one digit
+       before the decimal point and at least one digit after the
+       decimal point, preceded by a minus sign (-) if the number
+       is negative; there must be no leading zeros before the decimal
+       point apart possibly from the one required digit immediately
+       before the decimal point; beyond the one required digit
+       after the decimal point there must be as many, but only as
+       many, more digits as are needed to uniquely distinguish the
+       number from all other IEEE 754 numeric values.
+   - The boolean false value is converted to the string false.
+     The boolean true value is converted to the string true.</P
+><P
+>If the argument is omitted, it defaults to a node-set with the
+context node as its only member.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16173"
+></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
+>nargs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the number of arguments</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN16186"
 ></A
 ><H3
 ><A
@@ -13899,7 +13367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16221"
+NAME="AEN16194"
 ></A
 ><P
 ></P
@@ -13954,7 +13422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16234"
+NAME="AEN16207"
 ></A
 ><H3
 ><A
@@ -13990,7 +13458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16242"
+NAME="AEN16215"
 ></A
 ><P
 ></P
@@ -14045,7 +13513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16255"
+NAME="AEN16228"
 ></A
 ><H3
 ><A
@@ -14082,7 +13550,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16263"
+NAME="AEN16236"
 ></A
 ><P
 ></P
@@ -14137,7 +13605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16276"
+NAME="AEN16249"
 ></A
 ><H3
 ><A
@@ -14174,7 +13642,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16284"
+NAME="AEN16257"
 ></A
 ><P
 ></P
@@ -14229,7 +13697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16297"
+NAME="AEN16270"
 ></A
 ><H3
 ><A
@@ -14284,7 +13752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16305"
+NAME="AEN16278"
 ></A
 ><P
 ></P
@@ -14339,7 +13807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16318"
+NAME="AEN16291"
 ></A
 ><H3
 ><A
@@ -14379,7 +13847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16326"
+NAME="AEN16299"
 ></A
 ><P
 ></P
@@ -14434,7 +13902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16339"
+NAME="AEN16312"
 ></A
 ><H3
 ><A
@@ -14475,7 +13943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16347"
+NAME="AEN16320"
 ></A
 ><P
 ></P
@@ -14530,7 +13998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16360"
+NAME="AEN16333"
 ></A
 ><H3
 ><A
@@ -14571,7 +14039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16368"
+NAME="AEN16341"
 ></A
 ><P
 ></P
@@ -14626,7 +14094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16381"
+NAME="AEN16354"
 ></A
 ><H3
 ><A
@@ -14670,7 +14138,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16389"
+NAME="AEN16362"
 ></A
 ><P
 ></P
@@ -14725,7 +14193,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16402"
+NAME="AEN16375"
 ></A
 ><H3
 ><A
@@ -14762,7 +14230,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16410"
+NAME="AEN16383"
 ></A
 ><P
 ></P
@@ -14817,7 +14285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16423"
+NAME="AEN16396"
 ></A
 ><H3
 ><A
@@ -14855,7 +14323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16432"
+NAME="AEN16405"
 ></A
 ><P
 ></P
@@ -14910,7 +14378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16445"
+NAME="AEN16418"
 ></A
 ><H3
 ><A
@@ -14948,7 +14416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16454"
+NAME="AEN16427"
 ></A
 ><P
 ></P
@@ -15003,7 +14471,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16467"
+NAME="AEN16440"
 ></A
 ><H3
 ><A
@@ -15046,7 +14514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16475"
+NAME="AEN16448"
 ></A
 ><P
 ></P
@@ -15101,7 +14569,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16488"
+NAME="AEN16461"
 ></A
 ><H3
 ><A
@@ -15136,7 +14604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16496"
+NAME="AEN16469"
 ></A
 ><P
 ></P
@@ -15191,7 +14659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16509"
+NAME="AEN16482"
 ></A
 ><H3
 ><A
@@ -15228,7 +14696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16517"
+NAME="AEN16490"
 ></A
 ><P
 ></P
@@ -15283,7 +14751,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16530"
+NAME="AEN16503"
 ></A
 ><H3
 ><A
@@ -15320,7 +14788,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16538"
+NAME="AEN16511"
 ></A
 ><P
 ></P
@@ -15375,7 +14843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16551"
+NAME="AEN16524"
 ></A
 ><H3
 ><A
@@ -15412,7 +14880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16559"
+NAME="AEN16532"
 ></A
 ><P
 ></P
@@ -15467,7 +14935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16572"
+NAME="AEN16545"
 ></A
 ><H3
 ><A
@@ -15505,7 +14973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16580"
+NAME="AEN16553"
 ></A
 ><P
 ></P
@@ -15560,7 +15028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16593"
+NAME="AEN16566"
 ></A
 ><H3
 ><A
@@ -15600,7 +15068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16601"
+NAME="AEN16574"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index 072a1c3..f024945 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16619"
+NAME="AEN16592"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16622"
+NAME="AEN16595"
 ></A
 ><H2
 >Synopsis</H2
@@ -411,7 +411,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16697"
+NAME="AEN16670"
 ></A
 ><H2
 >Description</H2
@@ -421,14 +421,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16700"
+NAME="AEN16673"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16702"
+NAME="AEN16675"
 ></A
 ><H3
 ><A
@@ -458,7 +458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16707"
+NAME="AEN16680"
 ></A
 ><H3
 ><A
@@ -484,7 +484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16712"
+NAME="AEN16685"
 ></A
 ><H3
 ><A
@@ -522,7 +522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16721"
+NAME="AEN16694"
 ></A
 ><P
 ></P
@@ -575,7 +575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16734"
+NAME="AEN16707"
 ></A
 ><H3
 ><A
@@ -605,7 +605,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16741"
+NAME="AEN16714"
 ></A
 ><P
 ></P
@@ -643,7 +643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16750"
+NAME="AEN16723"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16761"
+NAME="AEN16734"
 ></A
 ><P
 ></P
@@ -760,7 +760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16778"
+NAME="AEN16751"
 ></A
 ><H3
 ><A
@@ -799,7 +799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16787"
+NAME="AEN16760"
 ></A
 ><P
 ></P
@@ -903,7 +903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16812"
+NAME="AEN16785"
 ></A
 ><H3
 ><A
@@ -940,7 +940,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16821"
+NAME="AEN16794"
 ></A
 ><P
 ></P
@@ -1010,7 +1010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16838"
+NAME="AEN16811"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16847"
+NAME="AEN16820"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16864"
+NAME="AEN16837"
 ></A
 ><H3
 ><A
@@ -1154,7 +1154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16873"
+NAME="AEN16846"
 ></A
 ><P
 ></P
@@ -1224,7 +1224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16890"
+NAME="AEN16863"
 ></A
 ><H3
 ><A
@@ -1261,7 +1261,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16899"
+NAME="AEN16872"
 ></A
 ><P
 ></P
@@ -1331,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16916"
+NAME="AEN16889"
 ></A
 ><H3
 ><A
@@ -1380,7 +1380,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16927"
+NAME="AEN16900"
 ></A
 ><P
 ></P
@@ -1450,7 +1450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16944"
+NAME="AEN16917"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16953"
+NAME="AEN16926"
 ></A
 ><P
 ></P
@@ -1543,7 +1543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16966"
+NAME="AEN16939"
 ></A
 ><H3
 ><A
@@ -1580,7 +1580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16975"
+NAME="AEN16948"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16992"
+NAME="AEN16965"
 ></A
 ><H3
 ><A
@@ -1683,7 +1683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17000"
+NAME="AEN16973"
 ></A
 ><P
 ></P
@@ -1736,7 +1736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17013"
+NAME="AEN16986"
 ></A
 ><H3
 ><A
@@ -1776,7 +1776,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17022"
+NAME="AEN16995"
 ></A
 ><P
 ></P
@@ -1831,7 +1831,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17035"
+NAME="AEN17008"
 ></A
 ><H3
 ><A
@@ -1869,7 +1869,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17044"
+NAME="AEN17017"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17057"
+NAME="AEN17030"
 ></A
 ><H3
 ><A
@@ -1956,7 +1956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17065"
+NAME="AEN17038"
 ></A
 ><P
 ></P
@@ -2011,7 +2011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17078"
+NAME="AEN17051"
 ></A
 ><H3
 ><A
@@ -2042,7 +2042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17085"
+NAME="AEN17058"
 ></A
 ><P
 ></P
@@ -2097,7 +2097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17098"
+NAME="AEN17071"
 ></A
 ><H3
 ><A
@@ -2138,7 +2138,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17108"
+NAME="AEN17081"
 ></A
 ><P
 ></P
@@ -2226,7 +2226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17129"
+NAME="AEN17102"
 ></A
 ><H3
 ><A
@@ -2263,7 +2263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17138"
+NAME="AEN17111"
 ></A
 ><P
 ></P
@@ -2334,7 +2334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17155"
+NAME="AEN17128"
 ></A
 ><H3
 ><A
@@ -2368,7 +2368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17163"
+NAME="AEN17136"
 ></A
 ><P
 ></P
@@ -2423,7 +2423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17176"
+NAME="AEN17149"
 ></A
 ><H3
 ><A
@@ -2457,7 +2457,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17184"
+NAME="AEN17157"
 ></A
 ><P
 ></P
@@ -2511,7 +2511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17197"
+NAME="AEN17170"
 ></A
 ><H3
 ><A
@@ -2548,7 +2548,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17206"
+NAME="AEN17179"
 ></A
 ><P
 ></P
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 16e5e8d..617d43a 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1,337 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <api name='libxml2'>
   <files>
-    <file name='debugXML'>
-     <exports symbol='xmlDebugDumpString'/>
-     <exports symbol='xmlDebugDumpAttr'/>
-     <exports symbol='xmlDebugDumpAttrList'/>
-     <exports symbol='xmlDebugDumpOneNode'/>
-     <exports symbol='xmlDebugDumpNode'/>
-     <exports symbol='xmlDebugDumpNodeList'/>
-     <exports symbol='xmlDebugDumpDocumentHead'/>
-     <exports symbol='xmlDebugDumpDocument'/>
-     <exports symbol='xmlDebugDumpDTD'/>
-     <exports symbol='xmlDebugDumpEntities'/>
-     <exports symbol='xmlLsOneNode'/>
-     <exports symbol='xmlLsCountNode'/>
-     <exports symbol='xmlShellReadlineFunc'/>
-     <exports symbol='xmlShellCtxt'/>
-     <exports symbol='xmlShellCtxtPtr'/>
-     <exports symbol='xmlShellCmd'/>
-     <exports symbol='xmlShellPrintXPathError'/>
-     <exports symbol='xmlShellPrintNode'/>
-     <exports symbol='xmlShellPrintXPathResult'/>
-     <exports symbol='xmlShellList'/>
-     <exports symbol='xmlShellBase'/>
-     <exports symbol='xmlShellDir'/>
-     <exports symbol='xmlShellCat'/>
-     <exports symbol='xmlShellLoad'/>
-     <exports symbol='xmlShellWrite'/>
-     <exports symbol='xmlShellSave'/>
-     <exports symbol='xmlShellValidate'/>
-     <exports symbol='xmlShellDu'/>
-     <exports symbol='xmlShellPwd'/>
-     <exports symbol='xmlShell'/>
-    </file>
-    <file name='DOCBparser'>
-     <exports symbol='docbParserCtxt'/>
-     <exports symbol='docbParserCtxtPtr'/>
-     <exports symbol='docbParserNodeInfo'/>
-     <exports symbol='docbSAXHandler'/>
-     <exports symbol='docbSAXHandlerPtr'/>
-     <exports symbol='docbParserInput'/>
-     <exports symbol='docbParserInputPtr'/>
-     <exports symbol='docbDocPtr'/>
-     <exports symbol='docbNodePtr'/>
-     <exports symbol='docbEncodeEntities'/>
-     <exports symbol='docbSAXParseDoc'/>
-     <exports symbol='docbParseDoc'/>
-     <exports symbol='docbSAXParseFile'/>
-     <exports symbol='docbParseFile'/>
-     <exports symbol='docbFreeParserCtxt'/>
-     <exports symbol='docbCreatePushParserCtxt'/>
-     <exports symbol='docbParseChunk'/>
-     <exports symbol='docbCreateFileParserCtxt'/>
-     <exports symbol='docbParseDocument'/>
-    </file>
-    <file name='HTMLparser'>
-     <exports symbol='htmlParserCtxt'/>
-     <exports symbol='htmlParserCtxtPtr'/>
-     <exports symbol='htmlParserNodeInfo'/>
-     <exports symbol='htmlSAXHandler'/>
-     <exports symbol='htmlSAXHandlerPtr'/>
-     <exports symbol='htmlParserInput'/>
-     <exports symbol='htmlParserInputPtr'/>
-     <exports symbol='htmlDocPtr'/>
-     <exports symbol='htmlNodePtr'/>
-     <exports symbol='htmlElemDesc'/>
-     <exports symbol='htmlElemDescPtr'/>
-     <exports symbol='htmlEntityDesc'/>
-     <exports symbol='htmlEntityDescPtr'/>
-     <exports symbol='htmlTagLookup'/>
-     <exports symbol='htmlEntityLookup'/>
-     <exports symbol='htmlEntityValueLookup'/>
-     <exports symbol='htmlIsAutoClosed'/>
-     <exports symbol='htmlAutoCloseTag'/>
-     <exports symbol='htmlParseEntityRef'/>
-     <exports symbol='htmlParseCharRef'/>
-     <exports symbol='htmlParseElement'/>
-     <exports symbol='htmlSAXParseDoc'/>
-     <exports symbol='htmlParseDoc'/>
-     <exports symbol='htmlSAXParseFile'/>
-     <exports symbol='htmlParseFile'/>
-     <exports symbol='UTF8ToHtml'/>
-     <exports symbol='htmlEncodeEntities'/>
-     <exports symbol='htmlIsScriptAttribute'/>
-     <exports symbol='htmlHandleOmittedElem'/>
-     <exports symbol='htmlFreeParserCtxt'/>
-     <exports symbol='htmlCreatePushParserCtxt'/>
-     <exports symbol='htmlParseChunk'/>
-    </file>
-    <file name='SAX'>
-     <exports symbol='getPublicId'/>
-     <exports symbol='getSystemId'/>
-     <exports symbol='setDocumentLocator'/>
-     <exports symbol='getLineNumber'/>
-     <exports symbol='getColumnNumber'/>
-     <exports symbol='isStandalone'/>
-     <exports symbol='hasInternalSubset'/>
-     <exports symbol='hasExternalSubset'/>
-     <exports symbol='internalSubset'/>
-     <exports symbol='externalSubset'/>
-     <exports symbol='getEntity'/>
-     <exports symbol='getParameterEntity'/>
-     <exports symbol='resolveEntity'/>
-     <exports symbol='entityDecl'/>
-     <exports symbol='attributeDecl'/>
-     <exports symbol='elementDecl'/>
-     <exports symbol='notationDecl'/>
-     <exports symbol='unparsedEntityDecl'/>
-     <exports symbol='startDocument'/>
-     <exports symbol='endDocument'/>
-     <exports symbol='attribute'/>
-     <exports symbol='startElement'/>
-     <exports symbol='endElement'/>
-     <exports symbol='reference'/>
-     <exports symbol='characters'/>
-     <exports symbol='ignorableWhitespace'/>
-     <exports symbol='processingInstruction'/>
-     <exports symbol='globalNamespace'/>
-     <exports symbol='setNamespace'/>
-     <exports symbol='getNamespace'/>
-     <exports symbol='checkNamespace'/>
-     <exports symbol='namespaceDecl'/>
-     <exports symbol='comment'/>
-     <exports symbol='cdataBlock'/>
-     <exports symbol='initxmlDefaultSAXHandler'/>
-     <exports symbol='inithtmlDefaultSAXHandler'/>
-     <exports symbol='initdocbDefaultSAXHandler'/>
-     <exports symbol='xmlDefaultSAXHandlerInit'/>
-     <exports symbol='htmlDefaultSAXHandlerInit'/>
-     <exports symbol='docbDefaultSAXHandlerInit'/>
-    </file>
-    <file name='nanohttp'>
-     <exports symbol='xmlNanoHTTPInit'/>
-     <exports symbol='xmlNanoHTTPCleanup'/>
-     <exports symbol='xmlNanoHTTPScanProxy'/>
-     <exports symbol='xmlNanoHTTPFetch'/>
-     <exports symbol='xmlNanoHTTPMethod'/>
-     <exports symbol='xmlNanoHTTPMethodRedir'/>
-     <exports symbol='xmlNanoHTTPOpen'/>
-     <exports symbol='xmlNanoHTTPOpenRedir'/>
-     <exports symbol='xmlNanoHTTPReturnCode'/>
-     <exports symbol='xmlNanoHTTPAuthHeader'/>
-     <exports symbol='xmlNanoHTTPRead'/>
-     <exports symbol='xmlNanoHTTPSave'/>
-     <exports symbol='xmlNanoHTTPClose'/>
-    </file>
-    <file name='entities'>
-     <exports symbol='xmlEntityType'/>
-     <exports symbol='xmlEntity'/>
-     <exports symbol='xmlEntityPtr'/>
-     <exports symbol='xmlEntitiesTablePtr'/>
-     <exports symbol='xmlInitializePredefinedEntities'/>
-     <exports symbol='xmlAddDocEntity'/>
-     <exports symbol='xmlAddDtdEntity'/>
-     <exports symbol='xmlGetPredefinedEntity'/>
-     <exports symbol='xmlGetDocEntity'/>
-     <exports symbol='xmlGetDtdEntity'/>
-     <exports symbol='xmlGetParameterEntity'/>
-     <exports symbol='xmlEncodeEntities'/>
-     <exports symbol='xmlEncodeEntitiesReentrant'/>
-     <exports symbol='xmlEncodeSpecialChars'/>
-     <exports symbol='xmlCreateEntitiesTable'/>
-     <exports symbol='xmlCopyEntitiesTable'/>
-     <exports symbol='xmlFreeEntitiesTable'/>
-     <exports symbol='xmlDumpEntitiesTable'/>
-     <exports symbol='xmlDumpEntityDecl'/>
-     <exports symbol='xmlCleanupPredefinedEntities'/>
-    </file>
-    <file name='xmlmemory'>
-     <exports symbol='DEBUG_MEMORY'/>
-     <exports symbol='MEM_LIST'/>
-     <exports symbol='xmlFreeFunc'/>
-     <exports symbol='xmlMallocFunc'/>
-     <exports symbol='xmlReallocFunc'/>
-     <exports symbol='xmlStrdupFunc'/>
-     <exports symbol='xmlMemSetup'/>
-     <exports symbol='xmlMemGet'/>
-     <exports symbol='xmlInitMemory'/>
-     <exports symbol='xmlMemUsed'/>
-     <exports symbol='xmlMemDisplay'/>
-     <exports symbol='xmlMemShow'/>
-     <exports symbol='xmlMemoryDump'/>
-     <exports symbol='xmlMalloc'/>
-     <exports symbol='xmlRealloc'/>
-     <exports symbol='xmlMemStrdup'/>
-     <exports symbol='xmlMallocLoc'/>
-     <exports symbol='xmlReallocLoc'/>
-     <exports symbol='xmlMemStrdupLoc'/>
-    </file>
-    <file name='valid'>
-     <exports symbol='xmlValidState'/>
-     <exports symbol='xmlValidStatePtr'/>
-     <exports symbol='xmlValidityErrorFunc'/>
-     <exports symbol='xmlValidityWarningFunc'/>
-     <exports symbol='xmlValidCtxt'/>
-     <exports symbol='xmlValidCtxtPtr'/>
-     <exports symbol='xmlNotationTablePtr'/>
-     <exports symbol='xmlElementTablePtr'/>
-     <exports symbol='xmlAttributeTablePtr'/>
-     <exports symbol='xmlIDTablePtr'/>
-     <exports symbol='xmlRefTablePtr'/>
-     <exports symbol='xmlSplitQName2'/>
-     <exports symbol='xmlAddNotationDecl'/>
-     <exports symbol='xmlCopyNotationTable'/>
-     <exports symbol='xmlFreeNotationTable'/>
-     <exports symbol='xmlDumpNotationDecl'/>
-     <exports symbol='xmlDumpNotationTable'/>
-     <exports symbol='xmlNewElementContent'/>
-     <exports symbol='xmlCopyElementContent'/>
-     <exports symbol='xmlFreeElementContent'/>
-     <exports symbol='xmlSnprintfElementContent'/>
-     <exports symbol='xmlSprintfElementContent'/>
-     <exports symbol='xmlAddElementDecl'/>
-     <exports symbol='xmlCopyElementTable'/>
-     <exports symbol='xmlFreeElementTable'/>
-     <exports symbol='xmlDumpElementTable'/>
-     <exports symbol='xmlDumpElementDecl'/>
-     <exports symbol='xmlCreateEnumeration'/>
-     <exports symbol='xmlFreeEnumeration'/>
-     <exports symbol='xmlCopyEnumeration'/>
-     <exports symbol='xmlAddAttributeDecl'/>
-     <exports symbol='xmlCopyAttributeTable'/>
-     <exports symbol='xmlFreeAttributeTable'/>
-     <exports symbol='xmlDumpAttributeTable'/>
-     <exports symbol='xmlDumpAttributeDecl'/>
-     <exports symbol='xmlAddID'/>
-     <exports symbol='xmlFreeIDTable'/>
-     <exports symbol='xmlGetID'/>
-     <exports symbol='xmlIsID'/>
-     <exports symbol='xmlRemoveID'/>
-     <exports symbol='xmlAddRef'/>
-     <exports symbol='xmlFreeRefTable'/>
-     <exports symbol='xmlIsRef'/>
-     <exports symbol='xmlRemoveRef'/>
-     <exports symbol='xmlGetRefs'/>
-     <exports symbol='xmlValidateRoot'/>
-     <exports symbol='xmlValidateElementDecl'/>
-     <exports symbol='xmlValidNormalizeAttributeValue'/>
-     <exports symbol='xmlValidateAttributeDecl'/>
-     <exports symbol='xmlValidateAttributeValue'/>
-     <exports symbol='xmlValidateNotationDecl'/>
-     <exports symbol='xmlValidateDtd'/>
-     <exports symbol='xmlValidateDtdFinal'/>
-     <exports symbol='xmlValidateDocument'/>
-     <exports symbol='xmlValidateElement'/>
-     <exports symbol='xmlValidateOneElement'/>
-     <exports symbol='xmlValidateOneAttribute'/>
-     <exports symbol='xmlValidateDocumentFinal'/>
-     <exports symbol='xmlValidateNotationUse'/>
-     <exports symbol='xmlIsMixedElement'/>
-     <exports symbol='xmlGetDtdAttrDesc'/>
-     <exports symbol='xmlGetDtdQAttrDesc'/>
-     <exports symbol='xmlGetDtdNotationDesc'/>
-     <exports symbol='xmlGetDtdQElementDesc'/>
-     <exports symbol='xmlGetDtdElementDesc'/>
-     <exports symbol='xmlValidGetValidElements'/>
-     <exports symbol='xmlValidGetPotentialChildren'/>
-    </file>
-    <file name='uri'>
-     <exports symbol='xmlURI'/>
-     <exports symbol='xmlURIPtr'/>
-     <exports symbol='xmlCreateURI'/>
-     <exports symbol='xmlBuildURI'/>
-     <exports symbol='xmlParseURI'/>
-     <exports symbol='xmlParseURIReference'/>
-     <exports symbol='xmlSaveUri'/>
-     <exports symbol='xmlPrintURI'/>
-     <exports symbol='xmlURIEscapeStr'/>
-     <exports symbol='xmlURIUnescapeString'/>
-     <exports symbol='xmlNormalizeURIPath'/>
-     <exports symbol='xmlURIEscape'/>
-     <exports symbol='xmlFreeURI'/>
-    </file>
-    <file name='list'>
-     <exports symbol='xmlLink'/>
-     <exports symbol='xmlLinkPtr'/>
-     <exports symbol='xmlList'/>
-     <exports symbol='xmlListPtr'/>
-     <exports symbol='xmlListDeallocator'/>
-     <exports symbol='xmlListDataCompare'/>
-     <exports symbol='xmlListWalker'/>
-     <exports symbol='xmlListCreate'/>
-     <exports symbol='xmlListDelete'/>
-     <exports symbol='xmlListSearch'/>
-     <exports symbol='xmlListReverseSearch'/>
-     <exports symbol='xmlListInsert'/>
-     <exports symbol='xmlListAppend'/>
-     <exports symbol='xmlListRemoveFirst'/>
-     <exports symbol='xmlListRemoveLast'/>
-     <exports symbol='xmlListRemoveAll'/>
-     <exports symbol='xmlListClear'/>
-     <exports symbol='xmlListEmpty'/>
-     <exports symbol='xmlListFront'/>
-     <exports symbol='xmlListEnd'/>
-     <exports symbol='xmlListSize'/>
-     <exports symbol='xmlListPopFront'/>
-     <exports symbol='xmlListPopBack'/>
-     <exports symbol='xmlListPushFront'/>
-     <exports symbol='xmlListPushBack'/>
-     <exports symbol='xmlListReverse'/>
-     <exports symbol='xmlListSort'/>
-     <exports symbol='xmlListWalk'/>
-     <exports symbol='xmlListReverseWalk'/>
-     <exports symbol='xmlListMerge'/>
-     <exports symbol='xmlListDup'/>
-     <exports symbol='xmlListCopy'/>
-     <exports symbol='xmlLinkGetData'/>
-    </file>
-    <file name='nanoftp'>
-     <exports symbol='ftpListCallback'/>
-     <exports symbol='ftpDataCallback'/>
-     <exports symbol='xmlNanoFTPInit'/>
-     <exports symbol='xmlNanoFTPCleanup'/>
-     <exports symbol='xmlNanoFTPNewCtxt'/>
-     <exports symbol='xmlNanoFTPFreeCtxt'/>
-     <exports symbol='xmlNanoFTPConnectTo'/>
-     <exports symbol='xmlNanoFTPOpen'/>
-     <exports symbol='xmlNanoFTPConnect'/>
-     <exports symbol='xmlNanoFTPClose'/>
-     <exports symbol='xmlNanoFTPQuit'/>
-     <exports symbol='xmlNanoFTPScanProxy'/>
-     <exports symbol='xmlNanoFTPProxy'/>
-     <exports symbol='xmlNanoFTPUpdateURL'/>
-     <exports symbol='xmlNanoFTPGetResponse'/>
-     <exports symbol='xmlNanoFTPCheckResponse'/>
-     <exports symbol='xmlNanoFTPCwd'/>
-     <exports symbol='xmlNanoFTPGetConnection'/>
-     <exports symbol='xmlNanoFTPCloseConnection'/>
-     <exports symbol='xmlNanoFTPList'/>
-     <exports symbol='xmlNanoFTPGetSocket'/>
-     <exports symbol='xmlNanoFTPGet'/>
-     <exports symbol='xmlNanoFTPRead'/>
-    </file>
     <file name='parserInternals'>
      <exports symbol='XML_MAX_NAMELEN'/>
      <exports symbol='INPUT_CHUNK'/>
@@ -353,8 +22,8 @@
      <exports symbol='xmlIsLetter'/>
      <exports symbol='xmlIsDigit'/>
      <exports symbol='xmlIsIdeographic'/>
-     <exports symbol='xmlIsCombining'/>
      <exports symbol='xmlIsExtender'/>
+     <exports symbol='xmlIsCombining'/>
      <exports symbol='xmlIsChar'/>
      <exports symbol='xmlCreateFileParserCtxt'/>
      <exports symbol='xmlCreateMemoryParserCtxt'/>
@@ -362,7 +31,6 @@
      <exports symbol='xmlCreateEntityParserCtxt'/>
      <exports symbol='xmlSwitchEncoding'/>
      <exports symbol='xmlSwitchToEncoding'/>
-     <exports symbol='xmlFreeParserCtxt'/>
      <exports symbol='xmlHandleEntity'/>
      <exports symbol='xmlNewStringInputStream'/>
      <exports symbol='xmlNewEntityInputStream'/>
@@ -450,6 +118,336 @@
      <exports symbol='xmlEntityReferenceFunc'/>
      <exports symbol='xmlSetEntityReferenceFunc'/>
     </file>
+    <file name='SAX'>
+     <exports symbol='getPublicId'/>
+     <exports symbol='getSystemId'/>
+     <exports symbol='setDocumentLocator'/>
+     <exports symbol='getLineNumber'/>
+     <exports symbol='getColumnNumber'/>
+     <exports symbol='isStandalone'/>
+     <exports symbol='hasInternalSubset'/>
+     <exports symbol='hasExternalSubset'/>
+     <exports symbol='internalSubset'/>
+     <exports symbol='externalSubset'/>
+     <exports symbol='getEntity'/>
+     <exports symbol='getParameterEntity'/>
+     <exports symbol='resolveEntity'/>
+     <exports symbol='entityDecl'/>
+     <exports symbol='attributeDecl'/>
+     <exports symbol='elementDecl'/>
+     <exports symbol='notationDecl'/>
+     <exports symbol='unparsedEntityDecl'/>
+     <exports symbol='startDocument'/>
+     <exports symbol='endDocument'/>
+     <exports symbol='attribute'/>
+     <exports symbol='startElement'/>
+     <exports symbol='endElement'/>
+     <exports symbol='reference'/>
+     <exports symbol='characters'/>
+     <exports symbol='ignorableWhitespace'/>
+     <exports symbol='processingInstruction'/>
+     <exports symbol='globalNamespace'/>
+     <exports symbol='setNamespace'/>
+     <exports symbol='getNamespace'/>
+     <exports symbol='checkNamespace'/>
+     <exports symbol='namespaceDecl'/>
+     <exports symbol='comment'/>
+     <exports symbol='cdataBlock'/>
+     <exports symbol='initxmlDefaultSAXHandler'/>
+     <exports symbol='inithtmlDefaultSAXHandler'/>
+     <exports symbol='initdocbDefaultSAXHandler'/>
+     <exports symbol='xmlDefaultSAXHandlerInit'/>
+     <exports symbol='htmlDefaultSAXHandlerInit'/>
+     <exports symbol='docbDefaultSAXHandlerInit'/>
+    </file>
+    <file name='debugXML'>
+     <exports symbol='xmlDebugDumpString'/>
+     <exports symbol='xmlDebugDumpAttr'/>
+     <exports symbol='xmlDebugDumpAttrList'/>
+     <exports symbol='xmlDebugDumpOneNode'/>
+     <exports symbol='xmlDebugDumpNode'/>
+     <exports symbol='xmlDebugDumpNodeList'/>
+     <exports symbol='xmlDebugDumpDocumentHead'/>
+     <exports symbol='xmlDebugDumpDocument'/>
+     <exports symbol='xmlDebugDumpDTD'/>
+     <exports symbol='xmlDebugDumpEntities'/>
+     <exports symbol='xmlLsOneNode'/>
+     <exports symbol='xmlLsCountNode'/>
+     <exports symbol='xmlShellReadlineFunc'/>
+     <exports symbol='xmlShellCtxt'/>
+     <exports symbol='xmlShellCtxtPtr'/>
+     <exports symbol='xmlShellCmd'/>
+     <exports symbol='xmlShellPrintXPathError'/>
+     <exports symbol='xmlShellPrintNode'/>
+     <exports symbol='xmlShellPrintXPathResult'/>
+     <exports symbol='xmlShellList'/>
+     <exports symbol='xmlShellBase'/>
+     <exports symbol='xmlShellDir'/>
+     <exports symbol='xmlShellCat'/>
+     <exports symbol='xmlShellLoad'/>
+     <exports symbol='xmlShellWrite'/>
+     <exports symbol='xmlShellSave'/>
+     <exports symbol='xmlShellValidate'/>
+     <exports symbol='xmlShellDu'/>
+     <exports symbol='xmlShellPwd'/>
+     <exports symbol='xmlShell'/>
+    </file>
+    <file name='DOCBparser'>
+     <exports symbol='docbParserCtxt'/>
+     <exports symbol='docbParserCtxtPtr'/>
+     <exports symbol='docbParserNodeInfo'/>
+     <exports symbol='docbSAXHandler'/>
+     <exports symbol='docbSAXHandlerPtr'/>
+     <exports symbol='docbParserInput'/>
+     <exports symbol='docbParserInputPtr'/>
+     <exports symbol='docbDocPtr'/>
+     <exports symbol='docbNodePtr'/>
+     <exports symbol='docbEncodeEntities'/>
+     <exports symbol='docbSAXParseDoc'/>
+     <exports symbol='docbParseDoc'/>
+     <exports symbol='docbSAXParseFile'/>
+     <exports symbol='docbParseFile'/>
+     <exports symbol='docbFreeParserCtxt'/>
+     <exports symbol='docbCreatePushParserCtxt'/>
+     <exports symbol='docbParseChunk'/>
+     <exports symbol='docbCreateFileParserCtxt'/>
+     <exports symbol='docbParseDocument'/>
+    </file>
+    <file name='HTMLparser'>
+     <exports symbol='htmlParserCtxt'/>
+     <exports symbol='htmlParserCtxtPtr'/>
+     <exports symbol='htmlParserNodeInfo'/>
+     <exports symbol='htmlSAXHandler'/>
+     <exports symbol='htmlSAXHandlerPtr'/>
+     <exports symbol='htmlParserInput'/>
+     <exports symbol='htmlParserInputPtr'/>
+     <exports symbol='htmlDocPtr'/>
+     <exports symbol='htmlNodePtr'/>
+     <exports symbol='htmlElemDesc'/>
+     <exports symbol='htmlElemDescPtr'/>
+     <exports symbol='htmlEntityDesc'/>
+     <exports symbol='htmlEntityDescPtr'/>
+     <exports symbol='htmlTagLookup'/>
+     <exports symbol='htmlEntityLookup'/>
+     <exports symbol='htmlEntityValueLookup'/>
+     <exports symbol='htmlIsAutoClosed'/>
+     <exports symbol='htmlAutoCloseTag'/>
+     <exports symbol='htmlParseEntityRef'/>
+     <exports symbol='htmlParseCharRef'/>
+     <exports symbol='htmlParseElement'/>
+     <exports symbol='htmlSAXParseDoc'/>
+     <exports symbol='htmlParseDoc'/>
+     <exports symbol='htmlSAXParseFile'/>
+     <exports symbol='htmlParseFile'/>
+     <exports symbol='UTF8ToHtml'/>
+     <exports symbol='htmlEncodeEntities'/>
+     <exports symbol='htmlIsScriptAttribute'/>
+     <exports symbol='htmlHandleOmittedElem'/>
+     <exports symbol='htmlFreeParserCtxt'/>
+     <exports symbol='htmlCreatePushParserCtxt'/>
+     <exports symbol='htmlParseChunk'/>
+    </file>
+    <file name='valid'>
+     <exports symbol='xmlValidState'/>
+     <exports symbol='xmlValidStatePtr'/>
+     <exports symbol='xmlValidityErrorFunc'/>
+     <exports symbol='xmlValidityWarningFunc'/>
+     <exports symbol='xmlValidCtxt'/>
+     <exports symbol='xmlValidCtxtPtr'/>
+     <exports symbol='xmlNotationTablePtr'/>
+     <exports symbol='xmlElementTablePtr'/>
+     <exports symbol='xmlAttributeTablePtr'/>
+     <exports symbol='xmlIDTablePtr'/>
+     <exports symbol='xmlRefTablePtr'/>
+     <exports symbol='xmlSplitQName2'/>
+     <exports symbol='xmlAddNotationDecl'/>
+     <exports symbol='xmlCopyNotationTable'/>
+     <exports symbol='xmlFreeNotationTable'/>
+     <exports symbol='xmlDumpNotationDecl'/>
+     <exports symbol='xmlDumpNotationTable'/>
+     <exports symbol='xmlNewElementContent'/>
+     <exports symbol='xmlCopyElementContent'/>
+     <exports symbol='xmlFreeElementContent'/>
+     <exports symbol='xmlSnprintfElementContent'/>
+     <exports symbol='xmlSprintfElementContent'/>
+     <exports symbol='xmlAddElementDecl'/>
+     <exports symbol='xmlCopyElementTable'/>
+     <exports symbol='xmlFreeElementTable'/>
+     <exports symbol='xmlDumpElementTable'/>
+     <exports symbol='xmlDumpElementDecl'/>
+     <exports symbol='xmlCreateEnumeration'/>
+     <exports symbol='xmlFreeEnumeration'/>
+     <exports symbol='xmlCopyEnumeration'/>
+     <exports symbol='xmlAddAttributeDecl'/>
+     <exports symbol='xmlCopyAttributeTable'/>
+     <exports symbol='xmlFreeAttributeTable'/>
+     <exports symbol='xmlDumpAttributeTable'/>
+     <exports symbol='xmlDumpAttributeDecl'/>
+     <exports symbol='xmlAddID'/>
+     <exports symbol='xmlFreeIDTable'/>
+     <exports symbol='xmlGetID'/>
+     <exports symbol='xmlIsID'/>
+     <exports symbol='xmlRemoveID'/>
+     <exports symbol='xmlAddRef'/>
+     <exports symbol='xmlFreeRefTable'/>
+     <exports symbol='xmlIsRef'/>
+     <exports symbol='xmlRemoveRef'/>
+     <exports symbol='xmlGetRefs'/>
+     <exports symbol='xmlValidateRoot'/>
+     <exports symbol='xmlValidateElementDecl'/>
+     <exports symbol='xmlValidNormalizeAttributeValue'/>
+     <exports symbol='xmlValidCtxtNormalizeAttributeValue'/>
+     <exports symbol='xmlValidateAttributeDecl'/>
+     <exports symbol='xmlValidateAttributeValue'/>
+     <exports symbol='xmlValidateNotationDecl'/>
+     <exports symbol='xmlValidateDtd'/>
+     <exports symbol='xmlValidateDtdFinal'/>
+     <exports symbol='xmlValidateDocument'/>
+     <exports symbol='xmlValidateElement'/>
+     <exports symbol='xmlValidateOneElement'/>
+     <exports symbol='xmlValidateOneAttribute'/>
+     <exports symbol='xmlValidateDocumentFinal'/>
+     <exports symbol='xmlValidateNotationUse'/>
+     <exports symbol='xmlIsMixedElement'/>
+     <exports symbol='xmlGetDtdAttrDesc'/>
+     <exports symbol='xmlGetDtdQAttrDesc'/>
+     <exports symbol='xmlGetDtdNotationDesc'/>
+     <exports symbol='xmlGetDtdQElementDesc'/>
+     <exports symbol='xmlGetDtdElementDesc'/>
+     <exports symbol='xmlValidGetValidElements'/>
+     <exports symbol='xmlValidGetPotentialChildren'/>
+    </file>
+    <file name='nanohttp'>
+     <exports symbol='xmlNanoHTTPInit'/>
+     <exports symbol='xmlNanoHTTPCleanup'/>
+     <exports symbol='xmlNanoHTTPScanProxy'/>
+     <exports symbol='xmlNanoHTTPFetch'/>
+     <exports symbol='xmlNanoHTTPMethod'/>
+     <exports symbol='xmlNanoHTTPMethodRedir'/>
+     <exports symbol='xmlNanoHTTPOpen'/>
+     <exports symbol='xmlNanoHTTPOpenRedir'/>
+     <exports symbol='xmlNanoHTTPReturnCode'/>
+     <exports symbol='xmlNanoHTTPAuthHeader'/>
+     <exports symbol='xmlNanoHTTPRead'/>
+     <exports symbol='xmlNanoHTTPSave'/>
+     <exports symbol='xmlNanoHTTPClose'/>
+    </file>
+    <file name='entities'>
+     <exports symbol='xmlEntityType'/>
+     <exports symbol='xmlEntity'/>
+     <exports symbol='xmlEntitiesTablePtr'/>
+     <exports symbol='xmlInitializePredefinedEntities'/>
+     <exports symbol='xmlAddDocEntity'/>
+     <exports symbol='xmlAddDtdEntity'/>
+     <exports symbol='xmlGetPredefinedEntity'/>
+     <exports symbol='xmlGetDocEntity'/>
+     <exports symbol='xmlGetDtdEntity'/>
+     <exports symbol='xmlGetParameterEntity'/>
+     <exports symbol='xmlEncodeEntities'/>
+     <exports symbol='xmlEncodeEntitiesReentrant'/>
+     <exports symbol='xmlEncodeSpecialChars'/>
+     <exports symbol='xmlCreateEntitiesTable'/>
+     <exports symbol='xmlCopyEntitiesTable'/>
+     <exports symbol='xmlFreeEntitiesTable'/>
+     <exports symbol='xmlDumpEntitiesTable'/>
+     <exports symbol='xmlDumpEntityDecl'/>
+     <exports symbol='xmlCleanupPredefinedEntities'/>
+    </file>
+    <file name='xmlmemory'>
+     <exports symbol='DEBUG_MEMORY'/>
+     <exports symbol='xmlFreeFunc'/>
+     <exports symbol='xmlMallocFunc'/>
+     <exports symbol='xmlReallocFunc'/>
+     <exports symbol='xmlStrdupFunc'/>
+     <exports symbol='xmlMemSetup'/>
+     <exports symbol='xmlMemGet'/>
+     <exports symbol='xmlInitMemory'/>
+     <exports symbol='xmlMemUsed'/>
+     <exports symbol='xmlMemDisplay'/>
+     <exports symbol='xmlMemShow'/>
+     <exports symbol='xmlMemoryDump'/>
+     <exports symbol='xmlMalloc'/>
+     <exports symbol='xmlRealloc'/>
+     <exports symbol='xmlMemStrdup'/>
+     <exports symbol='xmlMallocLoc'/>
+     <exports symbol='xmlReallocLoc'/>
+     <exports symbol='xmlMemStrdupLoc'/>
+    </file>
+    <file name='uri'>
+     <exports symbol='xmlURI'/>
+     <exports symbol='xmlURIPtr'/>
+     <exports symbol='xmlCreateURI'/>
+     <exports symbol='xmlBuildURI'/>
+     <exports symbol='xmlParseURI'/>
+     <exports symbol='xmlParseURIReference'/>
+     <exports symbol='xmlSaveUri'/>
+     <exports symbol='xmlPrintURI'/>
+     <exports symbol='xmlURIEscapeStr'/>
+     <exports symbol='xmlURIUnescapeString'/>
+     <exports symbol='xmlNormalizeURIPath'/>
+     <exports symbol='xmlURIEscape'/>
+     <exports symbol='xmlFreeURI'/>
+    </file>
+    <file name='list'>
+     <exports symbol='xmlLink'/>
+     <exports symbol='xmlLinkPtr'/>
+     <exports symbol='xmlList'/>
+     <exports symbol='xmlListPtr'/>
+     <exports symbol='xmlListDeallocator'/>
+     <exports symbol='xmlListDataCompare'/>
+     <exports symbol='xmlListWalker'/>
+     <exports symbol='xmlListCreate'/>
+     <exports symbol='xmlListDelete'/>
+     <exports symbol='xmlListSearch'/>
+     <exports symbol='xmlListReverseSearch'/>
+     <exports symbol='xmlListInsert'/>
+     <exports symbol='xmlListAppend'/>
+     <exports symbol='xmlListRemoveFirst'/>
+     <exports symbol='xmlListRemoveLast'/>
+     <exports symbol='xmlListRemoveAll'/>
+     <exports symbol='xmlListClear'/>
+     <exports symbol='xmlListEmpty'/>
+     <exports symbol='xmlListFront'/>
+     <exports symbol='xmlListEnd'/>
+     <exports symbol='xmlListSize'/>
+     <exports symbol='xmlListPopFront'/>
+     <exports symbol='xmlListPopBack'/>
+     <exports symbol='xmlListPushFront'/>
+     <exports symbol='xmlListPushBack'/>
+     <exports symbol='xmlListReverse'/>
+     <exports symbol='xmlListSort'/>
+     <exports symbol='xmlListWalk'/>
+     <exports symbol='xmlListReverseWalk'/>
+     <exports symbol='xmlListMerge'/>
+     <exports symbol='xmlListDup'/>
+     <exports symbol='xmlListCopy'/>
+     <exports symbol='xmlLinkGetData'/>
+    </file>
+    <file name='nanoftp'>
+     <exports symbol='ftpListCallback'/>
+     <exports symbol='ftpDataCallback'/>
+     <exports symbol='xmlNanoFTPInit'/>
+     <exports symbol='xmlNanoFTPCleanup'/>
+     <exports symbol='xmlNanoFTPNewCtxt'/>
+     <exports symbol='xmlNanoFTPFreeCtxt'/>
+     <exports symbol='xmlNanoFTPConnectTo'/>
+     <exports symbol='xmlNanoFTPOpen'/>
+     <exports symbol='xmlNanoFTPConnect'/>
+     <exports symbol='xmlNanoFTPClose'/>
+     <exports symbol='xmlNanoFTPQuit'/>
+     <exports symbol='xmlNanoFTPScanProxy'/>
+     <exports symbol='xmlNanoFTPProxy'/>
+     <exports symbol='xmlNanoFTPUpdateURL'/>
+     <exports symbol='xmlNanoFTPGetResponse'/>
+     <exports symbol='xmlNanoFTPCheckResponse'/>
+     <exports symbol='xmlNanoFTPCwd'/>
+     <exports symbol='xmlNanoFTPGetConnection'/>
+     <exports symbol='xmlNanoFTPCloseConnection'/>
+     <exports symbol='xmlNanoFTPList'/>
+     <exports symbol='xmlNanoFTPGetSocket'/>
+     <exports symbol='xmlNanoFTPGet'/>
+     <exports symbol='xmlNanoFTPRead'/>
+    </file>
     <file name='tree'>
      <exports symbol='xmlParserInputBuffer'/>
      <exports symbol='xmlParserInputBufferPtr'/>
@@ -459,6 +457,12 @@
      <exports symbol='xmlParserInputPtr'/>
      <exports symbol='xmlParserCtxt'/>
      <exports symbol='xmlParserCtxtPtr'/>
+     <exports symbol='xmlSAXLocator'/>
+     <exports symbol='xmlSAXLocatorPtr'/>
+     <exports symbol='xmlSAXHandler'/>
+     <exports symbol='xmlSAXHandlerPtr'/>
+     <exports symbol='xmlEntity'/>
+     <exports symbol='xmlEntityPtr'/>
      <exports symbol='BASE_BUFFER_SIZE'/>
      <exports symbol='XML_XML_NAMESPACE'/>
      <exports symbol='xmlElementType'/>
@@ -632,6 +636,38 @@
      <exports symbol='xmlGetCompressMode'/>
      <exports symbol='xmlSetCompressMode'/>
     </file>
+    <file name='encoding'>
+     <exports symbol='xmlCharEncoding'/>
+     <exports symbol='xmlCharEncodingInputFunc'/>
+     <exports symbol='xmlCharEncodingOutputFunc'/>
+     <exports symbol='xmlCharEncodingHandler'/>
+     <exports symbol='xmlCharEncodingHandlerPtr'/>
+     <exports symbol='xmlInitCharEncodingHandlers'/>
+     <exports symbol='xmlCleanupCharEncodingHandlers'/>
+     <exports symbol='xmlRegisterCharEncodingHandler'/>
+     <exports symbol='xmlGetCharEncodingHandler'/>
+     <exports symbol='xmlFindCharEncodingHandler'/>
+     <exports symbol='xmlAddEncodingAlias'/>
+     <exports symbol='xmlDelEncodingAlias'/>
+     <exports symbol='xmlGetEncodingAlias'/>
+     <exports symbol='xmlCleanupEncodingAliases'/>
+     <exports symbol='xmlParseCharEncoding'/>
+     <exports symbol='xmlGetCharEncodingName'/>
+     <exports symbol='xmlDetectCharEncoding'/>
+     <exports symbol='xmlCharEncOutFunc'/>
+     <exports symbol='xmlCharEncInFunc'/>
+     <exports symbol='xmlCharEncFirstLine'/>
+     <exports symbol='xmlCharEncCloseFunc'/>
+     <exports symbol='UTF8Toisolat1'/>
+     <exports symbol='isolat1ToUTF8'/>
+     <exports symbol='xmlCheckUTF8'/>
+     <exports symbol='xmlUTF8Strsize'/>
+     <exports symbol='xmlUTF8Strndup'/>
+     <exports symbol='xmlUTF8Strpos'/>
+     <exports symbol='xmlUTF8Strloc'/>
+     <exports symbol='xmlUTF8Strsub'/>
+     <exports symbol='xmlUTF8Strlen'/>
+    </file>
     <file name='HTMLtree'>
      <exports symbol='HTML_TEXT_NODE'/>
      <exports symbol='HTML_ENTITY_REF_NODE'/>
@@ -738,28 +774,19 @@
      <exports symbol='xmlXPathNodeSetAdd'/>
      <exports symbol='xmlXPathNodeSetAddUnique'/>
      <exports symbol='xmlXPathNodeSetSort'/>
-     <exports symbol='xmlXPathIdFunction'/>
      <exports symbol='xmlXPathRoot'/>
      <exports symbol='xmlXPathEvalExpr'/>
      <exports symbol='xmlXPathParseName'/>
      <exports symbol='xmlXPathParseNCName'/>
      <exports symbol='xmlXPathStringEvalNumber'/>
      <exports symbol='xmlXPathEvaluatePredicateResult'/>
-     <exports symbol='xmlXPathInit'/>
-     <exports symbol='xmlXPathStringFunction'/>
      <exports symbol='xmlXPathRegisterAllFunctions'/>
-     <exports symbol='xmlXPathNodeSetCreate'/>
      <exports symbol='xmlXPathNodeSetMerge'/>
      <exports symbol='xmlXPathNodeSetDel'/>
      <exports symbol='xmlXPathNodeSetRemove'/>
-     <exports symbol='xmlXPathFreeNodeSet'/>
      <exports symbol='xmlXPathNewNodeSetList'/>
      <exports symbol='xmlXPathWrapNodeSet'/>
      <exports symbol='xmlXPathWrapExternal'/>
-     <exports symbol='xmlXPathFreeNodeSetList'/>
-     <exports symbol='xmlXPathFreeObject'/>
-     <exports symbol='xmlXPathNewContext'/>
-     <exports symbol='xmlXPathFreeContext'/>
      <exports symbol='xmlXPathEqualValues'/>
      <exports symbol='xmlXPathCompareValues'/>
      <exports symbol='xmlXPathValueFlipSign'/>
@@ -785,8 +812,10 @@
      <exports symbol='xmlXPathLastFunction'/>
      <exports symbol='xmlXPathPositionFunction'/>
      <exports symbol='xmlXPathCountFunction'/>
+     <exports symbol='xmlXPathIdFunction'/>
      <exports symbol='xmlXPathLocalNameFunction'/>
      <exports symbol='xmlXPathNamespaceURIFunction'/>
+     <exports symbol='xmlXPathStringFunction'/>
      <exports symbol='xmlXPathStringLengthFunction'/>
      <exports symbol='xmlXPathConcatFunction'/>
      <exports symbol='xmlXPathContainsFunction'/>
@@ -838,12 +867,12 @@
     <file name='threads'>
      <exports symbol='xmlMutex'/>
      <exports symbol='xmlMutexPtr'/>
+     <exports symbol='xmlRMutex'/>
+     <exports symbol='xmlRMutexPtr'/>
      <exports symbol='xmlNewMutex'/>
      <exports symbol='xmlMutexLock'/>
      <exports symbol='xmlMutexUnlock'/>
      <exports symbol='xmlFreeMutex'/>
-     <exports symbol='xmlRMutex'/>
-     <exports symbol='xmlRMutexPtr'/>
      <exports symbol='xmlNewRMutex'/>
      <exports symbol='xmlRMutexLock'/>
      <exports symbol='xmlRMutexUnlock'/>
@@ -929,29 +958,6 @@
      <exports symbol='xmlCatalogGetSystem'/>
      <exports symbol='xmlCatalogGetPublic'/>
     </file>
-    <file name='xmlversion'>
-     <exports symbol='xmlCheckVersion'/>
-     <exports symbol='LIBXML_DOTTED_VERSION'/>
-     <exports symbol='LIBXML_VERSION'/>
-     <exports symbol='LIBXML_VERSION_STRING'/>
-     <exports symbol='LIBXML_TEST_VERSION'/>
-     <exports symbol='WITH_TRIO'/>
-     <exports symbol='WITHOUT_TRIO'/>
-     <exports symbol='LIBXML_THREAD_ENABLED'/>
-     <exports symbol='LIBXML_FTP_ENABLED'/>
-     <exports symbol='LIBXML_HTTP_ENABLED'/>
-     <exports symbol='LIBXML_HTML_ENABLED'/>
-     <exports symbol='LIBXML_CATALOG_ENABLED'/>
-     <exports symbol='LIBXML_DOCB_ENABLED'/>
-     <exports symbol='LIBXML_XPATH_ENABLED'/>
-     <exports symbol='LIBXML_XPTR_ENABLED'/>
-     <exports symbol='LIBXML_XINCLUDE_ENABLED'/>
-     <exports symbol='LIBXML_ICONV_ENABLED'/>
-     <exports symbol='LIBXML_DEBUG_ENABLED'/>
-     <exports symbol='DEBUG_MEMORY_LOCATION'/>
-     <exports symbol='LIBXML_DLL_IMPORT'/>
-     <exports symbol='ATTRIBUTE_UNUSED'/>
-    </file>
     <file name='parser'>
      <exports symbol='XML_DEFAULT_VERSION'/>
      <exports symbol='xmlParserInputDeallocate'/>
@@ -965,7 +971,6 @@
      <exports symbol='XML_COMPLETE_ATTRS'/>
      <exports symbol='xmlParserCtxt'/>
      <exports symbol='xmlSAXLocator'/>
-     <exports symbol='xmlSAXLocatorPtr'/>
      <exports symbol='resolveEntitySAXFunc'/>
      <exports symbol='internalSubsetSAXFunc'/>
      <exports symbol='externalSubsetSAXFunc'/>
@@ -995,7 +1000,6 @@
      <exports symbol='hasInternalSubsetSAXFunc'/>
      <exports symbol='hasExternalSubsetSAXFunc'/>
      <exports symbol='xmlSAXHandler'/>
-     <exports symbol='xmlSAXHandlerPtr'/>
      <exports symbol='xmlExternalEntityLoader'/>
      <exports symbol='xmlSubstituteEntitiesDefaultValue'/>
      <exports symbol='xmlInitParser'/>
@@ -1045,8 +1049,6 @@
      <exports symbol='xmlParseBalancedChunkMemory'/>
      <exports symbol='xmlParseExternalEntity'/>
      <exports symbol='xmlParseCtxtExternalEntity'/>
-     <exports symbol='xmlDefaultSAXHandlerInit'/>
-     <exports symbol='htmlDefaultSAXHandlerInit'/>
      <exports symbol='xmlInitParserCtxt'/>
      <exports symbol='xmlClearParserCtxt'/>
      <exports symbol='xmlFreeParserCtxt'/>
@@ -1080,37 +1082,28 @@
      <exports symbol='xmlParserPrintFileInfo'/>
      <exports symbol='xmlParserPrintFileContext'/>
     </file>
-    <file name='encoding'>
-     <exports symbol='xmlCharEncoding'/>
-     <exports symbol='xmlCharEncodingInputFunc'/>
-     <exports symbol='xmlCharEncodingOutputFunc'/>
-     <exports symbol='xmlCharEncodingHandler'/>
-     <exports symbol='xmlCharEncodingHandlerPtr'/>
-     <exports symbol='xmlInitCharEncodingHandlers'/>
-     <exports symbol='xmlCleanupCharEncodingHandlers'/>
-     <exports symbol='xmlRegisterCharEncodingHandler'/>
-     <exports symbol='xmlGetCharEncodingHandler'/>
-     <exports symbol='xmlFindCharEncodingHandler'/>
-     <exports symbol='xmlAddEncodingAlias'/>
-     <exports symbol='xmlDelEncodingAlias'/>
-     <exports symbol='xmlGetEncodingAlias'/>
-     <exports symbol='xmlCleanupEncodingAliases'/>
-     <exports symbol='xmlParseCharEncoding'/>
-     <exports symbol='xmlGetCharEncodingName'/>
-     <exports symbol='xmlDetectCharEncoding'/>
-     <exports symbol='xmlCharEncOutFunc'/>
-     <exports symbol='xmlCharEncInFunc'/>
-     <exports symbol='xmlCharEncFirstLine'/>
-     <exports symbol='xmlCharEncCloseFunc'/>
-     <exports symbol='UTF8Toisolat1'/>
-     <exports symbol='isolat1ToUTF8'/>
-     <exports symbol='xmlCheckUTF8'/>
-     <exports symbol='xmlUTF8Strsize'/>
-     <exports symbol='xmlUTF8Strndup'/>
-     <exports symbol='xmlUTF8Strpos'/>
-     <exports symbol='xmlUTF8Strloc'/>
-     <exports symbol='xmlUTF8Strsub'/>
-     <exports symbol='xmlUTF8Strlen'/>
+    <file name='xmlversion'>
+     <exports symbol='xmlCheckVersion'/>
+     <exports symbol='LIBXML_DOTTED_VERSION'/>
+     <exports symbol='LIBXML_VERSION'/>
+     <exports symbol='LIBXML_VERSION_STRING'/>
+     <exports symbol='LIBXML_TEST_VERSION'/>
+     <exports symbol='WITH_TRIO'/>
+     <exports symbol='WITHOUT_TRIO'/>
+     <exports symbol='LIBXML_THREAD_ENABLED'/>
+     <exports symbol='LIBXML_FTP_ENABLED'/>
+     <exports symbol='LIBXML_HTTP_ENABLED'/>
+     <exports symbol='LIBXML_HTML_ENABLED'/>
+     <exports symbol='LIBXML_CATALOG_ENABLED'/>
+     <exports symbol='LIBXML_DOCB_ENABLED'/>
+     <exports symbol='LIBXML_XPATH_ENABLED'/>
+     <exports symbol='LIBXML_XPTR_ENABLED'/>
+     <exports symbol='LIBXML_XINCLUDE_ENABLED'/>
+     <exports symbol='LIBXML_ICONV_ENABLED'/>
+     <exports symbol='LIBXML_DEBUG_ENABLED'/>
+     <exports symbol='DEBUG_MEMORY_LOCATION'/>
+     <exports symbol='LIBXML_DLL_IMPORT'/>
+     <exports symbol='ATTRIBUTE_UNUSED'/>
     </file>
     <file name='hash'>
      <exports symbol='xmlHashTable'/>
@@ -1391,9 +1384,6 @@
     <macro name='LIBXML_XPTR_ENABLED' file='xmlversion'>
       <info>Whether XPointer is configured in</info>
     </macro>
-    <macro name='MEM_LIST' file='xmlmemory'>
-      <info>keep track of all allocated blocks for error reporting</info>
-    </macro>
     <macro name='MOVETO_ENDTAG' file='parserInternals'>
       <info>Skips to the next &apos;&gt;&apos; char</info>
       <arg name='p' info='and UTF8 string pointer '/>
@@ -1645,6 +1635,7 @@
     <const name='XML_PARSER_MISC' file='parser'/>
     <const name='XML_PARSER_PI' file='parser'/>
     <const name='XML_PARSER_PROLOG' file='parser'/>
+    <const name='XML_PARSER_PUBLIC_LITERAL' file='parser'/>
     <const name='XML_PARSER_START' file='parser'/>
     <const name='XML_PARSER_START_TAG' file='parser'/>
     <const name='XML_PARSER_SYSTEM_LITERAL' file='parser'/>
@@ -2091,7 +2082,7 @@
     <macro name='htmlDefaultSAXHandler' file='globals'>
       <info>Default handler for HTML, builds the DOM tree</info>
     </macro>
-    <function name='htmlDefaultSAXHandlerInit' file='parser'>
+    <function name='htmlDefaultSAXHandlerInit' file='SAX'>
       <info>Initialize the default SAX handler</info>
       <return type='void'/>
     </function>
@@ -2618,7 +2609,7 @@
       <arg name='tree' type='xmlEnumerationPtr' info='if it&apos;s an enumeration, the associated list '/>
     </function>
     <function name='xmlAddChild' file='tree'>
-      <info>Add a new child element, to parent, at the end of the child list merging adjacent TEXT nodes (in which case cur is freed)</info>
+      <info>Add a new node to parent, at the end of the child (or property) list merging adjacent TEXT nodes (in which case cur is freed) If the new node was already inserted in a document it is first unlinked from its existing context. If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.</info>
       <return type='xmlNodePtr' info='the child or NULL in case of error. '/>
       <arg name='parent' type='xmlNodePtr' info='the parent node '/>
       <arg name='cur' type='xmlNodePtr' info='the child node '/>
@@ -2673,8 +2664,8 @@
       <arg name='attr' type='xmlAttrPtr' info='the attribute holding the ID '/>
     </function>
     <function name='xmlAddNextSibling' file='tree'>
-      <info>Add a new element elem as the next siblings of cur If the new element was already inserted in a document it is first unlinked from its existing context. As a result of text merging elem may be freed.</info>
-      <return type='xmlNodePtr' info='the new element or NULL in case of error. '/>
+      <info>Add a new node elem as the next sibling of cur If the new node was already inserted in a document it is first unlinked from its existing context. As a result of text merging elem may be freed. If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.</info>
+      <return type='xmlNodePtr' info='the new node or NULL in case of error. '/>
       <arg name='cur' type='xmlNodePtr' info='the child node '/>
       <arg name='elem' type='xmlNodePtr' info='the new node '/>
     </function>
@@ -2688,8 +2679,8 @@
       <arg name='SystemID' type='const xmlChar *' info='the system identifier or NULL '/>
     </function>
     <function name='xmlAddPrevSibling' file='tree'>
-      <info>Add a new element elem as the previous siblings of cur merging adjacent TEXT nodes (elem may be freed) If the new element was already inserted in a document it is first unlinked from its existing context.</info>
-      <return type='xmlNodePtr' info='the new element or NULL in case of error. '/>
+      <info>Add a new node elem as the previous sibling of cur merging adjacent TEXT nodes (elem may be freed) If the new node was already inserted in a document it is first unlinked from its existing context. If the new node is ATTRIBUTE, it is added into properties instead of children. If there is an attribute with equal name, it is first destroyed.</info>
+      <return type='xmlNodePtr' info='the new node or NULL in case of error. '/>
       <arg name='cur' type='xmlNodePtr' info='the child node '/>
       <arg name='elem' type='xmlNodePtr' info='the new node '/>
     </function>
@@ -3308,7 +3299,7 @@
     <macro name='xmlDefaultSAXHandler' file='globals'>
       <info>Default handler for XML, builds the DOM tree</info>
     </macro>
-    <function name='xmlDefaultSAXHandlerInit' file='parser'>
+    <function name='xmlDefaultSAXHandlerInit' file='SAX'>
       <info>Initialize the default SAX handler</info>
       <return type='void'/>
     </function>
@@ -3472,8 +3463,8 @@
       <arg name='input' type='const xmlChar *' info='A string to convert to XML. '/>
     </function>
     <typedef name='xmlEntitiesTablePtr' file='entities'/>
-    <struct name='xmlEntity' file='entities'/>
-    <typedef name='xmlEntityPtr' file='entities'/>
+    <struct name='xmlEntity' file='tree'/>
+    <typedef name='xmlEntityPtr' file='tree'/>
     <functype name='xmlEntityReferenceFunc' file='parserInternals'>
       <info>Callback function used when one need to be able to track back the provenance of a chunk of nodes inherited from an entity replacement</info>
       <return type='void'/>
@@ -3584,7 +3575,7 @@
       <return type='void'/>
       <arg name='cur' type='xmlNsPtr' info='the first namespace pointer '/>
     </function>
-    <function name='xmlFreeParserCtxt' file='parserInternals'>
+    <function name='xmlFreeParserCtxt' file='parser'>
       <info>Free all the memory used by a parser context. However the parsed document in ctxt-&gt;myDoc is not freed.</info>
       <return type='void'/>
       <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context '/>
@@ -3674,7 +3665,7 @@
       <arg name='name' type='const xmlChar *' info='the element name '/>
     </function>
     <function name='xmlGetDtdEntity' file='entities'>
-      <info>Do an entity lookup in the DTD entity hash table and returns the corresponding entity, if found.</info>
+      <info>Do an entity lookup in the DTD entity hash table and returns the corresponding entity, if found. Note: the first argument is the document node, not the DTD node.</info>
       <return type='xmlEntityPtr' info='A pointer to the entity structure or NULL if not found. '/>
       <arg name='doc' type='xmlDocPtr' info='the document referencing the entity '/>
       <arg name='name' type='const xmlChar *' info='the entity name '/>
@@ -5211,6 +5202,7 @@
       <info>parse the declaration for a Mixed Element content The leading &apos;(&apos; and spaces have been skipped in xmlParseElementContentDecl </info>
       <return type='xmlElementContentPtr' info='the tree of xmlElementContentPtr describing the element  hierarchy. '/>
       <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context '/>
+      <arg name='inputchk' type='xmlParserInputPtr'/>
     </function>
     <function name='xmlParseElementContentDecl' file='parserInternals'>
       <info>parse the declaration for an Element content either Mixed or Children, the cases EMPTY and ANY are handled directly in xmlParseElementDecl </info>
@@ -5228,6 +5220,7 @@
       <info>parse the declaration for a Mixed Element content The leading &apos;(&apos; and spaces have been skipped in xmlParseElementContentDecl </info>
       <return type='xmlElementContentPtr' info='the list of the xmlElementContentPtr describing the element choices '/>
       <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context '/>
+      <arg name='inputchk' type='xmlParserInputPtr'/>
     </function>
     <function name='xmlParseEncName' file='parserInternals'>
       <info>parse the XML encoding name </info>
@@ -5737,10 +5730,10 @@
     <macro name='xmlRootNode' file='tree'>
       <info>Macro for compatibility naming layer with libxml1</info>
     </macro>
-    <struct name='xmlSAXHandler' file='parser' info='a SAX handler is bunch of callbacks called by the parser when processing of the input generate data or structure informations.'/>
-    <typedef name='xmlSAXHandlerPtr' file='parser'/>
-    <struct name='xmlSAXLocator' file='parser' info='a SAX Locator.'/>
-    <typedef name='xmlSAXLocatorPtr' file='parser'/>
+    <struct name='xmlSAXHandler' file='tree' info='a SAX handler is bunch of callbacks called by the parser when processing of the input generate data or structure informations.'/>
+    <typedef name='xmlSAXHandlerPtr' file='tree'/>
+    <struct name='xmlSAXLocator' file='tree' info='a SAX Locator.'/>
+    <typedef name='xmlSAXLocatorPtr' file='tree'/>
     <function name='xmlSAXParseDTD' file='parser'>
       <info>Load and parse an external subset.</info>
       <return type='xmlDtdPtr' info='the resulting xmlDtdPtr or NULL in case of error. '/>
@@ -6337,6 +6330,15 @@
       <arg name='name' type='const xmlChar *' info='the attribute name '/>
     </function>
     <struct name='xmlValidCtxt' file='valid'/>
+    <function name='xmlValidCtxtNormalizeAttributeValue' file='valid'>
+      <info>Does the validation related extra step of the normalization of attribute values: </info>
+      <return type='xmlChar *' info='a new normalized string if normalization is needed, NULL otherwise the caller must free the returned value. '/>
+      <arg name='ctxt' type='xmlValidCtxtPtr' info='the validation context '/>
+      <arg name='doc' type='xmlDocPtr' info='the document '/>
+      <arg name='elem' type='xmlNodePtr' info='the parent '/>
+      <arg name='name' type='const xmlChar *' info='the attribute name '/>
+      <arg name='value' type='const xmlChar *' info='the attribute value '/>
+    </function>
     <typedef name='xmlValidCtxtPtr' file='valid'/>
     <function name='xmlValidGetPotentialChildren' file='valid'>
       <info>Build/extend a list of potential children allowed by the content tree</info>
@@ -6398,7 +6400,7 @@
     </function>
     <function name='xmlValidateDtdFinal' file='valid'>
       <info>Does the final step for the dtds validation once all the subsets have been parsed </info>
-      <return type='int' info='1 if valid or 0 otherwise '/>
+      <return type='int' info='1 if valid or 0 if invalid and -1 if not well-formed '/>
       <arg name='ctxt' type='xmlValidCtxtPtr' info='the validation context '/>
       <arg name='doc' type='xmlDocPtr' info='a document instance '/>
     </function>
@@ -6734,22 +6736,22 @@
       <return type='void'/>
       <arg name='comp' type='xmlXPathCompExprPtr' info='an XPATH comp '/>
     </function>
-    <function name='xmlXPathFreeContext' file='xpathInternals'>
+    <function name='xmlXPathFreeContext' file='xpath'>
       <info>Free up an xmlXPathContext</info>
       <return type='void'/>
       <arg name='ctxt' type='xmlXPathContextPtr' info='the context to free '/>
     </function>
-    <function name='xmlXPathFreeNodeSet' file='xpathInternals'>
+    <function name='xmlXPathFreeNodeSet' file='xpath'>
       <info>Free the NodeSet compound (not the actual nodes !).</info>
       <return type='void'/>
       <arg name='obj' type='xmlNodeSetPtr' info='the xmlNodeSetPtr to free '/>
     </function>
-    <function name='xmlXPathFreeNodeSetList' file='xpathInternals'>
+    <function name='xmlXPathFreeNodeSetList' file='xpath'>
       <info>Free up the xmlXPathObjectPtr obj but don&apos;t deallocate the objects in the list contrary to xmlXPathFreeObject().</info>
       <return type='void'/>
       <arg name='obj' type='xmlXPathObjectPtr' info='an existing NodeSetList object '/>
     </function>
-    <function name='xmlXPathFreeObject' file='xpathInternals'>
+    <function name='xmlXPathFreeObject' file='xpath'>
       <info>Free up an xmlXPathObjectPtr object.</info>
       <return type='void'/>
       <arg name='obj' type='xmlXPathObjectPtr' info='the object to free '/>
@@ -6811,7 +6813,7 @@
       <arg name='ctxt' type='xmlXPathParserContextPtr' info='the XPath Parser context '/>
       <arg name='nargs' type='int' info='the number of arguments '/>
     </function>
-    <function name='xmlXPathInit' file='xpathInternals'>
+    <function name='xmlXPathInit' file='xpath'>
       <info>Initialize the XPath environment</info>
       <return type='void'/>
     </function>
@@ -6892,7 +6894,7 @@
       <return type='xmlXPathObjectPtr' info='the newly created object. '/>
       <arg name='val' type='const char *' info='the char * value '/>
     </function>
-    <function name='xmlXPathNewContext' file='xpathInternals'>
+    <function name='xmlXPathNewContext' file='xpath'>
       <info>Create a new xmlXPathContext</info>
       <return type='xmlXPathContextPtr' info='the xmlXPathContext just allocated. '/>
       <arg name='doc' type='xmlDocPtr' info='the XML document '/>
@@ -7036,7 +7038,7 @@
       <arg name='cur' type='xmlNodeSetPtr' info='the node-set '/>
       <arg name='val' type='xmlNodePtr' info='the node '/>
     </function>
-    <function name='xmlXPathNodeSetCreate' file='xpathInternals'>
+    <function name='xmlXPathNodeSetCreate' file='xpath'>
       <info>Create a new xmlNodeSetPtr of type double and of value val</info>
       <return type='xmlNodeSetPtr' info='the newly created object. '/>
       <arg name='val' type='xmlNodePtr' info='an initial xmlNodePtr, or NULL '/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index e861559..4a073ad 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -45,9 +45,19 @@
     <reference name='LIBXML_XINCLUDE_ENABLED' href='html/libxml-xmlversion.html#LIBXML-XINCLUDE-ENABLED-CAPS'/>
     <reference name='LIBXML_XPATH_ENABLED' href='html/libxml-xmlversion.html#LIBXML-XPATH-ENABLED-CAPS'/>
     <reference name='LIBXML_XPTR_ENABLED' href='html/libxml-xmlversion.html#LIBXML-XPTR-ENABLED-CAPS'/>
-    <reference name='MEM_LIST' href='html/libxml-xmlmemory.html#MEM-LIST-CAPS'/>
     <reference name='MOVETO_ENDTAG' href='html/libxml-parserinternals.html#MOVETO-ENDTAG-CAPS'/>
     <reference name='MOVETO_STARTTAG' href='html/libxml-parserinternals.html#MOVETO-STARTTAG-CAPS'/>
+    <reference name='PyFile_Get' href='html/libxml-index.html#PYFILE-GET'/>
+    <reference name='Pycatalog_Get' href='html/libxml-index.html#PYCATALOG-GET'/>
+    <reference name='Pycatalog_Object' href='html/libxml-index.html#PYCATALOG-OBJECT'/>
+    <reference name='PyparserCtxt_Get' href='html/libxml-index.html#PYPARSERCTXT-GET'/>
+    <reference name='PyparserCtxt_Object' href='html/libxml-index.html#PYPARSERCTXT-OBJECT'/>
+    <reference name='PyxmlNode_Get' href='html/libxml-index.html#PYXMLNODE-GET'/>
+    <reference name='PyxmlNode_Object' href='html/libxml-index.html#PYXMLNODE-OBJECT'/>
+    <reference name='PyxmlXPathContext_Get' href='html/libxml-index.html#PYXMLXPATHCONTEXT-GET'/>
+    <reference name='PyxmlXPathContext_Object' href='html/libxml-index.html#PYXMLXPATHCONTEXT-OBJECT'/>
+    <reference name='PyxmlXPathParserContext_Get' href='html/libxml-index.html#PYXMLXPATHPARSERCONTEXT-GET'/>
+    <reference name='PyxmlXPathParserContext_Object' href='html/libxml-index.html#PYXMLXPATHPARSERCONTEXT-OBJECT'/>
     <reference name='SKIP_EOL' href='html/libxml-parserinternals.html#SKIP-EOL-CAPS'/>
     <reference name='UTF8ToHtml' href='html/libxml-htmlparser.html#UTF8TOHTML'/>
     <reference name='UTF8Toisolat1' href='html/libxml-encoding.html#UTF8TOISOLAT1'/>
@@ -133,7 +143,7 @@
     <reference name='htmlCreateFileParserCtxt' href='html/libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT'/>
     <reference name='htmlCreatePushParserCtxt' href='html/libxml-htmlparser.html#HTMLCREATEPUSHPARSERCTXT'/>
     <reference name='htmlDefaultSAXHandler' href='html/libxml-globals.html#HTMLDEFAULTSAXHANDLER'/>
-    <reference name='htmlDefaultSAXHandlerInit' href='html/libxml-parser.html#HTMLDEFAULTSAXHANDLERINIT'/>
+    <reference name='htmlDefaultSAXHandlerInit' href='html/libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT'/>
     <reference name='htmlDocContentDumpFormatOutput' href='html/libxml-htmltree.html#HTMLDOCCONTENTDUMPFORMATOUTPUT'/>
     <reference name='htmlDocContentDumpOutput' href='html/libxml-htmltree.html#HTMLDOCCONTENTDUMPOUTPUT'/>
     <reference name='htmlDocDump' href='html/libxml-htmltree.html#HTMLDOCDUMP'/>
@@ -192,6 +202,27 @@
     <reference name='isStandalone' href='html/libxml-sax.html#ISSTANDALONE'/>
     <reference name='isStandaloneSAXFunc' href='html/libxml-parser.html#ISSTANDALONESAXFUNC'/>
     <reference name='isolat1ToUTF8' href='html/libxml-encoding.html#ISOLAT1TOUTF8'/>
+    <reference name='libxml_charPtrConstWrap' href='html/libxml-index.html#LIBXML-CHARPTRCONSTWRAP'/>
+    <reference name='libxml_charPtrWrap' href='html/libxml-index.html#LIBXML-CHARPTRWRAP'/>
+    <reference name='libxml_constcharPtrWrap' href='html/libxml-index.html#LIBXML-CONSTCHARPTRWRAP'/>
+    <reference name='libxml_constxmlCharPtrWrap' href='html/libxml-index.html#LIBXML-CONSTXMLCHARPTRWRAP'/>
+    <reference name='libxml_doubleWrap' href='html/libxml-index.html#LIBXML-DOUBLEWRAP'/>
+    <reference name='libxml_intWrap' href='html/libxml-index.html#LIBXML-INTWRAP'/>
+    <reference name='libxml_longWrap' href='html/libxml-index.html#LIBXML-LONGWRAP'/>
+    <reference name='libxml_xmlAttrPtrWrap' href='html/libxml-index.html#LIBXML-XMLATTRPTRWRAP'/>
+    <reference name='libxml_xmlAttributePtrWrap' href='html/libxml-index.html#LIBXML-XMLATTRIBUTEPTRWRAP'/>
+    <reference name='libxml_xmlCatalogPtrWrap' href='html/libxml-index.html#LIBXML-XMLCATALOGPTRWRAP'/>
+    <reference name='libxml_xmlCharPtrConstWrap' href='html/libxml-index.html#LIBXML-XMLCHARPTRCONSTWRAP'/>
+    <reference name='libxml_xmlCharPtrWrap' href='html/libxml-index.html#LIBXML-XMLCHARPTRWRAP'/>
+    <reference name='libxml_xmlDocPtrWrap' href='html/libxml-index.html#LIBXML-XMLDOCPTRWRAP'/>
+    <reference name='libxml_xmlElementPtrWrap' href='html/libxml-index.html#LIBXML-XMLELEMENTPTRWRAP'/>
+    <reference name='libxml_xmlNodePtrWrap' href='html/libxml-index.html#LIBXML-XMLNODEPTRWRAP'/>
+    <reference name='libxml_xmlNsPtrWrap' href='html/libxml-index.html#LIBXML-XMLNSPTRWRAP'/>
+    <reference name='libxml_xmlParserCtxtPtrWrap' href='html/libxml-index.html#LIBXML-XMLPARSERCTXTPTRWRAP'/>
+    <reference name='libxml_xmlXPathContextPtrWrap' href='html/libxml-index.html#LIBXML-XMLXPATHCONTEXTPTRWRAP'/>
+    <reference name='libxml_xmlXPathObjectPtrConvert' href='html/libxml-index.html#LIBXML-XMLXPATHOBJECTPTRCONVERT'/>
+    <reference name='libxml_xmlXPathObjectPtrWrap' href='html/libxml-index.html#LIBXML-XMLXPATHOBJECTPTRWRAP'/>
+    <reference name='libxml_xmlXPathParserContextPtrWrap' href='html/libxml-index.html#LIBXML-XMLXPATHPARSERCONTEXTPTRWRAP'/>
     <reference name='namePop' href='html/libxml-parserinternals.html#NAMEPOP'/>
     <reference name='namePush' href='html/libxml-parserinternals.html#NAMEPUSH'/>
     <reference name='namespaceDecl' href='html/libxml-sax.html#NAMESPACEDECL'/>
@@ -361,7 +392,7 @@
     <reference name='xmlDecodeEntities' href='html/libxml-parserinternals.html#XMLDECODEENTITIES'/>
     <reference name='xmlDefaultBufferSize' href='html/libxml-globals.html#XMLDEFAULTBUFFERSIZE'/>
     <reference name='xmlDefaultSAXHandler' href='html/libxml-globals.html#XMLDEFAULTSAXHANDLER'/>
-    <reference name='xmlDefaultSAXHandlerInit' href='html/libxml-parser.html#XMLDEFAULTSAXHANDLERINIT'/>
+    <reference name='xmlDefaultSAXHandlerInit' href='html/libxml-sax.html#XMLDEFAULTSAXHANDLERINIT'/>
     <reference name='xmlDefaultSAXLocator' href='html/libxml-globals.html#XMLDEFAULTSAXLOCATOR'/>
     <reference name='xmlDelEncodingAlias' href='html/libxml-encoding.html#XMLDELENCODINGALIAS'/>
     <reference name='xmlDetectCharEncoding' href='html/libxml-encoding.html#XMLDETECTCHARENCODING'/>
@@ -400,8 +431,8 @@
     <reference name='xmlEncodeEntitiesReentrant' href='html/libxml-entities.html#XMLENCODEENTITIESREENTRANT'/>
     <reference name='xmlEncodeSpecialChars' href='html/libxml-entities.html#XMLENCODESPECIALCHARS'/>
     <reference name='xmlEntitiesTablePtr' href='html/libxml-entities.html#XMLENTITIESTABLEPTR'/>
-    <reference name='xmlEntity' href='html/libxml-entities.html#XMLENTITY'/>
-    <reference name='xmlEntityPtr' href='html/libxml-entities.html#XMLENTITYPTR'/>
+    <reference name='xmlEntity' href='html/libxml-tree.html#XMLENTITY'/>
+    <reference name='xmlEntityPtr' href='html/libxml-tree.html#XMLENTITYPTR'/>
     <reference name='xmlEntityReferenceFunc' href='html/libxml-parserinternals.html#XMLENTITYREFERENCEFUNC'/>
     <reference name='xmlEntityType' href='html/libxml-entities.html#XMLENTITYTYPE'/>
     <reference name='xmlEnumeration' href='html/libxml-tree.html#XMLENUMERATION'/>
@@ -839,9 +870,9 @@
     <reference name='xmlReplaceNode' href='html/libxml-tree.html#XMLREPLACENODE'/>
     <reference name='xmlRootNode' href='html/libxml-tree.html#XMLROOTNODE'/>
     <reference name='xmlSAXHandler' href='html/libxml-parser.html#XMLSAXHANDLER'/>
-    <reference name='xmlSAXHandlerPtr' href='html/libxml-parser.html#XMLSAXHANDLERPTR'/>
+    <reference name='xmlSAXHandlerPtr' href='html/libxml-tree.html#XMLSAXHANDLERPTR'/>
     <reference name='xmlSAXLocator' href='html/libxml-parser.html#XMLSAXLOCATOR'/>
-    <reference name='xmlSAXLocatorPtr' href='html/libxml-parser.html#XMLSAXLOCATORPTR'/>
+    <reference name='xmlSAXLocatorPtr' href='html/libxml-tree.html#XMLSAXLOCATORPTR'/>
     <reference name='xmlSAXParseDTD' href='html/libxml-parser.html#XMLSAXPARSEDTD'/>
     <reference name='xmlSAXParseDoc' href='html/libxml-parser.html#XMLSAXPARSEDOC'/>
     <reference name='xmlSAXParseEntity' href='html/libxml-parser.html#XMLSAXPARSEENTITY'/>
@@ -939,6 +970,7 @@
     <reference name='xmlUnsetNsProp' href='html/libxml-tree.html#XMLUNSETNSPROP'/>
     <reference name='xmlUnsetProp' href='html/libxml-tree.html#XMLUNSETPROP'/>
     <reference name='xmlValidCtxt' href='html/libxml-valid.html#XMLVALIDCTXT'/>
+    <reference name='xmlValidCtxtNormalizeAttributeValue' href='html/libxml-valid.html#XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE'/>
     <reference name='xmlValidCtxtPtr' href='html/libxml-valid.html#XMLVALIDCTXTPTR'/>
     <reference name='xmlValidGetPotentialChildren' href='html/libxml-valid.html#XMLVALIDGETPOTENTIALCHILDREN'/>
     <reference name='xmlValidGetValidElements' href='html/libxml-valid.html#XMLVALIDGETVALIDELEMENTS'/>
@@ -1234,10 +1266,22 @@
     <ref name='LIBXML_XPTR_ENABLED'/>
     </letter>
     <letter name='M'>
-    <ref name='MEM_LIST'/>
     <ref name='MOVETO_ENDTAG'/>
     <ref name='MOVETO_STARTTAG'/>
     </letter>
+    <letter name='P'>
+    <ref name='PyFile_Get'/>
+    <ref name='Pycatalog_Get'/>
+    <ref name='Pycatalog_Object'/>
+    <ref name='PyparserCtxt_Get'/>
+    <ref name='PyparserCtxt_Object'/>
+    <ref name='PyxmlNode_Get'/>
+    <ref name='PyxmlNode_Object'/>
+    <ref name='PyxmlXPathContext_Get'/>
+    <ref name='PyxmlXPathContext_Object'/>
+    <ref name='PyxmlXPathParserContext_Get'/>
+    <ref name='PyxmlXPathParserContext_Object'/>
+    </letter>
     <letter name='S'>
     <ref name='SKIP_EOL'/>
     </letter>
@@ -1406,6 +1450,29 @@
     <ref name='isStandaloneSAXFunc'/>
     <ref name='isolat1ToUTF8'/>
     </letter>
+    <letter name='l'>
+    <ref name='libxml_charPtrConstWrap'/>
+    <ref name='libxml_charPtrWrap'/>
+    <ref name='libxml_constcharPtrWrap'/>
+    <ref name='libxml_constxmlCharPtrWrap'/>
+    <ref name='libxml_doubleWrap'/>
+    <ref name='libxml_intWrap'/>
+    <ref name='libxml_longWrap'/>
+    <ref name='libxml_xmlAttrPtrWrap'/>
+    <ref name='libxml_xmlAttributePtrWrap'/>
+    <ref name='libxml_xmlCatalogPtrWrap'/>
+    <ref name='libxml_xmlCharPtrConstWrap'/>
+    <ref name='libxml_xmlCharPtrWrap'/>
+    <ref name='libxml_xmlDocPtrWrap'/>
+    <ref name='libxml_xmlElementPtrWrap'/>
+    <ref name='libxml_xmlNodePtrWrap'/>
+    <ref name='libxml_xmlNsPtrWrap'/>
+    <ref name='libxml_xmlParserCtxtPtrWrap'/>
+    <ref name='libxml_xmlXPathContextPtrWrap'/>
+    <ref name='libxml_xmlXPathObjectPtrConvert'/>
+    <ref name='libxml_xmlXPathObjectPtrWrap'/>
+    <ref name='libxml_xmlXPathParserContextPtrWrap'/>
+    </letter>
     <letter name='n'>
     <ref name='namePop'/>
     <ref name='namePush'/>
@@ -2170,6 +2237,7 @@
     <ref name='xmlUnsetNsProp'/>
     <ref name='xmlUnsetProp'/>
     <ref name='xmlValidCtxt'/>
+    <ref name='xmlValidCtxtNormalizeAttributeValue'/>
     <ref name='xmlValidCtxtPtr'/>
     <ref name='xmlValidGetPotentialChildren'/>
     <ref name='xmlValidGetValidElements'/>
@@ -2417,8 +2485,6 @@
     </type>
     <type name='const xmlChar *'>
       <ref name='htmlGetMetaEncoding'/>
-      <ref name='getPublicId'/>
-      <ref name='getSystemId'/>
       <ref name='xmlCatalogGetSystem'/>
       <ref name='xmlCatalogGetPublic'/>
       <ref name='xmlEncodeEntities'/>
@@ -2427,6 +2493,8 @@
       <ref name='xmlStrcasestr'/>
       <ref name='xmlBufferContent'/>
       <ref name='xmlXPathNsLookup'/>
+      <ref name='getPublicId'/>
+      <ref name='getSystemId'/>
     </type>
     <type name='const xmlParserNodeInfo *'>
       <ref name='xmlParserFindNodeInfo'/>
@@ -2594,6 +2662,7 @@
       <ref name='xmlURIEscape'/>
       <ref name='xmlSplitQName2'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlXPathCastBooleanToString'/>
       <ref name='xmlXPathCastNumberToString'/>
       <ref name='xmlXPathCastNodeToString'/>
@@ -2657,8 +2726,6 @@
       <ref name='xmlCopyEntitiesTable'/>
     </type>
     <type name='xmlEntityPtr'>
-      <ref name='getEntity'/>
-      <ref name='getParameterEntity'/>
       <ref name='xmlAddDocEntity'/>
       <ref name='xmlAddDtdEntity'/>
       <ref name='xmlGetPredefinedEntity'/>
@@ -2668,6 +2735,8 @@
       <ref name='getEntitySAXFunc'/>
       <ref name='getParameterEntitySAXFunc'/>
       <ref name='xmlParseEntityRef'/>
+      <ref name='getEntity'/>
+      <ref name='getParameterEntity'/>
     </type>
     <type name='xmlEnumerationPtr'>
       <ref name='xmlParseNotationType'/>
@@ -2767,7 +2836,6 @@
       <ref name='xmlXPathTrailingSorted'/>
       <ref name='xmlXPathNodeTrailing'/>
       <ref name='xmlXPathTrailing'/>
-      <ref name='xmlXPathNodeSetCreate'/>
       <ref name='xmlXPathNodeSetMerge'/>
     </type>
     <type name='xmlNotationPtr'>
@@ -2778,13 +2846,13 @@
       <ref name='xmlCopyNotationTable'/>
     </type>
     <type name='xmlNsPtr'>
-      <ref name='getNamespace'/>
       <ref name='xmlNewGlobalNs'/>
       <ref name='xmlNewNs'/>
       <ref name='xmlSearchNs'/>
       <ref name='xmlSearchNsByHref'/>
       <ref name='xmlCopyNamespace'/>
       <ref name='xmlCopyNamespaceList'/>
+      <ref name='getNamespace'/>
     </type>
     <type name='xmlNsPtr *'>
       <ref name='xmlGetNsList'/>
@@ -2815,7 +2883,6 @@
       <ref name='xmlParserInputBufferCreateIO'/>
     </type>
     <type name='xmlParserInputPtr'>
-      <ref name='resolveEntity'/>
       <ref name='resolveEntitySAXFunc'/>
       <ref name='xmlExternalEntityLoader'/>
       <ref name='xmlNewIOInputStream'/>
@@ -2826,6 +2893,7 @@
       <ref name='xmlNewInputStream'/>
       <ref name='inputPop'/>
       <ref name='xmlNoNetExternalEntityLoader'/>
+      <ref name='resolveEntity'/>
     </type>
     <type name='xmlRMutexPtr'>
       <ref name='xmlNewRMutex'/>
@@ -2842,7 +2910,6 @@
     </type>
     <type name='xmlXPathContextPtr'>
       <ref name='xmlXPathNewContext'/>
-      <ref name='xmlXPathNewContext'/>
       <ref name='xmlXPtrNewContext'/>
     </type>
     <type name='xmlXPathFunction'>
@@ -2871,14 +2938,9 @@
       <ref name='xmlXPathNewBoolean'/>
       <ref name='xmlXPathNewNodeSet'/>
       <ref name='xmlXPathNewValueTree'/>
-      <ref name='xmlXPathNewNodeSet'/>
       <ref name='xmlXPathNewNodeSetList'/>
       <ref name='xmlXPathWrapNodeSet'/>
       <ref name='xmlXPathWrapExternal'/>
-      <ref name='xmlXPathNewFloat'/>
-      <ref name='xmlXPathNewBoolean'/>
-      <ref name='xmlXPathNewString'/>
-      <ref name='xmlXPathNewCString'/>
       <ref name='xmlXPtrNewRange'/>
       <ref name='xmlXPtrNewRangePoints'/>
       <ref name='xmlXPtrNewRangeNodePoint'/>
@@ -2936,7 +2998,6 @@
       <ref name='xmlMemShow'/>
       <ref name='xmlXPathDebugDumpObject'/>
       <ref name='xmlXPathDebugDumpCompExpr'/>
-      <ref name='xmlXPathDebugDumpObject'/>
     </type>
     <type name='char **'>
       <ref name='xmlNanoHTTPFetch'/>
@@ -2989,46 +3050,6 @@
       <ref name='htmlNewDocNoDtD'/>
       <ref name='htmlNewDocNoDtD'/>
       <ref name='htmlSetMetaEncoding'/>
-      <ref name='internalSubset'/>
-      <ref name='internalSubset'/>
-      <ref name='internalSubset'/>
-      <ref name='externalSubset'/>
-      <ref name='externalSubset'/>
-      <ref name='externalSubset'/>
-      <ref name='getEntity'/>
-      <ref name='getParameterEntity'/>
-      <ref name='resolveEntity'/>
-      <ref name='resolveEntity'/>
-      <ref name='entityDecl'/>
-      <ref name='entityDecl'/>
-      <ref name='entityDecl'/>
-      <ref name='attributeDecl'/>
-      <ref name='attributeDecl'/>
-      <ref name='attributeDecl'/>
-      <ref name='elementDecl'/>
-      <ref name='notationDecl'/>
-      <ref name='notationDecl'/>
-      <ref name='notationDecl'/>
-      <ref name='unparsedEntityDecl'/>
-      <ref name='unparsedEntityDecl'/>
-      <ref name='unparsedEntityDecl'/>
-      <ref name='unparsedEntityDecl'/>
-      <ref name='attribute'/>
-      <ref name='attribute'/>
-      <ref name='startElement'/>
-      <ref name='endElement'/>
-      <ref name='reference'/>
-      <ref name='characters'/>
-      <ref name='ignorableWhitespace'/>
-      <ref name='processingInstruction'/>
-      <ref name='processingInstruction'/>
-      <ref name='globalNamespace'/>
-      <ref name='globalNamespace'/>
-      <ref name='setNamespace'/>
-      <ref name='namespaceDecl'/>
-      <ref name='namespaceDecl'/>
-      <ref name='comment'/>
-      <ref name='cdataBlock'/>
       <ref name='xmlACatalogAdd'/>
       <ref name='xmlACatalogAdd'/>
       <ref name='xmlACatalogAdd'/>
@@ -3269,6 +3290,8 @@
       <ref name='xmlGetRefs'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlValidateAttributeValue'/>
       <ref name='xmlValidateOneAttribute'/>
       <ref name='xmlValidateNotationUse'/>
@@ -3309,15 +3332,54 @@
       <ref name='xmlXPathNewParserContext'/>
       <ref name='xmlXPathNewString'/>
       <ref name='xmlXPathStringEvalNumber'/>
-      <ref name='xmlXPathNewString'/>
       <ref name='xmlXPathIsNodeType'/>
       <ref name='xmlXPtrEval'/>
+      <ref name='internalSubset'/>
+      <ref name='internalSubset'/>
+      <ref name='internalSubset'/>
+      <ref name='externalSubset'/>
+      <ref name='externalSubset'/>
+      <ref name='externalSubset'/>
+      <ref name='getEntity'/>
+      <ref name='getParameterEntity'/>
+      <ref name='resolveEntity'/>
+      <ref name='resolveEntity'/>
+      <ref name='entityDecl'/>
+      <ref name='entityDecl'/>
+      <ref name='entityDecl'/>
+      <ref name='attributeDecl'/>
+      <ref name='attributeDecl'/>
+      <ref name='attributeDecl'/>
+      <ref name='elementDecl'/>
+      <ref name='notationDecl'/>
+      <ref name='notationDecl'/>
+      <ref name='notationDecl'/>
+      <ref name='unparsedEntityDecl'/>
+      <ref name='unparsedEntityDecl'/>
+      <ref name='unparsedEntityDecl'/>
+      <ref name='unparsedEntityDecl'/>
+      <ref name='attribute'/>
+      <ref name='attribute'/>
+      <ref name='startElement'/>
+      <ref name='endElement'/>
+      <ref name='reference'/>
+      <ref name='characters'/>
+      <ref name='ignorableWhitespace'/>
+      <ref name='processingInstruction'/>
+      <ref name='processingInstruction'/>
+      <ref name='globalNamespace'/>
+      <ref name='globalNamespace'/>
+      <ref name='setNamespace'/>
+      <ref name='namespaceDecl'/>
+      <ref name='namespaceDecl'/>
+      <ref name='comment'/>
+      <ref name='cdataBlock'/>
     </type>
     <type name='const xmlChar **'>
-      <ref name='startElement'/>
       <ref name='startElementSAXFunc'/>
       <ref name='xmlValidGetValidElements'/>
       <ref name='xmlValidGetPotentialChildren'/>
+      <ref name='startElement'/>
     </type>
     <type name='const xmlChar*'>
       <ref name='xmlSetupParserForBuffer'/>
@@ -3356,7 +3418,6 @@
       <ref name='xmlXPathCastNumberToBoolean'/>
       <ref name='xmlXPathCastNumberToString'/>
       <ref name='xmlXPathNewFloat'/>
-      <ref name='xmlXPathNewFloat'/>
     </type>
     <type name='ftpDataCallback'>
       <ref name='xmlNanoFTPGet'/>
@@ -3443,40 +3504,6 @@
       <ref name='htmlSAXParseDoc'/>
       <ref name='htmlSAXParseFile'/>
       <ref name='htmlCreatePushParserCtxt'/>
-      <ref name='getPublicId'/>
-      <ref name='getSystemId'/>
-      <ref name='setDocumentLocator'/>
-      <ref name='getLineNumber'/>
-      <ref name='getColumnNumber'/>
-      <ref name='isStandalone'/>
-      <ref name='hasInternalSubset'/>
-      <ref name='hasExternalSubset'/>
-      <ref name='internalSubset'/>
-      <ref name='externalSubset'/>
-      <ref name='getEntity'/>
-      <ref name='getParameterEntity'/>
-      <ref name='resolveEntity'/>
-      <ref name='entityDecl'/>
-      <ref name='attributeDecl'/>
-      <ref name='elementDecl'/>
-      <ref name='notationDecl'/>
-      <ref name='unparsedEntityDecl'/>
-      <ref name='startDocument'/>
-      <ref name='endDocument'/>
-      <ref name='attribute'/>
-      <ref name='startElement'/>
-      <ref name='endElement'/>
-      <ref name='reference'/>
-      <ref name='characters'/>
-      <ref name='ignorableWhitespace'/>
-      <ref name='processingInstruction'/>
-      <ref name='globalNamespace'/>
-      <ref name='setNamespace'/>
-      <ref name='getNamespace'/>
-      <ref name='checkNamespace'/>
-      <ref name='namespaceDecl'/>
-      <ref name='comment'/>
-      <ref name='cdataBlock'/>
       <ref name='xmlCatalogFreeLocal'/>
       <ref name='xmlCatalogAddLocal'/>
       <ref name='xmlCatalogLocalResolve'/>
@@ -3591,6 +3618,40 @@
       <ref name='xmlXPathFuncLookupFunc'/>
       <ref name='xmlXPathRegisterFuncLookup'/>
       <ref name='xmlXPathWrapExternal'/>
+      <ref name='getPublicId'/>
+      <ref name='getSystemId'/>
+      <ref name='setDocumentLocator'/>
+      <ref name='getLineNumber'/>
+      <ref name='getColumnNumber'/>
+      <ref name='isStandalone'/>
+      <ref name='hasInternalSubset'/>
+      <ref name='hasExternalSubset'/>
+      <ref name='internalSubset'/>
+      <ref name='externalSubset'/>
+      <ref name='getEntity'/>
+      <ref name='getParameterEntity'/>
+      <ref name='resolveEntity'/>
+      <ref name='entityDecl'/>
+      <ref name='attributeDecl'/>
+      <ref name='elementDecl'/>
+      <ref name='notationDecl'/>
+      <ref name='unparsedEntityDecl'/>
+      <ref name='startDocument'/>
+      <ref name='endDocument'/>
+      <ref name='attribute'/>
+      <ref name='startElement'/>
+      <ref name='endElement'/>
+      <ref name='reference'/>
+      <ref name='characters'/>
+      <ref name='ignorableWhitespace'/>
+      <ref name='processingInstruction'/>
+      <ref name='globalNamespace'/>
+      <ref name='setNamespace'/>
+      <ref name='getNamespace'/>
+      <ref name='checkNamespace'/>
+      <ref name='namespaceDecl'/>
+      <ref name='comment'/>
+      <ref name='cdataBlock'/>
     </type>
     <type name='xmlAttrPtr'>
       <ref name='xmlDebugDumpAttr'/>
@@ -3693,8 +3754,6 @@
       <ref name='docbParseDoc'/>
       <ref name='htmlSAXParseDoc'/>
       <ref name='htmlParseDoc'/>
-      <ref name='entityDecl'/>
-      <ref name='checkNamespace'/>
       <ref name='xmlHashDeallocator'/>
       <ref name='xmlHashCopier'/>
       <ref name='xmlHashScanner'/>
@@ -3715,6 +3774,8 @@
       <ref name='xmlNewElementContent'/>
       <ref name='xmlCreateEnumeration'/>
       <ref name='xmlXPathWrapString'/>
+      <ref name='entityDecl'/>
+      <ref name='checkNamespace'/>
     </type>
     <type name='xmlChar **'>
       <ref name='htmlParseEntityRef'/>
@@ -3846,6 +3907,7 @@
       <ref name='xmlValidateRoot'/>
       <ref name='xmlValidateElementDecl'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlValidateAttributeDecl'/>
       <ref name='xmlValidateNotationDecl'/>
       <ref name='xmlValidateDtd'/>
@@ -3859,7 +3921,6 @@
       <ref name='xmlIsMixedElement'/>
       <ref name='xmlXIncludeProcess'/>
       <ref name='xmlXPathNewContext'/>
-      <ref name='xmlXPathNewContext'/>
       <ref name='xmlXPtrNewContext'/>
     </type>
     <type name='xmlDtdPtr'>
@@ -3880,13 +3941,13 @@
       <ref name='xmlValidGetPotentialChildren'/>
     </type>
     <type name='xmlElementContentPtr'>
-      <ref name='elementDecl'/>
       <ref name='elementDeclSAXFunc'/>
       <ref name='xmlCopyElementContent'/>
       <ref name='xmlFreeElementContent'/>
       <ref name='xmlSnprintfElementContent'/>
       <ref name='xmlSprintfElementContent'/>
       <ref name='xmlAddElementDecl'/>
+      <ref name='elementDecl'/>
     </type>
     <type name='xmlElementContentPtr *'>
       <ref name='xmlParseElementContentDecl'/>
@@ -3921,11 +3982,11 @@
       <ref name='xmlSetEntityReferenceFunc'/>
     </type>
     <type name='xmlEnumerationPtr'>
-      <ref name='attributeDecl'/>
       <ref name='attributeDeclSAXFunc'/>
       <ref name='xmlFreeEnumeration'/>
       <ref name='xmlCopyEnumeration'/>
       <ref name='xmlAddAttributeDecl'/>
+      <ref name='attributeDecl'/>
     </type>
     <type name='xmlEnumerationPtr *'>
       <ref name='xmlParseEnumeratedType'/>
@@ -4177,6 +4238,7 @@
       <ref name='xmlIsID'/>
       <ref name='xmlIsRef'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlValidateElement'/>
       <ref name='xmlValidateOneElement'/>
       <ref name='xmlValidateOneAttribute'/>
@@ -4194,10 +4256,7 @@
       <ref name='xmlXPathNewValueTree'/>
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
-      <ref name='xmlXPathNodeSetCreate'/>
-      <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetDel'/>
-      <ref name='xmlXPathNewNodeSet'/>
       <ref name='xmlXPathNextSelf'/>
       <ref name='xmlXPathNextChild'/>
       <ref name='xmlXPathNextDescendant'/>
@@ -4258,12 +4317,10 @@
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
       <ref name='xmlXPathNodeSetSort'/>
-      <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetMerge'/>
       <ref name='xmlXPathNodeSetMerge'/>
       <ref name='xmlXPathNodeSetDel'/>
       <ref name='xmlXPathNodeSetRemove'/>
-      <ref name='xmlXPathFreeNodeSet'/>
       <ref name='xmlXPathNewNodeSetList'/>
       <ref name='xmlXPathWrapNodeSet'/>
       <ref name='xmlXPtrNewLocationSetNodeSet'/>
@@ -4336,7 +4393,6 @@
       <ref name='xmlLoadExternalEntity'/>
       <ref name='xmlSwitchEncoding'/>
       <ref name='xmlSwitchToEncoding'/>
-      <ref name='xmlFreeParserCtxt'/>
       <ref name='xmlHandleEntity'/>
       <ref name='xmlNewStringInputStream'/>
       <ref name='xmlNewEntityInputStream'/>
@@ -4425,6 +4481,8 @@
       <ref name='xmlParserInputGrow'/>
       <ref name='xmlPushInput'/>
       <ref name='xmlFreeInputStream'/>
+      <ref name='xmlParseElementMixedContentDecl'/>
+      <ref name='xmlParseElementChildrenContentDecl'/>
       <ref name='inputPush'/>
       <ref name='xmlParserInputShrink'/>
       <ref name='xmlParserPrintFileInfo'/>
@@ -4469,8 +4527,8 @@
       <ref name='xmlCreateIOParserCtxt'/>
     </type>
     <type name='xmlSAXLocatorPtr'>
-      <ref name='setDocumentLocator'/>
       <ref name='setDocumentLocatorSAXFunc'/>
+      <ref name='setDocumentLocator'/>
     </type>
     <type name='xmlShellCtxtPtr'>
       <ref name='xmlShellCmd'/>
@@ -4508,6 +4566,7 @@
       <ref name='xmlAddRef'/>
       <ref name='xmlValidateRoot'/>
       <ref name='xmlValidateElementDecl'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlValidateAttributeDecl'/>
       <ref name='xmlValidateNotationDecl'/>
       <ref name='xmlValidateDtd'/>
@@ -4547,7 +4606,6 @@
       <ref name='xmlXPathRegisteredVariablesCleanup'/>
       <ref name='xmlXPathNewParserContext'/>
       <ref name='xmlXPathRegisterAllFunctions'/>
-      <ref name='xmlXPathFreeContext'/>
       <ref name='xmlXPtrEval'/>
     </type>
     <type name='xmlXPathFuncLookupFunc'>
@@ -4575,10 +4633,7 @@
       <ref name='xmlXPathRegisterVariable'/>
       <ref name='xmlXPathRegisterVariableNS'/>
       <ref name='valuePush'/>
-      <ref name='xmlXPathDebugDumpObject'/>
       <ref name='xmlXPathEvaluatePredicateResult'/>
-      <ref name='xmlXPathFreeNodeSetList'/>
-      <ref name='xmlXPathFreeObject'/>
       <ref name='xmlXPtrLocationSetCreate'/>
       <ref name='xmlXPtrNewRangePoints'/>
       <ref name='xmlXPtrNewRangePoints'/>
@@ -4602,13 +4657,11 @@
       <ref name='xmlXPathFreeParserContext'/>
       <ref name='valuePop'/>
       <ref name='valuePush'/>
-      <ref name='xmlXPathIdFunction'/>
       <ref name='xmlXPathRoot'/>
       <ref name='xmlXPathEvalExpr'/>
       <ref name='xmlXPathParseName'/>
       <ref name='xmlXPathParseNCName'/>
       <ref name='xmlXPathEvaluatePredicateResult'/>
-      <ref name='xmlXPathStringFunction'/>
       <ref name='xmlXPathEqualValues'/>
       <ref name='xmlXPathCompareValues'/>
       <ref name='xmlXPathValueFlipSign'/>
@@ -4630,7 +4683,6 @@
       <ref name='xmlXPathNextPreceding'/>
       <ref name='xmlXPathNextAncestor'/>
       <ref name='xmlXPathNextPrecedingSibling'/>
-      <ref name='xmlXPathRoot'/>
       <ref name='xmlXPathLastFunction'/>
       <ref name='xmlXPathPositionFunction'/>
       <ref name='xmlXPathCountFunction'/>
@@ -4895,7 +4947,6 @@
     <file name='entities'>
       <ref name='xmlEntityType'/>
       <ref name='xmlEntity'/>
-      <ref name='xmlEntityPtr'/>
       <ref name='xmlEntitiesTablePtr'/>
       <ref name='xmlInitializePredefinedEntities'/>
       <ref name='xmlAddDocEntity'/>
@@ -5059,7 +5110,6 @@
       <ref name='XML_COMPLETE_ATTRS'/>
       <ref name='xmlParserCtxt'/>
       <ref name='xmlSAXLocator'/>
-      <ref name='xmlSAXLocatorPtr'/>
       <ref name='resolveEntitySAXFunc'/>
       <ref name='internalSubsetSAXFunc'/>
       <ref name='externalSubsetSAXFunc'/>
@@ -5089,7 +5139,6 @@
       <ref name='hasInternalSubsetSAXFunc'/>
       <ref name='hasExternalSubsetSAXFunc'/>
       <ref name='xmlSAXHandler'/>
-      <ref name='xmlSAXHandlerPtr'/>
       <ref name='xmlExternalEntityLoader'/>
       <ref name='xmlSubstituteEntitiesDefaultValue'/>
       <ref name='xmlInitParser'/>
@@ -5139,8 +5188,6 @@
       <ref name='xmlParseBalancedChunkMemory'/>
       <ref name='xmlParseExternalEntity'/>
       <ref name='xmlParseCtxtExternalEntity'/>
-      <ref name='xmlDefaultSAXHandlerInit'/>
-      <ref name='htmlDefaultSAXHandlerInit'/>
       <ref name='xmlInitParserCtxt'/>
       <ref name='xmlClearParserCtxt'/>
       <ref name='xmlFreeParserCtxt'/>
@@ -5183,8 +5230,8 @@
       <ref name='xmlIsLetter'/>
       <ref name='xmlIsDigit'/>
       <ref name='xmlIsIdeographic'/>
-      <ref name='xmlIsCombining'/>
       <ref name='xmlIsExtender'/>
+      <ref name='xmlIsCombining'/>
       <ref name='xmlIsChar'/>
       <ref name='xmlCreateFileParserCtxt'/>
       <ref name='xmlCreateMemoryParserCtxt'/>
@@ -5192,7 +5239,6 @@
       <ref name='xmlCreateEntityParserCtxt'/>
       <ref name='xmlSwitchEncoding'/>
       <ref name='xmlSwitchToEncoding'/>
-      <ref name='xmlFreeParserCtxt'/>
       <ref name='xmlHandleEntity'/>
       <ref name='xmlNewStringInputStream'/>
       <ref name='xmlNewEntityInputStream'/>
@@ -5283,12 +5329,12 @@
     <file name='threads'>
       <ref name='xmlMutex'/>
       <ref name='xmlMutexPtr'/>
+      <ref name='xmlRMutex'/>
+      <ref name='xmlRMutexPtr'/>
       <ref name='xmlNewMutex'/>
       <ref name='xmlMutexLock'/>
       <ref name='xmlMutexUnlock'/>
       <ref name='xmlFreeMutex'/>
-      <ref name='xmlRMutex'/>
-      <ref name='xmlRMutexPtr'/>
       <ref name='xmlNewRMutex'/>
       <ref name='xmlRMutexLock'/>
       <ref name='xmlRMutexUnlock'/>
@@ -5310,6 +5356,12 @@
       <ref name='xmlParserInputPtr'/>
       <ref name='xmlParserCtxt'/>
       <ref name='xmlParserCtxtPtr'/>
+      <ref name='xmlSAXLocator'/>
+      <ref name='xmlSAXLocatorPtr'/>
+      <ref name='xmlSAXHandler'/>
+      <ref name='xmlSAXHandlerPtr'/>
+      <ref name='xmlEntity'/>
+      <ref name='xmlEntityPtr'/>
       <ref name='BASE_BUFFER_SIZE'/>
       <ref name='XML_XML_NAMESPACE'/>
       <ref name='xmlElementType'/>
@@ -5547,6 +5599,7 @@
       <ref name='xmlValidateRoot'/>
       <ref name='xmlValidateElementDecl'/>
       <ref name='xmlValidNormalizeAttributeValue'/>
+      <ref name='xmlValidCtxtNormalizeAttributeValue'/>
       <ref name='xmlValidateAttributeDecl'/>
       <ref name='xmlValidateAttributeValue'/>
       <ref name='xmlValidateNotationDecl'/>
@@ -5626,7 +5679,6 @@
     </file>
     <file name='xmlmemory'>
       <ref name='DEBUG_MEMORY'/>
-      <ref name='MEM_LIST'/>
       <ref name='xmlFreeFunc'/>
       <ref name='xmlMallocFunc'/>
       <ref name='xmlReallocFunc'/>
@@ -5815,28 +5867,19 @@
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
       <ref name='xmlXPathNodeSetSort'/>
-      <ref name='xmlXPathIdFunction'/>
       <ref name='xmlXPathRoot'/>
       <ref name='xmlXPathEvalExpr'/>
       <ref name='xmlXPathParseName'/>
       <ref name='xmlXPathParseNCName'/>
       <ref name='xmlXPathStringEvalNumber'/>
       <ref name='xmlXPathEvaluatePredicateResult'/>
-      <ref name='xmlXPathInit'/>
-      <ref name='xmlXPathStringFunction'/>
       <ref name='xmlXPathRegisterAllFunctions'/>
-      <ref name='xmlXPathNodeSetCreate'/>
       <ref name='xmlXPathNodeSetMerge'/>
       <ref name='xmlXPathNodeSetDel'/>
       <ref name='xmlXPathNodeSetRemove'/>
-      <ref name='xmlXPathFreeNodeSet'/>
       <ref name='xmlXPathNewNodeSetList'/>
       <ref name='xmlXPathWrapNodeSet'/>
       <ref name='xmlXPathWrapExternal'/>
-      <ref name='xmlXPathFreeNodeSetList'/>
-      <ref name='xmlXPathFreeObject'/>
-      <ref name='xmlXPathNewContext'/>
-      <ref name='xmlXPathFreeContext'/>
       <ref name='xmlXPathEqualValues'/>
       <ref name='xmlXPathCompareValues'/>
       <ref name='xmlXPathValueFlipSign'/>
@@ -5862,8 +5905,10 @@
       <ref name='xmlXPathLastFunction'/>
       <ref name='xmlXPathPositionFunction'/>
       <ref name='xmlXPathCountFunction'/>
+      <ref name='xmlXPathIdFunction'/>
       <ref name='xmlXPathLocalNameFunction'/>
       <ref name='xmlXPathNamespaceURIFunction'/>
+      <ref name='xmlXPathStringFunction'/>
       <ref name='xmlXPathStringLengthFunction'/>
       <ref name='xmlXPathConcatFunction'/>
       <ref name='xmlXPathContainsFunction'/>
@@ -5946,6 +5991,11 @@
           <ref name='xmlGetEncodingAlias'/>
           <ref name='xmlParseCharEncoding'/>
         </word>
+        <word name='ATTRIBUTE'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
+        </word>
         <word name='Activated'>
           <ref name='xmlGetWarningsDefaultValue'/>
           <ref name='xmlKeepBlanksDefaultValue'/>
@@ -6506,6 +6556,7 @@
           <ref name='hasInternalSubset'/>
           <ref name='hasInternalSubsetSAXFunc'/>
           <ref name='xmlShellList'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlValidateDocumentFinal'/>
           <ref name='xmlValidateDtdFinal'/>
@@ -6840,6 +6891,36 @@
         <word name='Fragment'>
           <ref name='xmlNewDocFragment'/>
         </word>
+        <word name='Free'>
+          <ref name='docbFreeParserCtxt'/>
+          <ref name='htmlFreeParserCtxt'/>
+          <ref name='xmlACatalogDump'/>
+          <ref name='xmlCatalogCleanup'/>
+          <ref name='xmlCatalogDump'/>
+          <ref name='xmlCatalogFreeLocal'/>
+          <ref name='xmlFreeCatalog'/>
+          <ref name='xmlFreeDoc'/>
+          <ref name='xmlFreeDtd'/>
+          <ref name='xmlFreeElementContent'/>
+          <ref name='xmlFreeInputStream'/>
+          <ref name='xmlFreeNode'/>
+          <ref name='xmlFreeNodeList'/>
+          <ref name='xmlFreeNs'/>
+          <ref name='xmlFreeNsList'/>
+          <ref name='xmlFreeParserCtxt'/>
+          <ref name='xmlFreeParserInputBuffer'/>
+          <ref name='xmlFreeProp'/>
+          <ref name='xmlFreePropList'/>
+          <ref name='xmlFreeURI'/>
+          <ref name='xmlHashFree'/>
+          <ref name='xmlXPathFreeCompExpr'/>
+          <ref name='xmlXPathFreeContext'/>
+          <ref name='xmlXPathFreeNodeSet'/>
+          <ref name='xmlXPathFreeNodeSetList'/>
+          <ref name='xmlXPathFreeObject'/>
+          <ref name='xmlXPathFreeParserContext'/>
+          <ref name='xmlXPtrFreeLocationSet'/>
+        </word>
         <word name='Frees'>
           <ref name='xmlBufferFree'/>
           <ref name='xmlNanoFTPFreeCtxt'/>
@@ -7323,6 +7404,7 @@
         </word>
         <word name='Note:'>
           <ref name='xmlCharEncodingOutputFunc'/>
+          <ref name='xmlGetDtdEntity'/>
           <ref name='xmlParseAttValue'/>
           <ref name='xmlUTF8Strsub'/>
         </word>
@@ -8371,6 +8453,9 @@
           <ref name='htmlNodeDumpFormatOutput'/>
           <ref name='htmlSaveFileEnc'/>
           <ref name='htmlSaveFileFormat'/>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlDocDumpFormatMemory'/>
           <ref name='xmlDocDumpFormatMemoryEnc'/>
           <ref name='xmlNewChild'/>
@@ -8519,6 +8604,7 @@
           <ref name='xmlCatalogAdd'/>
         </word>
         <word name='already'>
+          <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
           <ref name='xmlAddSibling'/>
@@ -8915,7 +9001,6 @@
           <ref name='xmlNanoHTTPRead'/>
         </word>
         <word name='blocks'>
-          <ref name='MEM_LIST'/>
           <ref name='xmlIsChar'/>
           <ref name='xmlMemDisplay'/>
           <ref name='xmlMemoryDump'/>
@@ -9342,6 +9427,9 @@
           <ref name='htmlNodeDumpFile'/>
           <ref name='htmlNodeDumpFileFormat'/>
           <ref name='htmlNodeDumpFormatOutput'/>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlDocGetRootElement'/>
           <ref name='xmlDocSetRootElement'/>
           <ref name='xmlElemDump'/>
@@ -10196,6 +10284,11 @@
           <ref name='xmlIOHTTPOpenW'/>
           <ref name='xmlURIUnescapeString'/>
         </word>
+        <word name='destroyed'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
+        </word>
         <word name='detect'>
           <ref name='xmlInputMatchCallback'/>
           <ref name='xmlKeepBlanksDefault'/>
@@ -10646,6 +10739,9 @@
           <ref name='xmlXPathInit'/>
         </word>
         <word name='equal'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlStrEqual'/>
           <ref name='xmlXPathEqualValues'/>
           <ref name='xmlXPathEvalPredicate'/>
@@ -11745,6 +11841,7 @@
           <ref name='xmlValidGetValidElements'/>
         </word>
         <word name='inserted'>
+          <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
           <ref name='xmlAddSibling'/>
@@ -11782,6 +11879,9 @@
           <ref name='xmlValidateRoot'/>
         </word>
         <word name='instead'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlKeepBlanksDefault'/>
           <ref name='xmlRegisterHTTPPostCallbacks'/>
           <ref name='xmlSubstituteEntitiesDefault'/>
@@ -11848,6 +11948,9 @@
         <word name='into'>
           <ref name='attribute'/>
           <ref name='attributeSAXFunc'/>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlCharEncFirstLine'/>
           <ref name='xmlCharEncInFunc'/>
           <ref name='xmlCharEncOutFunc'/>
@@ -11864,6 +11967,7 @@
         </word>
         <word name='invalid'>
           <ref name='xmlReconciliateNs'/>
+          <ref name='xmlValidateDtdFinal'/>
         </word>
         <word name='invited'>
           <ref name='xmlValidGetValidElements'/>
@@ -11929,7 +12033,6 @@
       </letter>
       <letter name='k'>
         <word name='keep'>
-          <ref name='MEM_LIST'/>
           <ref name='xmlKeepBlanksDefaultValue'/>
           <ref name='xmlParserInputGrow'/>
           <ref name='xmlSubstituteEntitiesDefault'/>
@@ -12650,6 +12753,7 @@
           <ref name='xmlSetBufferAllocationScheme'/>
           <ref name='xmlShellPwd'/>
           <ref name='xmlStrncat'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlXPathPopBoolean'/>
           <ref name='xmlXPathPopExternal'/>
@@ -12786,6 +12890,7 @@
         </word>
         <word name='normalization'>
           <ref name='xmlNormalizeURIPath'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
         </word>
         <word name='normalization:'>
@@ -12795,6 +12900,7 @@
           <ref name='xmlXPathNormalizeFunction'/>
         </word>
         <word name='normalized'>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlXPathNormalizeFunction'/>
         </word>
@@ -13217,6 +13323,7 @@
           <ref name='xmlGetLastChild'/>
           <ref name='xmlNewChild'/>
           <ref name='xmlNewTextChild'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlXPathNextAncestor'/>
           <ref name='xmlXPathNextAncestorOrSelf'/>
@@ -13695,7 +13802,13 @@
         <word name='properly'>
           <ref name='xmlReconciliateNs'/>
         </word>
+        <word name='properties'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
+        </word>
         <word name='property'>
+          <ref name='xmlAddChild'/>
           <ref name='xmlFreePropList'/>
           <ref name='xmlNewDocProp'/>
           <ref name='xmlNewNsProp'/>
@@ -14124,6 +14237,7 @@
           <ref name='xmlCleanupThreads'/>
           <ref name='xmlInitThreads'/>
           <ref name='xmlNanoHTTPClose'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
         </word>
         <word name='relative'>
@@ -14214,7 +14328,6 @@
         </word>
         <word name='reporting'>
           <ref name='INPUT_CHUNK'/>
-          <ref name='MEM_LIST'/>
         </word>
         <word name='reports'>
           <ref name='docbCreatePushParserCtxt'/>
@@ -14392,6 +14505,7 @@
           <ref name='xmlParseExternalEntity'/>
           <ref name='xmlSAXUserParseFile'/>
           <ref name='xmlSAXUserParseMemory'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlXPathEvalPredicate'/>
           <ref name='xmlXPathEvaluatePredicateResult'/>
@@ -14770,11 +14884,11 @@
           <ref name='ftpListCallback'/>
         </word>
         <word name='sibling'>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlXPathNextPrecedingSibling'/>
         </word>
         <word name='siblings'>
-          <ref name='xmlAddNextSibling'/>
-          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlAddSibling'/>
           <ref name='xmlFreeNodeList'/>
           <ref name='xmlFreePropList'/>
@@ -15046,6 +15160,7 @@
           <ref name='xmlPrintURI'/>
         </word>
         <word name='step'>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlValidateDocumentFinal'/>
           <ref name='xmlValidateDtdFinal'/>
@@ -15514,6 +15629,9 @@
           <ref name='xmlXPathTranslateFunction'/>
         </word>
         <word name='there'>
+          <ref name='xmlAddChild'/>
+          <ref name='xmlAddNextSibling'/>
+          <ref name='xmlAddPrevSibling'/>
           <ref name='xmlEnumeration'/>
           <ref name='xmlGenericErrorFunc'/>
           <ref name='xmlNanoFTPCheckResponse'/>
@@ -15644,7 +15762,6 @@
           <ref name='xmlUTF8Strsub'/>
         </word>
         <word name='track'>
-          <ref name='MEM_LIST'/>
           <ref name='xmlEntityReferenceFunc'/>
         </word>
         <word name='tracking'>
@@ -15890,6 +16007,7 @@
           <ref name='xmlFreeNode'/>
         </word>
         <word name='unlinked'>
+          <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
           <ref name='xmlAddSibling'/>
@@ -16073,6 +16191,7 @@
           <ref name='xmlAddNotationDecl'/>
           <ref name='xmlAddRef'/>
           <ref name='xmlShellValidate'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
           <ref name='xmlValidateAttributeDecl'/>
           <ref name='xmlValidateDocument'/>
@@ -16122,6 +16241,7 @@
         <word name='values:'>
           <ref name='xmlSetCompressMode'/>
           <ref name='xmlSetDocCompressMode'/>
+          <ref name='xmlValidCtxtNormalizeAttributeValue'/>
           <ref name='xmlValidNormalizeAttributeValue'/>
         </word>
         <word name='varags'>
@@ -16219,6 +16339,7 @@
         <word name='was'>
           <ref name='CHECK_ERROR'/>
           <ref name='CHECK_ERROR0'/>
+          <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
           <ref name='xmlAddSibling'/>
@@ -16261,6 +16382,7 @@
           <ref name='xmlParseCtxtExternalEntity'/>
           <ref name='xmlParseExtParsedEnt'/>
           <ref name='xmlParseExternalEntity'/>
+          <ref name='xmlValidateDtdFinal'/>
         </word>
         <word name='wellformed'>
           <ref name='xmlParseFile'/>
@@ -16898,6 +17020,36 @@
         <word name='xmlXPathNodeTrailingSorted'>
           <ref name='xmlXPathNodeTrailing'/>
         </word>
+        <word name='xmlXPathObjectPtr'>
+          <ref name='xmlXPathCompile'/>
+          <ref name='xmlXPathCompiledEval'/>
+          <ref name='xmlXPathEval'/>
+          <ref name='xmlXPathEvalExpression'/>
+          <ref name='xmlXPathFreeNodeSetList'/>
+          <ref name='xmlXPathFreeObject'/>
+          <ref name='xmlXPathNewBoolean'/>
+          <ref name='xmlXPathNewCString'/>
+          <ref name='xmlXPathNewFloat'/>
+          <ref name='xmlXPathNewNodeSet'/>
+          <ref name='xmlXPathNewNodeSetList'/>
+          <ref name='xmlXPathNewString'/>
+          <ref name='xmlXPathNewValueTree'/>
+          <ref name='xmlXPathWrapNodeSet'/>
+          <ref name='xmlXPtrEval'/>
+          <ref name='xmlXPtrLocationSetAdd'/>
+          <ref name='xmlXPtrLocationSetCreate'/>
+          <ref name='xmlXPtrLocationSetDel'/>
+          <ref name='xmlXPtrNewCollapsedRange'/>
+          <ref name='xmlXPtrNewLocationSetNodeSet'/>
+          <ref name='xmlXPtrNewLocationSetNodes'/>
+          <ref name='xmlXPtrNewRange'/>
+          <ref name='xmlXPtrNewRangeNodeObject'/>
+          <ref name='xmlXPtrNewRangeNodePoint'/>
+          <ref name='xmlXPtrNewRangeNodes'/>
+          <ref name='xmlXPtrNewRangePointNode'/>
+          <ref name='xmlXPtrNewRangePoints'/>
+          <ref name='xmlXPtrWrapLocationSet'/>
+        </word>
         <word name='xmlXPathParserContext'>
           <ref name='xmlXPathFreeParserContext'/>
           <ref name='xmlXPathNewParserContext'/>
diff --git a/doc/news.html b/doc/news.html
index 1a14cd8..d669244 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -94,6 +94,12 @@
 <li>(seeems working but delayed from release) parsing/import of Docbook
     SGML docs</li>
 </ul>
+<h3>2.4.16: Feb 20 2002</h3>
+<ul>
+<li>a lot of bug fixes, most of them were triggered by the XML Testsuite
+    from OASIS and W3C. Compliance has been significantly improved.</li>
+<li>a couple of portability fixes too.</li>
+</ul>
 <h3>2.4.15: Feb 11 2002</h3>
 <ul>
 <li>Fixed the Makefiles, especially the python module ones</li>
diff --git a/doc/parsedecl.py b/doc/parsedecl.py
index 074a808..3145701 100755
--- a/doc/parsedecl.py
+++ b/doc/parsedecl.py
@@ -32,6 +32,8 @@
 
 
 def indexString(id, str):
+    if str == None:
+        return
     str = string.replace(str, "'", ' ')
     str = string.replace(str, '"', ' ')
     str = string.replace(str, "/", ' ')
@@ -798,7 +800,11 @@
         target = string.upper(ids[id])
     else:
 	target = string.upper(id)
-    file = 'html/libxml-' + string.lower(hash[id]) + '.html';
+    if hash.has_key(id):
+        module = string.lower(hash[id])
+    else:
+        module = 'index'
+    file = 'html/libxml-' + module + '.html';
     return file + '#' + target
     
 print "Saving XML crossreferences libxml2-refs.xml"
diff --git a/doc/xml.html b/doc/xml.html
index fd64238..9061288 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -550,6 +550,13 @@
     SGML docs</li>
 </ul>
 
+<h3>2.4.16: Feb 20 2002</h3>
+<ul>
+  <li>a lot of bug fixes, most of them were triggered by the XML Testsuite
+    from OASIS and W3C. Compliance has been significantly improved.</li>
+  <li>a couple of portability fixes too.</li>
+</ul>
+
 <h3>2.4.15: Feb 11 2002</h3>
 <ul>
   <li>Fixed the Makefiles, especially the python module ones</li>
@@ -2218,6 +2225,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document:
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 476ca27..ebbc6ae 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -239,6 +239,7 @@
 
 
 
+
 } </pre>
 </li>
 <li>And then use it to save the document:
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index 0ac2060..40caf79 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.15"
+#define LIBXML_DOTTED_VERSION "2.4.16"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20415
+#define LIBXML_VERSION 20416
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20415"
+#define LIBXML_VERSION_STRING "20416"
 
 /**
  * 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(20415);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20416);
 
 #if 0
 /**
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 3e5a311..642df7c 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -78,8 +78,6 @@
 # functions from module parser
 cleanupParser()
 createDocParserCtxt()
-defaultSAXHandlerInit()
-htmlDefaultSAXHandlerInit()
 initParser()
 keepBlanksDefault()
 lineNumbersDefault()
@@ -329,7 +327,7 @@
     # functions from module xinclude
     xincludeProcess()
 
-    # functions from module xpathInternals
+    # functions from module xpath
     xpathNewContext()
 
 
@@ -434,6 +432,7 @@
 
     # functions from module parser
     clearParserCtxt()
+    freeParserCtxt()
     initParserCtxt()
     parseChunk()
     parseDocument()
@@ -442,7 +441,6 @@
 
     # functions from module parserInternals
     decodeEntities()
-    freeParserCtxt()
     namespaceParseNCName()
     namespaceParseNSDef()
     nextChar()
@@ -523,9 +521,9 @@
     # functions from module xpath
     xpathEval()
     xpathEvalExpression()
+    xpathFreeContext()
 
     # functions from module xpathInternals
-    xpathFreeContext()
     xpathNewParserContext()
     xpathNsLookup()
     xpathRegisterAllFunctions()
diff --git a/xpath.c b/xpath.c
index 0707b16..3464c92 100644
--- a/xpath.c
+++ b/xpath.c
@@ -4425,7 +4425,15 @@
 
     CAST_TO_NUMBER;
     CHECK_TYPE(XPATH_NUMBER);
-    ctxt->value->floatval /= val;
+    if (val == 0) {
+	if (ctxt->value->floatval == 0)
+	    ctxt->value->floatval = xmlXPathNAN;
+	else if (ctxt->value->floatval > 0)
+	    ctxt->value->floatval = xmlXPathPINF;
+	else if (ctxt->value->floatval < 0)
+	    ctxt->value->floatval = xmlXPathNINF;
+    } else 
+	ctxt->value->floatval /= val;
 }
 
 /**