- doc/html/* doc/xml.html: updated and regenerated the docs

Daniel
author: Daniel Veillard <veillard@src.gnome.org> 2001-04-22 19:31:20 +0000
committer: Daniel Veillard <veillard@src.gnome.org> 2001-04-22 19:31:20 +0000
commit: a41123ce959741be8e16f72177660af098819afc (patch)
tree: 551c673dc74aad261f34141b15ac8e3fd666217f
parent: fd0c3ebb0931af19ab3b4da3493f027fca849cf7 (diff)
download: libxml2-a41123ce959741be8e16f72177660af098819afc.tar.gz
22 files changed, 6998 insertions, 2562 deletions
diff --git a/ChangeLog b/ChangeLog
index 0db0bf5b..6ecfaf8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 22 21:29:52 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* doc/html/* doc/xml.html: updated and regenerated the docs
+
 Sun Apr 22 21:11:45 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* xpath.c: fixed the XPointer problem introduced in 2.3.6
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index d8b86cc5..63ca63a5 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -50,6 +50,8 @@
 <ANCHOR id ="XMLPARSERINPUTGROW" href="libxml/libxml-parser.html#XMLPARSERINPUTGROW">
 <ANCHOR id ="XMLSTRDUP" href="libxml/libxml-parser.html#XMLSTRDUP">
 <ANCHOR id ="XMLSTRNDUP" href="libxml/libxml-parser.html#XMLSTRNDUP">
+<ANCHOR id ="XMLCHARSTRNDUP" href="libxml/libxml-parser.html#XMLCHARSTRNDUP">
+<ANCHOR id ="XMLCHARSTRDUP" href="libxml/libxml-parser.html#XMLCHARSTRDUP">
 <ANCHOR id ="XMLSTRSUB" href="libxml/libxml-parser.html#XMLSTRSUB">
 <ANCHOR id ="XMLSTRCHR" href="libxml/libxml-parser.html#XMLSTRCHR">
 <ANCHOR id ="XMLSTRSTR" href="libxml/libxml-parser.html#XMLSTRSTR">
@@ -189,8 +191,11 @@
 <ANCHOR id ="XMLDOCPTR" href="libxml/libxml-tree.html#XMLDOCPTR">
 <ANCHOR id ="XMLCHILDRENNODE" href="libxml/libxml-tree.html#XMLCHILDRENNODE">
 <ANCHOR id ="XMLROOTNODE" href="libxml/libxml-tree.html#XMLROOTNODE">
+<ANCHOR id ="XMLSETBUFFERALLOCATIONSCHEME" href="libxml/libxml-tree.html#XMLSETBUFFERALLOCATIONSCHEME">
+<ANCHOR id ="XMLGETBUFFERALLOCATIONSCHEME" href="libxml/libxml-tree.html#XMLGETBUFFERALLOCATIONSCHEME">
 <ANCHOR id ="XMLBUFFERCREATE" href="libxml/libxml-tree.html#XMLBUFFERCREATE">
 <ANCHOR id ="XMLBUFFERCREATESIZE" href="libxml/libxml-tree.html#XMLBUFFERCREATESIZE">
+<ANCHOR id ="XMLBUFFERRESIZE" href="libxml/libxml-tree.html#XMLBUFFERRESIZE">
 <ANCHOR id ="XMLBUFFERFREE" href="libxml/libxml-tree.html#XMLBUFFERFREE">
 <ANCHOR id ="XMLBUFFERDUMP" href="libxml/libxml-tree.html#XMLBUFFERDUMP">
 <ANCHOR id ="XMLBUFFERADD" href="libxml/libxml-tree.html#XMLBUFFERADD">
@@ -211,6 +216,7 @@
 <ANCHOR id ="XMLNEWGLOBALNS" href="libxml/libxml-tree.html#XMLNEWGLOBALNS">
 <ANCHOR id ="XMLNEWNS" href="libxml/libxml-tree.html#XMLNEWNS">
 <ANCHOR id ="XMLFREENS" href="libxml/libxml-tree.html#XMLFREENS">
+<ANCHOR id ="XMLFREENSLIST" href="libxml/libxml-tree.html#XMLFREENSLIST">
 <ANCHOR id ="XMLNEWDOC" href="libxml/libxml-tree.html#XMLNEWDOC">
 <ANCHOR id ="XMLFREEDOC" href="libxml/libxml-tree.html#XMLFREEDOC">
 <ANCHOR id ="XMLNEWDOCPROP" href="libxml/libxml-tree.html#XMLNEWDOCPROP">
@@ -238,6 +244,7 @@
 <ANCHOR id ="XMLNEWCHARREF" href="libxml/libxml-tree.html#XMLNEWCHARREF">
 <ANCHOR id ="XMLNEWREFERENCE" href="libxml/libxml-tree.html#XMLNEWREFERENCE">
 <ANCHOR id ="XMLCOPYNODE" href="libxml/libxml-tree.html#XMLCOPYNODE">
+<ANCHOR id ="XMLDOCCOPYNODE" href="libxml/libxml-tree.html#XMLDOCCOPYNODE">
 <ANCHOR id ="XMLCOPYNODELIST" href="libxml/libxml-tree.html#XMLCOPYNODELIST">
 <ANCHOR id ="XMLNEWDOCFRAGMENT" href="libxml/libxml-tree.html#XMLNEWDOCFRAGMENT">
 <ANCHOR id ="XMLDOCGETROOTELEMENT" href="libxml/libxml-tree.html#XMLDOCGETROOTELEMENT">
@@ -327,6 +334,8 @@
 <ANCHOR id ="XMLDUMPENTITYDECL" href="libxml/libxml-entities.html#XMLDUMPENTITYDECL">
 <ANCHOR id ="XMLCLEANUPPREDEFINEDENTITIES" href="libxml/libxml-entities.html#XMLCLEANUPPREDEFINEDENTITIES">
 <ANCHOR id ="LIBXML-VALID" href="libxml/libxml-valid.html">
+<ANCHOR id ="XMLVALIDSTATE" href="libxml/libxml-valid.html#XMLVALIDSTATE">
+<ANCHOR id ="XMLVALIDSTATEPTR" href="libxml/libxml-valid.html#XMLVALIDSTATEPTR">
 <ANCHOR id ="XMLVALIDITYERRORFUNC" href="libxml/libxml-valid.html#XMLVALIDITYERRORFUNC">
 <ANCHOR id ="XMLVALIDITYWARNINGFUNC" href="libxml/libxml-valid.html#XMLVALIDITYWARNINGFUNC">
 <ANCHOR id ="XMLVALIDCTXT" href="libxml/libxml-valid.html#XMLVALIDCTXT">
@@ -370,6 +379,7 @@
 <ANCHOR id ="XMLFREEREFTABLE" href="libxml/libxml-valid.html#XMLFREEREFTABLE">
 <ANCHOR id ="XMLISREF" href="libxml/libxml-valid.html#XMLISREF">
 <ANCHOR id ="XMLREMOVEREF" href="libxml/libxml-valid.html#XMLREMOVEREF">
+<ANCHOR id ="XMLGETREFS" href="libxml/libxml-valid.html#XMLGETREFS">
 <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">
@@ -509,6 +519,7 @@
 <ANCHOR id ="XMLXPATHREGISTERVARIABLELOOKUP" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTERVARIABLELOOKUP">
 <ANCHOR id ="XMLXPATHERROR" href="libxml/libxml-xpathinternals.html#XMLXPATHERROR">
 <ANCHOR id ="XMLXPATHDEBUGDUMPOBJECT" href="libxml/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">
+<ANCHOR id ="XMLXPATHDEBUGDUMPCOMPEXPR" href="libxml/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPCOMPEXPR">
 <ANCHOR id ="XMLXPATHREGISTERNS" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTERNS">
 <ANCHOR id ="XMLXPATHNSLOOKUP" href="libxml/libxml-xpathinternals.html#XMLXPATHNSLOOKUP">
 <ANCHOR id ="XMLXPATHREGISTEREDNSCLEANUP" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTEREDNSCLEANUP">
@@ -533,6 +544,8 @@
 <ANCHOR id ="XMLXPATHNEWNODESET" href="libxml/libxml-xpathinternals.html#XMLXPATHNEWNODESET">
 <ANCHOR id ="XMLXPATHNEWVALUETREE" href="libxml/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">
 <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">
@@ -562,6 +575,17 @@
 <ANCHOR id ="XMLXPATHMULTVALUES" href="libxml/libxml-xpathinternals.html#XMLXPATHMULTVALUES">
 <ANCHOR id ="XMLXPATHDIVVALUES" href="libxml/libxml-xpathinternals.html#XMLXPATHDIVVALUES">
 <ANCHOR id ="XMLXPATHMODVALUES" href="libxml/libxml-xpathinternals.html#XMLXPATHMODVALUES">
+<ANCHOR id ="XMLXPATHISNODETYPE" href="libxml/libxml-xpathinternals.html#XMLXPATHISNODETYPE">
+<ANCHOR id ="XMLXPATHNEXTSELF" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTSELF">
+<ANCHOR id ="XMLXPATHNEXTCHILD" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTCHILD">
+<ANCHOR id ="XMLXPATHNEXTDESCENDANT" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTDESCENDANT">
+<ANCHOR id ="XMLXPATHNEXTDESCENDANTORSELF" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTDESCENDANTORSELF">
+<ANCHOR id ="XMLXPATHNEXTPARENT" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTPARENT">
+<ANCHOR id ="XMLXPATHNEXTANCESTORORSELF" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTANCESTORORSELF">
+<ANCHOR id ="XMLXPATHNEXTFOLLOWINGSIBLING" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTFOLLOWINGSIBLING">
+<ANCHOR id ="XMLXPATHNEXTFOLLOWING" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTFOLLOWING">
+<ANCHOR id ="XMLXPATHNEXTNAMESPACE" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTNAMESPACE">
+<ANCHOR id ="XMLXPATHNEXTATTRIBUTE" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTATTRIBUTE">
 <ANCHOR id ="XMLXPATHNEXTPRECEDING" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTPRECEDING">
 <ANCHOR id ="XMLXPATHNEXTANCESTOR" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTANCESTOR">
 <ANCHOR id ="XMLXPATHNEXTPRECEDINGSIBLING" href="libxml/libxml-xpathinternals.html#XMLXPATHNEXTPRECEDINGSIBLING">
@@ -595,9 +619,19 @@
 <ANCHOR id ="XMLXPTRLOCATIONSETCREATE" href="libxml/libxml-xpointer.html#XMLXPTRLOCATIONSETCREATE">
 <ANCHOR id ="XMLXPTRFREELOCATIONSET" href="libxml/libxml-xpointer.html#XMLXPTRFREELOCATIONSET">
 <ANCHOR id ="XMLXPTRLOCATIONSETMERGE" href="libxml/libxml-xpointer.html#XMLXPTRLOCATIONSETMERGE">
+<ANCHOR id ="XMLXPTRNEWRANGE" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGE">
+<ANCHOR id ="XMLXPTRNEWRANGEPOINTS" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS">
+<ANCHOR id ="XMLXPTRNEWRANGENODEPOINT" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGENODEPOINT">
+<ANCHOR id ="XMLXPTRNEWRANGEPOINTNODE" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGEPOINTNODE">
+<ANCHOR id ="XMLXPTRNEWRANGENODES" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGENODES">
+<ANCHOR id ="XMLXPTRNEWLOCATIONSETNODES" href="libxml/libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODES">
+<ANCHOR id ="XMLXPTRNEWLOCATIONSETNODESET" href="libxml/libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODESET">
 <ANCHOR id ="XMLXPTRNEWRANGENODEOBJECT" href="libxml/libxml-xpointer.html#XMLXPTRNEWRANGENODEOBJECT">
+<ANCHOR id ="XMLXPTRNEWCOLLAPSEDRANGE" href="libxml/libxml-xpointer.html#XMLXPTRNEWCOLLAPSEDRANGE">
 <ANCHOR id ="XMLXPTRLOCATIONSETADD" href="libxml/libxml-xpointer.html#XMLXPTRLOCATIONSETADD">
 <ANCHOR id ="XMLXPTRWRAPLOCATIONSET" href="libxml/libxml-xpointer.html#XMLXPTRWRAPLOCATIONSET">
+<ANCHOR id ="XMLXPTRLOCATIONSETDEL" href="libxml/libxml-xpointer.html#XMLXPTRLOCATIONSETDEL">
+<ANCHOR id ="XMLXPTRLOCATIONSETREMOVE" href="libxml/libxml-xpointer.html#XMLXPTRLOCATIONSETREMOVE">
 <ANCHOR id ="XMLXPTRNEWCONTEXT" href="libxml/libxml-xpointer.html#XMLXPTRNEWCONTEXT">
 <ANCHOR id ="XMLXPTREVAL" href="libxml/libxml-xpointer.html#XMLXPTREVAL">
 <ANCHOR id ="XMLXPTRRANGETOFUNCTION" href="libxml/libxml-xpointer.html#XMLXPTRRANGETOFUNCTION">
@@ -715,6 +749,7 @@
 <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">
 <ANCHOR id ="XMLPUSHINPUT" href="libxml/libxml-parserinternals.html#XMLPUSHINPUT">
 <ANCHOR id ="XMLPOPINPUT" href="libxml/libxml-parserinternals.html#XMLPOPINPUT">
@@ -783,17 +818,20 @@
 <ANCHOR id ="NODEPOP" href="libxml/libxml-parserinternals.html#NODEPOP">
 <ANCHOR id ="INPUTPUSH" href="libxml/libxml-parserinternals.html#INPUTPUSH">
 <ANCHOR id ="INPUTPOP" href="libxml/libxml-parserinternals.html#INPUTPOP">
+<ANCHOR id ="NAMEPOP" href="libxml/libxml-parserinternals.html#NAMEPOP">
+<ANCHOR id ="NAMEPUSH" href="libxml/libxml-parserinternals.html#NAMEPUSH">
 <ANCHOR id ="XMLSKIPBLANKCHARS" href="libxml/libxml-parserinternals.html#XMLSKIPBLANKCHARS">
 <ANCHOR id ="XMLSTRINGCURRENTCHAR" href="libxml/libxml-parserinternals.html#XMLSTRINGCURRENTCHAR">
 <ANCHOR id ="XMLPARSERHANDLEPEREFERENCE" href="libxml/libxml-parserinternals.html#XMLPARSERHANDLEPEREFERENCE">
 <ANCHOR id ="XMLPARSERHANDLEREFERENCE" href="libxml/libxml-parserinternals.html#XMLPARSERHANDLEREFERENCE">
-<ANCHOR id ="NAMEPOP" href="libxml/libxml-parserinternals.html#NAMEPOP">
 <ANCHOR id ="XMLCHECKLANGUAGEID" href="libxml/libxml-parserinternals.html#XMLCHECKLANGUAGEID">
 <ANCHOR id ="XMLCURRENTCHAR" href="libxml/libxml-parserinternals.html#XMLCURRENTCHAR">
+<ANCHOR id ="XMLCOPYCHARMULTIBYTE" href="libxml/libxml-parserinternals.html#XMLCOPYCHARMULTIBYTE">
 <ANCHOR id ="XMLCOPYCHAR" href="libxml/libxml-parserinternals.html#XMLCOPYCHAR">
 <ANCHOR id ="XMLNEXTCHAR" href="libxml/libxml-parserinternals.html#XMLNEXTCHAR">
 <ANCHOR id ="XMLPARSERINPUTSHRINK" href="libxml/libxml-parserinternals.html#XMLPARSERINPUTSHRINK">
 <ANCHOR id ="HTMLINITAUTOCLOSE" href="libxml/libxml-parserinternals.html#HTMLINITAUTOCLOSE">
+<ANCHOR id ="HTMLCREATEFILEPARSERCTXT" href="libxml/libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT">
 <ANCHOR id ="LIBXML-ENCODING" href="libxml/libxml-encoding.html">
 <ANCHOR id ="XMLCHARENCODING" href="libxml/libxml-encoding.html#XMLCHARENCODING">
 <ANCHOR id ="XMLCHARENCODINGINPUTFUNC" href="libxml/libxml-encoding.html#XMLCHARENCODINGINPUTFUNC">
@@ -812,11 +850,14 @@
 <ANCHOR id ="XMLPARSECHARENCODING" href="libxml/libxml-encoding.html#XMLPARSECHARENCODING">
 <ANCHOR id ="XMLGETCHARENCODINGNAME" href="libxml/libxml-encoding.html#XMLGETCHARENCODINGNAME">
 <ANCHOR id ="XMLDETECTCHARENCODING" href="libxml/libxml-encoding.html#XMLDETECTCHARENCODING">
-<ANCHOR id ="XMLCHECKUTF8" href="libxml/libxml-encoding.html#XMLCHECKUTF8">
 <ANCHOR id ="XMLCHARENCOUTFUNC" href="libxml/libxml-encoding.html#XMLCHARENCOUTFUNC">
 <ANCHOR id ="XMLCHARENCINFUNC" href="libxml/libxml-encoding.html#XMLCHARENCINFUNC">
 <ANCHOR id ="XMLCHARENCFIRSTLINE" href="libxml/libxml-encoding.html#XMLCHARENCFIRSTLINE">
 <ANCHOR id ="XMLCHARENCCLOSEFUNC" href="libxml/libxml-encoding.html#XMLCHARENCCLOSEFUNC">
+<ANCHOR id ="UTF8TOISOLAT1" href="libxml/libxml-encoding.html#UTF8TOISOLAT1">
+<ANCHOR id ="ISOLAT1TOUTF8" href="libxml/libxml-encoding.html#ISOLAT1TOUTF8">
+<ANCHOR id ="XMLCHECKUTF8" href="libxml/libxml-encoding.html#XMLCHECKUTF8">
+<ANCHOR id ="XMLUTF8STRLEN" href="libxml/libxml-encoding.html#XMLUTF8STRLEN">
 <ANCHOR id ="LIBXML-DEBUGXML" href="libxml/libxml-debugxml.html">
 <ANCHOR id ="XMLDEBUGDUMPSTRING" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPSTRING">
 <ANCHOR id ="XMLDEBUGDUMPATTR" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPATTR">
@@ -837,6 +878,7 @@
 <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 ="DEBUG-MEMORY-FREED-CAPS" href="libxml/libxml-xmlmemory.html#DEBUG-MEMORY-FREED-CAPS">
 <ANCHOR id ="MEM-CLEANUP-CAPS" href="libxml/libxml-xmlmemory.html#MEM-CLEANUP-CAPS">
 <ANCHOR id ="XMLFREEFUNC" href="libxml/libxml-xmlmemory.html#XMLFREEFUNC">
 <ANCHOR id ="XMLMALLOCFUNC" href="libxml/libxml-xmlmemory.html#XMLMALLOCFUNC">
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index f9172f94..b818a8ff 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -121,7 +121,7 @@ NAME="LIBXML-DEBUGXML"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18702"
+NAME="AEN19787"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN18702"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18705"
+NAME="AEN19790"
 ></A
 ><H2
 >Synopsis</H2
@@ -321,7 +321,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18752"
+NAME="AEN19837"
 ></A
 ><H2
 >Description</H2
@@ -331,14 +331,14 @@ NAME="AEN18752"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18755"
+NAME="AEN19840"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18757"
+NAME="AEN19842"
 ></A
 ><H3
 ><A
@@ -388,7 +388,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -405,7 +405,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -420,7 +420,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18777"
+NAME="AEN19862"
 ></A
 ><H3
 ><A
@@ -471,7 +471,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -488,7 +488,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -505,7 +505,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -520,7 +520,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18801"
+NAME="AEN19886"
 ></A
 ><H3
 ><A
@@ -571,7 +571,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -588,7 +588,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -605,7 +605,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -620,7 +620,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18825"
+NAME="AEN19910"
 ></A
 ><H3
 ><A
@@ -671,7 +671,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -688,7 +688,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -705,7 +705,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -720,7 +720,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18849"
+NAME="AEN19934"
 ></A
 ><H3
 ><A
@@ -771,7 +771,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -788,7 +788,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -805,7 +805,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -820,7 +820,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18873"
+NAME="AEN19958"
 ></A
 ><H3
 ><A
@@ -871,7 +871,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -888,7 +888,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -905,7 +905,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -920,7 +920,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18897"
+NAME="AEN19982"
 ></A
 ><H3
 ><A
@@ -970,7 +970,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -987,7 +987,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1002,7 +1002,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18917"
+NAME="AEN20002"
 ></A
 ><H3
 ><A
@@ -1052,7 +1052,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1069,7 +1069,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1084,7 +1084,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18937"
+NAME="AEN20022"
 ></A
 ><H3
 ><A
@@ -1134,7 +1134,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1151,7 +1151,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1166,7 +1166,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18957"
+NAME="AEN20042"
 ></A
 ><H3
 ><A
@@ -1216,7 +1216,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1233,7 +1233,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1248,7 +1248,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18977"
+NAME="AEN20062"
 ></A
 ><H3
 ><A
@@ -1298,7 +1298,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1315,7 +1315,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1330,7 +1330,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18997"
+NAME="AEN20082"
 ></A
 ><H3
 ><A
@@ -1373,7 +1373,7 @@ CLASS="PARAMETER"
 ><I
 >prompt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1403,7 +1403,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19015"
+NAME="AEN20100"
 ></A
 ><H3
 ><A
@@ -1437,7 +1437,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19020"
+NAME="AEN20105"
 ></A
 ><H3
 ><A
@@ -1463,7 +1463,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19025"
+NAME="AEN20110"
 ></A
 ><H3
 ><A
@@ -1518,7 +1518,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1535,7 +1535,7 @@ CLASS="PARAMETER"
 ><I
 >arg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1552,7 +1552,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1569,7 +1569,7 @@ CLASS="PARAMETER"
 ><I
 >node2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1599,7 +1599,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19058"
+NAME="AEN20143"
 ></A
 ><H3
 ><A
@@ -1658,7 +1658,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1675,7 +1675,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1692,7 +1692,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1709,7 +1709,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 14d610c0..f6a5d30f 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -121,7 +121,7 @@ NAME="LIBXML-ENCODING"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18236"
+NAME="AEN19229"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN18236"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18239"
+NAME="AEN19232"
 ></A
 ><H2
 >Synopsis</H2
@@ -244,10 +244,6 @@ HREF="libxml-encoding.html#XMLDETECTCHARENCODING"
 >       (unsigned char *in,
                                              int len);
 int         <A
-HREF="libxml-encoding.html#XMLCHECKUTF8"
->xmlCheckUTF8</A
->                    (unsigned char *utf);
-int         <A
 HREF="libxml-encoding.html#XMLCHARENCOUTFUNC"
 >xmlCharEncOutFunc</A
 >               (<A
@@ -298,7 +294,29 @@ HREF="libxml-encoding.html#XMLCHARENCCLOSEFUNC"
 >             (<A
 HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 >xmlCharEncodingHandler</A
-> *handler);</PRE
+> *handler);
+int         <A
+HREF="libxml-encoding.html#UTF8TOISOLAT1"
+>UTF8Toisolat1</A
+>                   (unsigned char *out,
+                                             int *outlen,
+                                             unsigned char *in,
+                                             int *inlen);
+int         <A
+HREF="libxml-encoding.html#ISOLAT1TOUTF8"
+>isolat1ToUTF8</A
+>                   (unsigned char *out,
+                                             int *outlen,
+                                             unsigned char *in,
+                                             int *inlen);
+int         <A
+HREF="libxml-encoding.html#XMLCHECKUTF8"
+>xmlCheckUTF8</A
+>                    (unsigned char *utf);
+int         <A
+HREF="libxml-encoding.html#XMLUTF8STRLEN"
+>xmlUTF8Strlen</A
+>                   (unsigned char *utf);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -306,7 +324,7 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18281"
+NAME="AEN19277"
 ></A
 ><H2
 >Description</H2
@@ -316,14 +334,14 @@ NAME="AEN18281"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18284"
+NAME="AEN19280"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18286"
+NAME="AEN19282"
 ></A
 ><H3
 ><A
@@ -374,7 +392,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18291"
+NAME="AEN19287"
 ></A
 ><H3
 ><A
@@ -420,7 +438,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -437,7 +455,7 @@ CLASS="PARAMETER"
 ><I
 >outlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -454,7 +472,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -471,7 +489,7 @@ CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -501,7 +519,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18321"
+NAME="AEN19317"
 ></A
 ><H3
 ><A
@@ -547,7 +565,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -564,7 +582,7 @@ CLASS="PARAMETER"
 ><I
 >outlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -581,7 +599,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -598,7 +616,7 @@ CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -628,7 +646,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18351"
+NAME="AEN19347"
 ></A
 ><H3
 ><A
@@ -662,7 +680,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18356"
+NAME="AEN19352"
 ></A
 ><H3
 ><A
@@ -688,7 +706,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18361"
+NAME="AEN19357"
 ></A
 ><H3
 ><A
@@ -719,7 +737,7 @@ in normal processing.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18367"
+NAME="AEN19363"
 ></A
 ><H3
 ><A
@@ -748,7 +766,7 @@ unregisters all the encoding handlers and the aliases.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18373"
+NAME="AEN19369"
 ></A
 ><H3
 ><A
@@ -796,7 +814,7 @@ CLASS="PARAMETER"
 ><I
 >handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -811,7 +829,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18389"
+NAME="AEN19385"
 ></A
 ><H3
 ><A
@@ -863,7 +881,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -893,7 +911,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18410"
+NAME="AEN19406"
 ></A
 ><H3
 ><A
@@ -940,7 +958,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -970,7 +988,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18429"
+NAME="AEN19425"
 ></A
 ><H3
 ><A
@@ -1027,7 +1045,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1044,7 +1062,7 @@ CLASS="PARAMETER"
 ><I
 >alias</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1074,7 +1092,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18454"
+NAME="AEN19450"
 ></A
 ><H3
 ><A
@@ -1124,7 +1142,7 @@ CLASS="PARAMETER"
 ><I
 >alias</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1154,7 +1172,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18474"
+NAME="AEN19470"
 ></A
 ><H3
 ><A
@@ -1199,7 +1217,7 @@ CLASS="PARAMETER"
 ><I
 >alias</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1229,7 +1247,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18493"
+NAME="AEN19489"
 ></A
 ><H3
 ><A
@@ -1257,7 +1275,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18499"
+NAME="AEN19495"
 ></A
 ><H3
 ><A
@@ -1307,7 +1325,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1338,7 +1356,7 @@ if not recognized.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18519"
+NAME="AEN19515"
 ></A
 ><H3
 ><A
@@ -1391,7 +1409,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1421,7 +1439,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18540"
+NAME="AEN19536"
 ></A
 ><H3
 ><A
@@ -1471,7 +1489,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1489,7 +1507,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1519,13 +1537,13 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18564"
+NAME="AEN19560"
 ></A
 ><H3
 ><A
-NAME="XMLCHECKUTF8"
+NAME="XMLCHARENCOUTFUNC"
 ></A
->xmlCheckUTF8 ()</H3
+>xmlCharEncOutFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1535,27 +1553,33 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCheckUTF8                    (unsigned char *utf);</PRE
+>int         xmlCharEncOutFunc               (<A
+HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
+>xmlCharEncodingHandler</A
+> *handler,
+                                             <A
+HREF="libxml-tree.html#XMLBUFFERPTR"
+>xmlBufferPtr</A
+> out,
+                                             <A
+HREF="libxml-tree.html#XMLBUFFERPTR"
+>xmlBufferPtr</A
+> in);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Checks <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> for being valid utf-8. <TT
+>Generic front-end for the encoding handler output function
+a first call with <TT
 CLASS="PARAMETER"
 ><I
->utf</I
+>in</I
 ></TT
-> is assumed to be
-null-terminated. This function is not super-strict, as it will
-allow longer utf-8 sequences than necessary. Note that Java is
-capable of producing these sequences if provoked. Also note, this
-routine checks for the 4-byte maxiumum size, but does not check for
-0x10ffff maximum value.</P
+> == NULL has to be made firs to initiate the 
+output in case of non-stateless encoding needing to initiate their
+state or the output (like the BOM in UTF16).
+In case of UTF8 sequence conversion errors for the given encoder,
+the content will be automatically remapped to a CharRef sequence.</P
 ><P
 ></P
 ><DIV
@@ -1577,14 +1601,48 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->utf</I
+>handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> Pointer to putative utf-8 encoded string.</TD
+>	char enconding transformation data structure</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an xmlBuffer for the output.</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1599,12 +1657,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> true if <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is valid.</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TABLE
 ><P
@@ -1614,13 +1670,13 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18586"
+NAME="AEN19591"
 ></A
 ><H3
 ><A
-NAME="XMLCHARENCOUTFUNC"
+NAME="XMLCHARENCINFUNC"
 ></A
->xmlCharEncOutFunc ()</H3
+>xmlCharEncInFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1630,7 +1686,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCharEncOutFunc               (<A
+>int         xmlCharEncInFunc                (<A
 HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 >xmlCharEncodingHandler</A
 > *handler,
@@ -1646,17 +1702,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ></TR
 ></TABLE
 ><P
->Generic front-end for the encoding handler output function
-a first call with <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-> == NULL has to be made firs to initiate the 
-output in case of non-stateless encoding needing to initiate their
-state or the output (like the BOM in UTF16).
-In case of UTF8 sequence conversion errors for the given encoder,
-the content will be automatically remapped to a CharRef sequence.</P
+>Generic front-end for the encoding handler input function</P
 ><P
 ></P
 ><DIV
@@ -1680,7 +1726,7 @@ CLASS="PARAMETER"
 ><I
 >handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1697,7 +1743,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1714,7 +1760,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1747,13 +1793,13 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18617"
+NAME="AEN19621"
 ></A
 ><H3
 ><A
-NAME="XMLCHARENCINFUNC"
+NAME="XMLCHARENCFIRSTLINE"
 ></A
->xmlCharEncInFunc ()</H3
+>xmlCharEncFirstLine ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1763,7 +1809,7 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCharEncInFunc                (<A
+>int         xmlCharEncFirstLine             (<A
 HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 >xmlCharEncodingHandler</A
 > *handler,
@@ -1779,7 +1825,8 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ></TR
 ></TABLE
 ><P
->Generic front-end for the encoding handler input function</P
+>Front-end for the encoding handler input function, but handle only
+the very first line, i.e. limit itself to 45 chars.</P
 ><P
 ></P
 ><DIV
@@ -1803,7 +1850,7 @@ CLASS="PARAMETER"
 ><I
 >handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1820,7 +1867,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1837,7 +1884,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1870,13 +1917,13 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18647"
+NAME="AEN19651"
 ></A
 ><H3
 ><A
-NAME="XMLCHARENCFIRSTLINE"
+NAME="XMLCHARENCCLOSEFUNC"
 ></A
->xmlCharEncFirstLine ()</H3
+>xmlCharEncCloseFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1886,24 +1933,15 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCharEncFirstLine             (<A
+>int         xmlCharEncCloseFunc             (<A
 HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 >xmlCharEncodingHandler</A
-> *handler,
-                                             <A
-HREF="libxml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> out,
-                                             <A
-HREF="libxml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> in);</PRE
+> *handler);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Front-end for the encoding handler input function, but handle only
-the very first line, i.e. limit itself to 45 chars.</P
+>Generic front-end for hencoding handler close function</P
 ><P
 ></P
 ><DIV
@@ -1927,7 +1965,7 @@ CLASS="PARAMETER"
 ><I
 >handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1939,17 +1977,101 @@ VALIGN="TOP"
 WIDTH="20%"
 ALIGN="RIGHT"
 VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 if success, or -1 in case of error</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19671"
+></A
+><H3
+><A
+NAME="UTF8TOISOLAT1"
+></A
+>UTF8Toisolat1 ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         UTF8Toisolat1                   (unsigned char *out,
+                                             int *outlen,
+                                             unsigned char *in,
+                                             int *inlen);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1
+block of chars out.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>  a pointer to an array of bytes to store the result</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -1961,12 +2083,34 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>  a pointer to an array of UTF-8 chars</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -1981,10 +2125,20 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TABLE
 ><P
@@ -1994,13 +2148,13 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18677"
+NAME="AEN19706"
 ></A
 ><H3
 ><A
-NAME="XMLCHARENCCLOSEFUNC"
+NAME="ISOLAT1TOUTF8"
 ></A
->xmlCharEncCloseFunc ()</H3
+>isolat1ToUTF8 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2010,15 +2164,16 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCharEncCloseFunc             (<A
-HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
->xmlCharEncodingHandler</A
-> *handler);</PRE
+>int         isolat1ToUTF8                   (unsigned char *out,
+                                             int *outlen,
+                                             unsigned char *in,
+                                             int *inlen);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Generic front-end for hencoding handler close function</P
+>Take a block of ISO Latin 1 chars in and try to convert it to an UTF-8
+block of chars out.</P
 ><P
 ></P
 ><DIV
@@ -2040,14 +2195,75 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->handler</I
+>out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>  a pointer to an array of bytes to store the result</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a pointer to an array of ISO Latin 1 chars</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2062,7 +2278,191 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, or -1 in case of error</TD
+>0 if success, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19741"
+></A
+><H3
+><A
+NAME="XMLCHECKUTF8"
+></A
+>xmlCheckUTF8 ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlCheckUTF8                    (unsigned char *utf);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Checks <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> for being valid utf-8. <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> is assumed to be
+null-terminated. This function is not super-strict, as it will
+allow longer utf-8 sequences than necessary. Note that Java is
+capable of producing these sequences if provoked. Also note, this
+routine checks for the 4-byte maxiumum size, but does not check for
+0x10ffff maximum value.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> Pointer to putative utf-8 encoded string.</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> true if <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> is valid.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19763"
+></A
+><H3
+><A
+NAME="XMLUTF8STRLEN"
+></A
+>xmlUTF8Strlen ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlUTF8Strlen                   (unsigned char *utf);</PRE
+></TD
+></TR
+></TABLE
+><P
+>compute the lenght of an UTF8 string, it doesn't do a full UTF8
+checking of the content of the string.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a sequence of UTF-8 encoded bytes</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the number of characters in the string or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 53976c55..d635ca48 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -121,7 +121,7 @@ NAME="LIBXML-ENTITIES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7149"
+NAME="AEN7313"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN7149"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7152"
+NAME="AEN7316"
 ></A
 ><H2
 >Synopsis</H2
@@ -369,7 +369,7 @@ HREF="libxml-entities.html#XMLCLEANUPPREDEFINEDENTITIES"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7215"
+NAME="AEN7379"
 ></A
 ><H2
 >Description</H2
@@ -379,14 +379,14 @@ NAME="AEN7215"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7218"
+NAME="AEN7382"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7220"
+NAME="AEN7384"
 ></A
 ><H3
 ><A
@@ -419,7 +419,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7225"
+NAME="AEN7389"
 ></A
 ><H3
 ><A
@@ -443,7 +443,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
     struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
+    struct _xmlDtd       *parent;	/* - DTD */
     struct _xmlNode        *next;	/* next sibling link  */
     struct _xmlNode        *prev;	/* previous sibling link  */
     struct _xmlDoc          *doc;       /* the containing document */
@@ -467,7 +467,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7230"
+NAME="AEN7394"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7235"
+NAME="AEN7399"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7240"
+NAME="AEN7404"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7246"
+NAME="AEN7410"
 ></A
 ><H3
 ><A
@@ -615,7 +615,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -632,7 +632,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -649,7 +649,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -666,7 +666,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -683,7 +683,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -700,7 +700,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -730,7 +730,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7291"
+NAME="AEN7455"
 ></A
 ><H3
 ><A
@@ -798,7 +798,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -815,7 +815,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -832,7 +832,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -849,7 +849,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -866,7 +866,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -883,7 +883,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -913,7 +913,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7336"
+NAME="AEN7500"
 ></A
 ><H3
 ><A
@@ -964,7 +964,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -994,7 +994,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7357"
+NAME="AEN7521"
 ></A
 ><H3
 ><A
@@ -1051,7 +1051,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1068,7 +1068,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1098,7 +1098,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7383"
+NAME="AEN7547"
 ></A
 ><H3
 ><A
@@ -1154,7 +1154,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1171,7 +1171,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1201,7 +1201,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7409"
+NAME="AEN7573"
 ></A
 ><H3
 ><A
@@ -1257,7 +1257,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1274,7 +1274,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1304,7 +1304,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7435"
+NAME="AEN7599"
 ></A
 ><H3
 ><A
@@ -1366,7 +1366,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1383,7 +1383,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1413,7 +1413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7463"
+NAME="AEN7627"
 ></A
 ><H3
 ><A
@@ -1471,7 +1471,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1488,7 +1488,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1518,7 +1518,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7489"
+NAME="AEN7653"
 ></A
 ><H3
 ><A
@@ -1574,7 +1574,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1591,7 +1591,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1621,7 +1621,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7515"
+NAME="AEN7679"
 ></A
 ><H3
 ><A
@@ -1682,7 +1682,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7531"
+NAME="AEN7695"
 ></A
 ><H3
 ><A
@@ -1733,7 +1733,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1763,7 +1763,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7552"
+NAME="AEN7716"
 ></A
 ><H3
 ><A
@@ -1811,7 +1811,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1826,7 +1826,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7568"
+NAME="AEN7732"
 ></A
 ><H3
 ><A
@@ -1878,7 +1878,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1895,7 +1895,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1910,7 +1910,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7589"
+NAME="AEN7753"
 ></A
 ><H3
 ><A
@@ -1962,7 +1962,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1979,7 +1979,7 @@ CLASS="PARAMETER"
 ><I
 >ent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1994,7 +1994,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7610"
+NAME="AEN7774"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 5863ef4b..4081313e 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -121,7 +121,7 @@ NAME="LIBXML-HTMLPARSER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9636"
+NAME="AEN9842"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN9636"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9639"
+NAME="AEN9845"
 ></A
 ><H2
 >Synopsis</H2
@@ -222,7 +222,7 @@ HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
 > <A
 HREF="libxml-htmlparser.html#HTMLENTITYVALUELOOKUP"
 >htmlEntityValueLookup</A
->     (int value);
+>     (unsigned int value);
 int         <A
 HREF="libxml-htmlparser.html#HTMLISAUTOCLOSED"
 >htmlIsAutoClosed</A
@@ -393,7 +393,7 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9703"
+NAME="AEN9909"
 ></A
 ><H2
 >Description</H2
@@ -403,14 +403,14 @@ NAME="AEN9703"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9706"
+NAME="AEN9912"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9708"
+NAME="AEN9914"
 ></A
 ><H3
 ><A
@@ -436,7 +436,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9713"
+NAME="AEN9919"
 ></A
 ><H3
 ><A
@@ -462,7 +462,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9718"
+NAME="AEN9924"
 ></A
 ><H3
 ><A
@@ -488,7 +488,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9723"
+NAME="AEN9929"
 ></A
 ><H3
 ><A
@@ -514,7 +514,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9728"
+NAME="AEN9934"
 ></A
 ><H3
 ><A
@@ -540,7 +540,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9733"
+NAME="AEN9939"
 ></A
 ><H3
 ><A
@@ -566,7 +566,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9738"
+NAME="AEN9944"
 ></A
 ><H3
 ><A
@@ -592,7 +592,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9743"
+NAME="AEN9949"
 ></A
 ><H3
 ><A
@@ -618,7 +618,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9748"
+NAME="AEN9954"
 ></A
 ><H3
 ><A
@@ -644,7 +644,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9753"
+NAME="AEN9959"
 ></A
 ><H3
 ><A
@@ -679,7 +679,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9758"
+NAME="AEN9964"
 ></A
 ><H3
 ><A
@@ -705,7 +705,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9763"
+NAME="AEN9969"
 ></A
 ><H3
 ><A
@@ -722,7 +722,7 @@ CELLPADDING="6"
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct htmlEntityDesc {
-    int value;		/* the UNICODE value for the character */
+    unsigned int value;	/* the UNICODE value for the character */
     const char *name;	/* The entity name */
     const char *desc;   /* the description */
 };</PRE
@@ -735,7 +735,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9768"
+NAME="AEN9974"
 ></A
 ><H3
 ><A
@@ -761,7 +761,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9773"
+NAME="AEN9979"
 ></A
 ><H3
 ><A
@@ -812,7 +812,7 @@ CLASS="PARAMETER"
 ><I
 >tag</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -842,7 +842,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9794"
+NAME="AEN10000"
 ></A
 ><H3
 ><A
@@ -895,7 +895,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -925,7 +925,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9816"
+NAME="AEN10022"
 ></A
 ><H3
 ><A
@@ -944,7 +944,7 @@ CLASS="PROGRAMLISTING"
 ><A
 HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
 >htmlEntityDescPtr</A
-> htmlEntityValueLookup     (int value);</PRE
+> htmlEntityValueLookup     (unsigned int value);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -975,7 +975,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1005,7 +1005,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9837"
+NAME="AEN10043"
 ></A
 ><H3
 ><A
@@ -1059,7 +1059,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1076,7 +1076,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1106,7 +1106,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9862"
+NAME="AEN10068"
 ></A
 ><H3
 ><A
@@ -1165,7 +1165,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1182,7 +1182,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1199,7 +1199,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1229,7 +1229,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9892"
+NAME="AEN10098"
 ></A
 ><H3
 ><A
@@ -1262,7 +1262,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><P
 >parse an HTML ENTITY references</P
 ><P
->[68] EntityRef ::= '&amp;' Name ';'</P
+>[68] EntityRef ::= '' Name ';'</P
 ><P
 ></P
 ><DIV
@@ -1286,7 +1286,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1303,7 +1303,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1334,7 +1334,7 @@ if non-NULL *str will have to be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9919"
+NAME="AEN10125"
 ></A
 ><H3
 ><A
@@ -1360,8 +1360,8 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ><P
 >parse Reference declarations</P
 ><P
->[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-'&amp;<GTKDOCLINK
+>[66] CharRef ::= '#' [0-9]+ ';' |
+'<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
@@ -1388,7 +1388,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1418,7 +1418,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9941"
+NAME="AEN10147"
 ></A
 ><H3
 ><A
@@ -1470,7 +1470,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1485,7 +1485,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9959"
+NAME="AEN10165"
 ></A
 ><H3
 ><A
@@ -1544,7 +1544,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1561,7 +1561,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1578,7 +1578,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1595,7 +1595,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1625,7 +1625,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9993"
+NAME="AEN10199"
 ></A
 ><H3
 ><A
@@ -1677,7 +1677,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1694,7 +1694,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1724,7 +1724,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10018"
+NAME="AEN10224"
 ></A
 ><H3
 ><A
@@ -1781,7 +1781,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1798,7 +1798,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1815,7 +1815,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1832,7 +1832,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1862,7 +1862,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10051"
+NAME="AEN10257"
 ></A
 ><H3
 ><A
@@ -1912,7 +1912,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1929,7 +1929,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1959,7 +1959,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10075"
+NAME="AEN10281"
 ></A
 ><H3
 ><A
@@ -2008,7 +2008,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2025,7 +2025,7 @@ CLASS="PARAMETER"
 ><I
 >outlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2047,7 +2047,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2064,7 +2064,7 @@ CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2112,7 +2112,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10110"
+NAME="AEN10316"
 ></A
 ><H3
 ><A
@@ -2162,7 +2162,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2179,7 +2179,7 @@ CLASS="PARAMETER"
 ><I
 >outlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2201,7 +2201,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2218,7 +2218,7 @@ CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2240,7 +2240,7 @@ CLASS="PARAMETER"
 ><I
 >quoteChar</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2283,7 +2283,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10149"
+NAME="AEN10355"
 ></A
 ><H3
 ><A
@@ -2331,7 +2331,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2361,7 +2361,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10169"
+NAME="AEN10375"
 ></A
 ><H3
 ><A
@@ -2406,7 +2406,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2436,7 +2436,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10188"
+NAME="AEN10394"
 ></A
 ><H3
 ><A
@@ -2461,7 +2461,7 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ></TABLE
 ><P
 >Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
+document in ctxt-myDoc is not freed.</P
 ><P
 ></P
 ><DIV
@@ -2485,7 +2485,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2500,7 +2500,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10204"
+NAME="AEN10410"
 ></A
 ><H3
 ><A
@@ -2541,7 +2541,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
-> should be &gt;= 4
+> should be = 4
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2572,7 +2572,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2589,7 +2589,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2606,7 +2606,7 @@ CLASS="PARAMETER"
 ><I
 >chunk</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2623,7 +2623,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2640,7 +2640,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2657,7 +2657,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2687,7 +2687,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10248"
+NAME="AEN10454"
 ></A
 ><H3
 ><A
@@ -2738,7 +2738,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2755,7 +2755,7 @@ CLASS="PARAMETER"
 ><I
 >chunk</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2772,7 +2772,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2789,7 +2789,7 @@ CLASS="PARAMETER"
 ><I
 >terminate</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index ae2baea5..5cf6a6df 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -121,7 +121,7 @@ NAME="LIBXML-HTMLTREE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10285"
+NAME="AEN10491"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN10285"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10288"
+NAME="AEN10494"
 ></A
 ><H2
 >Synopsis</H2
@@ -286,7 +286,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10327"
+NAME="AEN10533"
 ></A
 ><H2
 >Description</H2
@@ -296,14 +296,14 @@ NAME="AEN10327"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10330"
+NAME="AEN10536"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10332"
+NAME="AEN10538"
 ></A
 ><H3
 ><A
@@ -329,7 +329,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10337"
+NAME="AEN10543"
 ></A
 ><H3
 ><A
@@ -355,7 +355,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10342"
+NAME="AEN10548"
 ></A
 ><H3
 ><A
@@ -381,7 +381,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10347"
+NAME="AEN10553"
 ></A
 ><H3
 ><A
@@ -407,7 +407,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10352"
+NAME="AEN10558"
 ></A
 ><H3
 ><A
@@ -462,7 +462,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -479,7 +479,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -509,7 +509,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10378"
+NAME="AEN10584"
 ></A
 ><H3
 ><A
@@ -564,7 +564,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -581,7 +581,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -611,7 +611,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10404"
+NAME="AEN10610"
 ></A
 ><H3
 ><A
@@ -662,7 +662,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -692,7 +692,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10425"
+NAME="AEN10631"
 ></A
 ><H3
 ><A
@@ -746,7 +746,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -763,7 +763,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -793,7 +793,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10450"
+NAME="AEN10656"
 ></A
 ><H3
 ><A
@@ -847,7 +847,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -864,7 +864,7 @@ CLASS="PARAMETER"
 ><I
 >mem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -881,7 +881,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -896,7 +896,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10475"
+NAME="AEN10681"
 ></A
 ><H3
 ><A
@@ -948,7 +948,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -965,7 +965,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -995,7 +995,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10500"
+NAME="AEN10706"
 ></A
 ><H3
 ><A
@@ -1050,7 +1050,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1067,7 +1067,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1097,7 +1097,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10525"
+NAME="AEN10731"
 ></A
 ><H3
 ><A
@@ -1153,7 +1153,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1170,7 +1170,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1187,7 +1187,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1202,7 +1202,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10551"
+NAME="AEN10757"
 ></A
 ><H3
 ><A
@@ -1258,7 +1258,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1275,7 +1275,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1292,7 +1292,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1307,7 +1307,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10577"
+NAME="AEN10783"
 ></A
 ><H3
 ><A
@@ -1357,7 +1357,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1374,7 +1374,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1391,7 +1391,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index 7de8f9ea..2b15bbb7 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -121,7 +121,7 @@ NAME="LIBXML-NANOFTP"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14066"
+NAME="AEN14950"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN14066"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14069"
+NAME="AEN14953"
 ></A
 ><H2
 >Synopsis</H2
@@ -281,7 +281,7 @@ HREF="libxml-nanoftp.html#XMLNANOFTPREAD"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14098"
+NAME="AEN14982"
 ></A
 ><H2
 >Description</H2
@@ -291,14 +291,14 @@ NAME="AEN14098"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14101"
+NAME="AEN14985"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14103"
+NAME="AEN14987"
 ></A
 ><H3
 ><A
@@ -355,7 +355,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -372,7 +372,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -389,7 +389,7 @@ CLASS="PARAMETER"
 ><I
 >attrib</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -406,7 +406,7 @@ CLASS="PARAMETER"
 ><I
 >owner</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -423,7 +423,7 @@ CLASS="PARAMETER"
 ><I
 >group</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -440,7 +440,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -457,7 +457,7 @@ CLASS="PARAMETER"
 ><I
 >links</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -474,7 +474,7 @@ CLASS="PARAMETER"
 ><I
 >year</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -491,7 +491,7 @@ CLASS="PARAMETER"
 ><I
 >month</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -508,7 +508,7 @@ CLASS="PARAMETER"
 ><I
 >day</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -525,7 +525,7 @@ CLASS="PARAMETER"
 ><I
 >hour</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -542,7 +542,7 @@ CLASS="PARAMETER"
 ><I
 >minute</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -557,7 +557,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14162"
+NAME="AEN15046"
 ></A
 ><H3
 ><A
@@ -602,7 +602,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -619,7 +619,7 @@ CLASS="PARAMETER"
 ><I
 >data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -636,7 +636,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -651,7 +651,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14184"
+NAME="AEN15068"
 ></A
 ><H3
 ><A
@@ -681,7 +681,7 @@ and get the hostname</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14190"
+NAME="AEN15074"
 ></A
 ><H3
 ><A
@@ -709,7 +709,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14196"
+NAME="AEN15080"
 ></A
 ><H3
 ><A
@@ -754,7 +754,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -769,7 +769,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14211"
+NAME="AEN15095"
 ></A
 ><H3
 ><A
@@ -814,7 +814,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -829,7 +829,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14226"
+NAME="AEN15110"
 ></A
 ><H3
 ><A
@@ -875,7 +875,7 @@ CLASS="PARAMETER"
 ><I
 >server</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -892,7 +892,7 @@ CLASS="PARAMETER"
 ><I
 >port</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -907,7 +907,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14245"
+NAME="AEN15129"
 ></A
 ><H3
 ><A
@@ -952,7 +952,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -967,7 +967,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14260"
+NAME="AEN15144"
 ></A
 ><H3
 ><A
@@ -1012,7 +1012,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1042,7 +1042,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14279"
+NAME="AEN15163"
 ></A
 ><H3
 ><A
@@ -1087,7 +1087,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1117,7 +1117,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14298"
+NAME="AEN15182"
 ></A
 ><H3
 ><A
@@ -1162,7 +1162,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1192,7 +1192,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14317"
+NAME="AEN15201"
 ></A
 ><H3
 ><A
@@ -1240,7 +1240,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1255,7 +1255,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14332"
+NAME="AEN15216"
 ></A
 ><H3
 ><A
@@ -1306,7 +1306,7 @@ CLASS="PARAMETER"
 ><I
 >host</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1323,7 +1323,7 @@ CLASS="PARAMETER"
 ><I
 >port</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1340,7 +1340,7 @@ CLASS="PARAMETER"
 ><I
 >user</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1357,7 +1357,7 @@ CLASS="PARAMETER"
 ><I
 >passwd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1374,7 +1374,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1394,7 +1394,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14364"
+NAME="AEN15248"
 ></A
 ><H3
 ><A
@@ -1444,7 +1444,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1461,7 +1461,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1491,7 +1491,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14387"
+NAME="AEN15271"
 ></A
 ><H3
 ><A
@@ -1536,7 +1536,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1566,7 +1566,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14406"
+NAME="AEN15290"
 ></A
 ><H3
 ><A
@@ -1611,7 +1611,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1641,7 +1641,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14425"
+NAME="AEN15309"
 ></A
 ><H3
 ><A
@@ -1687,7 +1687,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1704,7 +1704,7 @@ CLASS="PARAMETER"
 ><I
 >directory</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1734,7 +1734,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14448"
+NAME="AEN15332"
 ></A
 ><H3
 ><A
@@ -1780,7 +1780,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1810,7 +1810,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14467"
+NAME="AEN15351"
 ></A
 ><H3
 ><A
@@ -1855,7 +1855,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1885,7 +1885,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14486"
+NAME="AEN15370"
 ></A
 ><H3
 ><A
@@ -1937,7 +1937,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1954,7 +1954,7 @@ CLASS="PARAMETER"
 ><I
 >callback</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1971,7 +1971,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1988,7 +1988,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2018,7 +2018,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14518"
+NAME="AEN15402"
 ></A
 ><H3
 ><A
@@ -2064,7 +2064,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2081,7 +2081,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2101,7 +2101,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the socket for the data connection, or &lt;0 in case of error</TD
+>the socket for the data connection, or 0 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -2111,7 +2111,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14541"
+NAME="AEN15425"
 ></A
 ><H3
 ><A
@@ -2163,7 +2163,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2180,7 +2180,7 @@ CLASS="PARAMETER"
 ><I
 >callback</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2197,7 +2197,7 @@ CLASS="PARAMETER"
 ><I
 >userData</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2214,7 +2214,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2244,7 +2244,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14573"
+NAME="AEN15457"
 ></A
 ><H3
 ><A
@@ -2302,7 +2302,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2319,7 +2319,7 @@ CLASS="PARAMETER"
 ><I
 >dest</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2336,7 +2336,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index 695ac56c..5e0c8f57 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -121,7 +121,7 @@ NAME="LIBXML-NANOHTTP"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13830"
+NAME="AEN14714"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN13830"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13833"
+NAME="AEN14717"
 ></A
 ><H2
 >Synopsis</H2
@@ -205,7 +205,7 @@ HREF="libxml-nanohttp.html#XMLNANOHTTPCLOSE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13847"
+NAME="AEN14731"
 ></A
 ><H2
 >Description</H2
@@ -215,14 +215,14 @@ NAME="AEN13847"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13850"
+NAME="AEN14734"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13852"
+NAME="AEN14736"
 ></A
 ><H3
 ><A
@@ -251,7 +251,7 @@ Currently it just checks for proxy informations</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13858"
+NAME="AEN14742"
 ></A
 ><H3
 ><A
@@ -277,7 +277,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13863"
+NAME="AEN14747"
 ></A
 ><H3
 ><A
@@ -325,7 +325,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -340,7 +340,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13878"
+NAME="AEN14762"
 ></A
 ><H3
 ><A
@@ -388,7 +388,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -405,7 +405,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -422,7 +422,7 @@ CLASS="PARAMETER"
 ><I
 >contentType</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -454,7 +454,7 @@ if provided must be freed by the caller</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13905"
+NAME="AEN14789"
 ></A
 ><H3
 ><A
@@ -510,7 +510,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -527,7 +527,7 @@ CLASS="PARAMETER"
 ><I
 >method</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -544,7 +544,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -561,7 +561,7 @@ CLASS="PARAMETER"
 ><I
 >contentType</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -578,7 +578,7 @@ CLASS="PARAMETER"
 ><I
 >headers</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -593,7 +593,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13937"
+NAME="AEN14821"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -657,7 +657,7 @@ CLASS="PARAMETER"
 ><I
 >contentType</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -673,7 +673,7 @@ returned at that location</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13956"
+NAME="AEN14840"
 ></A
 ><H3
 ><A
@@ -718,7 +718,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -748,7 +748,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13975"
+NAME="AEN14859"
 ></A
 ><H3
 ><A
@@ -793,7 +793,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -824,7 +824,7 @@ header.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13994"
+NAME="AEN14878"
 ></A
 ><H3
 ><A
@@ -882,7 +882,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -899,7 +899,7 @@ CLASS="PARAMETER"
 ><I
 >dest</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -916,7 +916,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -947,7 +947,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14023"
+NAME="AEN14907"
 ></A
 ><H3
 ><A
@@ -994,7 +994,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1011,7 +1011,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1041,7 +1041,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14046"
+NAME="AEN14930"
 ></A
 ><H3
 ><A
@@ -1087,7 +1087,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 143c6ac3..b55a45d5 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -567,6 +567,21 @@ HREF="libxml-tree.html#XMLCHAR"
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 >*    <A
+HREF="libxml-parser.html#XMLCHARSTRNDUP"
+>xmlCharStrndup</A
+>                  (const char *cur,
+                                             int len);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-parser.html#XMLCHARSTRDUP"
+>xmlCharStrdup</A
+>                   (const char *cur);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
 HREF="libxml-parser.html#XMLSTRSUB"
 >xmlStrsub</A
 >                       (const <A
@@ -1213,7 +1228,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN309"
+NAME="AEN313"
 ></A
 ><H2
 >Description</H2
@@ -1223,14 +1238,14 @@ NAME="AEN309"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN312"
+NAME="AEN316"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN314"
+NAME="AEN318"
 ></A
 ><H3
 ><A
@@ -1256,7 +1271,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN319"
+NAME="AEN323"
 ></A
 ><H3
 ><A
@@ -1302,7 +1317,7 @@ CLASS="PARAMETER"
 ><I
 >Param1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1317,7 +1332,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN334"
+NAME="AEN338"
 ></A
 ><H3
 ><A
@@ -1360,7 +1375,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN339"
+NAME="AEN343"
 ></A
 ><H3
 ><A
@@ -1386,7 +1401,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN344"
+NAME="AEN348"
 ></A
 ><H3
 ><A
@@ -1404,7 +1419,7 @@ CELLPADDING="6"
 CLASS="PROGRAMLISTING"
 >struct xmlParserNodeInfo {
   const struct _xmlNode* node;
-  /* Position &amp; line # that text that created the node begins &amp; ends on */
+  /* Position  line # that text that created the node begins  ends on */
   unsigned long begin_pos;
   unsigned long begin_line;
   unsigned long end_pos;
@@ -1419,7 +1434,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN349"
+NAME="AEN353"
 ></A
 ><H3
 ><A
@@ -1445,7 +1460,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN354"
+NAME="AEN358"
 ></A
 ><H3
 ><A
@@ -1475,7 +1490,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN359"
+NAME="AEN363"
 ></A
 ><H3
 ><A
@@ -1501,7 +1516,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN364"
+NAME="AEN368"
 ></A
 ><H3
 ><A
@@ -1545,7 +1560,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN369"
+NAME="AEN373"
 ></A
 ><H3
 ><A
@@ -1643,7 +1658,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN374"
+NAME="AEN378"
 ></A
 ><H3
 ><A
@@ -1669,7 +1684,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN379"
+NAME="AEN383"
 ></A
 ><H3
 ><A
@@ -1700,7 +1715,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN384"
+NAME="AEN388"
 ></A
 ><H3
 ><A
@@ -1726,7 +1741,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN389"
+NAME="AEN393"
 ></A
 ><H3
 ><A
@@ -1780,7 +1795,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1797,7 +1812,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1814,7 +1829,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1844,7 +1859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN418"
+NAME="AEN422"
 ></A
 ><H3
 ><A
@@ -1899,7 +1914,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1916,7 +1931,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1933,7 +1948,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1950,7 +1965,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1965,7 +1980,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN447"
+NAME="AEN451"
 ></A
 ><H3
 ><A
@@ -2020,7 +2035,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2037,7 +2052,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2054,7 +2069,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2071,7 +2086,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2086,7 +2101,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN476"
+NAME="AEN480"
 ></A
 ><H3
 ><A
@@ -2136,7 +2151,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2153,7 +2168,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2183,7 +2198,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN500"
+NAME="AEN504"
 ></A
 ><H3
 ><A
@@ -2233,7 +2248,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2250,7 +2265,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2280,7 +2295,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN524"
+NAME="AEN528"
 ></A
 ><H3
 ><A
@@ -2340,7 +2355,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2357,7 +2372,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2374,7 +2389,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2391,7 +2406,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2408,7 +2423,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2425,7 +2440,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2440,7 +2455,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN562"
+NAME="AEN566"
 ></A
 ><H3
 ><A
@@ -2495,7 +2510,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2512,7 +2527,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2529,7 +2544,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2546,7 +2561,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2561,7 +2576,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN591"
+NAME="AEN595"
 ></A
 ><H3
 ><A
@@ -2622,7 +2637,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2639,7 +2654,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2656,7 +2671,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2673,7 +2688,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2690,7 +2705,7 @@ CLASS="PARAMETER"
 ><I
 >def</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2707,7 +2722,7 @@ CLASS="PARAMETER"
 ><I
 >defaultValue</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2724,7 +2739,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2739,7 +2754,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN633"
+NAME="AEN637"
 ></A
 ><H3
 ><A
@@ -2791,7 +2806,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2808,7 +2823,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2825,7 +2840,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2842,7 +2857,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2857,7 +2872,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN661"
+NAME="AEN665"
 ></A
 ><H3
 ><A
@@ -2916,7 +2931,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2933,7 +2948,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2950,7 +2965,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2967,7 +2982,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2984,7 +2999,7 @@ CLASS="PARAMETER"
 ><I
 >notationName</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2999,7 +3014,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN695"
+NAME="AEN699"
 ></A
 ><H3
 ><A
@@ -3046,7 +3061,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3063,7 +3078,7 @@ CLASS="PARAMETER"
 ><I
 >loc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3078,7 +3093,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN714"
+NAME="AEN718"
 ></A
 ><H3
 ><A
@@ -3121,7 +3136,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3136,7 +3151,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN728"
+NAME="AEN732"
 ></A
 ><H3
 ><A
@@ -3179,7 +3194,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3194,7 +3209,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN742"
+NAME="AEN746"
 ></A
 ><H3
 ><A
@@ -3245,7 +3260,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3262,7 +3277,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3279,7 +3294,7 @@ CLASS="PARAMETER"
 ><I
 >atts</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3294,7 +3309,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN766"
+NAME="AEN770"
 ></A
 ><H3
 ><A
@@ -3341,7 +3356,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3358,7 +3373,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3373,7 +3388,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN785"
+NAME="AEN789"
 ></A
 ><H3
 ><A
@@ -3424,7 +3439,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3441,7 +3456,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3458,7 +3473,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3473,7 +3488,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN809"
+NAME="AEN813"
 ></A
 ><H3
 ><A
@@ -3520,7 +3535,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3537,7 +3552,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3552,7 +3567,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN828"
+NAME="AEN832"
 ></A
 ><H3
 ><A
@@ -3600,7 +3615,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3617,7 +3632,7 @@ CLASS="PARAMETER"
 ><I
 >ch</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3634,7 +3649,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3649,7 +3664,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN851"
+NAME="AEN855"
 ></A
 ><H3
 ><A
@@ -3697,7 +3712,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3714,7 +3729,7 @@ CLASS="PARAMETER"
 ><I
 >ch</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3731,7 +3746,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3746,7 +3761,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN874"
+NAME="AEN878"
 ></A
 ><H3
 ><A
@@ -3797,7 +3812,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3814,7 +3829,7 @@ CLASS="PARAMETER"
 ><I
 >target</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3831,7 +3846,7 @@ CLASS="PARAMETER"
 ><I
 >data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3846,7 +3861,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN898"
+NAME="AEN902"
 ></A
 ><H3
 ><A
@@ -3893,7 +3908,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3910,7 +3925,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3925,7 +3940,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN917"
+NAME="AEN921"
 ></A
 ><H3
 ><A
@@ -3973,7 +3988,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3990,7 +4005,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4007,7 +4022,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4022,7 +4037,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN940"
+NAME="AEN944"
 ></A
 ><H3
 ><A
@@ -4067,7 +4082,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4084,7 +4099,7 @@ CLASS="PARAMETER"
 ><I
 >msg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4101,7 +4116,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4116,7 +4131,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN962"
+NAME="AEN966"
 ></A
 ><H3
 ><A
@@ -4161,7 +4176,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4178,7 +4193,7 @@ CLASS="PARAMETER"
 ><I
 >msg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4195,7 +4210,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4210,7 +4225,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN984"
+NAME="AEN988"
 ></A
 ><H3
 ><A
@@ -4255,7 +4270,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4272,7 +4287,7 @@ CLASS="PARAMETER"
 ><I
 >msg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4289,7 +4304,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4304,7 +4319,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1006"
+NAME="AEN1010"
 ></A
 ><H3
 ><A
@@ -4347,7 +4362,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4377,7 +4392,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1024"
+NAME="AEN1028"
 ></A
 ><H3
 ><A
@@ -4420,7 +4435,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4450,7 +4465,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1042"
+NAME="AEN1046"
 ></A
 ><H3
 ><A
@@ -4493,7 +4508,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4523,7 +4538,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1060"
+NAME="AEN1064"
 ></A
 ><H3
 ><A
@@ -4577,7 +4592,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1065"
+NAME="AEN1069"
 ></A
 ><H3
 ><A
@@ -4603,7 +4618,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1070"
+NAME="AEN1074"
 ></A
 ><H3
 ><A
@@ -4655,7 +4670,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4672,7 +4687,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4689,7 +4704,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4719,7 +4734,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1098"
+NAME="AEN1102"
 ></A
 ><H3
 ><A
@@ -4745,7 +4760,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1103"
+NAME="AEN1107"
 ></A
 ><H3
 ><A
@@ -4775,7 +4790,7 @@ use in multithreaded programs.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1109"
+NAME="AEN1113"
 ></A
 ><H3
 ><A
@@ -4806,7 +4821,7 @@ function should not prevent reusing the parser.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1115"
+NAME="AEN1119"
 ></A
 ><H3
 ><A
@@ -4856,7 +4871,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4873,7 +4888,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4904,7 +4919,7 @@ end of this entity</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1139"
+NAME="AEN1143"
 ></A
 ><H3
 ><A
@@ -4954,7 +4969,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4971,7 +4986,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5002,7 +5017,7 @@ end of this entity</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1163"
+NAME="AEN1167"
 ></A
 ><H3
 ><A
@@ -5055,7 +5070,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5085,7 +5100,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1184"
+NAME="AEN1188"
 ></A
 ><H3
 ><A
@@ -5137,7 +5152,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5154,7 +5169,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5189,7 +5204,186 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1210"
+NAME="AEN1214"
+></A
+><H3
+><A
+NAME="XMLCHARSTRNDUP"
+></A
+>xmlCharStrndup ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCharStrndup                  (const char *cur,
+                                             int len);</PRE
+></TD
+></TR
+></TABLE
+><P
+>a strndup for char's to xmlChar's</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the input char *</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the len of <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+></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 xmlChar * or NULL</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1239"
+></A
+><H3
+><A
+NAME="XMLCHARSTRDUP"
+></A
+>xmlCharStrdup ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCharStrdup                   (const char *cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>a strdup for char's to xmlChar's</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the input char *</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 xmlChar * or NULL</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1259"
 ></A
 ><H3
 ><A
@@ -5242,7 +5436,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5259,7 +5453,7 @@ CLASS="PARAMETER"
 ><I
 >start</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5276,7 +5470,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5306,7 +5500,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1239"
+NAME="AEN1288"
 ></A
 ><H3
 ><A
@@ -5361,7 +5555,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5378,7 +5572,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5408,7 +5602,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1265"
+NAME="AEN1314"
 ></A
 ><H3
 ><A
@@ -5463,7 +5657,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5480,7 +5674,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5510,7 +5704,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1291"
+NAME="AEN1340"
 ></A
 ><H3
 ><A
@@ -5565,7 +5759,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5582,7 +5776,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5612,7 +5806,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1317"
+NAME="AEN1366"
 ></A
 ><H3
 ><A
@@ -5664,7 +5858,7 @@ CLASS="PARAMETER"
 ><I
 >str1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5681,7 +5875,7 @@ CLASS="PARAMETER"
 ><I
 >str2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5711,7 +5905,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1342"
+NAME="AEN1391"
 ></A
 ><H3
 ><A
@@ -5764,7 +5958,7 @@ CLASS="PARAMETER"
 ><I
 >str1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5781,7 +5975,7 @@ CLASS="PARAMETER"
 ><I
 >str2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5798,7 +5992,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5828,7 +6022,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1371"
+NAME="AEN1420"
 ></A
 ><H3
 ><A
@@ -5880,7 +6074,7 @@ CLASS="PARAMETER"
 ><I
 >str1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5897,7 +6091,7 @@ CLASS="PARAMETER"
 ><I
 >str2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5927,7 +6121,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1396"
+NAME="AEN1445"
 ></A
 ><H3
 ><A
@@ -5980,7 +6174,7 @@ CLASS="PARAMETER"
 ><I
 >str1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5997,7 +6191,7 @@ CLASS="PARAMETER"
 ><I
 >str2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6014,7 +6208,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6044,7 +6238,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1425"
+NAME="AEN1474"
 ></A
 ><H3
 ><A
@@ -6100,7 +6294,7 @@ CLASS="PARAMETER"
 ><I
 >str1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6117,7 +6311,7 @@ CLASS="PARAMETER"
 ><I
 >str2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6147,7 +6341,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1451"
+NAME="AEN1500"
 ></A
 ><H3
 ><A
@@ -6195,7 +6389,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6225,7 +6419,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1471"
+NAME="AEN1520"
 ></A
 ><H3
 ><A
@@ -6282,7 +6476,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6299,7 +6493,7 @@ CLASS="PARAMETER"
 ><I
 >add</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6329,7 +6523,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1497"
+NAME="AEN1546"
 ></A
 ><H3
 ><A
@@ -6391,7 +6585,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6408,7 +6602,7 @@ CLASS="PARAMETER"
 ><I
 >add</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6425,7 +6619,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6466,7 +6660,7 @@ and should not be freed</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1530"
+NAME="AEN1579"
 ></A
 ><H3
 ><A
@@ -6517,7 +6711,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6547,7 +6741,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1551"
+NAME="AEN1600"
 ></A
 ><H3
 ><A
@@ -6596,7 +6790,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6613,7 +6807,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6643,7 +6837,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1575"
+NAME="AEN1624"
 ></A
 ><H3
 ><A
@@ -6692,7 +6886,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6722,7 +6916,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1595"
+NAME="AEN1644"
 ></A
 ><H3
 ><A
@@ -6775,7 +6969,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6805,7 +6999,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1615"
+NAME="AEN1664"
 ></A
 ><H3
 ><A
@@ -6877,7 +7071,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6907,7 +7101,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1638"
+NAME="AEN1687"
 ></A
 ><H3
 ><A
@@ -6955,7 +7149,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6970,7 +7164,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1654"
+NAME="AEN1703"
 ></A
 ><H3
 ><A
@@ -7015,7 +7209,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7045,7 +7239,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1673"
+NAME="AEN1722"
 ></A
 ><H3
 ><A
@@ -7097,7 +7291,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7127,7 +7321,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1694"
+NAME="AEN1743"
 ></A
 ><H3
 ><A
@@ -7177,7 +7371,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7194,7 +7388,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7224,7 +7418,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1718"
+NAME="AEN1767"
 ></A
 ><H3
 ><A
@@ -7274,7 +7468,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7304,7 +7498,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1738"
+NAME="AEN1787"
 ></A
 ><H3
 ><A
@@ -7357,7 +7551,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7388,7 +7582,7 @@ as a result of the parsing.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1760"
+NAME="AEN1809"
 ></A
 ><H3
 ><A
@@ -7440,7 +7634,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7471,7 +7665,7 @@ as a result of the parsing.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1781"
+NAME="AEN1830"
 ></A
 ><H3
 ><A
@@ -7529,7 +7723,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7546,7 +7740,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7563,7 +7757,7 @@ CLASS="PARAMETER"
 ><I
 >recovery</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7594,7 +7788,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1811"
+NAME="AEN1860"
 ></A
 ><H3
 ><A
@@ -7645,7 +7839,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7662,7 +7856,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7679,7 +7873,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7709,7 +7903,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1839"
+NAME="AEN1888"
 ></A
 ><H3
 ><A
@@ -7761,7 +7955,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7778,7 +7972,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7795,7 +7989,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7812,7 +8006,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7842,7 +8036,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1871"
+NAME="AEN1920"
 ></A
 ><H3
 ><A
@@ -7898,7 +8092,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7915,7 +8109,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7932,7 +8126,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7949,7 +8143,7 @@ CLASS="PARAMETER"
 ><I
 >recovery</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7980,7 +8174,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1904"
+NAME="AEN1953"
 ></A
 ><H3
 ><A
@@ -8036,7 +8230,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8053,7 +8247,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8070,7 +8264,7 @@ CLASS="PARAMETER"
 ><I
 >recovery</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8101,7 +8295,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1933"
+NAME="AEN1982"
 ></A
 ><H3
 ><A
@@ -8159,7 +8353,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8176,7 +8370,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8206,7 +8400,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1960"
+NAME="AEN2009"
 ></A
 ><H3
 ><A
@@ -8258,7 +8452,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8288,7 +8482,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1982"
+NAME="AEN2031"
 ></A
 ><H3
 ><A
@@ -8343,7 +8537,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8360,7 +8554,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8390,7 +8584,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2008"
+NAME="AEN2057"
 ></A
 ><H3
 ><A
@@ -8449,7 +8643,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8466,7 +8660,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8483,7 +8677,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8513,7 +8707,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2039"
+NAME="AEN2088"
 ></A
 ><H3
 ><A
@@ -8572,7 +8766,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8589,7 +8783,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8606,7 +8800,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8642,7 +8836,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2071"
+NAME="AEN2120"
 ></A
 ><H3
 ><A
@@ -8709,7 +8903,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8726,7 +8920,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8743,7 +8937,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8760,7 +8954,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8777,7 +8971,7 @@ CLASS="PARAMETER"
 ><I
 >string</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8794,7 +8988,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8825,7 +9019,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2115"
+NAME="AEN2164"
 ></A
 ><H3
 ><A
@@ -8895,7 +9089,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8912,7 +9106,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8929,7 +9123,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8946,7 +9140,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8963,7 +9157,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8980,7 +9174,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8997,7 +9191,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9028,7 +9222,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2164"
+NAME="AEN2213"
 ></A
 ><H3
 ><A
@@ -9092,7 +9286,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9109,7 +9303,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9126,7 +9320,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9143,7 +9337,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9174,7 +9368,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2200"
+NAME="AEN2249"
 ></A
 ><H3
 ><A
@@ -9202,7 +9396,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2206"
+NAME="AEN2255"
 ></A
 ><H3
 ><A
@@ -9230,7 +9424,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2212"
+NAME="AEN2261"
 ></A
 ><H3
 ><A
@@ -9278,7 +9472,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9293,7 +9487,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2228"
+NAME="AEN2277"
 ></A
 ><H3
 ><A
@@ -9341,7 +9535,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9356,7 +9550,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2244"
+NAME="AEN2293"
 ></A
 ><H3
 ><A
@@ -9381,7 +9575,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TABLE
 ><P
 >Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
+document in ctxt-myDoc is not freed.</P
 ><P
 ></P
 ><DIV
@@ -9405,7 +9599,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9420,7 +9614,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2260"
+NAME="AEN2309"
 ></A
 ><H3
 ><A
@@ -9475,7 +9669,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9492,7 +9686,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9509,7 +9703,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9524,7 +9718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2285"
+NAME="AEN2334"
 ></A
 ><H3
 ><A
@@ -9575,7 +9769,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9605,7 +9799,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2306"
+NAME="AEN2355"
 ></A
 ><H3
 ><A
@@ -9649,7 +9843,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9666,7 +9860,7 @@ CLASS="PARAMETER"
 ><I
 >result</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9696,7 +9890,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2328"
+NAME="AEN2377"
 ></A
 ><H3
 ><A
@@ -9744,7 +9938,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9761,7 +9955,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9778,7 +9972,7 @@ CLASS="PARAMETER"
 ><I
 >result</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9808,7 +10002,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2355"
+NAME="AEN2404"
 ></A
 ><H3
 ><A
@@ -9856,7 +10050,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9873,7 +10067,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9890,7 +10084,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9920,7 +10114,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2382"
+NAME="AEN2431"
 ></A
 ><H3
 ><A
@@ -9957,7 +10151,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
-> should be &gt;= 4
+> should be = 4
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -9988,7 +10182,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10005,7 +10199,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10022,7 +10216,7 @@ CLASS="PARAMETER"
 ><I
 >chunk</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10039,7 +10233,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10056,7 +10250,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10086,7 +10280,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2421"
+NAME="AEN2470"
 ></A
 ><H3
 ><A
@@ -10137,7 +10331,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10154,7 +10348,7 @@ CLASS="PARAMETER"
 ><I
 >chunk</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10171,7 +10365,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10188,7 +10382,7 @@ CLASS="PARAMETER"
 ><I
 >terminate</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10218,7 +10412,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2453"
+NAME="AEN2502"
 ></A
 ><H3
 ><A
@@ -10284,7 +10478,7 @@ CLASS="PARAMETER"
 ><I
 >sax</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10301,7 +10495,7 @@ CLASS="PARAMETER"
 ><I
 >user_data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10318,7 +10512,7 @@ CLASS="PARAMETER"
 ><I
 >ioread</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10335,7 +10529,7 @@ CLASS="PARAMETER"
 ><I
 >ioclose</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10352,7 +10546,7 @@ CLASS="PARAMETER"
 ><I
 >ioctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10369,7 +10563,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10399,7 +10593,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2497"
+NAME="AEN2546"
 ></A
 ><H3
 ><A
@@ -10464,7 +10658,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10481,7 +10675,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10498,7 +10692,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10528,7 +10722,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2529"
+NAME="AEN2578"
 ></A
 ><H3
 ><A
@@ -10584,7 +10778,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10601,7 +10795,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10631,7 +10825,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2555"
+NAME="AEN2604"
 ></A
 ><H3
 ><A
@@ -10679,7 +10873,7 @@ CLASS="PARAMETER"
 ><I
 >seq</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10694,7 +10888,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2571"
+NAME="AEN2620"
 ></A
 ><H3
 ><A
@@ -10743,7 +10937,7 @@ CLASS="PARAMETER"
 ><I
 >seq</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10758,7 +10952,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2587"
+NAME="AEN2636"
 ></A
 ><H3
 ><A
@@ -10814,7 +11008,7 @@ CLASS="PARAMETER"
 ><I
 >seq</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10831,7 +11025,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10861,7 +11055,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2613"
+NAME="AEN2662"
 ></A
 ><H3
 ><A
@@ -10913,7 +11107,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10930,7 +11124,7 @@ CLASS="PARAMETER"
 ><I
 >info</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10945,7 +11139,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2634"
+NAME="AEN2683"
 ></A
 ><H3
 ><A
@@ -10991,7 +11185,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11006,7 +11200,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2649"
+NAME="AEN2698"
 ></A
 ><H3
 ><A
@@ -11066,7 +11260,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2664"
+NAME="AEN2713"
 ></A
 ><H3
 ><A
@@ -11117,7 +11311,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11134,7 +11328,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11151,7 +11345,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 24dfbfc7..ba7e27d3 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -121,7 +121,7 @@ NAME="LIBXML-PARSERINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15577"
+NAME="AEN16461"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN15577"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15580"
+NAME="AEN16464"
 ></A
 ><H2
 >Synopsis</H2
@@ -330,6 +330,20 @@ HREF="libxml-entities.html#XMLENTITYPTR"
 HREF="libxml-parser.html#XMLPARSERINPUTPTR"
 >xmlParserInputPtr</A
 > <A
+HREF="libxml-parserinternals.html#XMLNEWSTRINGINPUTSTREAM"
+>xmlNewStringInputStream</A
+>   (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *buffer);
+<A
+HREF="libxml-parser.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> <A
 HREF="libxml-parserinternals.html#XMLNEWENTITYINPUTSTREAM"
 >xmlNewEntityInputStream</A
 >   (<A
@@ -997,6 +1011,27 @@ HREF="libxml-parserinternals.html#INPUTPOP"
 HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 > ctxt);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-parserinternals.html#NAMEPOP"
+>namePop</A
+>                         (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);
+int         <A
+HREF="libxml-parserinternals.html#NAMEPUSH"
+>namePush</A
+>                        (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);
 int         <A
 HREF="libxml-parserinternals.html#XMLSKIPBLANKCHARS"
 >xmlSkipBlankChars</A
@@ -1030,16 +1065,6 @@ HREF="libxml-parserinternals.html#XMLPARSERHANDLEREFERENCE"
 HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 > ctxt);
-<A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
->*    <A
-HREF="libxml-parserinternals.html#NAMEPOP"
->namePop</A
->                         (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);
 int         <A
 HREF="libxml-parserinternals.html#XMLCHECKLANGUAGEID"
 >xmlCheckLanguageID</A
@@ -1056,6 +1081,14 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 > ctxt,
                                              int *len);
 int         <A
+HREF="libxml-parserinternals.html#XMLCOPYCHARMULTIBYTE"
+>xmlCopyCharMultiByte</A
+>            (<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *out,
+                                             int val);
+int         <A
 HREF="libxml-parserinternals.html#XMLCOPYCHAR"
 >xmlCopyChar</A
 >                     (int len,
@@ -1081,7 +1114,15 @@ HREF="libxml-parser.html#XMLPARSERINPUTPTR"
 void        <A
 HREF="libxml-parserinternals.html#HTMLINITAUTOCLOSE"
 >htmlInitAutoClose</A
->               (void);</PRE
+>               (void);
+<A
+HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
+>htmlParserCtxtPtr</A
+> <A
+HREF="libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT"
+>htmlCreateFileParserCtxt</A
+>  (const char *filename,
+                                             const char *encoding);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1089,7 +1130,7 @@ HREF="libxml-parserinternals.html#HTMLINITAUTOCLOSE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15844"
+NAME="AEN16739"
 ></A
 ><H2
 >Description</H2
@@ -1099,14 +1140,14 @@ NAME="AEN15844"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15847"
+NAME="AEN16742"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15849"
+NAME="AEN16744"
 ></A
 ><H3
 ><A
@@ -1132,7 +1173,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15854"
+NAME="AEN16749"
 ></A
 ><H3
 ><A
@@ -1158,7 +1199,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15859"
+NAME="AEN16754"
 ></A
 ><H3
 ><A
@@ -1201,7 +1242,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1216,7 +1257,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15873"
+NAME="AEN16768"
 ></A
 ><H3
 ><A
@@ -1259,7 +1300,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1274,7 +1315,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15887"
+NAME="AEN16782"
 ></A
 ><H3
 ><A
@@ -1317,7 +1358,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1332,7 +1373,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15901"
+NAME="AEN16796"
 ></A
 ><H3
 ><A
@@ -1375,7 +1416,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1390,7 +1431,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15915"
+NAME="AEN16810"
 ></A
 ><H3
 ><A
@@ -1433,7 +1474,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1448,7 +1489,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15929"
+NAME="AEN16824"
 ></A
 ><H3
 ><A
@@ -1491,7 +1532,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1506,7 +1547,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15943"
+NAME="AEN16838"
 ></A
 ><H3
 ><A
@@ -1549,7 +1590,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1564,7 +1605,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15957"
+NAME="AEN16852"
 ></A
 ><H3
 ><A
@@ -1607,7 +1648,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1622,7 +1663,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15971"
+NAME="AEN16866"
 ></A
 ><H3
 ><A
@@ -1665,7 +1706,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1680,7 +1721,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15985"
+NAME="AEN16880"
 ></A
 ><H3
 ><A
@@ -1723,7 +1764,7 @@ CLASS="PARAMETER"
 ><I
 >p</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1738,7 +1779,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15999"
+NAME="AEN16894"
 ></A
 ><H3
 ><A
@@ -1781,7 +1822,7 @@ CLASS="PARAMETER"
 ><I
 >p</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1796,7 +1837,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16013"
+NAME="AEN16908"
 ></A
 ><H3
 ><A
@@ -1839,7 +1880,7 @@ CLASS="PARAMETER"
 ><I
 >p</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1854,7 +1895,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16027"
+NAME="AEN16922"
 ></A
 ><H3
 ><A
@@ -1885,7 +1926,7 @@ HREF="X"
 >\([0-9A-Z]*\)-<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
->\([0-9A-Z]*\)\]/     (((c) &gt;= 0x\1) \&amp;\&amp; ((c) &lt;= 0x\2)) ||/
+>\([0-9A-Z]*\)\]/     (((c) = 0x\1) \\ ((c) = 0x\2)) ||/
 and 
 :1,$ s/<GTKDOCLINK
 HREF="X"
@@ -1914,7 +1955,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1944,7 +1985,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16050"
+NAME="AEN16945"
 ></A
 ><H3
 ><A
@@ -2006,7 +2047,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2036,7 +2077,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16074"
+NAME="AEN16969"
 ></A
 ><H3
 ><A
@@ -2091,7 +2132,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2121,7 +2162,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16096"
+NAME="AEN16991"
 ></A
 ><H3
 ><A
@@ -2167,7 +2208,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2197,7 +2238,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16115"
+NAME="AEN17010"
 ></A
 ><H3
 ><A
@@ -2243,7 +2284,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2273,7 +2314,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16134"
+NAME="AEN17029"
 ></A
 ><H3
 ><A
@@ -2334,7 +2375,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2364,7 +2405,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16158"
+NAME="AEN17053"
 ></A
 ><H3
 ><A
@@ -2410,7 +2451,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2440,7 +2481,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16177"
+NAME="AEN17072"
 ></A
 ><H3
 ><A
@@ -2530,7 +2571,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2560,7 +2601,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16210"
+NAME="AEN17105"
 ></A
 ><H3
 ><A
@@ -2639,7 +2680,7 @@ CLASS="PARAMETER"
 ><I
 >c</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2669,7 +2710,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16239"
+NAME="AEN17134"
 ></A
 ><H3
 ><A
@@ -2720,7 +2761,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2750,7 +2791,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16260"
+NAME="AEN17155"
 ></A
 ><H3
 ><A
@@ -2800,7 +2841,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2830,7 +2871,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16280"
+NAME="AEN17175"
 ></A
 ><H3
 ><A
@@ -2879,7 +2920,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2896,7 +2937,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2926,7 +2967,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16304"
+NAME="AEN17199"
 ></A
 ><H3
 ><A
@@ -2987,7 +3028,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16320"
+NAME="AEN17215"
 ></A
 ><H3
 ><A
@@ -3048,7 +3089,7 @@ CLASS="PARAMETER"
 ><I
 >URL</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3065,7 +3106,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3082,7 +3123,7 @@ CLASS="PARAMETER"
 ><I
 >base</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3112,7 +3153,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16351"
+NAME="AEN17246"
 ></A
 ><H3
 ><A
@@ -3165,7 +3206,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3182,7 +3223,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3212,7 +3253,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16376"
+NAME="AEN17271"
 ></A
 ><H3
 ><A
@@ -3265,7 +3306,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3282,7 +3323,7 @@ CLASS="PARAMETER"
 ><I
 >handler</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3312,7 +3353,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16401"
+NAME="AEN17296"
 ></A
 ><H3
 ><A
@@ -3337,7 +3378,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TABLE
 ><P
 >Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
+document in ctxt-myDoc is not freed.</P
 ><P
 ></P
 ><DIV
@@ -3361,7 +3402,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3376,7 +3417,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16417"
+NAME="AEN17312"
 ></A
 ><H3
 ><A
@@ -3431,7 +3472,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3448,7 +3489,7 @@ CLASS="PARAMETER"
 ><I
 >entity</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3463,7 +3504,109 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16439"
+NAME="AEN17334"
+></A
+><H3
+><A
+NAME="XMLNEWSTRINGINPUTSTREAM"
+></A
+>xmlNewStringInputStream ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-parser.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> xmlNewStringInputStream   (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *buffer);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new input stream based on a memory buffer.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XML parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>buffer</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an memory buffer</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new input stream</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN17360"
 ></A
 ><H3
 ><A
@@ -3518,7 +3661,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3535,7 +3678,7 @@ CLASS="PARAMETER"
 ><I
 >entity</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3565,7 +3708,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16465"
+NAME="AEN17386"
 ></A
 ><H3
 ><A
@@ -3618,7 +3761,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3635,7 +3778,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3650,7 +3793,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16486"
+NAME="AEN17407"
 ></A
 ><H3
 ><A
@@ -3677,7 +3820,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->xmlPopInput: the current input pointed by ctxt-&gt;input came to an end
+>xmlPopInput: the current input pointed by ctxt-input came to an end
 pop it and return the next char.</P
 ><P
 ></P
@@ -3702,7 +3845,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3732,7 +3875,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16507"
+NAME="AEN17428"
 ></A
 ><H3
 ><A
@@ -3780,7 +3923,7 @@ CLASS="PARAMETER"
 ><I
 >input</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3795,7 +3938,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16523"
+NAME="AEN17444"
 ></A
 ><H3
 ><A
@@ -3847,7 +3990,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3864,7 +4007,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3894,7 +4037,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16548"
+NAME="AEN17469"
 ></A
 ><H3
 ><A
@@ -3945,7 +4088,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3975,7 +4118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16569"
+NAME="AEN17490"
 ></A
 ><H3
 ><A
@@ -4040,7 +4183,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4057,7 +4200,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4074,7 +4217,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4105,7 +4248,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16603"
+NAME="AEN17524"
 ></A
 ><H3
 ><A
@@ -4164,7 +4307,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4194,7 +4337,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16627"
+NAME="AEN17548"
 ></A
 ><H3
 ><A
@@ -4258,7 +4401,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4275,7 +4418,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4306,7 +4449,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16657"
+NAME="AEN17578"
 ></A
 ><H3
 ><A
@@ -4364,7 +4507,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4394,7 +4537,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16681"
+NAME="AEN17602"
 ></A
 ><H3
 ><A
@@ -4447,7 +4590,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4477,7 +4620,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16703"
+NAME="AEN17624"
 ></A
 ><H3
 ><A
@@ -4501,7 +4644,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->xmlParseNamespace: parse specific PI '&lt;?namespace ...' constructs.</P
+>xmlParseNamespace: parse specific PI '?namespace ...' constructs.</P
 ><P
 >This is what the older xml-name Working Draft specified, a bunch of
 other stuff may still rely on it, so support is still here as
@@ -4533,7 +4676,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4548,7 +4691,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16722"
+NAME="AEN17643"
 ></A
 ><H3
 ><A
@@ -4610,7 +4753,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4640,7 +4783,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16747"
+NAME="AEN17668"
 ></A
 ><H3
 ><A
@@ -4698,7 +4841,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4728,7 +4871,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16771"
+NAME="AEN17692"
 ></A
 ><H3
 ><A
@@ -4783,7 +4926,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4813,7 +4956,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16794"
+NAME="AEN17715"
 ></A
 ><H3
 ><A
@@ -4846,8 +4989,8 @@ HREF="libxml-tree.html#XMLCHAR"
 ><P
 >parse a value for ENTITY declarations</P
 ><P
->[9] EntityValue ::= '"' ([^%&amp;"] | PEReference | Reference)* '"' |
-"'" ([^%&amp;'] | PEReference | Reference)* "'"</P
+>[9] EntityValue ::= '"' ([^%"] | PEReference | Reference)* '"' |
+"'" ([^%'] | PEReference | Reference)* "'"</P
 ><P
 ></P
 ><DIV
@@ -4871,7 +5014,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4888,7 +5031,7 @@ CLASS="PARAMETER"
 ><I
 >orig</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4918,7 +5061,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16821"
+NAME="AEN17742"
 ></A
 ><H3
 ><A
@@ -4949,8 +5092,8 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 Note: the parser won't do substitution of entities here, this
 will be handled later in xmlStringGetNodeList</P
 ><P
->[10] AttValue ::= '"' ([^&lt;&amp;"] | Reference)* '"' |
-"'" ([^&lt;&amp;'] | Reference)* "'"</P
+>[10] AttValue ::= '"' ([^"] | Reference)* '"' |
+"'" ([^'] | Reference)* "'"</P
 ><P
 >3.3.3 Attribute-Value Normalization:
 Before the value of an attribute is passed to the application or
@@ -5026,7 +5169,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5056,7 +5199,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16855"
+NAME="AEN17776"
 ></A
 ><H3
 ><A
@@ -5109,7 +5252,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5139,7 +5282,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16877"
+NAME="AEN17798"
 ></A
 ><H3
 ><A
@@ -5192,7 +5335,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5222,7 +5365,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16899"
+NAME="AEN17820"
 ></A
 ><H3
 ><A
@@ -5248,14 +5391,14 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TABLE
 ><P
 >parse a CharData section.
-if we are within a CDATA section ']]&gt;' marks an end of section.</P
+if we are within a CDATA section ']]' marks an end of section.</P
 ><P
->The right angle bracket (&gt;) may be represented using the string "&amp;gt;",
-and must, for compatibility, be escaped using "&amp;gt;" or a character
-reference when it appears in the string "]]&gt;" in content, when that
+>The right angle bracket () may be represented using the string "gt;",
+and must, for compatibility, be escaped using "gt;" or a character
+reference when it appears in the string "]]" in content, when that
 string is not marking the end of a CDATA section. </P
 ><P
->[14] CharData ::= [^&lt;&amp;]* - ([^&lt;&amp;]* ']]&gt;' [^&lt;&amp;]*)</P
+>[14] CharData ::= [^]* - ([^]* ']]' [^]*)</P
 ><P
 ></P
 ><DIV
@@ -5279,7 +5422,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5296,7 +5439,7 @@ CLASS="PARAMETER"
 ><I
 >cdata</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5311,7 +5454,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16921"
+NAME="AEN17842"
 ></A
 ><H3
 ><A
@@ -5375,7 +5518,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5392,7 +5535,7 @@ CLASS="PARAMETER"
 ><I
 >publicID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5409,7 +5552,7 @@ CLASS="PARAMETER"
 ><I
 >strict</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5442,7 +5585,7 @@ it is possible to return NULL and have publicID set.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16954"
+NAME="AEN17875"
 ></A
 ><H3
 ><A
@@ -5466,11 +5609,11 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->Skip an XML (SGML) comment &lt;!-- .... --&gt;
+>Skip an XML (SGML) comment !-- .... --
 The spec says that "For compatibility, the string "--" (double-hyphen)
 must not occur within comments. "</P
 ><P
->[15] Comment ::= '&lt;!--' ((Char - '-') | ('-' (Char - '-')))* '--&gt;'</P
+>[15] Comment ::= '!--' ((Char - '-') | ('-' (Char - '-')))* '--'</P
 ><P
 ></P
 ><DIV
@@ -5494,7 +5637,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5509,7 +5652,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16971"
+NAME="AEN17892"
 ></A
 ><H3
 ><A
@@ -5562,7 +5705,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5592,7 +5735,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16993"
+NAME="AEN17914"
 ></A
 ><H3
 ><A
@@ -5618,7 +5761,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse an XML Processing Instruction.</P
 ><P
->[16] PI ::= '&lt;?' PITarget (S (Char* - (Char* '?&gt;' Char*)))? '?&gt;'</P
+>[16] PI ::= '?' PITarget (S (Char* - (Char* '?' Char*)))? '?'</P
 ><P
 >The processing is transfered to SAX once parsed.</P
 ><P
@@ -5644,7 +5787,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5659,7 +5802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17011"
+NAME="AEN17932"
 ></A
 ><H3
 ><A
@@ -5685,7 +5828,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse a notation declaration</P
 ><P
->[82] NotationDecl ::= '&lt;!NOTATION' S Name S (ExternalID |  PublicID) S? '&gt;'</P
+>[82] NotationDecl ::= '!NOTATION' S Name S (ExternalID |  PublicID) S? ''</P
 ><P
 >Hence there is actually 3 choices:
 'PUBLIC' S PubidLiteral
@@ -5719,7 +5862,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5734,7 +5877,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17031"
+NAME="AEN17952"
 ></A
 ><H3
 ><A
@@ -5758,13 +5901,13 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->parse &lt;!ENTITY declarations</P
+>parse !ENTITY declarations</P
 ><P
 >[70] EntityDecl ::= GEDecl | PEDecl</P
 ><P
->[71] GEDecl ::= '&lt;!ENTITY' S Name S EntityDef S? '&gt;'</P
+>[71] GEDecl ::= '!ENTITY' S Name S EntityDef S? ''</P
 ><P
->[72] PEDecl ::= '&lt;!ENTITY' S '%' S Name S PEDef S? '&gt;'</P
+>[72] PEDecl ::= '!ENTITY' S '%' S Name S PEDef S? ''</P
 ><P
 >[73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)</P
 ><P
@@ -5797,7 +5940,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5812,7 +5955,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17054"
+NAME="AEN17975"
 ></A
 ><H3
 ><A
@@ -5875,7 +6018,7 @@ HREF="FIXED-CAPS"
 >
 keyword, instances of that attribute must match the default value. </P
 ><P
->[ WFC: No &lt; in Attribute Values ]
+>[ WFC: No  in Attribute Values ]
 handled in <A
 HREF="libxml-parserinternals.html#XMLPARSEATTVALUE"
 >xmlParseAttValue</A
@@ -5903,7 +6046,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5920,7 +6063,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5951,7 +6094,7 @@ or XML_ATTRIBUTE_FIXED. </TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17091"
+NAME="AEN18012"
 ></A
 ><H3
 ><A
@@ -6010,7 +6153,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6040,7 +6183,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17115"
+NAME="AEN18036"
 ></A
 ><H3
 ><A
@@ -6097,7 +6240,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6127,7 +6270,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17138"
+NAME="AEN18059"
 ></A
 ><H3
 ><A
@@ -6183,7 +6326,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6200,7 +6343,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6230,7 +6373,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17165"
+NAME="AEN18086"
 ></A
 ><H3
 ><A
@@ -6327,7 +6470,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6344,7 +6487,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6374,7 +6517,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17203"
+NAME="AEN18124"
 ></A
 ><H3
 ><A
@@ -6400,7 +6543,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >: parse the Attribute list def for an element</P
 ><P
->[52] AttlistDecl ::= '&lt;!ATTLIST' S Name AttDef* S? '&gt;'</P
+>[52] AttlistDecl ::= '!ATTLIST' S Name AttDef* S? ''</P
 ><P
 >[53] AttDef ::= S Name S AttType S DefaultDecl</P
 ><P
@@ -6426,7 +6569,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6441,7 +6584,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17221"
+NAME="AEN18142"
 ></A
 ><H3
 ><A
@@ -6509,7 +6652,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6539,7 +6682,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17247"
+NAME="AEN18168"
 ></A
 ><H3
 ><A
@@ -6589,7 +6732,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6619,7 +6762,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17267"
+NAME="AEN18188"
 ></A
 ><H3
 ><A
@@ -6691,7 +6834,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6722,7 +6865,7 @@ hierarchy.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17293"
+NAME="AEN18214"
 ></A
 ><H3
 ><A
@@ -6781,7 +6924,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6798,7 +6941,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6815,7 +6958,7 @@ CLASS="PARAMETER"
 ><I
 >result</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6845,7 +6988,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17324"
+NAME="AEN18245"
 ></A
 ><H3
 ><A
@@ -6871,7 +7014,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse an Element declaration.</P
 ><P
->[45] elementdecl ::= '&lt;!ELEMENT' S Name S contentspec S? '&gt;'</P
+>[45] elementdecl ::= '!ELEMENT' S Name S contentspec S? ''</P
 ><P
 >[ VC: Unique Element Type Declaration ]
 No element type may be declared more than once</P
@@ -6898,7 +7041,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6928,7 +7071,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17346"
+NAME="AEN18267"
 ></A
 ><H3
 ><A
@@ -6992,7 +7135,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7007,7 +7150,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17365"
+NAME="AEN18286"
 ></A
 ><H3
 ><A
@@ -7033,8 +7176,8 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse Reference declarations</P
 ><P
->[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-'&amp;<GTKDOCLINK
+>[66] CharRef ::= '#' [0-9]+ ';' |
+'<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
@@ -7065,7 +7208,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7095,7 +7238,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17388"
+NAME="AEN18309"
 ></A
 ><H3
 ><A
@@ -7124,7 +7267,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse ENTITY references declarations</P
 ><P
->[68] EntityRef ::= '&amp;' Name ';'</P
+>[68] EntityRef ::= '' Name ';'</P
 ><P
 >[ WFC: Entity Declared ]
 In a document without any DTD, a document with only an internal DTD
@@ -7166,7 +7309,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7196,7 +7339,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17412"
+NAME="AEN18333"
 ></A
 ><H3
 ><A
@@ -7255,7 +7398,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7270,7 +7413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17431"
+NAME="AEN18352"
 ></A
 ><H3
 ><A
@@ -7341,7 +7484,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7356,7 +7499,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17452"
+NAME="AEN18373"
 ></A
 ><H3
 ><A
@@ -7382,8 +7525,8 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse a DOCTYPE declaration</P
 ><P
->[28] doctypedecl ::= '&lt;!DOCTYPE' S Name (S ExternalID)? S? 
-('[' (markupdecl | PEReference | S)* ']' S?)? '&gt;'</P
+>[28] doctypedecl ::= '!DOCTYPE' S Name (S ExternalID)? S? 
+('[' (markupdecl | PEReference | S)* ']' S?)? ''</P
 ><P
 >[ VC: Root Element Type ]
 The Name in the document type declaration must match the element
@@ -7411,7 +7554,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7426,7 +7569,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17470"
+NAME="AEN18391"
 ></A
 ><H3
 ><A
@@ -7465,9 +7608,9 @@ HREF="libxml-tree.html#XMLCHAR"
 Attribute values cannot contain direct or indirect entity references
 to external entities.</P
 ><P
->[ WFC: No &lt; in Attribute Values ]
+>[ WFC: No  in Attribute Values ]
 The replacement text of any entity referred to directly or indirectly in
-an attribute value (other than "&amp;lt;") must not contain a &lt;. </P
+an attribute value (other than "lt;") must not contain a . </P
 ><P
 >[ VC: Attribute Value Type ]
 The attribute must have been declared; the value must be of the type
@@ -7504,7 +7647,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7521,7 +7664,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7551,7 +7694,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17504"
+NAME="AEN18425"
 ></A
 ><H3
 ><A
@@ -7581,13 +7724,13 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 >parse a start of tag either for rule element or
 EmptyElement. In both case we don't parse the tag closing chars.</P
 ><P
->[40] STag ::= '&lt;' Name (S Attribute)* S? '&gt;'</P
+>[40] STag ::= '' Name (S Attribute)* S? ''</P
 ><P
 >[ WFC: Unique Att Spec ]
 No attribute name may appear more than once in the same start-tag or
 empty-element tag. </P
 ><P
->[44] EmptyElemTag ::= '&lt;' Name (S Attribute)* S? '/&gt;'</P
+>[44] EmptyElemTag ::= '' Name (S Attribute)* S? '/'</P
 ><P
 >[ WFC: Unique Att Spec ]
 No attribute name may appear more than once in the same start-tag or
@@ -7595,9 +7738,9 @@ empty-element tag. </P
 ><P
 >With namespace:</P
 ><P
->[NS 8] STag ::= '&lt;' QName (S Attribute)* S? '&gt;'</P
+>[NS 8] STag ::= '' QName (S Attribute)* S? ''</P
 ><P
->[NS 10] EmptyElement ::= '&lt;' QName (S Attribute)* S? '/&gt;'</P
+>[NS 10] EmptyElement ::= '' QName (S Attribute)* S? '/'</P
 ><P
 ></P
 ><DIV
@@ -7621,7 +7764,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7651,7 +7794,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17532"
+NAME="AEN18453"
 ></A
 ><H3
 ><A
@@ -7677,11 +7820,11 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse an end of tag</P
 ><P
->[42] ETag ::= '&lt;/' Name S? '&gt;'</P
+>[42] ETag ::= '/' Name S? ''</P
 ><P
 >With namespace</P
 ><P
->[NS 9] ETag ::= '&lt;/' QName S? '&gt;'</P
+>[NS 9] ETag ::= '/' QName S? ''</P
 ><P
 ></P
 ><DIV
@@ -7705,7 +7848,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7720,7 +7863,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17551"
+NAME="AEN18472"
 ></A
 ><H3
 ><A
@@ -7748,11 +7891,11 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >[18] CDSect ::= CDStart CData CDEnd</P
 ><P
->[19] CDStart ::= '&lt;![CDATA['</P
+>[19] CDStart ::= '![CDATA['</P
 ><P
->[20] Data ::= (Char* - (Char* ']]&gt;' Char*))</P
+>[20] Data ::= (Char* - (Char* ']]' Char*))</P
 ><P
->[21] CDEnd ::= ']]&gt;'</P
+>[21] CDEnd ::= ']]'</P
 ><P
 ></P
 ><DIV
@@ -7776,7 +7919,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7791,7 +7934,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17571"
+NAME="AEN18492"
 ></A
 ><H3
 ><A
@@ -7841,7 +7984,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7856,7 +7999,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17588"
+NAME="AEN18509"
 ></A
 ><H3
 ><A
@@ -7923,7 +8066,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7938,7 +8081,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17607"
+NAME="AEN18528"
 ></A
 ><H3
 ><A
@@ -7991,7 +8134,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8021,7 +8164,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17629"
+NAME="AEN18550"
 ></A
 ><H3
 ><A
@@ -8076,7 +8219,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8106,7 +8249,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17652"
+NAME="AEN18573"
 ></A
 ><H3
 ><A
@@ -8159,7 +8302,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8189,7 +8332,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17674"
+NAME="AEN18595"
 ></A
 ><H3
 ><A
@@ -8244,7 +8387,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8274,7 +8417,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17697"
+NAME="AEN18618"
 ></A
 ><H3
 ><A
@@ -8339,7 +8482,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8369,7 +8512,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17719"
+NAME="AEN18640"
 ></A
 ><H3
 ><A
@@ -8395,7 +8538,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse an XML declaration header</P
 ><P
->[23] XMLDecl ::= '&lt;?xml' VersionInfo EncodingDecl? SDDecl? S? '?&gt;'</P
+>[23] XMLDecl ::= '?xml' VersionInfo EncodingDecl? SDDecl? S? '?'</P
 ><P
 ></P
 ><DIV
@@ -8419,7 +8562,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8434,7 +8577,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17736"
+NAME="AEN18657"
 ></A
 ><H3
 ><A
@@ -8460,7 +8603,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><P
 >parse an XML declaration header for external entities</P
 ><P
->[77] TextDecl ::= '&lt;?xml' VersionInfo? EncodingDecl S? '?&gt;'</P
+>[77] TextDecl ::= '?xml' VersionInfo? EncodingDecl S? '?'</P
 ><P
 >Question: Seems that EncodingDecl is mandatory ? Is that a typo ?</P
 ><P
@@ -8486,7 +8629,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8501,7 +8644,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17754"
+NAME="AEN18675"
 ></A
 ><H3
 ><A
@@ -8551,7 +8694,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8566,7 +8709,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17771"
+NAME="AEN18692"
 ></A
 ><H3
 ><A
@@ -8626,7 +8769,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8643,7 +8786,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8660,7 +8803,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8675,7 +8818,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17799"
+NAME="AEN18720"
 ></A
 ><H3
 ><A
@@ -8701,7 +8844,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17804"
+NAME="AEN18725"
 ></A
 ><H3
 ><A
@@ -8727,7 +8870,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17809"
+NAME="AEN18730"
 ></A
 ><H3
 ><A
@@ -8753,7 +8896,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17814"
+NAME="AEN18735"
 ></A
 ><H3
 ><A
@@ -8779,7 +8922,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17819"
+NAME="AEN18740"
 ></A
 ><H3
 ><A
@@ -8851,7 +8994,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8868,7 +9011,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8885,7 +9028,7 @@ CLASS="PARAMETER"
 ><I
 >what</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8902,7 +9045,7 @@ CLASS="PARAMETER"
 ><I
 >end</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8919,7 +9062,7 @@ CLASS="PARAMETER"
 ><I
 >end2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8936,7 +9079,7 @@ CLASS="PARAMETER"
 ><I
 >end3</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8967,7 +9110,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17866"
+NAME="AEN18787"
 ></A
 ><H3
 ><A
@@ -9039,7 +9182,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9056,7 +9199,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9073,7 +9216,7 @@ CLASS="PARAMETER"
 ><I
 >what</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9090,7 +9233,7 @@ CLASS="PARAMETER"
 ><I
 >end</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9107,7 +9250,7 @@ CLASS="PARAMETER"
 ><I
 >end2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9124,7 +9267,7 @@ CLASS="PARAMETER"
 ><I
 >end3</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9155,7 +9298,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17913"
+NAME="AEN18834"
 ></A
 ><H3
 ><A
@@ -9205,7 +9348,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9222,7 +9365,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9252,7 +9395,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17937"
+NAME="AEN18858"
 ></A
 ><H3
 ><A
@@ -9301,7 +9444,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9331,7 +9474,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17957"
+NAME="AEN18878"
 ></A
 ><H3
 ><A
@@ -9381,7 +9524,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9398,7 +9541,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9428,7 +9571,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17981"
+NAME="AEN18902"
 ></A
 ><H3
 ><A
@@ -9477,7 +9620,183 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</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"
+>&#13;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18922"
+></A
+><H3
+><A
+NAME="NAMEPOP"
+></A
+>namePop ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    namePop                         (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</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"
+>&#13;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18942"
+></A
+><H3
+><A
+NAME="NAMEPUSH"
+></A
+>namePush ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         namePush                        (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9507,7 +9826,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18001"
+NAME="AEN18966"
 ></A
 ><H3
 ><A
@@ -9556,7 +9875,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9586,7 +9905,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18021"
+NAME="AEN18986"
 ></A
 ><H3
 ><A
@@ -9640,7 +9959,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9657,7 +9976,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9674,7 +9993,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9704,7 +10023,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18050"
+NAME="AEN19015"
 ></A
 ><H3
 ><A
@@ -9781,7 +10100,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9796,7 +10115,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18072"
+NAME="AEN19037"
 ></A
 ><H3
 ><A
@@ -9826,7 +10145,7 @@ routines.</P
 ><P
 >[67] Reference ::= EntityRef | CharRef</P
 ><P
->[68] EntityRef ::= '&amp;' Name ';'</P
+>[68] EntityRef ::= '' Name ';'</P
 ><P
 >[ WFC: Entity Declared ]
 the Name given in the entity reference must match that in an entity
@@ -9836,8 +10155,8 @@ of the following entities: amp, lt, gt, apos, quot. </P
 >[ WFC: Parsed Entity ]
 An entity reference must not contain the name of an unparsed entity</P
 ><P
->[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-'&amp;<GTKDOCLINK
+>[66] CharRef ::= '#' [0-9]+ ';' |
+'<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
@@ -9871,7 +10190,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9886,13 +10205,13 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18096"
+NAME="AEN19061"
 ></A
 ><H3
 ><A
-NAME="NAMEPOP"
+NAME="XMLCHECKLANGUAGEID"
 ></A
->namePop ()</H3
+>xmlCheckLanguageID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9902,13 +10221,10 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
+>int         xmlCheckLanguageID              (const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
->*    namePop                         (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
+> *lang);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9933,9 +10249,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->ctxt</I
+>lang</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9965,13 +10281,13 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18116"
+NAME="AEN19080"
 ></A
 ><H3
 ><A
-NAME="XMLCHECKLANGUAGEID"
+NAME="XMLCURRENTCHAR"
 ></A
->xmlCheckLanguageID ()</H3
+>xmlCurrentChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9981,14 +10297,40 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCheckLanguageID              (const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *lang);</PRE
+>int         xmlCurrentChar                  (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             int *len);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>The current char value, if using UTF-8 this may actaully span multiple
+bytes in the input buffer. Implement the end of line normalization:
+2.11 End-of-Line Handling
+Wherever an external parsed entity or the literal entity value
+of an internal parsed entity contains either the literal two-character
+sequence "<GTKDOCLINK
+HREF="XD"
+>xD</GTKDOCLINK
+><GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+>" or a standalone literal <GTKDOCLINK
+HREF="XD"
+>xD</GTKDOCLINK
+>, an XML processor
+must pass to the application the single character <GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+>.
+This behavior can conveniently be produced by normalizing all
+line breaks to <GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+> on input, before parsing.)</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -10009,14 +10351,31 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->lang</I
+>ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to the length of the char read</TD
 ></TR
 ><TR
 ><TD
@@ -10031,7 +10390,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&#13;</TD
+>the current char value and its lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -10041,13 +10400,13 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18135"
+NAME="AEN19109"
 ></A
 ><H3
 ><A
-NAME="XMLCURRENTCHAR"
+NAME="XMLCOPYCHARMULTIBYTE"
 ></A
->xmlCurrentChar ()</H3
+>xmlCopyCharMultiByte ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10057,39 +10416,16 @@ CELLPADDING="6"
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCurrentChar                  (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             int *len);</PRE
+>int         xmlCopyCharMultiByte            (<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *out,
+                                             int val);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->The current char value, if using UTF-8 this may actaully span multiple
-bytes in the input buffer. Implement the end of line normalization:
-2.11 End-of-Line Handling
-Wherever an external parsed entity or the literal entity value
-of an internal parsed entity contains either the literal two-character
-sequence "<GTKDOCLINK
-HREF="XD"
->xD</GTKDOCLINK
-><GTKDOCLINK
-HREF="XA"
->xA</GTKDOCLINK
->" or a standalone literal <GTKDOCLINK
-HREF="XD"
->xD</GTKDOCLINK
->, an XML processor
-must pass to the application the single character <GTKDOCLINK
-HREF="XA"
->xA</GTKDOCLINK
->.
-This behavior can conveniently be produced by normalizing all
-line breaks to <GTKDOCLINK
-HREF="XA"
->xA</GTKDOCLINK
-> on input, before parsing.)</P
+>append the char value in the array</P
 ><P
 ></P
 ><DIV
@@ -10111,14 +10447,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->ctxt</I
+>out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>  pointer to an arry of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -10128,14 +10464,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->len</I
+>val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>  the char value</TD
 ></TR
 ><TR
 ><TD
@@ -10150,7 +10486,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its lenght</TD
+>the number of xmlChar written</TD
 ></TR
 ></TABLE
 ><P
@@ -10160,7 +10496,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18164"
+NAME="AEN19133"
 ></A
 ><H3
 ><A
@@ -10210,12 +10546,12 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read (or zero)</TD
+>  Ignored, compatibility</TD
 ></TR
 ><TR
 ><TD
@@ -10227,12 +10563,12 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to an arry of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -10244,7 +10580,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10274,7 +10610,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18192"
+NAME="AEN19161"
 ></A
 ><H3
 ><A
@@ -10322,7 +10658,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10337,7 +10673,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18208"
+NAME="AEN19177"
 ></A
 ><H3
 ><A
@@ -10385,7 +10721,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10400,7 +10736,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18224"
+NAME="AEN19193"
 ></A
 ><H3
 ><A
@@ -10430,6 +10766,104 @@ case of use in multithreaded programs.</P
 ><P
 ></P
 ></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19200"
+></A
+><H3
+><A
+NAME="HTMLCREATEFILEPARSERCTXT"
+></A
+>htmlCreateFileParserCtxt ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
+>htmlParserCtxtPtr</A
+> htmlCreateFileParserCtxt  (const char *filename,
+                                             const char *encoding);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a parser context for a file content. 
+Automatic support for ZLIB/Compress compressed document is provided
+by default if found at compile-time.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the filename</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>encoding</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a free form C string describing the HTML document encoding, or NULL</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new parser context or NULL</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index eda3496f..7d662e0b 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -121,7 +121,7 @@ NAME="LIBXML-SAX"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2697"
+NAME="AEN2746"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN2697"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2700"
+NAME="AEN2749"
 ></A
 ><H2
 >Synopsis</H2
@@ -508,7 +508,7 @@ HREF="libxml-sax.html#SGMLDEFAULTSAXHANDLERINIT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2792"
+NAME="AEN2841"
 ></A
 ><H2
 >Description</H2
@@ -518,14 +518,14 @@ NAME="AEN2792"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2795"
+NAME="AEN2844"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2797"
+NAME="AEN2846"
 ></A
 ><H3
 ><A
@@ -573,7 +573,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -603,7 +603,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2817"
+NAME="AEN2866"
 ></A
 ><H3
 ><A
@@ -652,7 +652,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -682,7 +682,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2837"
+NAME="AEN2886"
 ></A
 ><H3
 ><A
@@ -732,7 +732,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -749,7 +749,7 @@ CLASS="PARAMETER"
 ><I
 >loc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -764,7 +764,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2857"
+NAME="AEN2906"
 ></A
 ><H3
 ><A
@@ -809,7 +809,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -839,7 +839,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2876"
+NAME="AEN2925"
 ></A
 ><H3
 ><A
@@ -884,7 +884,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -914,7 +914,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2895"
+NAME="AEN2944"
 ></A
 ><H3
 ><A
@@ -959,7 +959,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -989,7 +989,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2914"
+NAME="AEN2963"
 ></A
 ><H3
 ><A
@@ -1034,7 +1034,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1064,7 +1064,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2933"
+NAME="AEN2982"
 ></A
 ><H3
 ><A
@@ -1109,7 +1109,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1139,7 +1139,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2952"
+NAME="AEN3001"
 ></A
 ><H3
 ><A
@@ -1196,7 +1196,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1213,7 +1213,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1230,7 +1230,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1247,7 +1247,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1262,7 +1262,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2982"
+NAME="AEN3031"
 ></A
 ><H3
 ><A
@@ -1319,7 +1319,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1336,7 +1336,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1353,7 +1353,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1370,7 +1370,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1385,7 +1385,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3012"
+NAME="AEN3061"
 ></A
 ><H3
 ><A
@@ -1437,7 +1437,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1454,7 +1454,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1484,7 +1484,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3037"
+NAME="AEN3086"
 ></A
 ><H3
 ><A
@@ -1536,7 +1536,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1553,7 +1553,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1583,7 +1583,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3062"
+NAME="AEN3111"
 ></A
 ><H3
 ><A
@@ -1649,7 +1649,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1666,7 +1666,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1683,7 +1683,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1713,7 +1713,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3094"
+NAME="AEN3143"
 ></A
 ><H3
 ><A
@@ -1775,7 +1775,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1792,7 +1792,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1809,7 +1809,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1826,7 +1826,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1843,7 +1843,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1860,7 +1860,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1875,7 +1875,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3133"
+NAME="AEN3182"
 ></A
 ><H3
 ><A
@@ -1938,7 +1938,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1955,7 +1955,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1972,7 +1972,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1989,7 +1989,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2006,7 +2006,7 @@ CLASS="PARAMETER"
 ><I
 >def</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2023,7 +2023,7 @@ CLASS="PARAMETER"
 ><I
 >defaultValue</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2040,7 +2040,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2055,7 +2055,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3176"
+NAME="AEN3225"
 ></A
 ><H3
 ><A
@@ -2109,7 +2109,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2126,7 +2126,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2143,7 +2143,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2160,7 +2160,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2175,7 +2175,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3205"
+NAME="AEN3254"
 ></A
 ><H3
 ><A
@@ -2232,7 +2232,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2249,7 +2249,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2266,7 +2266,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2283,7 +2283,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2298,7 +2298,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3235"
+NAME="AEN3284"
 ></A
 ><H3
 ><A
@@ -2359,7 +2359,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2376,7 +2376,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2393,7 +2393,7 @@ CLASS="PARAMETER"
 ><I
 >publicId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2410,7 +2410,7 @@ CLASS="PARAMETER"
 ><I
 >systemId</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2427,7 +2427,7 @@ CLASS="PARAMETER"
 ><I
 >notationName</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2442,7 +2442,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3270"
+NAME="AEN3319"
 ></A
 ><H3
 ><A
@@ -2487,7 +2487,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2502,7 +2502,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3285"
+NAME="AEN3334"
 ></A
 ><H3
 ><A
@@ -2547,7 +2547,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2562,7 +2562,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3300"
+NAME="AEN3349"
 ></A
 ><H3
 ><A
@@ -2618,7 +2618,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2635,7 +2635,7 @@ CLASS="PARAMETER"
 ><I
 >fullname</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2652,7 +2652,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2667,7 +2667,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3325"
+NAME="AEN3374"
 ></A
 ><H3
 ><A
@@ -2720,7 +2720,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2737,7 +2737,7 @@ CLASS="PARAMETER"
 ><I
 >fullname</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2754,7 +2754,7 @@ CLASS="PARAMETER"
 ><I
 >atts</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2769,7 +2769,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3350"
+NAME="AEN3399"
 ></A
 ><H3
 ><A
@@ -2818,7 +2818,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2835,7 +2835,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2850,7 +2850,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3370"
+NAME="AEN3419"
 ></A
 ><H3
 ><A
@@ -2899,7 +2899,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2916,7 +2916,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2931,7 +2931,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3390"
+NAME="AEN3439"
 ></A
 ><H3
 ><A
@@ -2982,7 +2982,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2999,7 +2999,7 @@ CLASS="PARAMETER"
 ><I
 >ch</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3016,7 +3016,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3031,7 +3031,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3414"
+NAME="AEN3463"
 ></A
 ><H3
 ><A
@@ -3082,7 +3082,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3099,7 +3099,7 @@ CLASS="PARAMETER"
 ><I
 >ch</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3116,7 +3116,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3131,7 +3131,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3438"
+NAME="AEN3487"
 ></A
 ><H3
 ><A
@@ -3184,7 +3184,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3201,7 +3201,7 @@ CLASS="PARAMETER"
 ><I
 >target</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3218,7 +3218,7 @@ CLASS="PARAMETER"
 ><I
 >data</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3233,7 +3233,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3463"
+NAME="AEN3512"
 ></A
 ><H3
 ><A
@@ -3286,7 +3286,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3303,7 +3303,7 @@ CLASS="PARAMETER"
 ><I
 >href</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3320,7 +3320,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3335,7 +3335,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3488"
+NAME="AEN3537"
 ></A
 ><H3
 ><A
@@ -3384,7 +3384,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3401,7 +3401,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3416,7 +3416,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3508"
+NAME="AEN3557"
 ></A
 ><H3
 ><A
@@ -3464,7 +3464,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3494,7 +3494,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3528"
+NAME="AEN3577"
 ></A
 ><H3
 ><A
@@ -3544,7 +3544,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3561,7 +3561,7 @@ CLASS="PARAMETER"
 ><I
 >nameSpace</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3591,7 +3591,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3552"
+NAME="AEN3601"
 ></A
 ><H3
 ><A
@@ -3644,7 +3644,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3661,7 +3661,7 @@ CLASS="PARAMETER"
 ><I
 >href</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3678,7 +3678,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3693,7 +3693,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3577"
+NAME="AEN3626"
 ></A
 ><H3
 ><A
@@ -3742,7 +3742,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3759,7 +3759,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3774,7 +3774,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3597"
+NAME="AEN3646"
 ></A
 ><H3
 ><A
@@ -3824,7 +3824,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3841,7 +3841,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3858,7 +3858,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3873,7 +3873,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3621"
+NAME="AEN3670"
 ></A
 ><H3
 ><A
@@ -3901,7 +3901,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3627"
+NAME="AEN3676"
 ></A
 ><H3
 ><A
@@ -3929,7 +3929,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3633"
+NAME="AEN3682"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 9ead4c52..1fadcbe7 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -121,7 +121,7 @@ NAME="LIBXML-TREE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3644"
+NAME="AEN3693"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN3644"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3647"
+NAME="AEN3696"
 ></A
 ><H2
 >Synopsis</H2
@@ -308,6 +308,21 @@ HREF="libxml-tree.html#XMLCHILDRENNODE"
 HREF="libxml-tree.html#XMLROOTNODE"
 >xmlRootNode</A
 >
+void        <A
+HREF="libxml-tree.html#XMLSETBUFFERALLOCATIONSCHEME"
+>xmlSetBufferAllocationScheme</A
+>    (<A
+HREF="libxml-tree.html#XMLBUFFERALLOCATIONSCHEME"
+>xmlBufferAllocationScheme</A
+> scheme);
+<A
+HREF="libxml-tree.html#XMLBUFFERALLOCATIONSCHEME"
+>xmlBufferAllocationScheme</A
+> <A
+HREF="libxml-tree.html#XMLGETBUFFERALLOCATIONSCHEME"
+>xmlGetBufferAllocationScheme</A
+>
+                                            (void);
 <A
 HREF="libxml-tree.html#XMLBUFFERPTR"
 >xmlBufferPtr</A
@@ -325,6 +340,14 @@ HREF="libxml-tree.html#XMLBUFFERCREATESIZE"
 HREF="SIZE-T"
 >size_t</GTKDOCLINK
 > size);
+int         <A
+HREF="libxml-tree.html#XMLBUFFERRESIZE"
+>xmlBufferResize</A
+>                 (<A
+HREF="libxml-tree.html#XMLBUFFERPTR"
+>xmlBufferPtr</A
+> buf,
+                                             unsigned int size);
 void        <A
 HREF="libxml-tree.html#XMLBUFFERFREE"
 >xmlBufferFree</A
@@ -548,6 +571,13 @@ HREF="libxml-tree.html#XMLFREENS"
 HREF="libxml-tree.html#XMLNSPTR"
 >xmlNsPtr</A
 > cur);
+void        <A
+HREF="libxml-tree.html#XMLFREENSLIST"
+>xmlFreeNsList</A
+>                   (<A
+HREF="libxml-tree.html#XMLNSPTR"
+>xmlNsPtr</A
+> cur);
 <A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
@@ -934,6 +964,21 @@ HREF="libxml-tree.html#XMLNODEPTR"
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
+HREF="libxml-tree.html#XMLDOCCOPYNODE"
+>xmlDocCopyNode</A
+>                  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             int recursive);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
 HREF="libxml-tree.html#XMLCOPYNODELIST"
 >xmlCopyNodeList</A
 >                 (<A
@@ -1716,7 +1761,7 @@ HREF="libxml-tree.html#XMLSETCOMPRESSMODE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4077"
+NAME="AEN4138"
 ></A
 ><H2
 >Description</H2
@@ -1726,14 +1771,14 @@ NAME="AEN4077"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4080"
+NAME="AEN4141"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4082"
+NAME="AEN4143"
 ></A
 ><H3
 ><A
@@ -1759,7 +1804,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4087"
+NAME="AEN4148"
 ></A
 ><H3
 ><A
@@ -1809,7 +1854,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4092"
+NAME="AEN4153"
 ></A
 ><H3
 ><A
@@ -1835,7 +1880,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4097"
+NAME="AEN4158"
 ></A
 ><H3
 ><A
@@ -1861,7 +1906,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4102"
+NAME="AEN4163"
 ></A
 ><H3
 ><A
@@ -1887,7 +1932,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4107"
+NAME="AEN4168"
 ></A
 ><H3
 ><A
@@ -1917,7 +1962,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4112"
+NAME="AEN4173"
 ></A
 ><H3
 ><A
@@ -1943,7 +1988,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4117"
+NAME="AEN4178"
 ></A
 ><H3
 ><A
@@ -1980,7 +2025,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4122"
+NAME="AEN4183"
 ></A
 ><H3
 ><A
@@ -2011,7 +2056,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4127"
+NAME="AEN4188"
 ></A
 ><H3
 ><A
@@ -2040,7 +2085,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4132"
+NAME="AEN4193"
 ></A
 ><H3
 ><A
@@ -2066,7 +2111,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4137"
+NAME="AEN4198"
 ></A
 ><H3
 ><A
@@ -2090,7 +2135,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
     struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
+    struct _xmlDtd       *parent;	/* - DTD */
     struct _xmlNode        *next;	/* next sibling link  */
     struct _xmlNode        *prev;	/* previous sibling link  */
     struct _xmlDoc          *doc;       /* the containing document */
@@ -2112,7 +2157,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4142"
+NAME="AEN4203"
 ></A
 ><H3
 ><A
@@ -2138,7 +2183,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4147"
+NAME="AEN4208"
 ></A
 ><H3
 ><A
@@ -2169,7 +2214,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4152"
+NAME="AEN4213"
 ></A
 ><H3
 ><A
@@ -2200,7 +2245,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4157"
+NAME="AEN4218"
 ></A
 ><H3
 ><A
@@ -2222,6 +2267,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar            *name;	/* Element name */
     struct _xmlElementContent *c1;	/* first child */
     struct _xmlElementContent *c2;	/* second child */
+    struct _xmlElementContent *parent;	/* parent */
 };</PRE
 ></TD
 ></TR
@@ -2232,7 +2278,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4162"
+NAME="AEN4223"
 ></A
 ><H3
 ><A
@@ -2258,7 +2304,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4167"
+NAME="AEN4228"
 ></A
 ><H3
 ><A
@@ -2275,6 +2321,7 @@ CELLPADDING="6"
 ><PRE
 CLASS="PROGRAMLISTING"
 >typedef enum {
+    XML_ELEMENT_TYPE_UNDEFINED = 0,
     XML_ELEMENT_TYPE_EMPTY = 1,
     XML_ELEMENT_TYPE_ANY,
     XML_ELEMENT_TYPE_MIXED,
@@ -2289,7 +2336,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4172"
+NAME="AEN4233"
 ></A
 ><H3
 ><A
@@ -2313,7 +2360,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar          *name;	/* Element name */
     struct _xmlNode    *children;	/* NULL */
     struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
+    struct _xmlDtd       *parent;	/* - DTD */
     struct _xmlNode        *next;	/* next sibling link  */
     struct _xmlNode        *prev;	/* previous sibling link  */
     struct _xmlDoc          *doc;       /* the containing document */
@@ -2332,7 +2379,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4177"
+NAME="AEN4238"
 ></A
 ><H3
 ><A
@@ -2358,7 +2405,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4182"
+NAME="AEN4243"
 ></A
 ><H3
 ><A
@@ -2384,7 +2431,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4187"
+NAME="AEN4248"
 ></A
 ><H3
 ><A
@@ -2410,7 +2457,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4192"
+NAME="AEN4253"
 ></A
 ><H3
 ><A
@@ -2441,7 +2488,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4197"
+NAME="AEN4258"
 ></A
 ><H3
 ><A
@@ -2467,7 +2514,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4202"
+NAME="AEN4263"
 ></A
 ><H3
 ><A
@@ -2491,7 +2538,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar *name;	/* Name of the DTD */
     struct _xmlNode *children;	/* the value of the property link */
     struct _xmlNode *last;	/* last child link */
-    struct _xmlDoc  *parent;	/* child-&gt;parent link */
+    struct _xmlDoc  *parent;	/* child-parent link */
     struct _xmlNode *next;	/* next sibling link  */
     struct _xmlNode *prev;	/* previous sibling link  */
     struct _xmlDoc  *doc;	/* the containing document */
@@ -2514,7 +2561,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4207"
+NAME="AEN4268"
 ></A
 ><H3
 ><A
@@ -2540,7 +2587,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4212"
+NAME="AEN4273"
 ></A
 ><H3
 ><A
@@ -2564,7 +2611,7 @@ CLASS="PROGRAMLISTING"
     const xmlChar   *name;      /* the name of the property */
     struct _xmlNode *children;	/* the value of the property */
     struct _xmlNode *last;	/* NULL */
-    struct _xmlNode *parent;	/* child-&gt;parent link */
+    struct _xmlNode *parent;	/* child-parent link */
     struct _xmlAttr *next;	/* next sibling link  */
     struct _xmlAttr *prev;	/* previous sibling link  */
     struct _xmlDoc  *doc;	/* the containing document */
@@ -2580,7 +2627,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4217"
+NAME="AEN4278"
 ></A
 ><H3
 ><A
@@ -2606,7 +2653,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4222"
+NAME="AEN4283"
 ></A
 ><H3
 ><A
@@ -2636,7 +2683,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4227"
+NAME="AEN4288"
 ></A
 ><H3
 ><A
@@ -2662,7 +2709,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4232"
+NAME="AEN4293"
 ></A
 ><H3
 ><A
@@ -2692,7 +2739,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4237"
+NAME="AEN4298"
 ></A
 ><H3
 ><A
@@ -2718,7 +2765,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4242"
+NAME="AEN4303"
 ></A
 ><H3
 ><A
@@ -2747,7 +2794,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4247"
+NAME="AEN4308"
 ></A
 ><H3
 ><A
@@ -2778,7 +2825,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4252"
+NAME="AEN4313"
 ></A
 ><H3
 ><A
@@ -2804,7 +2851,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4257"
+NAME="AEN4318"
 ></A
 ><H3
 ><A
@@ -2826,9 +2873,9 @@ CLASS="PROGRAMLISTING"
 #endif
     xmlElementType   type;	/* type number, must be second ! */
     const xmlChar   *name;      /* the name of the node, or the entity */
-    struct _xmlNode *children;	/* parent-&gt;childs link */
+    struct _xmlNode *children;	/* parent-childs link */
     struct _xmlNode *last;	/* last child link */
-    struct _xmlNode *parent;	/* child-&gt;parent link */
+    struct _xmlNode *parent;	/* child-parent link */
     struct _xmlNode *next;	/* next sibling link  */
     struct _xmlNode *prev;	/* previous sibling link  */
     struct _xmlDoc  *doc;	/* the containing document */
@@ -2852,7 +2899,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4262"
+NAME="AEN4323"
 ></A
 ><H3
 ><A
@@ -2878,7 +2925,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4267"
+NAME="AEN4328"
 ></A
 ><H3
 ><A
@@ -2902,7 +2949,7 @@ CLASS="PROGRAMLISTING"
     char           *name;	/* name/filename/URI of the document */
     struct _xmlNode *children;	/* the document tree */
     struct _xmlNode *last;	/* last child link */
-    struct _xmlNode *parent;	/* child-&gt;parent link */
+    struct _xmlNode *parent;	/* child-parent link */
     struct _xmlNode *next;	/* next sibling link  */
     struct _xmlNode *prev;	/* previous sibling link  */
     struct _xmlDoc  *doc;	/* autoreference to itself */
@@ -2930,7 +2977,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4272"
+NAME="AEN4333"
 ></A
 ><H3
 ><A
@@ -2956,7 +3003,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4277"
+NAME="AEN4338"
 ></A
 ><H3
 ><A
@@ -2982,7 +3029,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4282"
+NAME="AEN4343"
 ></A
 ><H3
 ><A
@@ -3008,7 +3055,138 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4287"
+NAME="AEN4348"
+></A
+><H3
+><A
+NAME="XMLSETBUFFERALLOCATIONSCHEME"
+></A
+>xmlSetBufferAllocationScheme ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlSetBufferAllocationScheme    (<A
+HREF="libxml-tree.html#XMLBUFFERALLOCATIONSCHEME"
+>xmlBufferAllocationScheme</A
+> scheme);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Set the buffer allocation method.  Types are
+XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down
+XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, 
+improves performance</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>scheme</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  allocation method to use</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4364"
+></A
+><H3
+><A
+NAME="XMLGETBUFFERALLOCATIONSCHEME"
+></A
+>xmlGetBufferAllocationScheme ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLBUFFERALLOCATIONSCHEME"
+>xmlBufferAllocationScheme</A
+> xmlGetBufferAllocationScheme
+                                            (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Types are
+XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down
+XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, 
+improves performance</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the current allocation scheme</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4380"
 ></A
 ><H3
 ><A
@@ -3069,7 +3247,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4303"
+NAME="AEN4396"
 ></A
 ><H3
 ><A
@@ -3120,7 +3298,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3150,7 +3328,108 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4324"
+NAME="AEN4417"
+></A
+><H3
+><A
+NAME="XMLBUFFERRESIZE"
+></A
+>xmlBufferResize ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlBufferResize                 (<A
+HREF="libxml-tree.html#XMLBUFFERPTR"
+>xmlBufferPtr</A
+> buf,
+                                             unsigned int size);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Resize a buffer to accomodate minimum size of <TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+>.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>buf</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the buffer to resize</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the desired size</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 in case of problems, 1 otherwise</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4442"
 ></A
 ><H3
 ><A
@@ -3198,7 +3477,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3213,7 +3492,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4340"
+NAME="AEN4458"
 ></A
 ><H3
 ><A
@@ -3265,7 +3544,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3282,7 +3561,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3312,7 +3591,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4365"
+NAME="AEN4483"
 ></A
 ><H3
 ><A
@@ -3366,7 +3645,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3383,7 +3662,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3400,7 +3679,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3415,7 +3694,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4390"
+NAME="AEN4508"
 ></A
 ><H3
 ><A
@@ -3474,7 +3753,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3491,7 +3770,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3508,7 +3787,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3523,7 +3802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4416"
+NAME="AEN4534"
 ></A
 ><H3
 ><A
@@ -3575,7 +3854,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3592,7 +3871,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3607,7 +3886,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4437"
+NAME="AEN4555"
 ></A
 ><H3
 ><A
@@ -3656,7 +3935,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3673,7 +3952,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3688,7 +3967,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4457"
+NAME="AEN4575"
 ></A
 ><H3
 ><A
@@ -3737,7 +4016,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3754,7 +4033,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3784,7 +4063,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4481"
+NAME="AEN4599"
 ></A
 ><H3
 ><A
@@ -3833,7 +4112,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3850,7 +4129,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3880,7 +4159,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4505"
+NAME="AEN4623"
 ></A
 ><H3
 ><A
@@ -3928,7 +4207,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3943,7 +4222,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4521"
+NAME="AEN4639"
 ></A
 ><H3
 ><A
@@ -3994,7 +4273,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4024,7 +4303,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4542"
+NAME="AEN4660"
 ></A
 ><H3
 ><A
@@ -4070,7 +4349,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4100,7 +4379,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4561"
+NAME="AEN4679"
 ></A
 ><H3
 ><A
@@ -4152,7 +4431,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4169,7 +4448,7 @@ CLASS="PARAMETER"
 ><I
 >scheme</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4184,7 +4463,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4582"
+NAME="AEN4700"
 ></A
 ><H3
 ><A
@@ -4232,7 +4511,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4262,7 +4541,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4602"
+NAME="AEN4720"
 ></A
 ><H3
 ><A
@@ -4325,7 +4604,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4342,7 +4621,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4359,7 +4638,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4376,7 +4655,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4406,7 +4685,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4638"
+NAME="AEN4756"
 ></A
 ><H3
 ><A
@@ -4473,7 +4752,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4490,7 +4769,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4507,7 +4786,7 @@ CLASS="PARAMETER"
 ><I
 >ExternalID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4524,7 +4803,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4554,7 +4833,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4675"
+NAME="AEN4793"
 ></A
 ><H3
 ><A
@@ -4605,7 +4884,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4635,7 +4914,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4696"
+NAME="AEN4814"
 ></A
 ><H3
 ><A
@@ -4683,7 +4962,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4698,7 +4977,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4712"
+NAME="AEN4830"
 ></A
 ><H3
 ><A
@@ -4759,7 +5038,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4776,7 +5055,7 @@ CLASS="PARAMETER"
 ><I
 >href</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4793,7 +5072,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4823,7 +5102,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4743"
+NAME="AEN4861"
 ></A
 ><H3
 ><A
@@ -4886,7 +5165,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4903,7 +5182,7 @@ CLASS="PARAMETER"
 ><I
 >href</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4920,7 +5199,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4950,7 +5229,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4774"
+NAME="AEN4892"
 ></A
 ><H3
 ><A
@@ -4998,7 +5277,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5013,7 +5292,70 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4790"
+NAME="AEN4908"
+></A
+><H3
+><A
+NAME="XMLFREENSLIST"
+></A
+>xmlFreeNsList ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlFreeNsList                   (<A
+HREF="libxml-tree.html#XMLNSPTR"
+>xmlNsPtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free up all the structures associated to the chained namespaces.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the first namespace pointer</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4924"
 ></A
 ><H3
 ><A
@@ -5064,7 +5406,7 @@ CLASS="PARAMETER"
 ><I
 >version</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5094,7 +5436,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4811"
+NAME="AEN4945"
 ></A
 ><H3
 ><A
@@ -5142,7 +5484,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5158,7 +5500,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4827"
+NAME="AEN4961"
 ></A
 ><H3
 ><A
@@ -5217,7 +5559,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5234,7 +5576,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5251,7 +5593,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5281,7 +5623,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4858"
+NAME="AEN4992"
 ></A
 ><H3
 ><A
@@ -5340,7 +5682,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5357,7 +5699,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5374,7 +5716,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5404,7 +5746,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4889"
+NAME="AEN5023"
 ></A
 ><H3
 ><A
@@ -5467,7 +5809,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5484,7 +5826,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5501,7 +5843,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5518,7 +5860,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5548,7 +5890,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4925"
+NAME="AEN5059"
 ></A
 ><H3
 ><A
@@ -5596,7 +5938,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5611,7 +5953,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4941"
+NAME="AEN5075"
 ></A
 ><H3
 ><A
@@ -5659,7 +6001,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5674,7 +6016,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4957"
+NAME="AEN5091"
 ></A
 ><H3
 ><A
@@ -5729,7 +6071,7 @@ CLASS="PARAMETER"
 ><I
 >target</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5746,7 +6088,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5776,7 +6118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4983"
+NAME="AEN5117"
 ></A
 ><H3
 ><A
@@ -5831,7 +6173,7 @@ CLASS="PARAMETER"
 ><I
 >target</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5848,7 +6190,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5878,7 +6220,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5009"
+NAME="AEN5143"
 ></A
 ><H3
 ><A
@@ -5929,7 +6271,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5959,7 +6301,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5030"
+NAME="AEN5164"
 ></A
 ><H3
 ><A
@@ -6012,7 +6354,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6029,7 +6371,7 @@ CLASS="PARAMETER"
 ><I
 >recursive</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6059,7 +6401,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5055"
+NAME="AEN5189"
 ></A
 ><H3
 ><A
@@ -6148,7 +6490,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6165,7 +6507,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6182,7 +6524,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6199,7 +6541,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6229,7 +6571,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5096"
+NAME="AEN5230"
 ></A
 ><H3
 ><A
@@ -6303,7 +6645,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6320,7 +6662,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6337,7 +6679,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6354,7 +6696,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6384,7 +6726,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5134"
+NAME="AEN5268"
 ></A
 ><H3
 ><A
@@ -6444,7 +6786,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6461,7 +6803,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6491,7 +6833,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5161"
+NAME="AEN5295"
 ></A
 ><H3
 ><A
@@ -6586,7 +6928,7 @@ CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6603,7 +6945,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6620,7 +6962,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6637,7 +6979,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6667,7 +7009,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5203"
+NAME="AEN5337"
 ></A
 ><H3
 ><A
@@ -6747,7 +7089,7 @@ CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6764,7 +7106,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6781,7 +7123,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6798,7 +7140,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6828,7 +7170,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5242"
+NAME="AEN5376"
 ></A
 ><H3
 ><A
@@ -6883,7 +7225,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6900,7 +7242,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6930,7 +7272,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5268"
+NAME="AEN5402"
 ></A
 ><H3
 ><A
@@ -6981,7 +7323,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7011,7 +7353,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5289"
+NAME="AEN5423"
 ></A
 ><H3
 ><A
@@ -7066,7 +7408,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7083,7 +7425,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7113,7 +7455,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5315"
+NAME="AEN5449"
 ></A
 ><H3
 ><A
@@ -7170,7 +7512,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7187,7 +7529,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7204,7 +7546,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7234,7 +7576,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5345"
+NAME="AEN5479"
 ></A
 ><H3
 ><A
@@ -7286,7 +7628,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7303,7 +7645,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7333,7 +7675,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5370"
+NAME="AEN5504"
 ></A
 ><H3
 ><A
@@ -7388,7 +7730,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7405,7 +7747,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7435,7 +7777,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5396"
+NAME="AEN5530"
 ></A
 ><H3
 ><A
@@ -7486,7 +7828,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7516,7 +7858,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5417"
+NAME="AEN5551"
 ></A
 ><H3
 ><A
@@ -7572,7 +7914,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7589,7 +7931,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7606,7 +7948,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7636,7 +7978,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5447"
+NAME="AEN5581"
 ></A
 ><H3
 ><A
@@ -7691,7 +8033,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7708,12 +8050,12 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char ref string, starting with # or "&amp;# ... ;"</TD
+>  the char ref string, starting with # or "# ... ;"</TD
 ></TR
 ><TR
 ><TD
@@ -7738,7 +8080,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5473"
+NAME="AEN5607"
 ></A
 ><H3
 ><A
@@ -7793,7 +8135,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7810,12 +8152,12 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reference name, or the reference string with &amp; and ;</TD
+>  the reference name, or the reference string with  and ;</TD
 ></TR
 ><TR
 ><TD
@@ -7840,7 +8182,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5499"
+NAME="AEN5633"
 ></A
 ><H3
 ><A
@@ -7892,7 +8234,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7909,7 +8251,7 @@ CLASS="PARAMETER"
 ><I
 >recursive</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7939,7 +8281,127 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5524"
+NAME="AEN5658"
+></A
+><H3
+><A
+NAME="XMLDOCCOPYNODE"
+></A
+>xmlDocCopyNode ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlDocCopyNode                  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             int recursive);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do a copy of the node to a given document.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>doc</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>recursive</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  if 1 do a recursive copy.</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 xmlNodePtr, or NULL in case of error.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5688"
 ></A
 ><H3
 ><A
@@ -7990,7 +8452,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8020,7 +8482,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5545"
+NAME="AEN5709"
 ></A
 ><H3
 ><A
@@ -8071,7 +8533,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8101,7 +8563,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5566"
+NAME="AEN5730"
 ></A
 ><H3
 ><A
@@ -8128,7 +8590,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ></TR
 ></TABLE
 ><P
->Get the root element of the document (doc-&gt;children is a list
+>Get the root element of the document (doc-children is a list
 containing possibly comments, PIs, etc ...).</P
 ><P
 ></P
@@ -8153,7 +8615,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8183,7 +8645,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5587"
+NAME="AEN5751"
 ></A
 ><H3
 ><A
@@ -8234,7 +8696,7 @@ CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8264,7 +8726,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5608"
+NAME="AEN5772"
 ></A
 ><H3
 ><A
@@ -8312,7 +8774,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8342,7 +8804,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5628"
+NAME="AEN5792"
 ></A
 ><H3
 ><A
@@ -8391,7 +8853,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8421,7 +8883,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5648"
+NAME="AEN5812"
 ></A
 ><H3
 ><A
@@ -8452,7 +8914,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->Set the root element of the document (doc-&gt;children is a list
+>Set the root element of the document (doc-children is a list
 containing possibly comments, PIs, etc ...).</P
 ><P
 ></P
@@ -8477,7 +8939,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8494,7 +8956,7 @@ CLASS="PARAMETER"
 ><I
 >root</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8524,7 +8986,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5674"
+NAME="AEN5838"
 ></A
 ><H3
 ><A
@@ -8576,7 +9038,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8593,7 +9055,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8608,7 +9070,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5695"
+NAME="AEN5859"
 ></A
 ><H3
 ><A
@@ -8674,7 +9136,7 @@ CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8691,7 +9153,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8721,7 +9183,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5723"
+NAME="AEN5887"
 ></A
 ><H3
 ><A
@@ -8782,7 +9244,7 @@ CLASS="PARAMETER"
 ><I
 >parent</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8799,7 +9261,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8829,7 +9291,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5750"
+NAME="AEN5914"
 ></A
 ><H3
 ><A
@@ -8886,7 +9348,7 @@ CLASS="PARAMETER"
 ><I
 >old</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8903,7 +9365,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8933,7 +9395,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5776"
+NAME="AEN5940"
 ></A
 ><H3
 ><A
@@ -9006,7 +9468,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9023,7 +9485,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9053,7 +9515,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5805"
+NAME="AEN5969"
 ></A
 ><H3
 ><A
@@ -9126,7 +9588,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9143,7 +9605,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9173,7 +9635,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5834"
+NAME="AEN5998"
 ></A
 ><H3
 ><A
@@ -9246,7 +9708,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9263,7 +9725,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9293,7 +9755,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5863"
+NAME="AEN6027"
 ></A
 ><H3
 ><A
@@ -9341,7 +9803,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9356,7 +9818,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5879"
+NAME="AEN6043"
 ></A
 ><H3
 ><A
@@ -9411,7 +9873,7 @@ CLASS="PARAMETER"
 ><I
 >first</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9428,7 +9890,7 @@ CLASS="PARAMETER"
 ><I
 >second</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9458,7 +9920,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5905"
+NAME="AEN6069"
 ></A
 ><H3
 ><A
@@ -9511,7 +9973,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9528,7 +9990,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9545,7 +10007,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9565,7 +10027,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5931"
+NAME="AEN6095"
 ></A
 ><H3
 ><A
@@ -9614,7 +10076,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9629,7 +10091,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5947"
+NAME="AEN6111"
 ></A
 ><H3
 ><A
@@ -9681,7 +10143,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9696,7 +10158,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5964"
+NAME="AEN6128"
 ></A
 ><H3
 ><A
@@ -9748,7 +10210,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9765,7 +10227,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9780,7 +10242,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5985"
+NAME="AEN6149"
 ></A
 ><H3
 ><A
@@ -9832,7 +10294,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9849,7 +10311,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9864,7 +10326,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6006"
+NAME="AEN6170"
 ></A
 ><H3
 ><A
@@ -9934,7 +10396,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9951,7 +10413,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9968,7 +10430,7 @@ CLASS="PARAMETER"
 ><I
 >nameSpace</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -9998,7 +10460,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6038"
+NAME="AEN6202"
 ></A
 ><H3
 ><A
@@ -10058,7 +10520,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10075,7 +10537,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10092,7 +10554,7 @@ CLASS="PARAMETER"
 ><I
 >href</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10122,7 +10584,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6069"
+NAME="AEN6233"
 ></A
 ><H3
 ><A
@@ -10177,7 +10639,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10194,7 +10656,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10226,7 +10688,7 @@ namespace if defined</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6095"
+NAME="AEN6259"
 ></A
 ><H3
 ><A
@@ -10278,7 +10740,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10295,7 +10757,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10310,7 +10772,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6116"
+NAME="AEN6280"
 ></A
 ><H3
 ><A
@@ -10361,7 +10823,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10391,7 +10853,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6137"
+NAME="AEN6301"
 ></A
 ><H3
 ><A
@@ -10442,7 +10904,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10472,7 +10934,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6158"
+NAME="AEN6322"
 ></A
 ><H3
 ><A
@@ -10531,7 +10993,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10548,7 +11010,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10565,7 +11027,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10595,7 +11057,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6189"
+NAME="AEN6353"
 ></A
 ><H3
 ><A
@@ -10656,7 +11118,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10673,7 +11135,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10704,7 +11166,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6216"
+NAME="AEN6380"
 ></A
 ><H3
 ><A
@@ -10764,7 +11226,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10781,7 +11243,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10812,7 +11274,7 @@ neither was found.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6243"
+NAME="AEN6407"
 ></A
 ><H3
 ><A
@@ -10876,7 +11338,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10893,7 +11355,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10910,7 +11372,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10927,7 +11389,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -10957,7 +11419,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6279"
+NAME="AEN6443"
 ></A
 ><H3
 ><A
@@ -11023,7 +11485,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11040,7 +11502,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11057,7 +11519,7 @@ CLASS="PARAMETER"
 ><I
 >nameSpace</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11088,7 +11550,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6311"
+NAME="AEN6475"
 ></A
 ><H3
 ><A
@@ -11144,7 +11606,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11161,7 +11623,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11191,7 +11653,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6337"
+NAME="AEN6501"
 ></A
 ><H3
 ><A
@@ -11248,7 +11710,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11265,7 +11727,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11282,7 +11744,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11312,7 +11774,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6367"
+NAME="AEN6531"
 ></A
 ><H3
 ><A
@@ -11369,7 +11831,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11386,7 +11848,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11403,7 +11865,7 @@ CLASS="PARAMETER"
 ><I
 >inLine</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11433,7 +11895,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6397"
+NAME="AEN6561"
 ></A
 ><H3
 ><A
@@ -11494,7 +11956,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11511,7 +11973,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11528,7 +11990,7 @@ CLASS="PARAMETER"
 ><I
 >inLine</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11558,7 +12020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6428"
+NAME="AEN6592"
 ></A
 ><H3
 ><A
@@ -11610,7 +12072,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11627,7 +12089,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11642,7 +12104,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6449"
+NAME="AEN6613"
 ></A
 ><H3
 ><A
@@ -11695,7 +12157,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11712,7 +12174,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11729,7 +12191,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11749,7 +12211,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6475"
+NAME="AEN6639"
 ></A
 ><H3
 ><A
@@ -11801,7 +12263,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11818,7 +12280,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11833,7 +12295,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6496"
+NAME="AEN6660"
 ></A
 ><H3
 ><A
@@ -11886,7 +12348,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11903,7 +12365,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11920,7 +12382,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -11940,7 +12402,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6522"
+NAME="AEN6686"
 ></A
 ><H3
 ><A
@@ -11994,7 +12456,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12025,7 +12487,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6543"
+NAME="AEN6707"
 ></A
 ><H3
 ><A
@@ -12077,7 +12539,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12108,7 +12570,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6564"
+NAME="AEN6728"
 ></A
 ><H3
 ><A
@@ -12161,7 +12623,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12178,7 +12640,7 @@ CLASS="PARAMETER"
 ><I
 >lang</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12193,7 +12655,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6585"
+NAME="AEN6749"
 ></A
 ><H3
 ><A
@@ -12243,7 +12705,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12273,7 +12735,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6605"
+NAME="AEN6769"
 ></A
 ><H3
 ><A
@@ -12326,7 +12788,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12343,7 +12805,7 @@ CLASS="PARAMETER"
 ><I
 >Param2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12358,7 +12820,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6626"
+NAME="AEN6790"
 ></A
 ><H3
 ><A
@@ -12423,7 +12885,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12440,7 +12902,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12471,7 +12933,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6653"
+NAME="AEN6817"
 ></A
 ><H3
 ><A
@@ -12524,7 +12986,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12541,7 +13003,7 @@ CLASS="PARAMETER"
 ><I
 >uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12556,7 +13018,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6674"
+NAME="AEN6838"
 ></A
 ><H3
 ><A
@@ -12605,7 +13067,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12635,7 +13097,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6694"
+NAME="AEN6858"
 ></A
 ><H3
 ><A
@@ -12681,7 +13143,7 @@ CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12711,7 +13173,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6713"
+NAME="AEN6877"
 ></A
 ><H3
 ><A
@@ -12761,7 +13223,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12778,7 +13240,7 @@ CLASS="PARAMETER"
 ><I
 >string</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12793,7 +13255,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6733"
+NAME="AEN6897"
 ></A
 ><H3
 ><A
@@ -12846,7 +13308,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12863,7 +13325,7 @@ CLASS="PARAMETER"
 ><I
 >string</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12878,7 +13340,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6754"
+NAME="AEN6918"
 ></A
 ><H3
 ><A
@@ -12928,7 +13390,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12945,7 +13407,7 @@ CLASS="PARAMETER"
 ><I
 >string</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -12960,7 +13422,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6774"
+NAME="AEN6938"
 ></A
 ><H3
 ><A
@@ -13014,7 +13476,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13031,7 +13493,7 @@ CLASS="PARAMETER"
 ><I
 >string</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13046,7 +13508,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6795"
+NAME="AEN6959"
 ></A
 ><H3
 ><A
@@ -13109,7 +13571,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13126,7 +13588,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13156,7 +13618,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6821"
+NAME="AEN6985"
 ></A
 ><H3
 ><A
@@ -13211,7 +13673,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13228,7 +13690,7 @@ CLASS="PARAMETER"
 ><I
 >mem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13245,7 +13707,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13262,7 +13724,7 @@ CLASS="PARAMETER"
 ><I
 >format</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13277,7 +13739,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6850"
+NAME="AEN7014"
 ></A
 ><H3
 ><A
@@ -13331,7 +13793,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13348,7 +13810,7 @@ CLASS="PARAMETER"
 ><I
 >mem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13365,7 +13827,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13380,7 +13842,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6875"
+NAME="AEN7039"
 ></A
 ><H3
 ><A
@@ -13436,7 +13898,7 @@ CLASS="PARAMETER"
 ><I
 >out_doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13453,7 +13915,7 @@ CLASS="PARAMETER"
 ><I
 >doc_txt_ptr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13470,7 +13932,7 @@ CLASS="PARAMETER"
 ><I
 >doc_txt_len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13487,7 +13949,7 @@ CLASS="PARAMETER"
 ><I
 >txt_encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13502,7 +13964,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6904"
+NAME="AEN7068"
 ></A
 ><H3
 ><A
@@ -13555,7 +14017,7 @@ CLASS="PARAMETER"
 ><I
 >out_doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13572,7 +14034,7 @@ CLASS="PARAMETER"
 ><I
 >doc_txt_ptr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13589,7 +14051,7 @@ CLASS="PARAMETER"
 ><I
 >doc_txt_len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13606,7 +14068,7 @@ CLASS="PARAMETER"
 ><I
 >txt_encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13623,7 +14085,7 @@ CLASS="PARAMETER"
 ><I
 >format</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13638,7 +14100,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6936"
+NAME="AEN7100"
 ></A
 ><H3
 ><A
@@ -13690,7 +14152,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13707,7 +14169,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13737,7 +14199,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6961"
+NAME="AEN7125"
 ></A
 ><H3
 ><A
@@ -13793,7 +14255,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13810,7 +14272,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13827,7 +14289,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13842,7 +14304,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6987"
+NAME="AEN7151"
 ></A
 ><H3
 ><A
@@ -13898,7 +14360,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13915,7 +14377,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -13945,7 +14407,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7012"
+NAME="AEN7176"
 ></A
 ><H3
 ><A
@@ -14003,7 +14465,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14020,7 +14482,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14037,7 +14499,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14054,7 +14516,7 @@ CLASS="PARAMETER"
 ><I
 >level</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14071,7 +14533,7 @@ CLASS="PARAMETER"
 ><I
 >format</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14086,7 +14548,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7046"
+NAME="AEN7210"
 ></A
 ><H3
 ><A
@@ -14136,7 +14598,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14153,7 +14615,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14170,7 +14632,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14200,7 +14662,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7074"
+NAME="AEN7238"
 ></A
 ><H3
 ><A
@@ -14248,7 +14710,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14278,7 +14740,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7094"
+NAME="AEN7258"
 ></A
 ><H3
 ><A
@@ -14328,7 +14790,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14345,7 +14807,7 @@ CLASS="PARAMETER"
 ><I
 >mode</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -14360,7 +14822,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7114"
+NAME="AEN7278"
 ></A
 ><H3
 ><A
@@ -14418,7 +14880,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7129"
+NAME="AEN7293"
 ></A
 ><H3
 ><A
@@ -14464,7 +14926,7 @@ CLASS="PARAMETER"
 ><I
 >mode</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index 680c7598..07862f72 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -121,7 +121,7 @@ NAME="LIBXML-URI"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9365"
+NAME="AEN9571"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN9365"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9368"
+NAME="AEN9574"
 ></A
 ><H2
 >Synopsis</H2
@@ -243,7 +243,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9396"
+NAME="AEN9602"
 ></A
 ><H2
 >Description</H2
@@ -253,14 +253,14 @@ NAME="AEN9396"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9399"
+NAME="AEN9605"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9401"
+NAME="AEN9607"
 ></A
 ><H3
 ><A
@@ -296,7 +296,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9406"
+NAME="AEN9612"
 ></A
 ><H3
 ><A
@@ -322,7 +322,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9411"
+NAME="AEN9617"
 ></A
 ><H3
 ><A
@@ -383,7 +383,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9427"
+NAME="AEN9633"
 ></A
 ><H3
 ><A
@@ -443,7 +443,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -460,7 +460,7 @@ CLASS="PARAMETER"
 ><I
 >base</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -491,7 +491,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9454"
+NAME="AEN9660"
 ></A
 ><H3
 ><A
@@ -541,7 +541,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -571,7 +571,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9475"
+NAME="AEN9681"
 ></A
 ><H3
 ><A
@@ -628,7 +628,7 @@ CLASS="PARAMETER"
 ><I
 >uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -645,7 +645,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -675,7 +675,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9501"
+NAME="AEN9707"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@ CLASS="PARAMETER"
 ><I
 >uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -756,7 +756,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9522"
+NAME="AEN9728"
 ></A
 ><H3
 ><A
@@ -813,7 +813,7 @@ CLASS="PARAMETER"
 ><I
 >stream</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -830,7 +830,7 @@ CLASS="PARAMETER"
 ><I
 >uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -845,7 +845,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9544"
+NAME="AEN9750"
 ></A
 ><H3
 ><A
@@ -896,7 +896,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -913,12 +913,12 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->   the lenght in bytes to unescape (or &lt;= 0 to indicate full string)</TD
+>   the lenght in bytes to unescape (or = 0 to indicate full string)</TD
 ></TR
 ><TR
 ><TD
@@ -930,7 +930,7 @@ CLASS="PARAMETER"
 ><I
 >target</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -960,7 +960,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9572"
+NAME="AEN9778"
 ></A
 ><H3
 ><A
@@ -1008,7 +1008,7 @@ CLASS="PARAMETER"
 ><I
 >path</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1038,7 +1038,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9592"
+NAME="AEN9798"
 ></A
 ><H3
 ><A
@@ -1098,7 +1098,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1128,7 +1128,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9615"
+NAME="AEN9821"
 ></A
 ><H3
 ><A
@@ -1176,7 +1176,7 @@ CLASS="PARAMETER"
 ><I
 >uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 42eedb9c..fe86179f 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -121,7 +121,7 @@ NAME="LIBXML-VALID"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7621"
+NAME="AEN7785"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN7621"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7624"
+NAME="AEN7788"
 ></A
 ><H2
 >Synopsis</H2
@@ -144,6 +144,14 @@ CELLPADDING="6"
 CLASS="SYNOPSIS"
 >&#13;
 
+struct      <A
+HREF="libxml-valid.html#XMLVALIDSTATE"
+>xmlValidState</A
+>;
+typedef     <A
+HREF="libxml-valid.html#XMLVALIDSTATEPTR"
+>xmlValidStatePtr</A
+>;
 void        (<A
 HREF="libxml-valid.html#XMLVALIDITYERRORFUNC"
 >*xmlValidityErrorFunc</A
@@ -620,6 +628,20 @@ HREF="libxml-tree.html#XMLDOCPTR"
 HREF="libxml-tree.html#XMLATTRPTR"
 >xmlAttrPtr</A
 > attr);
+<GTKDOCLINK
+HREF="XMLLISTPTR"
+>xmlListPtr</GTKDOCLINK
+>  <A
+HREF="libxml-valid.html#XMLGETREFS"
+>xmlGetRefs</A
+>                      (<A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *ID);
 int         <A
 HREF="libxml-valid.html#XMLVALIDATEROOT"
 >xmlValidateRoot</A
@@ -918,7 +940,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7835"
+NAME="AEN8005"
 ></A
 ><H2
 >Description</H2
@@ -928,14 +950,66 @@ NAME="AEN7835"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7838"
+NAME="AEN8008"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7840"
+NAME="AEN8010"
+></A
+><H3
+><A
+NAME="XMLVALIDSTATE"
+></A
+>struct xmlValidState</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlValidState;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN8015"
+></A
+><H3
+><A
+NAME="XMLVALIDSTATEPTR"
+></A
+>xmlValidStatePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlValidState *xmlValidStatePtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN8020"
 ></A
 ><H3
 ><A
@@ -980,7 +1054,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -997,7 +1071,7 @@ CLASS="PARAMETER"
 ><I
 >msg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1014,7 +1088,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1029,7 +1103,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7862"
+NAME="AEN8042"
 ></A
 ><H3
 ><A
@@ -1074,7 +1148,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1091,7 +1165,7 @@ CLASS="PARAMETER"
 ><I
 >msg</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1108,7 +1182,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1123,7 +1197,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7884"
+NAME="AEN8064"
 ></A
 ><H3
 ><A
@@ -1153,6 +1227,12 @@ CLASS="PROGRAMLISTING"
     int              finishDtd;       /* finished validating the Dtd ? */
     xmlDocPtr              doc;       /* the document */
     int                  valid;       /* temporary validity check result */
+
+    /* state state used for non-determinist content validation */
+    xmlValidState     *vstate;        /* current state */
+    int                vstateNr;      /* Depth of the validation stack */
+    int                vstateMax;     /* Max depth of the validation stack */
+    xmlValidState     *vstateTab;     /* array of validation states */
 };</PRE
 ></TD
 ></TR
@@ -1163,7 +1243,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7889"
+NAME="AEN8069"
 ></A
 ><H3
 ><A
@@ -1189,7 +1269,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7894"
+NAME="AEN8074"
 ></A
 ><H3
 ><A
@@ -1215,7 +1295,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7899"
+NAME="AEN8079"
 ></A
 ><H3
 ><A
@@ -1241,7 +1321,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7904"
+NAME="AEN8084"
 ></A
 ><H3
 ><A
@@ -1267,7 +1347,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7909"
+NAME="AEN8089"
 ></A
 ><H3
 ><A
@@ -1293,7 +1373,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7914"
+NAME="AEN8094"
 ></A
 ><H3
 ><A
@@ -1319,7 +1399,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7919"
+NAME="AEN8099"
 ></A
 ><H3
 ><A
@@ -1380,7 +1460,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1397,7 +1477,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1428,7 +1508,7 @@ is updated to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7948"
+NAME="AEN8128"
 ></A
 ><H3
 ><A
@@ -1495,7 +1575,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1512,7 +1592,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1529,7 +1609,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1546,7 +1626,7 @@ CLASS="PARAMETER"
 ><I
 >PublicID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1563,7 +1643,7 @@ CLASS="PARAMETER"
 ><I
 >SystemID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1593,7 +1673,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7989"
+NAME="AEN8169"
 ></A
 ><H3
 ><A
@@ -1644,7 +1724,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1674,7 +1754,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8010"
+NAME="AEN8190"
 ></A
 ><H3
 ><A
@@ -1722,7 +1802,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1737,7 +1817,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8026"
+NAME="AEN8206"
 ></A
 ><H3
 ><A
@@ -1789,7 +1869,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1806,7 +1886,7 @@ CLASS="PARAMETER"
 ><I
 >nota</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1821,7 +1901,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8047"
+NAME="AEN8227"
 ></A
 ><H3
 ><A
@@ -1873,7 +1953,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1890,7 +1970,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1905,7 +1985,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8068"
+NAME="AEN8248"
 ></A
 ><H3
 ><A
@@ -1960,7 +2040,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1977,7 +2057,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2007,7 +2087,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8094"
+NAME="AEN8274"
 ></A
 ><H3
 ><A
@@ -2058,7 +2138,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2088,7 +2168,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8115"
+NAME="AEN8295"
 ></A
 ><H3
 ><A
@@ -2136,7 +2216,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2151,7 +2231,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8131"
+NAME="AEN8311"
 ></A
 ><H3
 ><A
@@ -2202,7 +2282,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2219,7 +2299,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2236,7 +2316,7 @@ CLASS="PARAMETER"
 ><I
 >glob</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2251,7 +2331,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8155"
+NAME="AEN8335"
 ></A
 ><H3
 ><A
@@ -2318,7 +2398,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2335,7 +2415,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2352,7 +2432,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2369,7 +2449,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2386,7 +2466,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2416,7 +2496,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8196"
+NAME="AEN8376"
 ></A
 ><H3
 ><A
@@ -2467,7 +2547,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2497,7 +2577,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8217"
+NAME="AEN8397"
 ></A
 ><H3
 ><A
@@ -2545,7 +2625,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2560,7 +2640,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8233"
+NAME="AEN8413"
 ></A
 ><H3
 ><A
@@ -2612,7 +2692,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2629,7 +2709,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2644,7 +2724,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8254"
+NAME="AEN8434"
 ></A
 ><H3
 ><A
@@ -2697,7 +2777,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2714,7 +2794,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2729,7 +2809,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8275"
+NAME="AEN8455"
 ></A
 ><H3
 ><A
@@ -2780,7 +2860,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2811,7 +2891,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8296"
+NAME="AEN8476"
 ></A
 ><H3
 ><A
@@ -2859,7 +2939,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2874,7 +2954,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8312"
+NAME="AEN8492"
 ></A
 ><H3
 ><A
@@ -2925,7 +3005,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2956,7 +3036,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8333"
+NAME="AEN8513"
 ></A
 ><H3
 ><A
@@ -3045,7 +3125,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3062,7 +3142,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3079,7 +3159,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3096,7 +3176,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3113,7 +3193,7 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3130,7 +3210,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3147,7 +3227,7 @@ CLASS="PARAMETER"
 ><I
 >def</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3164,7 +3244,7 @@ CLASS="PARAMETER"
 ><I
 >defaultValue</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3181,7 +3261,7 @@ CLASS="PARAMETER"
 ><I
 >tree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3211,7 +3291,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8395"
+NAME="AEN8575"
 ></A
 ><H3
 ><A
@@ -3262,7 +3342,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3292,7 +3372,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8416"
+NAME="AEN8596"
 ></A
 ><H3
 ><A
@@ -3340,7 +3420,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3355,7 +3435,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8432"
+NAME="AEN8612"
 ></A
 ><H3
 ><A
@@ -3407,7 +3487,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3424,7 +3504,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3439,7 +3519,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8453"
+NAME="AEN8633"
 ></A
 ><H3
 ><A
@@ -3492,7 +3572,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3509,7 +3589,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3524,7 +3604,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8474"
+NAME="AEN8654"
 ></A
 ><H3
 ><A
@@ -3587,7 +3667,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3604,7 +3684,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3621,7 +3701,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3638,7 +3718,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3668,7 +3748,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8510"
+NAME="AEN8690"
 ></A
 ><H3
 ><A
@@ -3717,7 +3797,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3747,7 +3827,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8530"
+NAME="AEN8710"
 ></A
 ><H3
 ><A
@@ -3795,7 +3875,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3810,7 +3890,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8546"
+NAME="AEN8726"
 ></A
 ><H3
 ><A
@@ -3865,7 +3945,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3882,7 +3962,7 @@ CLASS="PARAMETER"
 ><I
 >ID</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3912,7 +3992,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8572"
+NAME="AEN8752"
 ></A
 ><H3
 ><A
@@ -3970,7 +4050,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3987,7 +4067,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4004,7 +4084,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4034,7 +4114,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8602"
+NAME="AEN8782"
 ></A
 ><H3
 ><A
@@ -4086,7 +4166,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4103,7 +4183,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4133,7 +4213,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8627"
+NAME="AEN8807"
 ></A
 ><H3
 ><A
@@ -4196,7 +4276,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4213,7 +4293,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4230,7 +4310,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4247,7 +4327,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4277,7 +4357,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8663"
+NAME="AEN8843"
 ></A
 ><H3
 ><A
@@ -4326,7 +4406,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4356,7 +4436,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8683"
+NAME="AEN8863"
 ></A
 ><H3
 ><A
@@ -4404,7 +4484,7 @@ CLASS="PARAMETER"
 ><I
 >table</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4419,7 +4499,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8699"
+NAME="AEN8879"
 ></A
 ><H3
 ><A
@@ -4477,7 +4557,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4494,7 +4574,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4511,7 +4591,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4541,7 +4621,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8729"
+NAME="AEN8909"
 ></A
 ><H3
 ><A
@@ -4593,7 +4673,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4610,7 +4690,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4640,7 +4720,109 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8754"
+NAME="AEN8934"
+></A
+><H3
+><A
+NAME="XMLGETREFS"
+></A
+>xmlGetRefs ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="XMLLISTPTR"
+>xmlListPtr</GTKDOCLINK
+>  xmlGetRefs                      (<A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *ID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Find the set of references for the supplied ID.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>doc</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to the document</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ID</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ID value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>NULL if not found, otherwise node set for the ID.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN8960"
 ></A
 ><H3
 ><A
@@ -4696,7 +4878,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4713,7 +4895,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4743,7 +4925,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8779"
+NAME="AEN8985"
 ></A
 ><H3
 ><A
@@ -4804,7 +4986,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4821,7 +5003,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4838,7 +5020,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4868,7 +5050,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8809"
+NAME="AEN9015"
 ></A
 ><H3
 ><A
@@ -4946,7 +5128,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4963,7 +5145,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4980,7 +5162,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4997,7 +5179,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5028,7 +5210,7 @@ the caller must free the returned value.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8849"
+NAME="AEN9055"
 ></A
 ><H3
 ><A
@@ -5091,7 +5273,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5108,7 +5290,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5125,7 +5307,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5155,7 +5337,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8880"
+NAME="AEN9086"
 ></A
 ><H3
 ><A
@@ -5222,7 +5404,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5239,7 +5421,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5269,7 +5451,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8909"
+NAME="AEN9115"
 ></A
 ><H3
 ><A
@@ -5329,7 +5511,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5346,7 +5528,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5363,7 +5545,7 @@ CLASS="PARAMETER"
 ><I
 >nota</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5393,7 +5575,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8939"
+NAME="AEN9145"
 ></A
 ><H3
 ><A
@@ -5451,7 +5633,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5468,7 +5650,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5485,7 +5667,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5515,7 +5697,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8970"
+NAME="AEN9176"
 ></A
 ><H3
 ><A
@@ -5574,7 +5756,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5591,7 +5773,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5621,7 +5803,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8996"
+NAME="AEN9202"
 ></A
 ><H3
 ><A
@@ -5677,7 +5859,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5694,7 +5876,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5724,7 +5906,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9022"
+NAME="AEN9228"
 ></A
 ><H3
 ><A
@@ -5780,7 +5962,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5797,7 +5979,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5814,7 +5996,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5844,7 +6026,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9052"
+NAME="AEN9258"
 ></A
 ><H3
 ><A
@@ -5910,7 +6092,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5927,7 +6109,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5944,7 +6126,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5974,7 +6156,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9084"
+NAME="AEN9290"
 ></A
 ><H3
 ><A
@@ -6050,7 +6232,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6067,7 +6249,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6084,7 +6266,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6101,7 +6283,7 @@ CLASS="PARAMETER"
 ><I
 >attr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6118,7 +6300,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6148,7 +6330,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9125"
+NAME="AEN9331"
 ></A
 ><H3
 ><A
@@ -6203,7 +6385,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6220,7 +6402,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6250,7 +6432,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9151"
+NAME="AEN9357"
 ></A
 ><H3
 ><A
@@ -6307,7 +6489,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6324,7 +6506,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6341,7 +6523,7 @@ CLASS="PARAMETER"
 ><I
 >notationName</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6371,7 +6553,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9181"
+NAME="AEN9387"
 ></A
 ><H3
 ><A
@@ -6424,7 +6606,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6441,7 +6623,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6471,7 +6653,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9206"
+NAME="AEN9412"
 ></A
 ><H3
 ><A
@@ -6531,7 +6713,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6548,7 +6730,7 @@ CLASS="PARAMETER"
 ><I
 >elem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6565,7 +6747,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6595,7 +6777,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9237"
+NAME="AEN9443"
 ></A
 ><H3
 ><A
@@ -6650,7 +6832,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6667,7 +6849,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6697,7 +6879,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9263"
+NAME="AEN9469"
 ></A
 ><H3
 ><A
@@ -6752,7 +6934,7 @@ CLASS="PARAMETER"
 ><I
 >dtd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6769,7 +6951,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6799,7 +6981,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9289"
+NAME="AEN9495"
 ></A
 ><H3
 ><A
@@ -6846,11 +7028,11 @@ CLASS="PARAMETER"
 >next</I
 ></TT
 > in the following ways:
-to insert before 'node': xmlValidGetValidElements(node-&gt;prev, node, ...
-to insert next 'node': xmlValidGetValidElements(node, node-&gt;next, ...
-to replace 'node': xmlValidGetValidElements(node-&gt;prev, node-&gt;next, ...
-to prepend a child to 'node': xmlValidGetValidElements(NULL, node-&gt;childs,
-to append a child to 'node': xmlValidGetValidElements(node-&gt;last, NULL, ...</P
+to insert before 'node': xmlValidGetValidElements(node-prev, node, ...
+to insert next 'node': xmlValidGetValidElements(node, node-next, ...
+to replace 'node': xmlValidGetValidElements(node-prev, node-next, ...
+to prepend a child to 'node': xmlValidGetValidElements(NULL, node-childs,
+to append a child to 'node': xmlValidGetValidElements(node-last, NULL, ...</P
 ><P
 >pointers to the element names are inserted at the beginning of the array
 and do not need to be freed.</P
@@ -6877,7 +7059,7 @@ CLASS="PARAMETER"
 ><I
 >prev</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6894,7 +7076,7 @@ CLASS="PARAMETER"
 ><I
 >next</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6911,7 +7093,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6928,7 +7110,7 @@ CLASS="PARAMETER"
 ><I
 >max</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6965,7 +7147,7 @@ receiving array and retry.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9327"
+NAME="AEN9533"
 ></A
 ><H3
 ><A
@@ -7019,7 +7201,7 @@ CLASS="PARAMETER"
 ><I
 >ctree</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7036,7 +7218,7 @@ CLASS="PARAMETER"
 ><I
 >list</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7053,7 +7235,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7070,7 +7252,7 @@ CLASS="PARAMETER"
 ><I
 >max</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 489dcaec..4d729d44 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -121,7 +121,7 @@ NAME="LIBXML-XINCLUDE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13791"
+NAME="AEN14675"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN13791"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13794"
+NAME="AEN14678"
 ></A
 ><H2
 >Synopsis</H2
@@ -158,7 +158,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13799"
+NAME="AEN14683"
 ></A
 ><H2
 >Description</H2
@@ -168,14 +168,14 @@ NAME="AEN13799"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13802"
+NAME="AEN14686"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13804"
+NAME="AEN14688"
 ></A
 ><H3
 ><A
@@ -228,7 +228,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index 046362a8..5d52aeca 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -121,7 +121,7 @@ NAME="LIBXML-XMLIO"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14607"
+NAME="AEN15491"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN14607"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14610"
+NAME="AEN15494"
 ></A
 ><H2
 >Synopsis</H2
@@ -338,19 +338,19 @@ HREF="libxml-xmlio.html#XMLREGISTERINPUTCALLBACKS"
 >       (<A
 HREF="libxml-xmlio.html#XMLINPUTMATCHCALLBACK"
 >xmlInputMatchCallback</A
-> match,
+> matchFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTOPENCALLBACK"
 >xmlInputOpenCallback</A
-> open,
+> openFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTREADCALLBACK"
 >xmlInputReadCallback</A
-> read,
+> readFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTCLOSECALLBACK"
 >xmlInputCloseCallback</A
-> close);
+> closeFunc);
 void        <A
 HREF="libxml-xmlio.html#XMLREGISTERDEFAULTOUTPUTCALLBACKS"
 >xmlRegisterDefaultOutputCallbacks</A
@@ -461,19 +461,19 @@ HREF="libxml-xmlio.html#XMLREGISTEROUTPUTCALLBACKS"
 >      (<A
 HREF="libxml-xmlio.html#XMLOUTPUTMATCHCALLBACK"
 >xmlOutputMatchCallback</A
-> match,
+> matchFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTOPENCALLBACK"
 >xmlOutputOpenCallback</A
-> open,
+> openFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTWRITECALLBACK"
 >xmlOutputWriteCallback</A
-> write,
+> writeFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTCLOSECALLBACK"
 >xmlOutputCloseCallback</A
-> close);
+> closeFunc);
 int         <A
 HREF="libxml-xmlio.html#XMLSAVEFILETO"
 >xmlSaveFileTo</A
@@ -523,7 +523,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14706"
+NAME="AEN15590"
 ></A
 ><H2
 >Description</H2
@@ -533,14 +533,14 @@ NAME="AEN14706"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14709"
+NAME="AEN15593"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14711"
+NAME="AEN15595"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -613,7 +613,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14729"
+NAME="AEN15613"
 ></A
 ><H3
 ><A
@@ -656,7 +656,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -671,7 +671,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14743"
+NAME="AEN15627"
 ></A
 ><H3
 ><A
@@ -716,7 +716,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -733,7 +733,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -750,7 +750,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -780,7 +780,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14769"
+NAME="AEN15653"
 ></A
 ><H3
 ><A
@@ -823,7 +823,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -838,7 +838,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14783"
+NAME="AEN15667"
 ></A
 ><H3
 ><A
@@ -873,7 +873,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14788"
+NAME="AEN15672"
 ></A
 ><H3
 ><A
@@ -899,7 +899,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14793"
+NAME="AEN15677"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -972,7 +972,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14811"
+NAME="AEN15695"
 ></A
 ><H3
 ><A
@@ -1015,7 +1015,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1030,7 +1030,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14825"
+NAME="AEN15709"
 ></A
 ><H3
 ><A
@@ -1075,7 +1075,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1092,7 +1092,7 @@ CLASS="PARAMETER"
 ><I
 >buffer</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1109,7 +1109,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1139,7 +1139,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14851"
+NAME="AEN15735"
 ></A
 ><H3
 ><A
@@ -1182,7 +1182,7 @@ CLASS="PARAMETER"
 ><I
 >context</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1197,7 +1197,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14865"
+NAME="AEN15749"
 ></A
 ><H3
 ><A
@@ -1233,7 +1233,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14870"
+NAME="AEN15754"
 ></A
 ><H3
 ><A
@@ -1259,7 +1259,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14875"
+NAME="AEN15759"
 ></A
 ><H3
 ><A
@@ -1288,7 +1288,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14881"
+NAME="AEN15765"
 ></A
 ><H3
 ><A
@@ -1340,7 +1340,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1370,7 +1370,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14902"
+NAME="AEN15786"
 ></A
 ><H3
 ><A
@@ -1421,7 +1421,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1438,7 +1438,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1468,7 +1468,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14926"
+NAME="AEN15810"
 ></A
 ><H3
 ><A
@@ -1525,7 +1525,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1542,7 +1542,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1572,7 +1572,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14951"
+NAME="AEN15835"
 ></A
 ><H3
 ><A
@@ -1629,7 +1629,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1646,7 +1646,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1676,7 +1676,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14977"
+NAME="AEN15861"
 ></A
 ><H3
 ><A
@@ -1730,7 +1730,7 @@ CLASS="PARAMETER"
 ><I
 >fd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1747,7 +1747,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1777,7 +1777,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15002"
+NAME="AEN15886"
 ></A
 ><H3
 ><A
@@ -1832,7 +1832,7 @@ CLASS="PARAMETER"
 ><I
 >mem</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1849,7 +1849,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1866,7 +1866,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1896,7 +1896,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15031"
+NAME="AEN15915"
 ></A
 ><H3
 ><A
@@ -1958,7 +1958,7 @@ CLASS="PARAMETER"
 ><I
 >ioread</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1975,7 +1975,7 @@ CLASS="PARAMETER"
 ><I
 >ioclose</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1992,7 +1992,7 @@ CLASS="PARAMETER"
 ><I
 >ioctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2009,7 +2009,7 @@ CLASS="PARAMETER"
 ><I
 >enc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2039,7 +2039,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15066"
+NAME="AEN15950"
 ></A
 ><H3
 ><A
@@ -2090,7 +2090,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2107,7 +2107,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2138,7 +2138,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15090"
+NAME="AEN15974"
 ></A
 ><H3
 ><A
@@ -2168,7 +2168,7 @@ This routine handle the I18N transcoding to internal UTF-8
 This routine is used when operating the parser in normal (pull) mode</P
 ><P
 >TODO: one should be able to remove one extra copy by copying directy
-onto in-&gt;buffer or in-&gt;raw</P
+onto in-buffer or in-raw</P
 ><P
 ></P
 ><DIV
@@ -2192,7 +2192,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2209,7 +2209,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2240,7 +2240,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15115"
+NAME="AEN15999"
 ></A
 ><H3
 ><A
@@ -2292,7 +2292,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2309,7 +2309,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2326,7 +2326,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2357,7 +2357,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15143"
+NAME="AEN16027"
 ></A
 ><H3
 ><A
@@ -2405,7 +2405,7 @@ CLASS="PARAMETER"
 ><I
 >in</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2420,7 +2420,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15159"
+NAME="AEN16043"
 ></A
 ><H3
 ><A
@@ -2463,7 +2463,7 @@ CLASS="PARAMETER"
 ><I
 >filename</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2493,7 +2493,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15177"
+NAME="AEN16061"
 ></A
 ><H3
 ><A
@@ -2512,19 +2512,19 @@ CLASS="PROGRAMLISTING"
 >int         xmlRegisterInputCallbacks       (<A
 HREF="libxml-xmlio.html#XMLINPUTMATCHCALLBACK"
 >xmlInputMatchCallback</A
-> match,
+> matchFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTOPENCALLBACK"
 >xmlInputOpenCallback</A
-> open,
+> openFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTREADCALLBACK"
 >xmlInputReadCallback</A
-> read,
+> readFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLINPUTCLOSECALLBACK"
 >xmlInputCloseCallback</A
-> close);</PRE
+> closeFunc);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2551,9 +2551,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->match</I
+>matchFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2568,9 +2568,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->open</I
+>openFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2585,9 +2585,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->read</I
+>readFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2602,9 +2602,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->close</I
+>closeFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2634,7 +2634,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15212"
+NAME="AEN16096"
 ></A
 ><H3
 ><A
@@ -2663,7 +2663,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15218"
+NAME="AEN16102"
 ></A
 ><H3
 ><A
@@ -2714,7 +2714,7 @@ CLASS="PARAMETER"
 ><I
 >encoder</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2744,7 +2744,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15239"
+NAME="AEN16123"
 ></A
 ><H3
 ><A
@@ -2803,7 +2803,7 @@ CLASS="PARAMETER"
 ><I
 >URI</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2820,7 +2820,7 @@ CLASS="PARAMETER"
 ><I
 >encoder</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2837,7 +2837,7 @@ CLASS="PARAMETER"
 ><I
 >compression</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2867,7 +2867,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15268"
+NAME="AEN16152"
 ></A
 ><H3
 ><A
@@ -2924,7 +2924,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2941,7 +2941,7 @@ CLASS="PARAMETER"
 ><I
 >encoder</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2971,7 +2971,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15294"
+NAME="AEN16178"
 ></A
 ><H3
 ><A
@@ -3024,7 +3024,7 @@ CLASS="PARAMETER"
 ><I
 >fd</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3041,7 +3041,7 @@ CLASS="PARAMETER"
 ><I
 >encoder</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3071,7 +3071,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15319"
+NAME="AEN16203"
 ></A
 ><H3
 ><A
@@ -3132,7 +3132,7 @@ CLASS="PARAMETER"
 ><I
 >iowrite</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3149,7 +3149,7 @@ CLASS="PARAMETER"
 ><I
 >ioclose</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3166,7 +3166,7 @@ CLASS="PARAMETER"
 ><I
 >ioctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3183,7 +3183,7 @@ CLASS="PARAMETER"
 ><I
 >encoder</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3213,7 +3213,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15354"
+NAME="AEN16238"
 ></A
 ><H3
 ><A
@@ -3266,7 +3266,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3283,7 +3283,7 @@ CLASS="PARAMETER"
 ><I
 >len</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3300,7 +3300,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3331,7 +3331,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15382"
+NAME="AEN16266"
 ></A
 ><H3
 ><A
@@ -3383,7 +3383,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3400,7 +3400,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3431,7 +3431,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15406"
+NAME="AEN16290"
 ></A
 ><H3
 ><A
@@ -3479,7 +3479,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3509,7 +3509,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15426"
+NAME="AEN16310"
 ></A
 ><H3
 ><A
@@ -3558,7 +3558,7 @@ CLASS="PARAMETER"
 ><I
 >out</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3588,7 +3588,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15446"
+NAME="AEN16330"
 ></A
 ><H3
 ><A
@@ -3607,19 +3607,19 @@ CLASS="PROGRAMLISTING"
 >int         xmlRegisterOutputCallbacks      (<A
 HREF="libxml-xmlio.html#XMLOUTPUTMATCHCALLBACK"
 >xmlOutputMatchCallback</A
-> match,
+> matchFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTOPENCALLBACK"
 >xmlOutputOpenCallback</A
-> open,
+> openFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTWRITECALLBACK"
 >xmlOutputWriteCallback</A
-> write,
+> writeFunc,
                                              <A
 HREF="libxml-xmlio.html#XMLOUTPUTCLOSECALLBACK"
 >xmlOutputCloseCallback</A
-> close);</PRE
+> closeFunc);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3646,9 +3646,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->match</I
+>matchFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3663,9 +3663,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->open</I
+>openFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3680,9 +3680,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->write</I
+>writeFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3697,9 +3697,9 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->close</I
+>closeFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3729,7 +3729,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15481"
+NAME="AEN16365"
 ></A
 ><H3
 ><A
@@ -3782,7 +3782,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3799,7 +3799,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3816,7 +3816,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3846,7 +3846,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15510"
+NAME="AEN16394"
 ></A
 ><H3
 ><A
@@ -3905,7 +3905,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3922,7 +3922,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3939,7 +3939,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3956,7 +3956,7 @@ CLASS="PARAMETER"
 ><I
 >level</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3973,7 +3973,7 @@ CLASS="PARAMETER"
 ><I
 >format</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3990,7 +3990,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4005,7 +4005,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15548"
+NAME="AEN16432"
 ></A
 ><H3
 ><A
@@ -4056,7 +4056,7 @@ CLASS="PARAMETER"
 ><I
 >buf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4073,7 +4073,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4090,7 +4090,7 @@ CLASS="PARAMETER"
 ><I
 >encoding</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 2139a497..8f04c6e8 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -109,7 +109,7 @@ NAME="LIBXML-XMLMEMORY"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19093"
+NAME="AEN20178"
 ></A
 ><H2
 >Name</H2
@@ -117,7 +117,7 @@ NAME="AEN19093"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19096"
+NAME="AEN20181"
 ></A
 ><H2
 >Synopsis</H2
@@ -141,6 +141,10 @@ HREF="libxml-xmlmemory.html#MEM-LIST-CAPS"
 >MEM_LIST</A
 >
 #define     <A
+HREF="libxml-xmlmemory.html#DEBUG-MEMORY-FREED-CAPS"
+>DEBUG_MEMORY_FREED</A
+>
+#define     <A
 HREF="libxml-xmlmemory.html#MEM-CLEANUP-CAPS"
 >MEM_CLEANUP</A
 >                     (p,l)
@@ -264,7 +268,7 @@ HREF="libxml-xmlmemory.html#XMLMEMSTRDUPLOC"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19129"
+NAME="AEN20215"
 ></A
 ><H2
 >Description</H2
@@ -274,14 +278,14 @@ NAME="AEN19129"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19132"
+NAME="AEN20218"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19134"
+NAME="AEN20220"
 ></A
 ><H3
 ><A
@@ -307,7 +311,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19139"
+NAME="AEN20225"
 ></A
 ><H3
 ><A
@@ -333,7 +337,33 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19144"
+NAME="AEN20230"
+></A
+><H3
+><A
+NAME="DEBUG-MEMORY-FREED-CAPS"
+></A
+>DEBUG_MEMORY_FREED</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define DEBUG_MEMORY_FREED</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN20235"
 ></A
 ><H3
 ><A
@@ -376,7 +406,7 @@ CLASS="PARAMETER"
 ><I
 >p</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -393,7 +423,7 @@ CLASS="PARAMETER"
 ><I
 >l</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -408,7 +438,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19162"
+NAME="AEN20253"
 ></A
 ><H3
 ><A
@@ -451,7 +481,7 @@ CLASS="PARAMETER"
 ><I
 >Param1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -466,7 +496,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19176"
+NAME="AEN20267"
 ></A
 ><H3
 ><A
@@ -509,7 +539,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -524,7 +554,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19190"
+NAME="AEN20281"
 ></A
 ><H3
 ><A
@@ -568,7 +598,7 @@ CLASS="PARAMETER"
 ><I
 >Param1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -585,7 +615,7 @@ CLASS="PARAMETER"
 ><I
 >...</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -600,7 +630,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19208"
+NAME="AEN20299"
 ></A
 ><H3
 ><A
@@ -643,7 +673,7 @@ CLASS="PARAMETER"
 ><I
 >Param1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -673,7 +703,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19226"
+NAME="AEN20317"
 ></A
 ><H3
 ><A
@@ -737,7 +767,7 @@ CLASS="PARAMETER"
 ><I
 >freeFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -757,7 +787,7 @@ CLASS="PARAMETER"
 ><I
 >mallocFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -777,7 +807,7 @@ CLASS="PARAMETER"
 ><I
 >reallocFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -797,7 +827,7 @@ CLASS="PARAMETER"
 ><I
 >strdupFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -830,7 +860,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19266"
+NAME="AEN20357"
 ></A
 ><H3
 ><A
@@ -890,7 +920,7 @@ CLASS="PARAMETER"
 ><I
 >freeFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -910,7 +940,7 @@ CLASS="PARAMETER"
 ><I
 >mallocFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -930,7 +960,7 @@ CLASS="PARAMETER"
 ><I
 >reallocFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -950,7 +980,7 @@ CLASS="PARAMETER"
 ><I
 >strdupFunc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -983,7 +1013,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19305"
+NAME="AEN20396"
 ></A
 ><H3
 ><A
@@ -1041,7 +1071,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19320"
+NAME="AEN20411"
 ></A
 ><H3
 ><A
@@ -1099,7 +1129,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19335"
+NAME="AEN20426"
 ></A
 ><H3
 ><A
@@ -1147,7 +1177,7 @@ CLASS="PARAMETER"
 ><I
 >fp</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1163,7 +1193,7 @@ written to the file .memorylist</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19351"
+NAME="AEN20442"
 ></A
 ><H3
 ><A
@@ -1218,7 +1248,7 @@ CLASS="PARAMETER"
 ><I
 >fp</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1235,7 +1265,7 @@ CLASS="PARAMETER"
 ><I
 >nr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1250,7 +1280,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19372"
+NAME="AEN20463"
 ></A
 ><H3
 ><A
@@ -1278,7 +1308,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19378"
+NAME="AEN20469"
 ></A
 ><H3
 ><A
@@ -1321,7 +1351,7 @@ CLASS="PARAMETER"
 ><I
 >x</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1336,7 +1366,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19392"
+NAME="AEN20483"
 ></A
 ><H3
 ><A
@@ -1379,7 +1409,7 @@ CLASS="PARAMETER"
 ><I
 >p</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1396,7 +1426,7 @@ CLASS="PARAMETER"
 ><I
 >x</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1411,7 +1441,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19410"
+NAME="AEN20501"
 ></A
 ><H3
 ><A
@@ -1454,7 +1484,7 @@ CLASS="PARAMETER"
 ><I
 >x</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1469,7 +1499,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19424"
+NAME="AEN20515"
 ></A
 ><H3
 ><A
@@ -1519,7 +1549,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1536,7 +1566,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1553,7 +1583,7 @@ CLASS="PARAMETER"
 ><I
 >line</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1568,7 +1598,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19448"
+NAME="AEN20539"
 ></A
 ><H3
 ><A
@@ -1619,7 +1649,7 @@ CLASS="PARAMETER"
 ><I
 >ptr</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1636,7 +1666,7 @@ CLASS="PARAMETER"
 ><I
 >size</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1653,7 +1683,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1670,7 +1700,7 @@ CLASS="PARAMETER"
 ><I
 >line</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1685,7 +1715,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19476"
+NAME="AEN20567"
 ></A
 ><H3
 ><A
@@ -1735,7 +1765,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1752,7 +1782,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1769,7 +1799,7 @@ CLASS="PARAMETER"
 ><I
 >line</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 78824864..a772a3f1 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -121,7 +121,7 @@ NAME="LIBXML-XPATH"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10610"
+NAME="AEN10816"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN10610"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10613"
+NAME="AEN10819"
 ></A
 ><H2
 >Synopsis</H2
@@ -459,7 +459,7 @@ HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10701"
+NAME="AEN10907"
 ></A
 ><H2
 >Description</H2
@@ -469,14 +469,14 @@ NAME="AEN10701"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10704"
+NAME="AEN10910"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10706"
+NAME="AEN10912"
 ></A
 ><H3
 ><A
@@ -543,7 +543,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10711"
+NAME="AEN10917"
 ></A
 ><H3
 ><A
@@ -569,7 +569,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10716"
+NAME="AEN10922"
 ></A
 ><H3
 ><A
@@ -609,7 +609,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10721"
+NAME="AEN10927"
 ></A
 ><H3
 ><A
@@ -635,7 +635,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10726"
+NAME="AEN10932"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10733"
+NAME="AEN10939"
 ></A
 ><H3
 ><A
@@ -719,7 +719,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10738"
+NAME="AEN10944"
 ></A
 ><H3
 ><A
@@ -745,7 +745,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10743"
+NAME="AEN10949"
 ></A
 ><H3
 ><A
@@ -782,7 +782,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10748"
+NAME="AEN10954"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10753"
+NAME="AEN10959"
 ></A
 ><H3
 ><A
@@ -877,7 +877,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10768"
+NAME="AEN10974"
 ></A
 ><H3
 ><A
@@ -924,7 +924,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -941,7 +941,7 @@ CLASS="PARAMETER"
 ><I
 >type</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -971,7 +971,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10791"
+NAME="AEN10997"
 ></A
 ><H3
 ><A
@@ -1000,7 +1000,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10796"
+NAME="AEN11002"
 ></A
 ><H3
 ><A
@@ -1026,7 +1026,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10801"
+NAME="AEN11007"
 ></A
 ><H3
 ><A
@@ -1055,7 +1055,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10806"
+NAME="AEN11012"
 ></A
 ><H3
 ><A
@@ -1081,7 +1081,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10811"
+NAME="AEN11017"
 ></A
 ><H3
 ><A
@@ -1128,7 +1128,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1145,7 +1145,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1160,7 +1160,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10830"
+NAME="AEN11036"
 ></A
 ><H3
 ><A
@@ -1189,7 +1189,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10835"
+NAME="AEN11041"
 ></A
 ><H3
 ><A
@@ -1215,7 +1215,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10840"
+NAME="AEN11046"
 ></A
 ><H3
 ><A
@@ -1268,7 +1268,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1285,7 +1285,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1315,7 +1315,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10865"
+NAME="AEN11071"
 ></A
 ><H3
 ><A
@@ -1344,7 +1344,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10870"
+NAME="AEN11076"
 ></A
 ><H3
 ><A
@@ -1370,7 +1370,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10875"
+NAME="AEN11081"
 ></A
 ><H3
 ><A
@@ -1402,7 +1402,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10882"
+NAME="AEN11088"
 ></A
 ><H3
 ><A
@@ -1428,7 +1428,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10887"
+NAME="AEN11093"
 ></A
 ><H3
 ><A
@@ -1475,7 +1475,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1492,7 +1492,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1507,7 +1507,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10906"
+NAME="AEN11112"
 ></A
 ><H3
 ><A
@@ -1555,7 +1555,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1570,7 +1570,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10922"
+NAME="AEN11128"
 ></A
 ><H3
 ><A
@@ -1626,7 +1626,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1656,7 +1656,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10944"
+NAME="AEN11150"
 ></A
 ><H3
 ><A
@@ -1713,7 +1713,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1728,7 +1728,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10962"
+NAME="AEN11168"
 ></A
 ><H3
 ><A
@@ -1776,7 +1776,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1791,7 +1791,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10978"
+NAME="AEN11184"
 ></A
 ><H3
 ><A
@@ -1842,7 +1842,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1872,7 +1872,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10999"
+NAME="AEN11205"
 ></A
 ><H3
 ><A
@@ -1924,7 +1924,7 @@ CLASS="PARAMETER"
 ><I
 >node1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1941,7 +1941,7 @@ CLASS="PARAMETER"
 ><I
 >node2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1961,7 +1961,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-2 in case of error 1 if first point &lt; second point, 0 if
+>-2 in case of error 1 if first point  second point, 0 if
 that's the same node, -1 otherwise</TD
 ></TR
 ></TABLE
@@ -1972,7 +1972,7 @@ that's the same node, -1 otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11024"
+NAME="AEN11230"
 ></A
 ><H3
 ><A
@@ -2026,7 +2026,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2062,7 +2062,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11047"
+NAME="AEN11253"
 ></A
 ><H3
 ><A
@@ -2116,7 +2116,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2152,7 +2152,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11070"
+NAME="AEN11276"
 ></A
 ><H3
 ><A
@@ -2206,7 +2206,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2242,7 +2242,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11093"
+NAME="AEN11299"
 ></A
 ><H3
 ><A
@@ -2270,7 +2270,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11099"
+NAME="AEN11305"
 ></A
 ><H3
 ><A
@@ -2321,7 +2321,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2351,7 +2351,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11120"
+NAME="AEN11326"
 ></A
 ><H3
 ><A
@@ -2399,7 +2399,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2414,7 +2414,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11136"
+NAME="AEN11342"
 ></A
 ><H3
 ><A
@@ -2469,7 +2469,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2486,7 +2486,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2517,7 +2517,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11162"
+NAME="AEN11368"
 ></A
 ><H3
 ><A
@@ -2570,7 +2570,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2587,7 +2587,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2617,7 +2617,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11187"
+NAME="AEN11393"
 ></A
 ><H3
 ><A
@@ -2672,7 +2672,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2689,7 +2689,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2720,7 +2720,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11213"
+NAME="AEN11419"
 ></A
 ><H3
 ><A
@@ -2781,7 +2781,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2798,7 +2798,7 @@ CLASS="PARAMETER"
 ><I
 >res</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2828,7 +2828,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11239"
+NAME="AEN11445"
 ></A
 ><H3
 ><A
@@ -2879,7 +2879,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2910,7 +2910,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11260"
+NAME="AEN11466"
 ></A
 ><H3
 ><A
@@ -2965,7 +2965,7 @@ CLASS="PARAMETER"
 ><I
 >comp</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2982,7 +2982,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3013,7 +3013,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11286"
+NAME="AEN11492"
 ></A
 ><H3
 ><A
@@ -3066,7 +3066,7 @@ CLASS="PARAMETER"
 ><I
 >comp</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 99dd8469..3cc3658f 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -121,7 +121,7 @@ NAME="LIBXML-XPATHINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11308"
+NAME="AEN11514"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN11308"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11311"
+NAME="AEN11517"
 ></A
 ><H2
 >Synopsis</H2
@@ -221,6 +221,18 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
 > cur,
                                              int depth);
+void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHDEBUGDUMPCOMPEXPR"
+>xmlXPathDebugDumpCompExpr</A
+>       (<GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
+>xmlXPathCompExprPtr</A
+> comp,
+                                             int depth);
 int         <A
 HREF="libxml-xpathinternals.html#XMLXPATHREGISTERNS"
 >xmlXPathRegisterNs</A
@@ -513,6 +525,24 @@ HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > val);
 void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE"
+>xmlXPathNodeSetAddUnique</A
+>        (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);
+void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHNODESETSORT"
+>xmlXPathNodeSetSort</A
+>             (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> set);
+void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHIDFUNCTION"
 >xmlXPathIdFunction</A
 >              (<A
@@ -753,6 +783,153 @@ HREF="libxml-xpathinternals.html#XMLXPATHMODVALUES"
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt);
+int         <A
+HREF="libxml-xpathinternals.html#XMLXPATHISNODETYPE"
+>xmlXPathIsNodeType</A
+>              (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTSELF"
+>xmlXPathNextSelf</A
+>                (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTCHILD"
+>xmlXPathNextChild</A
+>               (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTDESCENDANT"
+>xmlXPathNextDescendant</A
+>          (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTDESCENDANTORSELF"
+>xmlXPathNextDescendantOrSelf</A
+>    (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTPARENT"
+>xmlXPathNextParent</A
+>              (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTANCESTORORSELF"
+>xmlXPathNextAncestorOrSelf</A
+>      (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTFOLLOWINGSIBLING"
+>xmlXPathNextFollowingSibling</A
+>    (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTFOLLOWING"
+>xmlXPathNextFollowing</A
+>           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTNAMESPACE"
+>xmlXPathNextNamespace</A
+>           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
+<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  <A
+HREF="libxml-xpathinternals.html#XMLXPATHNEXTATTRIBUTE"
+>xmlXPathNextAttribute</A
+>           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);
 <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
@@ -994,7 +1171,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11542"
+NAME="AEN11798"
 ></A
 ><H2
 >Description</H2
@@ -1004,14 +1181,14 @@ NAME="AEN11542"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11545"
+NAME="AEN11801"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11547"
+NAME="AEN11803"
 ></A
 ><H3
 ><A
@@ -1037,7 +1214,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11552"
+NAME="AEN11808"
 ></A
 ><H3
 ><A
@@ -1063,7 +1240,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11557"
+NAME="AEN11813"
 ></A
 ><H3
 ><A
@@ -1106,7 +1283,7 @@ CLASS="PARAMETER"
 ><I
 >X</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1121,7 +1298,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11571"
+NAME="AEN11827"
 ></A
 ><H3
 ><A
@@ -1164,7 +1341,7 @@ CLASS="PARAMETER"
 ><I
 >X</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1179,7 +1356,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11585"
+NAME="AEN11841"
 ></A
 ><H3
 ><A
@@ -1222,7 +1399,7 @@ CLASS="PARAMETER"
 ><I
 >typeval</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1237,7 +1414,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11599"
+NAME="AEN11855"
 ></A
 ><H3
 ><A
@@ -1280,7 +1457,7 @@ CLASS="PARAMETER"
 ><I
 >x</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1295,7 +1472,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11613"
+NAME="AEN11869"
 ></A
 ><H3
 ><A
@@ -1321,7 +1498,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11618"
+NAME="AEN11874"
 ></A
 ><H3
 ><A
@@ -1347,7 +1524,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11623"
+NAME="AEN11879"
 ></A
 ><H3
 ><A
@@ -1373,7 +1550,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11628"
+NAME="AEN11884"
 ></A
 ><H3
 ><A
@@ -1432,7 +1609,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11643"
+NAME="AEN11899"
 ></A
 ><H3
 ><A
@@ -1485,7 +1662,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1502,7 +1679,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1519,7 +1696,7 @@ CLASS="PARAMETER"
 ><I
 >varCtxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1534,7 +1711,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11668"
+NAME="AEN11924"
 ></A
 ><H3
 ><A
@@ -1583,7 +1760,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1600,7 +1777,7 @@ CLASS="PARAMETER"
 ><I
 >file</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1617,7 +1794,7 @@ CLASS="PARAMETER"
 ><I
 >line</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1634,7 +1811,7 @@ CLASS="PARAMETER"
 ><I
 >no</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1649,7 +1826,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11695"
+NAME="AEN11951"
 ></A
 ><H3
 ><A
@@ -1702,7 +1879,7 @@ CLASS="PARAMETER"
 ><I
 >output</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1719,7 +1896,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1736,7 +1913,7 @@ CLASS="PARAMETER"
 ><I
 >depth</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1751,7 +1928,107 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11720"
+NAME="AEN11976"
+></A
+><H3
+><A
+NAME="XMLXPATHDEBUGDUMPCOMPEXPR"
+></A
+>xmlXPathDebugDumpCompExpr ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathDebugDumpCompExpr       (<GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
+>xmlXPathCompExprPtr</A
+> comp,
+                                             int depth);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>output</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>comp</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>depth</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&#13;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12000"
 ></A
 ><H3
 ><A
@@ -1813,7 +2090,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1830,7 +2107,7 @@ CLASS="PARAMETER"
 ><I
 >prefix</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1847,7 +2124,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1877,7 +2154,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11751"
+NAME="AEN12031"
 ></A
 ><H3
 ><A
@@ -1933,7 +2210,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1950,7 +2227,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1980,7 +2257,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11777"
+NAME="AEN12057"
 ></A
 ><H3
 ><A
@@ -2026,7 +2303,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2041,7 +2318,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11792"
+NAME="AEN12072"
 ></A
 ><H3
 ><A
@@ -2102,7 +2379,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2119,7 +2396,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2136,7 +2413,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2166,7 +2443,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11823"
+NAME="AEN12103"
 ></A
 ><H3
 ><A
@@ -2231,7 +2508,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2248,7 +2525,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2265,7 +2542,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2282,7 +2559,7 @@ CLASS="PARAMETER"
 ><I
 >f</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2312,7 +2589,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11859"
+NAME="AEN12139"
 ></A
 ><H3
 ><A
@@ -2374,7 +2651,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2391,7 +2668,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2408,7 +2685,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2438,7 +2715,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11890"
+NAME="AEN12170"
 ></A
 ><H3
 ><A
@@ -2504,7 +2781,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2521,7 +2798,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2538,7 +2815,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2555,7 +2832,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2585,7 +2862,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11926"
+NAME="AEN12206"
 ></A
 ><H3
 ><A
@@ -2641,7 +2918,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2658,7 +2935,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2688,7 +2965,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11952"
+NAME="AEN12232"
 ></A
 ><H3
 ><A
@@ -2748,7 +3025,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2765,7 +3042,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2782,7 +3059,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2812,7 +3089,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11983"
+NAME="AEN12263"
 ></A
 ><H3
 ><A
@@ -2860,7 +3137,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2875,7 +3152,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11999"
+NAME="AEN12279"
 ></A
 ><H3
 ><A
@@ -2931,7 +3208,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2948,7 +3225,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -2978,7 +3255,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12025"
+NAME="AEN12305"
 ></A
 ><H3
 ><A
@@ -3038,7 +3315,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3055,7 +3332,7 @@ CLASS="PARAMETER"
 ><I
 >name</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3072,7 +3349,7 @@ CLASS="PARAMETER"
 ><I
 >ns_uri</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3102,7 +3379,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12056"
+NAME="AEN12336"
 ></A
 ><H3
 ><A
@@ -3151,7 +3428,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3166,7 +3443,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12072"
+NAME="AEN12352"
 ></A
 ><H3
 ><A
@@ -3222,7 +3499,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3239,7 +3516,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3269,7 +3546,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12098"
+NAME="AEN12378"
 ></A
 ><H3
 ><A
@@ -3317,7 +3594,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3332,7 +3609,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12114"
+NAME="AEN12394"
 ></A
 ><H3
 ><A
@@ -3381,7 +3658,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3411,7 +3688,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12134"
+NAME="AEN12414"
 ></A
 ><H3
 ><A
@@ -3461,7 +3738,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3478,7 +3755,7 @@ CLASS="PARAMETER"
 ><I
 >value</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3508,7 +3785,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12158"
+NAME="AEN12438"
 ></A
 ><H3
 ><A
@@ -3564,7 +3841,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3594,7 +3871,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12180"
+NAME="AEN12460"
 ></A
 ><H3
 ><A
@@ -3647,7 +3924,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3677,7 +3954,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12201"
+NAME="AEN12481"
 ></A
 ><H3
 ><A
@@ -3733,7 +4010,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3763,7 +4040,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12223"
+NAME="AEN12503"
 ></A
 ><H3
 ><A
@@ -3816,7 +4093,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3846,7 +4123,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12244"
+NAME="AEN12524"
 ></A
 ><H3
 ><A
@@ -3903,7 +4180,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -3933,7 +4210,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12266"
+NAME="AEN12546"
 ></A
 ><H3
 ><A
@@ -3990,7 +4267,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4020,7 +4297,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12288"
+NAME="AEN12568"
 ></A
 ><H3
 ><A
@@ -4072,7 +4349,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4089,7 +4366,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4104,7 +4381,155 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12309"
+NAME="AEN12589"
+></A
+><H3
+><A
+NAME="XMLXPATHNODESETADDUNIQUE"
+></A
+>xmlXPathNodeSetAddUnique ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathNodeSetAddUnique        (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>add a new xmlNodePtr ot an existing NodeSet, optimized version
+when we are sure the node is not already in the set.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the initial node set</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a new xmlNodePtr</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12610"
+></A
+><H3
+><A
+NAME="XMLXPATHNODESETSORT"
+></A
+>xmlXPathNodeSetSort ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathNodeSetSort             (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> set);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Sort the node set in document order</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>set</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node set</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12626"
 ></A
 ><H3
 ><A
@@ -4167,7 +4592,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4184,7 +4609,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4199,7 +4624,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12330"
+NAME="AEN12647"
 ></A
 ><H3
 ><A
@@ -4247,7 +4672,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4262,7 +4687,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12346"
+NAME="AEN12663"
 ></A
 ><H3
 ><A
@@ -4311,7 +4736,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4326,7 +4751,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12362"
+NAME="AEN12679"
 ></A
 ><H3
 ><A
@@ -4382,7 +4807,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4412,7 +4837,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12385"
+NAME="AEN12702"
 ></A
 ><H3
 ><A
@@ -4468,7 +4893,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4498,7 +4923,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12408"
+NAME="AEN12725"
 ></A
 ><H3
 ><A
@@ -4525,6 +4950,8 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
+>[30a]  Float  ::= Number ('e' Digits?)?</P
+><P
 >[30]   Number ::=   Digits ('.' Digits?)?
 | '.' Digits 
 [31]   Digits ::=   [0-9]+</P
@@ -4555,7 +4982,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4585,7 +5012,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12430"
+NAME="AEN12748"
 ></A
 ><H3
 ><A
@@ -4646,7 +5073,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4663,7 +5090,7 @@ CLASS="PARAMETER"
 ><I
 >res</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4693,7 +5120,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12456"
+NAME="AEN12774"
 ></A
 ><H3
 ><A
@@ -4721,7 +5148,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12462"
+NAME="AEN12780"
 ></A
 ><H3
 ><A
@@ -4802,7 +5229,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4819,7 +5246,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4834,7 +5261,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12484"
+NAME="AEN12802"
 ></A
 ><H3
 ><A
@@ -4882,7 +5309,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4897,7 +5324,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12500"
+NAME="AEN12818"
 ></A
 ><H3
 ><A
@@ -4953,7 +5380,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -4983,7 +5410,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12522"
+NAME="AEN12840"
 ></A
 ><H3
 ><A
@@ -5059,7 +5486,7 @@ CLASS="PARAMETER"
 ><I
 >val1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5076,7 +5503,7 @@ CLASS="PARAMETER"
 ><I
 >val2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5106,7 +5533,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12552"
+NAME="AEN12870"
 ></A
 ><H3
 ><A
@@ -5158,7 +5585,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5175,7 +5602,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5190,7 +5617,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12573"
+NAME="AEN12891"
 ></A
 ><H3
 ><A
@@ -5239,7 +5666,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5256,7 +5683,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5271,7 +5698,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12593"
+NAME="AEN12911"
 ></A
 ><H3
 ><A
@@ -5319,7 +5746,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5334,7 +5761,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12609"
+NAME="AEN12927"
 ></A
 ><H3
 ><A
@@ -5391,7 +5818,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5421,7 +5848,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12631"
+NAME="AEN12949"
 ></A
 ><H3
 ><A
@@ -5477,7 +5904,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5507,7 +5934,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12653"
+NAME="AEN12971"
 ></A
 ><H3
 ><A
@@ -5564,7 +5991,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5579,7 +6006,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12671"
+NAME="AEN12989"
 ></A
 ><H3
 ><A
@@ -5627,7 +6054,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5642,7 +6069,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12687"
+NAME="AEN13005"
 ></A
 ><H3
 ><A
@@ -5693,7 +6120,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5723,7 +6150,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12708"
+NAME="AEN13026"
 ></A
 ><H3
 ><A
@@ -5771,7 +6198,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5786,7 +6213,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12724"
+NAME="AEN13042"
 ></A
 ><H3
 ><A
@@ -5844,7 +6271,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5874,7 +6301,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12746"
+NAME="AEN13064"
 ></A
 ><H3
 ><A
@@ -5906,7 +6333,7 @@ CLASS="PARAMETER"
 ><I
 >arg1</I
 ></TT
-> &lt; <TT
+>  <TT
 CLASS="PARAMETER"
 ><I
 >arg2</I
@@ -5917,7 +6344,7 @@ CLASS="PARAMETER"
 ><I
 >arg1</I
 ></TT
-> &lt;= <TT
+> = <TT
 CLASS="PARAMETER"
 ><I
 >arg2</I
@@ -5928,7 +6355,7 @@ CLASS="PARAMETER"
 ><I
 >arg1</I
 ></TT
-> &gt; <TT
+>  <TT
 CLASS="PARAMETER"
 ><I
 >arg2</I
@@ -5939,7 +6366,7 @@ CLASS="PARAMETER"
 ><I
 >arg1</I
 ></TT
-> &gt;= <TT
+> = <TT
 CLASS="PARAMETER"
 ><I
 >arg2</I
@@ -5947,13 +6374,13 @@ CLASS="PARAMETER"
 >   (0, 0, ...</P
 ><P
 >When neither object to be compared is a node-set and the operator is
-&lt;=, &lt;, &gt;=, &gt;, then the objects are compared by converted both objects
-to numbers and comparing the numbers according to IEEE 754. The &lt;
+=, , =, , then the objects are compared by converted both objects
+to numbers and comparing the numbers according to IEEE 754. The 
 comparison will be true if and only if the first number is less than the
-second number. The &lt;= comparison will be true if and only if the first
-number is less than or equal to the second number. The &gt; comparison
+second number. The = comparison will be true if and only if the first
+number is less than or equal to the second number. The  comparison
 will be true if and only if the first number is greater than the second
-number. The &gt;= comparison will be true if and only if the first number
+number. The = comparison will be true if and only if the first number
 is greater than or equal to the second number.</P
 ><P
 ></P
@@ -5978,7 +6405,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -5995,7 +6422,7 @@ CLASS="PARAMETER"
 ><I
 >inf</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6012,7 +6439,7 @@ CLASS="PARAMETER"
 ><I
 >strict</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6042,7 +6469,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12783"
+NAME="AEN13101"
 ></A
 ><H3
 ><A
@@ -6092,7 +6519,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6107,7 +6534,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12799"
+NAME="AEN13117"
 ></A
 ><H3
 ><A
@@ -6157,7 +6584,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6172,7 +6599,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12815"
+NAME="AEN13133"
 ></A
 ><H3
 ><A
@@ -6222,7 +6649,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6237,7 +6664,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12831"
+NAME="AEN13149"
 ></A
 ><H3
 ><A
@@ -6287,7 +6714,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6302,7 +6729,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12847"
+NAME="AEN13165"
 ></A
 ><H3
 ><A
@@ -6362,7 +6789,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6377,7 +6804,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12865"
+NAME="AEN13183"
 ></A
 ><H3
 ><A
@@ -6437,13 +6864,1139 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13201"
+></A
+><H3
+><A
+NAME="XMLXPATHISNODETYPE"
+></A
+>xmlXPathIsNodeType ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathIsNodeType              (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Is the name given a NodeType one.</P
+><P
+>[38]   NodeType ::=   'comment'
+| 'text'
+| 'processing-instruction'
+| 'node'</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a name string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>1 if true 0 otherwise</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13222"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTSELF"
+></A
+>xmlXPathNextSelf ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextSelf                (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "self" direction
+The self axis contains just the context node itself</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13248"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTCHILD"
+></A
+>xmlXPathNextChild ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextChild               (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "child" direction
+The child axis contains the children of the context node in document order.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
 >  the XPath Parser context</TD
 ></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13274"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTDESCENDANT"
+></A
+>xmlXPathNextDescendant ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextDescendant          (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "descendant" direction
+the descendant axis contains the descendants of the context node in document
+order; a descendant is a child or a child of a child and so on.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13300"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTDESCENDANTORSELF"
+></A
+>xmlXPathNextDescendantOrSelf ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextDescendantOrSelf    (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "descendant-or-self" direction
+the descendant-or-self axis contains the context node and the descendants
+of the context node in document order; thus the context node is the first
+node on the axis, and the first child of the context node is the second node
+on the axis</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13326"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTPARENT"
+></A
+>xmlXPathNextParent ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextParent              (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "parent" direction
+The parent axis contains the parent of the context node, if there is one.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13352"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTANCESTORORSELF"
+></A
+>xmlXPathNextAncestorOrSelf ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextAncestorOrSelf      (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "ancestor-or-self" direction
+he ancestor-or-self axis contains the context node and ancestors of
+the context node in reverse document order; thus the context node is
+the first node on the axis, and the context node's parent the second;
+parent here is defined the same as with the parent axis.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13378"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTFOLLOWINGSIBLING"
+></A
+>xmlXPathNextFollowingSibling ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextFollowingSibling    (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "following-sibling" direction
+The following-sibling axis contains the following siblings of the context
+node in document order.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13404"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTFOLLOWING"
+></A
+>xmlXPathNextFollowing ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextFollowing           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "following" direction
+The following axis contains all nodes in the same document as the context
+node that are after the context node in document order, excluding any
+descendants and excluding attribute nodes and namespace nodes; the nodes
+are ordered in document order</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13430"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTNAMESPACE"
+></A
+>xmlXPathNextNamespace ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextNamespace           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "namespace" direction
+the namespace axis contains the namespace nodes of the context node;
+the order of nodes on this axis is implementation-defined; the axis will
+be empty unless the context node is an element</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current attribute in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13456"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTATTRIBUTE"
+></A
+>xmlXPathNextAttribute ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextAttribute           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "attribute" direction
+TODO: support DTD inherited default attributes</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the current attribute in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
 ></TABLE
 ><P
 ></P
@@ -6452,7 +8005,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12883"
+NAME="AEN13482"
 ></A
 ><H3
 ><A
@@ -6511,7 +8064,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6528,7 +8081,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6558,7 +8111,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12909"
+NAME="AEN13508"
 ></A
 ><H3
 ><A
@@ -6618,7 +8171,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6635,7 +8188,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6665,7 +8218,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12935"
+NAME="AEN13534"
 ></A
 ><H3
 ><A
@@ -6723,7 +8276,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6740,7 +8293,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6770,7 +8323,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12961"
+NAME="AEN13560"
 ></A
 ><H3
 ><A
@@ -6827,7 +8380,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6844,7 +8397,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6859,7 +8412,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12983"
+NAME="AEN13582"
 ></A
 ><H3
 ><A
@@ -6921,7 +8474,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6938,7 +8491,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -6953,7 +8506,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13006"
+NAME="AEN13605"
 ></A
 ><H3
 ><A
@@ -7006,7 +8559,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7023,7 +8576,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7038,7 +8591,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13027"
+NAME="AEN13626"
 ></A
 ><H3
 ><A
@@ -7096,7 +8649,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7113,7 +8666,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7128,7 +8681,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13048"
+NAME="AEN13647"
 ></A
 ><H3
 ><A
@@ -7187,7 +8740,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7204,7 +8757,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7219,7 +8772,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13069"
+NAME="AEN13668"
 ></A
 ><H3
 ><A
@@ -7276,7 +8829,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7293,7 +8846,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7308,7 +8861,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13090"
+NAME="AEN13689"
 ></A
 ><H3
 ><A
@@ -7362,7 +8915,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7379,7 +8932,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7394,7 +8947,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13111"
+NAME="AEN13710"
 ></A
 ><H3
 ><A
@@ -7449,7 +9002,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7466,7 +9019,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7481,7 +9034,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13132"
+NAME="AEN13731"
 ></A
 ><H3
 ><A
@@ -7536,7 +9089,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7553,7 +9106,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7568,7 +9121,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13153"
+NAME="AEN13752"
 ></A
 ><H3
 ><A
@@ -7641,7 +9194,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7658,7 +9211,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7673,7 +9226,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13174"
+NAME="AEN13773"
 ></A
 ><H3
 ><A
@@ -7731,7 +9284,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7748,7 +9301,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7763,7 +9316,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13195"
+NAME="AEN13794"
 ></A
 ><H3
 ><A
@@ -7822,7 +9375,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7839,7 +9392,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7854,7 +9407,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13216"
+NAME="AEN13815"
 ></A
 ><H3
 ><A
@@ -7913,7 +9466,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7930,7 +9483,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -7945,7 +9498,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13237"
+NAME="AEN13836"
 ></A
 ><H3
 ><A
@@ -8007,7 +9560,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8024,7 +9577,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8039,7 +9592,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13258"
+NAME="AEN13857"
 ></A
 ><H3
 ><A
@@ -8094,7 +9647,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8111,7 +9664,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8126,7 +9679,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13279"
+NAME="AEN13878"
 ></A
 ><H3
 ><A
@@ -8182,7 +9735,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8199,7 +9752,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8214,7 +9767,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13301"
+NAME="AEN13900"
 ></A
 ><H3
 ><A
@@ -8270,7 +9823,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8287,7 +9840,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8302,7 +9855,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13323"
+NAME="AEN13922"
 ></A
 ><H3
 ><A
@@ -8363,7 +9916,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8380,7 +9933,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8395,7 +9948,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13344"
+NAME="AEN13943"
 ></A
 ><H3
 ><A
@@ -8448,7 +10001,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8465,7 +10018,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8480,7 +10033,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13365"
+NAME="AEN13964"
 ></A
 ><H3
 ><A
@@ -8535,7 +10088,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8552,7 +10105,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8567,7 +10120,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13386"
+NAME="AEN13985"
 ></A
 ><H3
 ><A
@@ -8622,7 +10175,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8639,7 +10192,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8654,7 +10207,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13407"
+NAME="AEN14006"
 ></A
 ><H3
 ><A
@@ -8709,7 +10262,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8726,7 +10279,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8741,7 +10294,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13428"
+NAME="AEN14027"
 ></A
 ><H3
 ><A
@@ -8797,7 +10350,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8814,7 +10367,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8829,7 +10382,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13449"
+NAME="AEN14048"
 ></A
 ><H3
 ><A
@@ -8887,7 +10440,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -8904,7 +10457,7 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index 3a38437c..b736c321 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -121,7 +121,7 @@ NAME="LIBXML-XPOINTER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13475"
+NAME="AEN14074"
 ></A
 ><H2
 >Name</H2
@@ -129,7 +129,7 @@ NAME="AEN13475"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13478"
+NAME="AEN14077"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,6 +187,104 @@ HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
 HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
 > <A
+HREF="libxml-xpointer.html#XMLXPTRNEWRANGE"
+>xmlXPtrNewRange</A
+>           (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             int startindex,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end,
+                                             int endindex);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWRANGEPOINTS"
+>xmlXPtrNewRangePoints</A
+>     (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> start,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWRANGENODEPOINT"
+>xmlXPtrNewRangeNodePoint</A
+>  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWRANGEPOINTNODE"
+>xmlXPtrNewRangePointNode</A
+>  (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWRANGENODES"
+>xmlXPtrNewRangeNodes</A
+>      (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODES"
+>xmlXPtrNewLocationSetNodes</A
+>
+                                            (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWLOCATIONSETNODESET"
+>xmlXPtrNewLocationSetNodeSet</A
+>
+                                            (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> set);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
 HREF="libxml-xpointer.html#XMLXPTRNEWRANGENODEOBJECT"
 >xmlXPtrNewRangeNodeObject</A
 > (<A
@@ -197,6 +295,16 @@ HREF="libxml-tree.html#XMLNODEPTR"
 HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
 > end);
+<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="libxml-xpointer.html#XMLXPTRNEWCOLLAPSEDRANGE"
+>xmlXPtrNewCollapsedRange</A
+>  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start);
 void        <A
 HREF="libxml-xpointer.html#XMLXPTRLOCATIONSETADD"
 >xmlXPtrLocationSetAdd</A
@@ -218,6 +326,25 @@ HREF="libxml-xpointer.html#XMLXPTRWRAPLOCATIONSET"
 HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
 >xmlLocationSetPtr</A
 > val);
+void        <A
+HREF="libxml-xpointer.html#XMLXPTRLOCATIONSETDEL"
+>xmlXPtrLocationSetDel</A
+>           (<A
+HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);
+void        <A
+HREF="libxml-xpointer.html#XMLXPTRLOCATIONSETREMOVE"
+>xmlXPtrLocationSetRemove</A
+>        (<A
+HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> cur,
+                                             int val);
 <A
 HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 >xmlXPathContextPtr</A
@@ -282,7 +409,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13518"
+NAME="AEN14152"
 ></A
 ><H2
 >Description</H2
@@ -292,14 +419,14 @@ NAME="AEN13518"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13521"
+NAME="AEN14155"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13523"
+NAME="AEN14157"
 ></A
 ><H3
 ><A
@@ -329,7 +456,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13528"
+NAME="AEN14162"
 ></A
 ><H3
 ><A
@@ -355,7 +482,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13533"
+NAME="AEN14167"
 ></A
 ><H3
 ><A
@@ -411,7 +538,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -441,7 +568,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13555"
+NAME="AEN14189"
 ></A
 ><H3
 ><A
@@ -489,7 +616,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -504,7 +631,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13571"
+NAME="AEN14205"
 ></A
 ><H3
 ><A
@@ -569,7 +696,7 @@ CLASS="PARAMETER"
 ><I
 >val1</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -586,7 +713,7 @@ CLASS="PARAMETER"
 ><I
 >val2</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -616,7 +743,755 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13599"
+NAME="AEN14233"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWRANGE"
+></A
+>xmlXPtrNewRange ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewRange           (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             int startindex,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end,
+                                             int endindex);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>startindex</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the start index</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending point</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>endindex</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending index</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14267"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWRANGEPOINTS"
+></A
+>xmlXPtrNewRangePoints ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewRangePoints     (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> start,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> end);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range using 2 Points</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting point</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending point</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14293"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWRANGENODEPOINT"
+></A
+>xmlXPtrNewRangeNodePoint ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewRangeNodePoint  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> end);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range from a node to a point</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending point</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14319"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWRANGEPOINTNODE"
+></A
+>xmlXPtrNewRangePointNode ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewRangePointNode  (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range from a point to a node</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting point</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14345"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWRANGENODES"
+></A
+>xmlXPtrNewRangeNodes ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewRangeNodes      (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range using 2 nodes</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the ending node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14371"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWLOCATIONSETNODES"
+></A
+>xmlXPtrNewLocationSetNodes ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewLocationSetNodes
+                                            (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> end);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type LocationSet and initialize
+it with the single range made of the two nodes <TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+> and <TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the start NodePtr value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>end</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the end NodePtr value or NULL</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14399"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWLOCATIONSETNODESET"
+></A
+>xmlXPtrNewLocationSetNodeSet ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewLocationSetNodeSet
+                                            (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> set);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type LocationSet and initialize
+it with all the nodes from <TT
+CLASS="PARAMETER"
+><I
+>set</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>set</I
+></TT
+>:</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 newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14421"
 ></A
 ><H3
 ><A
@@ -671,7 +1546,7 @@ CLASS="PARAMETER"
 ><I
 >start</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -688,7 +1563,7 @@ CLASS="PARAMETER"
 ><I
 >end</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -718,7 +1593,88 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13625"
+NAME="AEN14447"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWCOLLAPSEDRANGE"
+></A
+>xmlXPtrNewCollapsedRange ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrNewCollapsedRange  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> start);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type range using a single nodes</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>start</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the starting and ending node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14468"
 ></A
 ><H3
 ><A
@@ -776,7 +1732,7 @@ CLASS="PARAMETER"
 ><I
 >cur</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -793,7 +1749,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -808,7 +1764,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13647"
+NAME="AEN14490"
 ></A
 ><H3
 ><A
@@ -864,7 +1820,7 @@ CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -894,7 +1850,172 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13669"
+NAME="AEN14512"
+></A
+><H3
+><A
+NAME="XMLXPTRLOCATIONSETDEL"
+></A
+>xmlXPtrLocationSetDel ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPtrLocationSetDel           (<A
+HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Removes an xmlXPathObjectPtr from an existing LocationSet</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the initial range set</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an xmlXPathObjectPtr</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14533"
+></A
+><H3
+><A
+NAME="XMLXPTRLOCATIONSETREMOVE"
+></A
+>xmlXPtrLocationSetRemove ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPtrLocationSetRemove        (<A
+HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> cur,
+                                             int val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Removes an entry from an existing LocationSet list.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the initial range set</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the index to remove</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN14553"
 ></A
 ><H3
 ><A
@@ -953,7 +2074,7 @@ CLASS="PARAMETER"
 ><I
 >doc</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -970,7 +2091,7 @@ CLASS="PARAMETER"
 ><I
 >here</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -987,7 +2108,7 @@ CLASS="PARAMETER"
 ><I
 >origin</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1018,7 +2139,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13700"
+NAME="AEN14584"
 ></A
 ><H3
 ><A
@@ -1073,7 +2194,7 @@ CLASS="PARAMETER"
 ><I
 >str</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1090,7 +2211,7 @@ CLASS="PARAMETER"
 ><I
 >ctx</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1121,7 +2242,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13726"
+NAME="AEN14610"
 ></A
 ><H3
 ><A
@@ -1173,7 +2294,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1190,12 +2311,12 @@ CLASS="PARAMETER"
 ><I
 >nargs</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&#13;</TD
+>  the number of args</TD
 ></TR
 ></TABLE
 ><P
@@ -1205,7 +2326,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13747"
+NAME="AEN14631"
 ></A
 ><H3
 ><A
@@ -1256,7 +2377,7 @@ CLASS="PARAMETER"
 ><I
 >obj</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
@@ -1287,7 +2408,7 @@ the caller has to free the node tree.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13768"
+NAME="AEN14652"
 ></A
 ><H3
 ><A
@@ -1342,7 +2463,7 @@ CLASS="PARAMETER"
 ><I
 >ctxt</I
 ></TT
->&nbsp;:</TD
+>:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
diff --git a/doc/xml.html b/doc/xml.html
index 17953f12..65893163 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -141,9 +141,9 @@ of fixing them in a timely fashion. The best way to report a bug is to use the
 <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml">Gnome bug
 tracking database</a> (make sure to use the "libxml" module name). I look at
 reports there regularly and it's good to have a reminder when a bug is still
-open. Check the <a href="http://bugzilla.gnome.org/bugwritinghelp.html">instructions on
-reporting bugs</a> and be sure to specify that the bug is for the package
-libxml.</p>
+open. Check the <a
+href="http://bugzilla.gnome.org/bugwritinghelp.html">instructions on reporting
+bugs</a> and be sure to specify that the bug is for the package libxml.</p>
 
 <p>There is also a mailing-list <a
 href="mailto:xml@gnome.org">xml@gnome.org</a> for libxml, with an  <a
@@ -195,8 +195,8 @@ href="ftp://xmlsoft.org/">xmlsoft.org</a> or on the <a
 href="ftp://ftp.gnome.org/pub/GNOME/MIRRORS.html">Gnome FTP server</a> either
 as a <a href="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/">source
 archive</a> or <a
-href="ftp://ftp.gnome.org/pub/GNOME/stable/redhat/i386/libxml/">RPM packages</a>.
-(NOTE that you need both the <a
+href="ftp://ftp.gnome.org/pub/GNOME/stable/redhat/i386/libxml/">RPM
+packages</a>. (NOTE that you need both the <a
 href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a> and <a
 href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a>
 packages installed to compile applications using libxml.)</p>
@@ -244,6 +244,20 @@ you want to test those</p>
     docs</li>
 </ul>
 
+<h3>2.3.7: April 22 2001</h3>
+<ul>
+  <li>lots of small bug fixes, corrected XPointer</li>
+  <li>Non determinist content model validation support</li>
+  <li>added xmlDocCopyNode for gdome2</li>
+  <li>revamped the way the HTML parser handles end of tags</li>
+  <li>XPath: corrctions of namespacessupport and number formatting</li>
+  <li>Windows: Igor Zlatkovic patches for MSC compilation</li>
+  <li>HTML ouput fixes from P C Chow and William M. Brack</li>
+  <li>Improved validation speed sensible for DocBook</li>
+  <li>fixed a big bug with ID declared in external parsed entities</li>
+  <li>portability fixes, update of Trio from Bjorn Reese</li>
+</ul>
+
 <h3>2.3.6: April 8 2001</h3>
 <ul>
   <li>Code cleanup using extreme gcc compiler warning options, found and
@@ -1494,6 +1508,6 @@ Gnome CVS base under gnome-xml/example</p>
 
 <p><a href="mailto:Daniel.Veillard@imag.fr">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.79 2001/04/11 11:51:41 veillard Exp $</p>
+<p>$Id: xml.html,v 1.80 2001/04/17 21:03:15 veillard Exp $</p>
 </body>
 </html>
author	Daniel Veillard <veillard@src.gnome.org>	2001-04-22 19:31:20 +0000
committer	Daniel Veillard <veillard@src.gnome.org>	2001-04-22 19:31:20 +0000
commit	a41123ce959741be8e16f72177660af098819afc (patch)
tree	551c673dc74aad261f34141b15ac8e3fd666217f
parent	fd0c3ebb0931af19ab3b4da3493f027fca849cf7 (diff)
download	libxml2-a41123ce959741be8e16f72177660af098819afc.tar.gz