applied 42 documentation patches from Charlie Bozeman. Regenerated the

* *.c include/libxml/*.h doc/html/*: applied 42 documentation
  patches from Charlie Bozeman. Regenerated the HTML docs.
Daniel

26 files changed, 2621 insertions, 2300 deletions

diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 2721267c..fb76186c 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -1120,7 +1120,6 @@
 <ANCHOR id ="XMLDEBUGDUMPENTITIES" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPENTITIES">
 <ANCHOR id ="XMLLSONENODE" href="libxml/libxml-debugxml.html#XMLLSONENODE">
 <ANCHOR id ="XMLLSCOUNTNODE" href="libxml/libxml-debugxml.html#XMLLSCOUNTNODE">
-<ANCHOR id ="XMLBOOLTOTEXT" href="libxml/libxml-debugxml.html#XMLBOOLTOTEXT">
 <ANCHOR id ="XMLSHELLREADLINEFUNC" href="libxml/libxml-debugxml.html#XMLSHELLREADLINEFUNC">
 <ANCHOR id ="XMLSHELLCTXT" href="libxml/libxml-debugxml.html#XMLSHELLCTXT">
 <ANCHOR id ="XMLSHELLCTXTPTR" href="libxml/libxml-debugxml.html#XMLSHELLCTXTPTR">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 3415639f..6baa6bbd 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -123,7 +123,7 @@ NAME="LIBXML-CATALOG"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19010"
+NAME="AEN19034"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN19010"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19013"
+NAME="AEN19037"
 ></A
 ><H2
 >Synopsis</H2
@@ -506,7 +506,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19114"
+NAME="AEN19138"
 ></A
 ><H2
 >Description</H2
@@ -516,14 +516,14 @@ NAME="AEN19114"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19117"
+NAME="AEN19141"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19119"
+NAME="AEN19143"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19125"
+NAME="AEN19149"
 ></A
 ><H3
 ><A
@@ -577,7 +577,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19130"
+NAME="AEN19154"
 ></A
 ><H3
 ><A
@@ -607,7 +607,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19135"
+NAME="AEN19159"
 ></A
 ><H3
 ><A
@@ -638,7 +638,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19140"
+NAME="AEN19164"
 ></A
 ><H3
 ><A
@@ -664,7 +664,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19145"
+NAME="AEN19169"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19150"
+NAME="AEN19174"
 ></A
 ><H3
 ><A
@@ -720,7 +720,7 @@ HREF="libxml-catalog.html#XMLCATALOGPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19157"
+NAME="AEN19181"
 ></A
 ><P
 ></P
@@ -773,7 +773,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19170"
+NAME="AEN19194"
 ></A
 ><H3
 ><A
@@ -806,7 +806,7 @@ Catalogs are not handled recursively.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19177"
+NAME="AEN19201"
 ></A
 ><P
 ></P
@@ -859,7 +859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19190"
+NAME="AEN19214"
 ></A
 ><H3
 ><A
@@ -891,7 +891,7 @@ like adding and removing CATALOG or DELEGATE entries.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19197"
+NAME="AEN19221"
 ></A
 ><P
 ></P
@@ -944,7 +944,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19210"
+NAME="AEN19234"
 ></A
 ><H3
 ><A
@@ -974,7 +974,7 @@ HREF="libxml-catalog.html#XMLCATALOGPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19217"
+NAME="AEN19241"
 ></A
 ><P
 ></P
@@ -1027,7 +1027,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19230"
+NAME="AEN19254"
 ></A
 ><H3
 ><A
@@ -1070,7 +1070,7 @@ different entries.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19240"
+NAME="AEN19264"
 ></A
 ><P
 ></P
@@ -1174,7 +1174,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19265"
+NAME="AEN19289"
 ></A
 ><H3
 ><A
@@ -1208,7 +1208,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19273"
+NAME="AEN19297"
 ></A
 ><P
 ></P
@@ -1278,7 +1278,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19290"
+NAME="AEN19314"
 ></A
 ><H3
 ><A
@@ -1319,7 +1319,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19300"
+NAME="AEN19324"
 ></A
 ><P
 ></P
@@ -1407,7 +1407,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19321"
+NAME="AEN19345"
 ></A
 ><H3
 ><A
@@ -1444,7 +1444,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19330"
+NAME="AEN19354"
 ></A
 ><P
 ></P
@@ -1515,7 +1515,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19347"
+NAME="AEN19371"
 ></A
 ><H3
 ><A
@@ -1552,7 +1552,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19356"
+NAME="AEN19380"
 ></A
 ><P
 ></P
@@ -1623,7 +1623,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19373"
+NAME="AEN19397"
 ></A
 ><H3
 ><A
@@ -1660,7 +1660,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19382"
+NAME="AEN19406"
 ></A
 ><P
 ></P
@@ -1704,7 +1704,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI</TD
 ></TR
 ><TR
 ><TD
@@ -1731,7 +1731,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19399"
+NAME="AEN19423"
 ></A
 ><H3
 ><A
@@ -1765,7 +1765,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19407"
+NAME="AEN19431"
 ></A
 ><P
 ></P
@@ -1820,7 +1820,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19420"
+NAME="AEN19444"
 ></A
 ><H3
 ><A
@@ -1850,7 +1850,7 @@ HREF="libxml-catalog.html#XMLCATALOGPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19427"
+NAME="AEN19451"
 ></A
 ><P
 ></P
@@ -1888,7 +1888,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19436"
+NAME="AEN19460"
 ></A
 ><H3
 ><A
@@ -1918,7 +1918,7 @@ HREF="libxml-catalog.html#XMLCATALOGPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19443"
+NAME="AEN19467"
 ></A
 ><P
 ></P
@@ -1971,7 +1971,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19456"
+NAME="AEN19480"
 ></A
 ><H3
 ><A
@@ -2001,7 +2001,7 @@ preferably be done once at startup</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19462"
+NAME="AEN19486"
 ></A
 ><H3
 ><A
@@ -2031,7 +2031,7 @@ preferably be done once at startup</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19468"
+NAME="AEN19492"
 ></A
 ><P
 ></P
@@ -2084,7 +2084,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19481"
+NAME="AEN19505"
 ></A
 ><H3
 ><A
@@ -2114,7 +2114,7 @@ preferably be done once at startup</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19487"
+NAME="AEN19511"
 ></A
 ><P
 ></P
@@ -2152,7 +2152,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19496"
+NAME="AEN19520"
 ></A
 ><H3
 ><A
@@ -2180,7 +2180,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19502"
+NAME="AEN19526"
 ></A
 ><H3
 ><A
@@ -2210,7 +2210,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19509"
+NAME="AEN19533"
 ></A
 ><P
 ></P
@@ -2248,7 +2248,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19518"
+NAME="AEN19542"
 ></A
 ><H3
 ><A
@@ -2285,7 +2285,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19527"
+NAME="AEN19551"
 ></A
 ><P
 ></P
@@ -2356,7 +2356,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19544"
+NAME="AEN19568"
 ></A
 ><H3
 ><A
@@ -2389,7 +2389,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19552"
+NAME="AEN19576"
 ></A
 ><P
 ></P
@@ -2443,7 +2443,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19565"
+NAME="AEN19589"
 ></A
 ><H3
 ><A
@@ -2476,7 +2476,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19573"
+NAME="AEN19597"
 ></A
 ><P
 ></P
@@ -2530,7 +2530,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19586"
+NAME="AEN19610"
 ></A
 ><H3
 ><A
@@ -2563,7 +2563,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19594"
+NAME="AEN19618"
 ></A
 ><P
 ></P
@@ -2590,7 +2590,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI</TD
 ></TR
 ><TR
 ><TD
@@ -2617,7 +2617,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19607"
+NAME="AEN19631"
 ></A
 ><H3
 ><A
@@ -2651,7 +2651,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><P
 >Add an entry in the catalog, it may overwrite existing but
 different entries.
-If called before any other catalo routine, allows to override the
+If called before any other catalog routine, allows to override the
 default shared catalog put in place by <A
 HREF="libxml-catalog.html#XMLINITIALIZECATALOG"
 >xmlInitializeCatalog</A
@@ -2661,7 +2661,7 @@ HREF="libxml-catalog.html#XMLINITIALIZECATALOG"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19617"
+NAME="AEN19641"
 ></A
 ><P
 ></P
@@ -2748,7 +2748,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19638"
+NAME="AEN19662"
 ></A
 ><H3
 ><A
@@ -2778,7 +2778,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19645"
+NAME="AEN19669"
 ></A
 ><P
 ></P
@@ -2831,7 +2831,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19658"
+NAME="AEN19682"
 ></A
 ><H3
 ><A
@@ -2865,7 +2865,7 @@ except it bypass all catalog lookups.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19666"
+NAME="AEN19690"
 ></A
 ><P
 ></P
@@ -2918,7 +2918,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19679"
+NAME="AEN19703"
 ></A
 ><H3
 ><A
@@ -2945,7 +2945,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19685"
+NAME="AEN19709"
 ></A
 ><P
 ></P
@@ -2981,7 +2981,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19694"
+NAME="AEN19718"
 ></A
 ><H3
 ><A
@@ -3008,7 +3008,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19700"
+NAME="AEN19724"
 ></A
 ><P
 ></P
@@ -3046,7 +3046,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19709"
+NAME="AEN19733"
 ></A
 ><H3
 ><A
@@ -3077,7 +3077,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19716"
+NAME="AEN19740"
 ></A
 ><P
 ></P
@@ -3132,7 +3132,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19729"
+NAME="AEN19753"
 ></A
 ><H3
 ><A
@@ -3171,7 +3171,7 @@ document's private catalog list</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19738"
+NAME="AEN19762"
 ></A
 ><P
 ></P
@@ -3259,7 +3259,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19759"
+NAME="AEN19783"
 ></A
 ><H3
 ><A
@@ -3294,7 +3294,7 @@ document's private catalog list</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19767"
+NAME="AEN19791"
 ></A
 ><P
 ></P
@@ -3338,7 +3338,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI</TD
 ></TR
 ><TR
 ><TD
@@ -3365,7 +3365,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19784"
+NAME="AEN19808"
 ></A
 ><H3
 ><A
@@ -3393,7 +3393,7 @@ debugging, 1 enable it</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19790"
+NAME="AEN19814"
 ></A
 ><P
 ></P
@@ -3446,7 +3446,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19803"
+NAME="AEN19827"
 ></A
 ><H3
 ><A
@@ -3481,7 +3481,7 @@ Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19811"
+NAME="AEN19835"
 ></A
 ><P
 ></P
@@ -3534,7 +3534,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19824"
+NAME="AEN19848"
 ></A
 ><H3
 ><A
@@ -3565,7 +3565,7 @@ be accepted</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19831"
+NAME="AEN19855"
 ></A
 ><P
 ></P
@@ -3592,7 +3592,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  what catalogs should be accepted</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3603,7 +3603,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19840"
+NAME="AEN19864"
 ></A
 ><H3
 ><A
@@ -3634,7 +3634,7 @@ be accepted</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19847"
+NAME="AEN19871"
 ></A
 ><P
 ></P
@@ -3670,7 +3670,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19856"
+NAME="AEN19880"
 ></A
 ><H3
 ><A
@@ -3707,7 +3707,7 @@ HREF="libxml-catalog.html#XMLCATALOGRESOLVESYSTEM"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19865"
+NAME="AEN19889"
 ></A
 ><P
 ></P
@@ -3734,7 +3734,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID string</TD
 ></TR
 ><TR
 ><TD
@@ -3760,7 +3760,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19878"
+NAME="AEN19902"
 ></A
 ><H3
 ><A
@@ -3797,7 +3797,7 @@ HREF="libxml-catalog.html#XMLCATALOGRESOLVEPUBLIC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19887"
+NAME="AEN19911"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index 966023b8..cd59cc8b 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -123,7 +123,7 @@ NAME="LIBXML-DEBUGXML"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN25191"
+NAME="AEN25274"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN25191"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN25194"
+NAME="AEN25277"
 ></A
 ><H2
 >Synopsis</H2
@@ -279,10 +279,6 @@ HREF="libxml-debugxml.html#XMLLSCOUNTNODE"
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > node);
-const char* <A
-HREF="libxml-debugxml.html#XMLBOOLTOTEXT"
->xmlBoolToText</A
->                   (int boolval);
 char*       (<A
 HREF="libxml-debugxml.html#XMLSHELLREADLINEFUNC"
 >*xmlShellReadlineFunc</A
@@ -513,7 +509,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25289"
+NAME="AEN25371"
 ></A
 ><H2
 >Description</H2
@@ -523,14 +519,14 @@ NAME="AEN25289"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25292"
+NAME="AEN25374"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25294"
+NAME="AEN25376"
 ></A
 ><H3
 ><A
@@ -564,7 +560,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25302"
+NAME="AEN25384"
 ></A
 ><P
 ></P
@@ -619,7 +615,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25315"
+NAME="AEN25397"
 ></A
 ><H3
 ><A
@@ -654,7 +650,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25323"
+NAME="AEN25405"
 ></A
 ><P
 ></P
@@ -726,7 +722,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25340"
+NAME="AEN25422"
 ></A
 ><H3
 ><A
@@ -761,7 +757,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25348"
+NAME="AEN25430"
 ></A
 ><P
 ></P
@@ -833,7 +829,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25365"
+NAME="AEN25447"
 ></A
 ><H3
 ><A
@@ -868,7 +864,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25373"
+NAME="AEN25455"
 ></A
 ><P
 ></P
@@ -940,7 +936,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25390"
+NAME="AEN25472"
 ></A
 ><H3
 ><A
@@ -975,7 +971,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25398"
+NAME="AEN25480"
 ></A
 ><P
 ></P
@@ -1047,7 +1043,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25415"
+NAME="AEN25497"
 ></A
 ><H3
 ><A
@@ -1082,7 +1078,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25423"
+NAME="AEN25505"
 ></A
 ><P
 ></P
@@ -1154,7 +1150,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25440"
+NAME="AEN25522"
 ></A
 ><H3
 ><A
@@ -1188,7 +1184,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25448"
+NAME="AEN25530"
 ></A
 ><P
 ></P
@@ -1243,7 +1239,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25461"
+NAME="AEN25543"
 ></A
 ><H3
 ><A
@@ -1277,7 +1273,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25469"
+NAME="AEN25551"
 ></A
 ><P
 ></P
@@ -1332,7 +1328,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25482"
+NAME="AEN25564"
 ></A
 ><H3
 ><A
@@ -1366,7 +1362,7 @@ HREF="libxml-tree.html#XMLDTDPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25490"
+NAME="AEN25572"
 ></A
 ><P
 ></P
@@ -1421,7 +1417,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25503"
+NAME="AEN25585"
 ></A
 ><H3
 ><A
@@ -1455,7 +1451,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25511"
+NAME="AEN25593"
 ></A
 ><P
 ></P
@@ -1510,7 +1506,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25524"
+NAME="AEN25606"
 ></A
 ><H3
 ><A
@@ -1538,11 +1534,23 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
+>Dump to <TT
+CLASS="PARAMETER"
+><I
+>output</I
+></TT
+> the type and name of <TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25531"
+NAME="AEN25616"
 ></A
 ><P
 ></P
@@ -1569,7 +1577,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE * for the output</TD
 ></TR
 ><TR
 ><TD
@@ -1586,7 +1594,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node to dump</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1597,7 +1605,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25544"
+NAME="AEN25629"
 ></A
 ><H3
 ><A
@@ -1621,91 +1629,18 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN25550"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
+>Count the children of <TT
 CLASS="PARAMETER"
 ><I
 >node</I
 ></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN25563"
-></A
-><H3
-><A
-NAME="XMLBOOLTOTEXT"
-></A
->xmlBoolToText ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->const char* xmlBoolToText                   (int boolval);</PRE
-></TD
-></TR
-></TABLE
-><P
->Convenient way to turn bool into text</P
+>.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25569"
+NAME="AEN25637"
 ></A
 ><P
 ></P
@@ -1725,14 +1660,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->boolval</I
+>node</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a bool to turn into text</TD
+>  the node to count</TD
 ></TR
 ><TR
 ><TD
@@ -1747,7 +1682,12 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of children of <TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1758,7 +1698,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25582"
+NAME="AEN25651"
 ></A
 ><H3
 ><A
@@ -1785,7 +1725,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25588"
+NAME="AEN25657"
 ></A
 ><P
 ></P
@@ -1838,7 +1778,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25601"
+NAME="AEN25670"
 ></A
 ><H3
 ><A
@@ -1875,7 +1815,7 @@ TODO: add the defined function tables.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25607"
+NAME="AEN25676"
 ></A
 ><H3
 ><A
@@ -1901,7 +1841,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25612"
+NAME="AEN25681"
 ></A
 ><H3
 ><A
@@ -1940,7 +1880,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25621"
+NAME="AEN25690"
 ></A
 ><P
 ></P
@@ -2044,7 +1984,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25646"
+NAME="AEN25715"
 ></A
 ><H3
 ><A
@@ -2066,11 +2006,13 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
+>Print the xpath error to libxml default error channel</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25651"
+NAME="AEN25721"
 ></A
 ><P
 ></P
@@ -2097,7 +2039,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> valid xpath error id</TD
 ></TR
 ><TR
 ><TD
@@ -2114,7 +2056,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the argument that cause xpath to fail</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2125,7 +2067,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25664"
+NAME="AEN25734"
 ></A
 ><H3
 ><A
@@ -2155,7 +2097,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25671"
+NAME="AEN25741"
 ></A
 ><P
 ></P
@@ -2193,7 +2135,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25680"
+NAME="AEN25750"
 ></A
 ><H3
 ><A
@@ -2223,7 +2165,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25687"
+NAME="AEN25757"
 ></A
 ><P
 ></P
@@ -2261,7 +2203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25696"
+NAME="AEN25766"
 ></A
 ><H3
 ><A
@@ -2301,7 +2243,7 @@ Does an Unix like listing of the given node (like a directory)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25705"
+NAME="AEN25775"
 ></A
 ><P
 ></P
@@ -2405,7 +2347,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25730"
+NAME="AEN25800"
 ></A
 ><H3
 ><A
@@ -2445,7 +2387,7 @@ dumps the current XML base of the node</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25739"
+NAME="AEN25809"
 ></A
 ><P
 ></P
@@ -2549,7 +2491,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25764"
+NAME="AEN25834"
 ></A
 ><H3
 ><A
@@ -2589,7 +2531,7 @@ dumps informations about the node (namespace, attributes, content).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25773"
+NAME="AEN25843"
 ></A
 ><P
 ></P
@@ -2693,7 +2635,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25798"
+NAME="AEN25868"
 ></A
 ><H3
 ><A
@@ -2733,7 +2675,7 @@ dumps the serialization node content (XML or HTML).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25807"
+NAME="AEN25877"
 ></A
 ><P
 ></P
@@ -2837,7 +2779,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25832"
+NAME="AEN25902"
 ></A
 ><H3
 ><A
@@ -2877,7 +2819,7 @@ loads a new document specified by the filename</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25841"
+NAME="AEN25911"
 ></A
 ><P
 ></P
@@ -2981,7 +2923,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25866"
+NAME="AEN25936"
 ></A
 ><H3
 ><A
@@ -3015,7 +2957,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TABLE
 ><P
 >Implements the XML shell function "write"
-Write the current node to the filename, it saves the serailization
+Write the current node to the filename, it saves the serialization
 of the subtree under the <TT
 CLASS="PARAMETER"
 ><I
@@ -3027,7 +2969,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25876"
+NAME="AEN25946"
 ></A
 ><P
 ></P
@@ -3131,7 +3073,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25901"
+NAME="AEN25971"
 ></A
 ><H3
 ><A
@@ -3171,7 +3113,7 @@ Write the current document to the filename, or it's original name</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25910"
+NAME="AEN25980"
 ></A
 ><P
 ></P
@@ -3215,7 +3157,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name (optionnal)</TD
+>  the file name (optional)</TD
 ></TR
 ><TR
 ><TD
@@ -3275,7 +3217,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25935"
+NAME="AEN26005"
 ></A
 ><H3
 ><A
@@ -3316,7 +3258,7 @@ is done against the given DTD.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25944"
+NAME="AEN26014"
 ></A
 ><P
 ></P
@@ -3360,7 +3302,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD URI (optionnal)</TD
+>  the DTD URI (optional)</TD
 ></TR
 ><TR
 ><TD
@@ -3420,7 +3362,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25969"
+NAME="AEN26039"
 ></A
 ><H3
 ><A
@@ -3471,7 +3413,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25980"
+NAME="AEN26050"
 ></A
 ><P
 ></P
@@ -3575,7 +3517,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26005"
+NAME="AEN26075"
 ></A
 ><H3
 ><A
@@ -3617,7 +3559,7 @@ The output is compatible with XPath commands.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26014"
+NAME="AEN26084"
 ></A
 ><P
 ></P
@@ -3721,7 +3663,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26039"
+NAME="AEN26109"
 ></A
 ><H3
 ><A
@@ -3762,7 +3704,7 @@ using a environment similar to a UNIX commandline.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26048"
+NAME="AEN26118"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index d205393e..b5ebe652 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -123,7 +123,7 @@ NAME="LIBXML-DOCBPARSER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20408"
+NAME="AEN20432"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN20408"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20411"
+NAME="AEN20435"
 ></A
 ><H2
 >Synopsis</H2
@@ -295,7 +295,7 @@ HREF="libxml-docbparser.html#DOCBPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20448"
+NAME="AEN20472"
 ></A
 ><H2
 >Description</H2
@@ -305,14 +305,14 @@ NAME="AEN20448"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20451"
+NAME="AEN20475"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20453"
+NAME="AEN20477"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20458"
+NAME="AEN20482"
 ></A
 ><H3
 ><A
@@ -364,7 +364,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20463"
+NAME="AEN20487"
 ></A
 ><H3
 ><A
@@ -390,7 +390,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20468"
+NAME="AEN20492"
 ></A
 ><H3
 ><A
@@ -416,7 +416,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20473"
+NAME="AEN20497"
 ></A
 ><H3
 ><A
@@ -442,7 +442,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20478"
+NAME="AEN20502"
 ></A
 ><H3
 ><A
@@ -468,7 +468,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20483"
+NAME="AEN20507"
 ></A
 ><H3
 ><A
@@ -494,7 +494,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20488"
+NAME="AEN20512"
 ></A
 ><H3
 ><A
@@ -520,7 +520,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20493"
+NAME="AEN20517"
 ></A
 ><H3
 ><A
@@ -546,7 +546,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20498"
+NAME="AEN20522"
 ></A
 ><H3
 ><A
@@ -578,7 +578,7 @@ plus SGML entities block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20504"
+NAME="AEN20528"
 ></A
 ><P
 ></P
@@ -705,7 +705,7 @@ CLASS="PARAMETER"
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -722,7 +722,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20537"
+NAME="AEN20561"
 ></A
 ><H3
 ><A
@@ -763,7 +763,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20546"
+NAME="AEN20570"
 ></A
 ><P
 ></P
@@ -867,7 +867,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20571"
+NAME="AEN20595"
 ></A
 ><H3
 ><A
@@ -901,7 +901,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20579"
+NAME="AEN20603"
 ></A
 ><P
 ></P
@@ -971,7 +971,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20596"
+NAME="AEN20620"
 ></A
 ><H3
 ><A
@@ -1010,7 +1010,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20604"
+NAME="AEN20628"
 ></A
 ><P
 ></P
@@ -1114,7 +1114,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20629"
+NAME="AEN20653"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@ at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20636"
+NAME="AEN20660"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20653"
+NAME="AEN20677"
 ></A
 ><H3
 ><A
@@ -1248,7 +1248,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20660"
+NAME="AEN20684"
 ></A
 ><P
 ></P
@@ -1286,7 +1286,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20669"
+NAME="AEN20693"
 ></A
 ><H3
 ><A
@@ -1340,7 +1340,7 @@ and error/warning reports.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20680"
+NAME="AEN20704"
 ></A
 ><P
 ></P
@@ -1478,7 +1478,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20713"
+NAME="AEN20737"
 ></A
 ><H3
 ><A
@@ -1511,7 +1511,7 @@ HREF="libxml-docbparser.html#DOCBPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20720"
+NAME="AEN20744"
 ></A
 ><P
 ></P
@@ -1615,7 +1615,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20745"
+NAME="AEN20769"
 ></A
 ><H3
 ><A
@@ -1648,7 +1648,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20752"
+NAME="AEN20776"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20769"
+NAME="AEN20793"
 ></A
 ><H3
 ><A
@@ -1749,7 +1749,7 @@ interface).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20776"
+NAME="AEN20800"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 0e0530e8..7ac9f4de 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -123,7 +123,7 @@ NAME="LIBXML-ENCODING"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23635"
+NAME="AEN23659"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN23635"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23638"
+NAME="AEN23662"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23698"
+NAME="AEN23722"
 ></A
 ><H2
 >Description</H2
@@ -392,14 +392,14 @@ NAME="AEN23698"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23701"
+NAME="AEN23725"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23703"
+NAME="AEN23727"
 ></A
 ><H3
 ><A
@@ -454,7 +454,7 @@ given to the parser itself. The BOM for UTF16 and the encoding
 declaration are looked at and a converter is looked for at that
 point. If not found the parser stops here as asked by the XML REC
 Converter can be registered by the user using xmlRegisterCharEncodingHandler
-but the currentl form doesn't allow stateful transcoding (a serious
+but the current form doesn't allow stateful transcoding (a serious
 problem agreed !). If iconv has been found it will be used
 automatically and allow stateful transcoding, the simplest is then
 to be sure to enable icon and to provide iconv libs for the encoding
@@ -465,7 +465,7 @@ support needed.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23710"
+NAME="AEN23734"
 ></A
 ><H3
 ><A
@@ -496,7 +496,7 @@ it to an UTF-8 block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23716"
+NAME="AEN23740"
 ></A
 ><P
 ></P
@@ -523,7 +523,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of bytes to store the UTF-8 result</TD
+>  a pointer to an array of bytes to store the UTF-8 result</TD
 ></TR
 ><TR
 ><TD
@@ -562,7 +562,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of chars in the original encoding</TD
+>  a pointer to an array of chars in the original encoding</TD
 ></TR
 ><TR
 ><TD
@@ -613,7 +613,7 @@ CLASS="PARAMETER"
 ><I
 >outlen</I
 ></TT
-> after return is the number of ocetes consumed.</TD
+> after return is the number of octets consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -624,7 +624,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23745"
+NAME="AEN23769"
 ></A
 ><H3
 ><A
@@ -657,7 +657,7 @@ in = NULL. If stateful this should also initialize the encoder state</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23751"
+NAME="AEN23775"
 ></A
 ><P
 ></P
@@ -684,7 +684,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of bytes to store the result</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -723,7 +723,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of UTF-8 chars</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -785,7 +785,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23780"
+NAME="AEN23804"
 ></A
 ><H3
 ><A
@@ -819,7 +819,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23785"
+NAME="AEN23809"
 ></A
 ><H3
 ><A
@@ -845,7 +845,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23790"
+NAME="AEN23814"
 ></A
 ><H3
 ><A
@@ -876,7 +876,7 @@ in normal processing.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23796"
+NAME="AEN23820"
 ></A
 ><H3
 ><A
@@ -905,7 +905,7 @@ unregisters all the encoding handlers and the aliases.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23802"
+NAME="AEN23826"
 ></A
 ><H3
 ><A
@@ -929,13 +929,13 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 ></TR
 ></TABLE
 ><P
->Register the char encoding handler, surprizing, isn't it ?</P
+>Register the char encoding handler, surprising, isn't it ?</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23809"
+NAME="AEN23833"
 ></A
 ><P
 ></P
@@ -973,7 +973,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23818"
+NAME="AEN23842"
 ></A
 ><H3
 ><A
@@ -1001,13 +1001,13 @@ HREF="libxml-encoding.html#XMLCHARENCODING"
 ></TR
 ></TABLE
 ><P
->Search in the registrered set the handler able to read/write that encoding.</P
+>Search in the registered set the handler able to read/write that encoding.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23826"
+NAME="AEN23850"
 ></A
 ><P
 ></P
@@ -1060,7 +1060,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23839"
+NAME="AEN23863"
 ></A
 ><H3
 ><A
@@ -1085,13 +1085,13 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 ></TR
 ></TABLE
 ><P
->Search in the registrered set the handler able to read/write that encoding.</P
+>Search in the registered set the handler able to read/write that encoding.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23846"
+NAME="AEN23870"
 ></A
 ><P
 ></P
@@ -1144,7 +1144,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23859"
+NAME="AEN23883"
 ></A
 ><H3
 ><A
@@ -1183,7 +1183,7 @@ will be overwritten.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23867"
+NAME="AEN23891"
 ></A
 ><P
 ></P
@@ -1253,7 +1253,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23884"
+NAME="AEN23908"
 ></A
 ><H3
 ><A
@@ -1285,7 +1285,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23891"
+NAME="AEN23915"
 ></A
 ><P
 ></P
@@ -1338,7 +1338,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23904"
+NAME="AEN23928"
 ></A
 ><H3
 ><A
@@ -1365,7 +1365,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23910"
+NAME="AEN23934"
 ></A
 ><P
 ></P
@@ -1418,7 +1418,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23923"
+NAME="AEN23947"
 ></A
 ><H3
 ><A
@@ -1446,7 +1446,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23929"
+NAME="AEN23953"
 ></A
 ><H3
 ><A
@@ -1470,7 +1470,7 @@ HREF="libxml-encoding.html#XMLCHARENCODING"
 ></TR
 ></TABLE
 ><P
->Conpare the string to the known encoding schemes already known. Note
+>Compare the string to the known encoding schemes already known. Note
 that the comparison is case insensitive accordingly to the section
 [XML] 4.3.3 Character Encoding in Entities.</P
 ><P
@@ -1478,7 +1478,7 @@ that the comparison is case insensitive accordingly to the section
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23936"
+NAME="AEN23960"
 ></A
 ><P
 ></P
@@ -1532,7 +1532,7 @@ if not recognized.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23949"
+NAME="AEN23973"
 ></A
 ><H3
 ><A
@@ -1567,7 +1567,7 @@ Section 4.3.3  Character Encoding in Entities</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23957"
+NAME="AEN23981"
 ></A
 ><P
 ></P
@@ -1620,7 +1620,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23970"
+NAME="AEN23994"
 ></A
 ><H3
 ><A
@@ -1652,7 +1652,7 @@ accordingly of the non-normative appendix F of the XML-1.0 recommendation.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23977"
+NAME="AEN24001"
 ></A
 ><P
 ></P
@@ -1723,7 +1723,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23994"
+NAME="AEN24018"
 ></A
 ><H3
 ><A
@@ -1771,7 +1771,7 @@ the content will be automatically remapped to a CharRef sequence.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24004"
+NAME="AEN24028"
 ></A
 ><P
 ></P
@@ -1861,7 +1861,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24025"
+NAME="AEN24049"
 ></A
 ><H3
 ><A
@@ -1899,7 +1899,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24034"
+NAME="AEN24058"
 ></A
 ><P
 ></P
@@ -1926,7 +1926,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>	char encoding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1989,7 +1989,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24055"
+NAME="AEN24079"
 ></A
 ><H3
 ><A
@@ -2028,7 +2028,7 @@ the very first line, i.e. limit itself to 45 chars.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24064"
+NAME="AEN24088"
 ></A
 ><P
 ></P
@@ -2118,7 +2118,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24085"
+NAME="AEN24109"
 ></A
 ><H3
 ><A
@@ -2142,13 +2142,13 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 ></TR
 ></TABLE
 ><P
->Generic front-end for hencoding handler close function</P
+>Generic front-end for encoding handler close function</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24092"
+NAME="AEN24116"
 ></A
 ><P
 ></P
@@ -2201,7 +2201,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24105"
+NAME="AEN24129"
 ></A
 ><H3
 ><A
@@ -2232,7 +2232,7 @@ block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24111"
+NAME="AEN24135"
 ></A
 ><P
 ></P
@@ -2342,7 +2342,7 @@ CLASS="PARAMETER"
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2359,7 +2359,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24140"
+NAME="AEN24164"
 ></A
 ><H3
 ><A
@@ -2390,7 +2390,7 @@ block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24146"
+NAME="AEN24170"
 ></A
 ><P
 ></P
@@ -2500,7 +2500,7 @@ CLASS="PARAMETER"
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2517,7 +2517,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24175"
+NAME="AEN24199"
 ></A
 ><H3
 ><A
@@ -2552,14 +2552,14 @@ CLASS="PARAMETER"
 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
+routine checks for the 4-byte maximum size, but does not check for
 0x10ffff maximum value.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24183"
+NAME="AEN24207"
 ></A
 ><P
 ></P
@@ -2617,7 +2617,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24197"
+NAME="AEN24221"
 ></A
 ><H3
 ><A
@@ -2648,7 +2648,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24204"
+NAME="AEN24228"
 ></A
 ><P
 ></P
@@ -2719,7 +2719,7 @@ the first 'len' characters of ARRAY&#13;</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24221"
+NAME="AEN24245"
 ></A
 ><H3
 ><A
@@ -2753,7 +2753,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24229"
+NAME="AEN24253"
 ></A
 ><P
 ></P
@@ -2828,7 +2828,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24247"
+NAME="AEN24271"
 ></A
 ><H3
 ><A
@@ -2863,7 +2863,7 @@ character from a string array</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24255"
+NAME="AEN24279"
 ></A
 ><P
 ></P
@@ -2933,7 +2933,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24272"
+NAME="AEN24296"
 ></A
 ><H3
 ><A
@@ -2967,7 +2967,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24280"
+NAME="AEN24304"
 ></A
 ><P
 ></P
@@ -3038,7 +3038,7 @@ or -1 if not found</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24297"
+NAME="AEN24321"
 ></A
 ><H3
 ><A
@@ -3073,7 +3073,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24305"
+NAME="AEN24329"
 ></A
 ><P
 ></P
@@ -3161,7 +3161,7 @@ or NULL if any problem</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24326"
+NAME="AEN24350"
 ></A
 ><H3
 ><A
@@ -3192,7 +3192,7 @@ checking of the content of the string.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24333"
+NAME="AEN24357"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index ae1137c8..94706d97 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -123,7 +123,7 @@ NAME="LIBXML-ENTITIES"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7834"
+NAME="AEN7858"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN7834"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7837"
+NAME="AEN7861"
 ></A
 ><H2
 >Synopsis</H2
@@ -371,7 +371,7 @@ HREF="libxml-entities.html#XMLCLEANUPPREDEFINEDENTITIES"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7900"
+NAME="AEN7924"
 ></A
 ><H2
 >Description</H2
@@ -381,14 +381,14 @@ NAME="AEN7900"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7903"
+NAME="AEN7927"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7905"
+NAME="AEN7929"
 ></A
 ><H3
 ><A
@@ -421,7 +421,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7910"
+NAME="AEN7934"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@ CELLPADDING="6"
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlEntity {
-    void           *_private;	        /* for Corba, must be first ! */
+    void           *_private;	        /* application data */
     xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
@@ -467,7 +467,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7915"
+NAME="AEN7939"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7920"
+NAME="AEN7944"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7925"
+NAME="AEN7949"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7931"
+NAME="AEN7955"
 ></A
 ><H3
 ><A
@@ -597,7 +597,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7943"
+NAME="AEN7967"
 ></A
 ><P
 ></P
@@ -735,7 +735,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7976"
+NAME="AEN8000"
 ></A
 ><H3
 ><A
@@ -785,7 +785,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7988"
+NAME="AEN8012"
 ></A
 ><P
 ></P
@@ -923,7 +923,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8021"
+NAME="AEN8045"
 ></A
 ><H3
 ><A
@@ -956,7 +956,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8029"
+NAME="AEN8053"
 ></A
 ><P
 ></P
@@ -998,7 +998,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>NULL if not, otherwise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1009,7 +1009,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8042"
+NAME="AEN8066"
 ></A
 ><H3
 ><A
@@ -1041,14 +1041,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TABLE
 ><P
 >Do an entity lookup in the document entity hash table and
-returns the corrsponding entity, otherwise a lookup is done
+returns the corresponding entity, otherwise a lookup is done
 in the predefined entities too.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8051"
+NAME="AEN8075"
 ></A
 ><P
 ></P
@@ -1118,7 +1118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8068"
+NAME="AEN8092"
 ></A
 ><H3
 ><A
@@ -1149,14 +1149,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Do an entity lookup in the Dtd entity hash table and
+>Do an entity lookup in the DTD entity hash table and
 returns the corresponding entity, if found.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8077"
+NAME="AEN8101"
 ></A
 ><P
 ></P
@@ -1226,7 +1226,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8094"
+NAME="AEN8118"
 ></A
 ><H3
 ><A
@@ -1264,7 +1264,7 @@ returns the corresponding parameter entity, if found.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8103"
+NAME="AEN8127"
 ></A
 ><P
 ></P
@@ -1334,7 +1334,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8120"
+NAME="AEN8144"
 ></A
 ><H3
 ><A
@@ -1378,7 +1378,7 @@ This routine will issue a warning when encountered.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8131"
+NAME="AEN8155"
 ></A
 ><P
 ></P
@@ -1448,7 +1448,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8148"
+NAME="AEN8172"
 ></A
 ><H3
 ><A
@@ -1488,7 +1488,7 @@ must be deallocated.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8157"
+NAME="AEN8181"
 ></A
 ><P
 ></P
@@ -1558,7 +1558,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8174"
+NAME="AEN8198"
 ></A
 ><H3
 ><A
@@ -1596,7 +1596,7 @@ this routine is reentrant, and result must be deallocated.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8183"
+NAME="AEN8207"
 ></A
 ><P
 ></P
@@ -1666,7 +1666,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8200"
+NAME="AEN8224"
 ></A
 ><H3
 ><A
@@ -1696,7 +1696,7 @@ HREF="libxml-entities.html#XMLENTITIESTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8207"
+NAME="AEN8231"
 ></A
 ><P
 ></P
@@ -1732,7 +1732,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8216"
+NAME="AEN8240"
 ></A
 ><H3
 ><A
@@ -1765,7 +1765,7 @@ HREF="libxml-entities.html#XMLENTITIESTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8224"
+NAME="AEN8248"
 ></A
 ><P
 ></P
@@ -1818,7 +1818,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8237"
+NAME="AEN8261"
 ></A
 ><H3
 ><A
@@ -1848,7 +1848,7 @@ HREF="libxml-entities.html#XMLENTITIESTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8244"
+NAME="AEN8268"
 ></A
 ><P
 ></P
@@ -1886,7 +1886,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8253"
+NAME="AEN8277"
 ></A
 ><H3
 ><A
@@ -1920,7 +1920,7 @@ HREF="libxml-entities.html#XMLENTITIESTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8261"
+NAME="AEN8285"
 ></A
 ><P
 ></P
@@ -1975,7 +1975,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8274"
+NAME="AEN8298"
 ></A
 ><H3
 ><A
@@ -2009,7 +2009,7 @@ HREF="libxml-entities.html#XMLENTITYPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8282"
+NAME="AEN8306"
 ></A
 ><P
 ></P
@@ -2064,7 +2064,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8295"
+NAME="AEN8319"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index 51a98126..b0c972de 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -123,7 +123,7 @@ NAME="LIBXML-GLOBALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20178"
+NAME="AEN20202"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN20178"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20181"
+NAME="AEN20205"
 ></A
 ><H2
 >Synopsis</H2
@@ -264,7 +264,7 @@ HREF="libxml-parser.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20212"
+NAME="AEN20236"
 ></A
 ><H2
 >Description</H2
@@ -274,14 +274,14 @@ NAME="AEN20212"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20215"
+NAME="AEN20239"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20217"
+NAME="AEN20241"
 ></A
 ><H3
 ><A
@@ -340,7 +340,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20222"
+NAME="AEN20246"
 ></A
 ><H3
 ><A
@@ -366,7 +366,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20227"
+NAME="AEN20251"
 ></A
 ><H3
 ><A
@@ -400,7 +400,7 @@ default values of the library.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20235"
+NAME="AEN20259"
 ></A
 ><P
 ></P
@@ -438,7 +438,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20244"
+NAME="AEN20268"
 ></A
 ><H3
 ><A
@@ -468,7 +468,7 @@ HREF="MALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20251"
+NAME="AEN20275"
 ></A
 ><P
 ></P
@@ -506,7 +506,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20260"
+NAME="AEN20284"
 ></A
 ><H3
 ><A
@@ -536,7 +536,7 @@ HREF="REALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20267"
+NAME="AEN20291"
 ></A
 ><P
 ></P
@@ -591,7 +591,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20280"
+NAME="AEN20304"
 ></A
 ><H3
 ><A
@@ -617,7 +617,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20285"
+NAME="AEN20309"
 ></A
 ><H3
 ><A
@@ -650,7 +650,7 @@ HREF="libxml-parser.html#XMLSTRDUP"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20293"
+NAME="AEN20317"
 ></A
 ><P
 ></P
@@ -688,7 +688,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20302"
+NAME="AEN20326"
 ></A
 ><H3
 ><A
@@ -714,7 +714,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20307"
+NAME="AEN20331"
 ></A
 ><H3
 ><A
@@ -740,7 +740,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20312"
+NAME="AEN20336"
 ></A
 ><H3
 ><A
@@ -766,7 +766,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20317"
+NAME="AEN20341"
 ></A
 ><H3
 ><A
@@ -792,7 +792,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20322"
+NAME="AEN20346"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20327"
+NAME="AEN20351"
 ></A
 ><H3
 ><A
@@ -844,7 +844,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20332"
+NAME="AEN20356"
 ></A
 ><H3
 ><A
@@ -870,7 +870,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20337"
+NAME="AEN20361"
 ></A
 ><H3
 ><A
@@ -896,7 +896,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20342"
+NAME="AEN20366"
 ></A
 ><H3
 ><A
@@ -922,7 +922,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20347"
+NAME="AEN20371"
 ></A
 ><H3
 ><A
@@ -948,7 +948,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20352"
+NAME="AEN20376"
 ></A
 ><H3
 ><A
@@ -974,7 +974,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20357"
+NAME="AEN20381"
 ></A
 ><H3
 ><A
@@ -1000,7 +1000,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20362"
+NAME="AEN20386"
 ></A
 ><H3
 ><A
@@ -1026,7 +1026,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20367"
+NAME="AEN20391"
 ></A
 ><H3
 ><A
@@ -1052,7 +1052,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20372"
+NAME="AEN20396"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20377"
+NAME="AEN20401"
 ></A
 ><H3
 ><A
@@ -1104,7 +1104,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20382"
+NAME="AEN20406"
 ></A
 ><H3
 ><A
@@ -1130,7 +1130,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20387"
+NAME="AEN20411"
 ></A
 ><H3
 ><A
@@ -1156,7 +1156,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20392"
+NAME="AEN20416"
 ></A
 ><H3
 ><A
@@ -1182,7 +1182,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20397"
+NAME="AEN20421"
 ></A
 ><H3
 ><A
@@ -1203,7 +1203,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->global variable controlling the entity substitution default behaviour</P
+>global variable controlling the entity substitution default behavior</P
 ><P
 ></P
 ></DIV
diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 227a5608..292d79e5 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -123,7 +123,7 @@ NAME="LIBXML-HASH"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN24351"
+NAME="AEN24375"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN24351"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN24354"
+NAME="AEN24378"
 ></A
 ><H2
 >Synopsis</H2
@@ -524,7 +524,7 @@ HREF="libxml-hash.html#XMLHASHSCANNERFULL"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24452"
+NAME="AEN24476"
 ></A
 ><H2
 >Description</H2
@@ -534,14 +534,14 @@ NAME="AEN24452"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24455"
+NAME="AEN24479"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24457"
+NAME="AEN24481"
 ></A
 ><H3
 ><A
@@ -567,7 +567,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24462"
+NAME="AEN24486"
 ></A
 ><H3
 ><A
@@ -593,7 +593,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24467"
+NAME="AEN24491"
 ></A
 ><H3
 ><A
@@ -622,7 +622,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24473"
+NAME="AEN24497"
 ></A
 ><P
 ></P
@@ -677,7 +677,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24486"
+NAME="AEN24510"
 ></A
 ><H3
 ><A
@@ -706,7 +706,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24492"
+NAME="AEN24516"
 ></A
 ><P
 ></P
@@ -761,7 +761,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24505"
+NAME="AEN24529"
 ></A
 ><H3
 ><A
@@ -791,7 +791,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24511"
+NAME="AEN24535"
 ></A
 ><P
 ></P
@@ -863,7 +863,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24528"
+NAME="AEN24552"
 ></A
 ><H3
 ><A
@@ -901,7 +901,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24536"
+NAME="AEN24560"
 ></A
 ><P
 ></P
@@ -1007,7 +1007,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24561"
+NAME="AEN24585"
 ></A
 ><H3
 ><A
@@ -1037,7 +1037,7 @@ HREF="libxml-hash.html#XMLHASHTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24568"
+NAME="AEN24592"
 ></A
 ><P
 ></P
@@ -1090,7 +1090,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24581"
+NAME="AEN24605"
 ></A
 ><H3
 ><A
@@ -1118,14 +1118,24 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Free the hash table and its contents. The userdata is
-deallocated with f if provided.</P
+>Free the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and its contents. The userdata is
+deallocated with <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> if provided.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24589"
+NAME="AEN24615"
 ></A
 ><P
 ></P
@@ -1180,7 +1190,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24602"
+NAME="AEN24628"
 ></A
 ><H3
 ><A
@@ -1209,14 +1219,29 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the name. Duplicate names generate errors.</P
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>. Duplicate names generate errors.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24610"
+NAME="AEN24639"
 ></A
 ><P
 ></P
@@ -1303,7 +1328,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24631"
+NAME="AEN24660"
 ></A
 ><H3
 ><A
@@ -1336,8 +1361,28 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the name. Existing entry for this name will be removed
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>. Existing entry for this <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+> will be removed
 and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -1349,7 +1394,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24641"
+NAME="AEN24674"
 ></A
 ><P
 ></P
@@ -1453,7 +1498,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24666"
+NAME="AEN24699"
 ></A
 ><H3
 ><A
@@ -1486,14 +1531,34 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the (name, name2) tuple. Duplicate tuples generate errors.</P
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>) tuple. Duplicate tuples generate errors.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24675"
+NAME="AEN24712"
 ></A
 ><P
 ></P
@@ -1597,7 +1662,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24700"
+NAME="AEN24737"
 ></A
 ><H3
 ><A
@@ -1634,8 +1699,28 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the (name, name2) tuple. Existing entry for this tuple will
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>) tuple. Existing entry for this tuple will
 be removed and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -1647,7 +1732,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24711"
+NAME="AEN24752"
 ></A
 ><P
 ></P
@@ -1768,7 +1853,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24740"
+NAME="AEN24781"
 ></A
 ><H3
 ><A
@@ -1805,15 +1890,40 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the tuple (name, name2, name3). Duplicate entries generate
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the tuple (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>). Duplicate entries generate
 errors.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24750"
+NAME="AEN24796"
 ></A
 ><P
 ></P
@@ -1934,7 +2044,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24779"
+NAME="AEN24825"
 ></A
 ><H3
 ><A
@@ -1975,8 +2085,33 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Add the userdata to the hash table. This can later be retrieved
-by using the tuple (name, name2, name3). Existing entry for this tuple
+>Add the <TT
+CLASS="PARAMETER"
+><I
+>userdata</I
+></TT
+> to the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. This can later be retrieved
+by using the tuple (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>). Existing entry for this tuple
 will be removed and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -1988,7 +2123,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24791"
+NAME="AEN24842"
 ></A
 ><P
 ></P
@@ -2126,7 +2261,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24824"
+NAME="AEN24875"
 ></A
 ><H3
 ><A
@@ -2158,8 +2293,18 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the (name, name2, name3) tuple and remove
-it from the hash table. Existing userdata for this tuple will be removed
+>Find the userdata specified by the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+> and remove
+it from the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. Existing userdata for this tuple will be removed
 and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -2171,7 +2316,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24834"
+NAME="AEN24887"
 ></A
 ><P
 ></P
@@ -2258,7 +2403,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24855"
+NAME="AEN24908"
 ></A
 ><H3
 ><A
@@ -2294,8 +2439,23 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the (name, name2, name3) tuple and remove
-it from the hash table. Existing userdata for this tuple will be removed
+>Find the userdata specified by the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>) tuple and remove
+it from the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. Existing userdata for this tuple will be removed
 and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -2307,7 +2467,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24866"
+NAME="AEN24922"
 ></A
 ><P
 ></P
@@ -2411,7 +2571,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24891"
+NAME="AEN24947"
 ></A
 ><H3
 ><A
@@ -2451,8 +2611,28 @@ HREF="libxml-hash.html#XMLHASHDEALLOCATOR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the (name, name2, name3) tuple and remove
-it from the hash table. Existing userdata for this tuple will be removed
+>Find the userdata specified by the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>) tuple and remove
+it from the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>. Existing userdata for this tuple will be removed
 and freed with <TT
 CLASS="PARAMETER"
 ><I
@@ -2464,7 +2644,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24903"
+NAME="AEN24963"
 ></A
 ><P
 ></P
@@ -2585,7 +2765,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24932"
+NAME="AEN24992"
 ></A
 ><H3
 ><A
@@ -2613,13 +2793,18 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the name.</P
+>Find the userdata specified by the <TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24940"
+NAME="AEN25001"
 ></A
 ><P
 ></P
@@ -2674,7 +2859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24953"
+NAME="AEN25014"
 ></A
 ><H3
 ><A
@@ -2706,13 +2891,23 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the (name, name2) tuple.</P
+>Find the userdata specified by the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>) tuple.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24962"
+NAME="AEN25025"
 ></A
 ><P
 ></P
@@ -2784,7 +2979,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24979"
+NAME="AEN25042"
 ></A
 ><H3
 ><A
@@ -2820,13 +3015,28 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Find the userdata specified by the (name, name2, name3) tuple.</P
+>Find the userdata specified by the (<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>) tuple.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24989"
+NAME="AEN25055"
 ></A
 ><P
 ></P
@@ -2915,7 +3125,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25010"
+NAME="AEN25076"
 ></A
 ><H3
 ><A
@@ -2946,13 +3156,23 @@ HREF="libxml-hash.html#XMLHASHCOPIER"
 ></TR
 ></TABLE
 ><P
->Scan the hash table and applied f to each value.</P
+>Scan the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and applied <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> to each value.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25019"
+NAME="AEN25087"
 ></A
 ><P
 ></P
@@ -3022,7 +3242,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25036"
+NAME="AEN25104"
 ></A
 ><H3
 ><A
@@ -3046,13 +3266,18 @@ HREF="libxml-hash.html#XMLHASHTABLEPTR"
 ></TR
 ></TABLE
 ><P
->Query the number of element installed in the hash table.</P
+>Query the number of elements installed in the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+>.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25043"
+NAME="AEN25112"
 ></A
 ><P
 ></P
@@ -3106,7 +3331,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25056"
+NAME="AEN25125"
 ></A
 ><H3
 ><A
@@ -3135,13 +3360,23 @@ HREF="libxml-hash.html#XMLHASHSCANNER"
 ></TR
 ></TABLE
 ><P
->Scan the hash table and applied f to each value.</P
+>Scan the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and applied <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> to each value.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25064"
+NAME="AEN25135"
 ></A
 ><P
 ></P
@@ -3213,7 +3448,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25081"
+NAME="AEN25152"
 ></A
 ><H3
 ><A
@@ -3254,15 +3489,40 @@ HREF="libxml-hash.html#XMLHASHSCANNER"
 ></TR
 ></TABLE
 ><P
->Scan the hash table and applied f to each value matching
-(name, name2, name3) tuple. If one of the names is null,
+>Scan the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and applied <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> to each value matching
+(<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>) tuple. If one of the names is null,
 the comparison is considered to match.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25092"
+NAME="AEN25168"
 ></A
 ><P
 ></P
@@ -3385,7 +3645,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25121"
+NAME="AEN25197"
 ></A
 ><H3
 ><A
@@ -3414,13 +3674,23 @@ HREF="libxml-hash.html#XMLHASHSCANNERFULL"
 ></TR
 ></TABLE
 ><P
->Scan the hash table and applied f to each value.</P
+>Scan the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and applied <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> to each value.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25129"
+NAME="AEN25207"
 ></A
 ><P
 ></P
@@ -3492,7 +3762,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25146"
+NAME="AEN25224"
 ></A
 ><H3
 ><A
@@ -3533,15 +3803,40 @@ HREF="libxml-hash.html#XMLHASHSCANNERFULL"
 ></TR
 ></TABLE
 ><P
->Scan the hash table and applied f to each value matching
-(name, name2, name3) tuple. If one of the names is null,
+>Scan the hash <TT
+CLASS="PARAMETER"
+><I
+>table</I
+></TT
+> and applied <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> to each value matching
+(<TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name2</I
+></TT
+>, <TT
+CLASS="PARAMETER"
+><I
+>name3</I
+></TT
+>) tuple. If one of the names is null,
 the comparison is considered to match.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25157"
+NAME="AEN25240"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 045946bd..7e8c906c 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -123,7 +123,7 @@ NAME="LIBXML-HTMLPARSER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10675"
+NAME="AEN10699"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN10675"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10678"
+NAME="AEN10702"
 ></A
 ><H2
 >Synopsis</H2
@@ -395,7 +395,7 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10742"
+NAME="AEN10766"
 ></A
 ><H2
 >Description</H2
@@ -405,14 +405,14 @@ NAME="AEN10742"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10745"
+NAME="AEN10769"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10747"
+NAME="AEN10771"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10752"
+NAME="AEN10776"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10757"
+NAME="AEN10781"
 ></A
 ><H3
 ><A
@@ -490,7 +490,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10762"
+NAME="AEN10786"
 ></A
 ><H3
 ><A
@@ -516,7 +516,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10767"
+NAME="AEN10791"
 ></A
 ><H3
 ><A
@@ -542,7 +542,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10772"
+NAME="AEN10796"
 ></A
 ><H3
 ><A
@@ -568,7 +568,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10777"
+NAME="AEN10801"
 ></A
 ><H3
 ><A
@@ -594,7 +594,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10782"
+NAME="AEN10806"
 ></A
 ><H3
 ><A
@@ -620,7 +620,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10787"
+NAME="AEN10811"
 ></A
 ><H3
 ><A
@@ -646,7 +646,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10792"
+NAME="AEN10816"
 ></A
 ><H3
 ><A
@@ -682,7 +682,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10797"
+NAME="AEN10821"
 ></A
 ><H3
 ><A
@@ -708,7 +708,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10802"
+NAME="AEN10826"
 ></A
 ><H3
 ><A
@@ -738,7 +738,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10807"
+NAME="AEN10831"
 ></A
 ><H3
 ><A
@@ -764,7 +764,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10812"
+NAME="AEN10836"
 ></A
 ><H3
 ><A
@@ -797,7 +797,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10820"
+NAME="AEN10844"
 ></A
 ><P
 ></P
@@ -850,7 +850,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10833"
+NAME="AEN10857"
 ></A
 ><H3
 ><A
@@ -885,7 +885,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10842"
+NAME="AEN10866"
 ></A
 ><P
 ></P
@@ -938,7 +938,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10855"
+NAME="AEN10879"
 ></A
 ><H3
 ><A
@@ -970,7 +970,7 @@ HREF="libxml-htmlparser.html#HTMLENTITYDESC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10863"
+NAME="AEN10887"
 ></A
 ><P
 ></P
@@ -1023,7 +1023,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10876"
+NAME="AEN10900"
 ></A
 ><H3
 ><A
@@ -1051,7 +1051,7 @@ HREF="libxml-htmlparser.html#HTMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->The HTmL DtD allows a tag to implicitely close other tags.
+>The HTML DTD allows a tag to implicitly close other tags.
 The list is kept in htmlStartClose array. This function checks
 if a tag is autoclosed by one of it's child</P
 ><P
@@ -1059,7 +1059,7 @@ if a tag is autoclosed by one of it's child</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10884"
+NAME="AEN10908"
 ></A
 ><P
 ></P
@@ -1129,7 +1129,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10901"
+NAME="AEN10925"
 ></A
 ><H3
 ><A
@@ -1161,7 +1161,7 @@ HREF="libxml-htmlparser.html#HTMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->The HTmL DtD allows a tag to implicitely close other tags.
+>The HTML DTD allows a tag to implicitly close other tags.
 The list is kept in htmlStartClose array. This function checks
 if the element or one of it's children would autoclose the
 given tag.</P
@@ -1170,7 +1170,7 @@ given tag.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10910"
+NAME="AEN10934"
 ></A
 ><P
 ></P
@@ -1257,7 +1257,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10931"
+NAME="AEN10955"
 ></A
 ><H3
 ><A
@@ -1296,7 +1296,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10941"
+NAME="AEN10965"
 ></A
 ><P
 ></P
@@ -1367,7 +1367,7 @@ if non-NULL *str will have to be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10958"
+NAME="AEN10982"
 ></A
 ><H3
 ><A
@@ -1403,7 +1403,7 @@ HREF="X"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10967"
+NAME="AEN10991"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10980"
+NAME="AEN11004"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10989"
+NAME="AEN11013"
 ></A
 ><P
 ></P
@@ -1528,7 +1528,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10998"
+NAME="AEN11022"
 ></A
 ><H3
 ><A
@@ -1569,7 +1569,7 @@ behavior and return a tree.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11007"
+NAME="AEN11031"
 ></A
 ><P
 ></P
@@ -1674,7 +1674,7 @@ not well formed.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11032"
+NAME="AEN11056"
 ></A
 ><H3
 ><A
@@ -1708,7 +1708,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11040"
+NAME="AEN11064"
 ></A
 ><P
 ></P
@@ -1778,7 +1778,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11057"
+NAME="AEN11081"
 ></A
 ><H3
 ><A
@@ -1817,7 +1817,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11065"
+NAME="AEN11089"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@ not well formed.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11090"
+NAME="AEN11114"
 ></A
 ><H3
 ><A
@@ -1954,7 +1954,7 @@ compressed document is provided by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11097"
+NAME="AEN11121"
 ></A
 ><P
 ></P
@@ -2024,7 +2024,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11114"
+NAME="AEN11138"
 ></A
 ><H3
 ><A
@@ -2055,7 +2055,7 @@ plus HTML entities block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11120"
+NAME="AEN11144"
 ></A
 ><P
 ></P
@@ -2165,7 +2165,7 @@ CLASS="PARAMETER"
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2182,7 +2182,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11149"
+NAME="AEN11173"
 ></A
 ><H3
 ><A
@@ -2214,7 +2214,7 @@ plus HTML entities block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11155"
+NAME="AEN11179"
 ></A
 ><P
 ></P
@@ -2341,7 +2341,7 @@ CLASS="PARAMETER"
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2358,7 +2358,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11188"
+NAME="AEN11212"
 ></A
 ><H3
 ><A
@@ -2388,7 +2388,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11195"
+NAME="AEN11219"
 ></A
 ><P
 ></P
@@ -2441,7 +2441,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11208"
+NAME="AEN11232"
 ></A
 ><H3
 ><A
@@ -2468,7 +2468,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11214"
+NAME="AEN11238"
 ></A
 ><P
 ></P
@@ -2521,7 +2521,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11227"
+NAME="AEN11251"
 ></A
 ><H3
 ><A
@@ -2552,7 +2552,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11234"
+NAME="AEN11258"
 ></A
 ><P
 ></P
@@ -2590,7 +2590,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11243"
+NAME="AEN11267"
 ></A
 ><H3
 ><A
@@ -2644,7 +2644,7 @@ and error/warning reports.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11254"
+NAME="AEN11278"
 ></A
 ><P
 ></P
@@ -2782,7 +2782,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11287"
+NAME="AEN11311"
 ></A
 ><H3
 ><A
@@ -2815,7 +2815,7 @@ HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11294"
+NAME="AEN11318"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index 13569fe4..e6382503 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -123,7 +123,7 @@ NAME="LIBXML-HTMLTREE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11324"
+NAME="AEN11348"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN11324"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11327"
+NAME="AEN11351"
 ></A
 ><H2
 >Synopsis</H2
@@ -361,7 +361,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11383"
+NAME="AEN11407"
 ></A
 ><H2
 >Description</H2
@@ -371,14 +371,14 @@ NAME="AEN11383"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11386"
+NAME="AEN11410"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11388"
+NAME="AEN11412"
 ></A
 ><H3
 ><A
@@ -407,7 +407,7 @@ the same way as a text node in an XML document.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11394"
+NAME="AEN11418"
 ></A
 ><H3
 ><A
@@ -436,7 +436,7 @@ the same way as an entity reference in an XML document.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11400"
+NAME="AEN11424"
 ></A
 ><H3
 ><A
@@ -465,7 +465,7 @@ the same way as a comment in an XML document.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11406"
+NAME="AEN11430"
 ></A
 ><H3
 ><A
@@ -494,7 +494,7 @@ the same way as a CDATA section in an XML document.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11412"
+NAME="AEN11436"
 ></A
 ><H3
 ><A
@@ -523,7 +523,7 @@ the same way as a processing instruction in an XML document.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11418"
+NAME="AEN11442"
 ></A
 ><H3
 ><A
@@ -560,7 +560,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11427"
+NAME="AEN11451"
 ></A
 ><P
 ></P
@@ -630,7 +630,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11444"
+NAME="AEN11468"
 ></A
 ><H3
 ><A
@@ -678,7 +678,7 @@ are NULL</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11455"
+NAME="AEN11479"
 ></A
 ><P
 ></P
@@ -737,7 +737,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document, do not intialize the DTD if not provided</TD
+>a new document, do not initialize the DTD if not provided</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -748,7 +748,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11472"
+NAME="AEN11496"
 ></A
 ><H3
 ><A
@@ -781,7 +781,7 @@ HREF="libxml-htmlparser.html#HTMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11480"
+NAME="AEN11504"
 ></A
 ><P
 ></P
@@ -834,7 +834,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11493"
+NAME="AEN11517"
 ></A
 ><H3
 ><A
@@ -870,7 +870,7 @@ the META flag associated.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11501"
+NAME="AEN11525"
 ></A
 ><P
 ></P
@@ -940,7 +940,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11518"
+NAME="AEN11542"
 ></A
 ><H3
 ><A
@@ -976,7 +976,7 @@ It's up to the caller to free the memory.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11526"
+NAME="AEN11550"
 ></A
 ><P
 ></P
@@ -1048,7 +1048,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11543"
+NAME="AEN11567"
 ></A
 ><H3
 ><A
@@ -1082,7 +1082,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11551"
+NAME="AEN11575"
 ></A
 ><P
 ></P
@@ -1152,7 +1152,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11568"
+NAME="AEN11592"
 ></A
 ><H3
 ><A
@@ -1189,7 +1189,7 @@ used.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11576"
+NAME="AEN11600"
 ></A
 ><P
 ></P
@@ -1259,7 +1259,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11593"
+NAME="AEN11617"
 ></A
 ><H3
 ><A
@@ -1298,7 +1298,7 @@ and formatting returns are added.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11602"
+NAME="AEN11626"
 ></A
 ><P
 ></P
@@ -1370,7 +1370,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11619"
+NAME="AEN11643"
 ></A
 ><H3
 ><A
@@ -1409,7 +1409,7 @@ and formatting returns are added.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11628"
+NAME="AEN11652"
 ></A
 ><P
 ></P
@@ -1481,7 +1481,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11645"
+NAME="AEN11669"
 ></A
 ><H3
 ><A
@@ -1523,7 +1523,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11655"
+NAME="AEN11679"
 ></A
 ><P
 ></P
@@ -1644,7 +1644,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11684"
+NAME="AEN11708"
 ></A
 ><H3
 ><A
@@ -1677,7 +1677,7 @@ and formatting returns/spaces are added.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11691"
+NAME="AEN11715"
 ></A
 ><P
 ></P
@@ -1764,7 +1764,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11712"
+NAME="AEN11736"
 ></A
 ><H3
 ><A
@@ -1797,7 +1797,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11719"
+NAME="AEN11743"
 ></A
 ><P
 ></P
@@ -1901,7 +1901,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11744"
+NAME="AEN11768"
 ></A
 ><H3
 ><A
@@ -1941,7 +1941,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11753"
+NAME="AEN11777"
 ></A
 ><P
 ></P
@@ -2047,7 +2047,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11778"
+NAME="AEN11802"
 ></A
 ><H3
 ><A
@@ -2082,7 +2082,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11786"
+NAME="AEN11810"
 ></A
 ><P
 ></P
@@ -2154,7 +2154,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11803"
+NAME="AEN11827"
 ></A
 ><H3
 ><A
@@ -2190,7 +2190,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11811"
+NAME="AEN11835"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index e212e62a..d9e47bba 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -123,7 +123,7 @@ NAME="LIBXML-NANOFTP"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17526"
+NAME="AEN17550"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN17526"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17529"
+NAME="AEN17553"
 ></A
 ><H2
 >Synopsis</H2
@@ -283,7 +283,7 @@ HREF="libxml-nanoftp.html#XMLNANOFTPREAD"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17558"
+NAME="AEN17582"
 ></A
 ><H2
 >Description</H2
@@ -293,14 +293,14 @@ NAME="AEN17558"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17561"
+NAME="AEN17585"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17563"
+NAME="AEN17587"
 ></A
 ><H3
 ><A
@@ -342,7 +342,7 @@ Note that only one of year and day:minute are specified</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17570"
+NAME="AEN17594"
 ></A
 ><P
 ></P
@@ -567,7 +567,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17623"
+NAME="AEN17647"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17629"
+NAME="AEN17653"
 ></A
 ><P
 ></P
@@ -668,7 +668,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17646"
+NAME="AEN17670"
 ></A
 ><H3
 ><A
@@ -698,7 +698,7 @@ and get the hostname</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17652"
+NAME="AEN17676"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17658"
+NAME="AEN17682"
 ></A
 ><H3
 ><A
@@ -753,7 +753,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17664"
+NAME="AEN17688"
 ></A
 ><P
 ></P
@@ -791,7 +791,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17673"
+NAME="AEN17697"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17679"
+NAME="AEN17703"
 ></A
 ><P
 ></P
@@ -856,7 +856,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17688"
+NAME="AEN17712"
 ></A
 ><H3
 ><A
@@ -884,7 +884,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17694"
+NAME="AEN17718"
 ></A
 ><P
 ></P
@@ -939,7 +939,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17707"
+NAME="AEN17731"
 ></A
 ><H3
 ><A
@@ -966,7 +966,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17713"
+NAME="AEN17737"
 ></A
 ><P
 ></P
@@ -1004,7 +1004,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17722"
+NAME="AEN17746"
 ></A
 ><H3
 ><A
@@ -1031,7 +1031,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17728"
+NAME="AEN17752"
 ></A
 ><P
 ></P
@@ -1084,7 +1084,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17741"
+NAME="AEN17765"
 ></A
 ><H3
 ><A
@@ -1111,7 +1111,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17747"
+NAME="AEN17771"
 ></A
 ><P
 ></P
@@ -1164,7 +1164,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17760"
+NAME="AEN17784"
 ></A
 ><H3
 ><A
@@ -1191,7 +1191,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17766"
+NAME="AEN17790"
 ></A
 ><P
 ></P
@@ -1244,7 +1244,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17779"
+NAME="AEN17803"
 ></A
 ><H3
 ><A
@@ -1274,7 +1274,7 @@ A NULL URL cleans up proxy informations.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17785"
+NAME="AEN17809"
 ></A
 ><P
 ></P
@@ -1312,7 +1312,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17794"
+NAME="AEN17818"
 ></A
 ><H3
 ><A
@@ -1345,7 +1345,7 @@ ftp_proxy_password environment variables.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17800"
+NAME="AEN17824"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17826"
+NAME="AEN17850"
 ></A
 ><H3
 ><A
@@ -1488,7 +1488,7 @@ be established.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17832"
+NAME="AEN17856"
 ></A
 ><P
 ></P
@@ -1558,7 +1558,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17849"
+NAME="AEN17873"
 ></A
 ><H3
 ><A
@@ -1585,7 +1585,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17855"
+NAME="AEN17879"
 ></A
 ><P
 ></P
@@ -1638,7 +1638,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17868"
+NAME="AEN17892"
 ></A
 ><H3
 ><A
@@ -1665,7 +1665,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17874"
+NAME="AEN17898"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17887"
+NAME="AEN17911"
 ></A
 ><H3
 ><A
@@ -1746,7 +1746,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17893"
+NAME="AEN17917"
 ></A
 ><P
 ></P
@@ -1816,7 +1816,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17910"
+NAME="AEN17934"
 ></A
 ><H3
 ><A
@@ -1844,7 +1844,7 @@ passive mode is supported.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17916"
+NAME="AEN17940"
 ></A
 ><P
 ></P
@@ -1897,7 +1897,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17929"
+NAME="AEN17953"
 ></A
 ><H3
 ><A
@@ -1924,7 +1924,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17935"
+NAME="AEN17959"
 ></A
 ><P
 ></P
@@ -1977,7 +1977,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17948"
+NAME="AEN17972"
 ></A
 ><H3
 ><A
@@ -2011,7 +2011,7 @@ in the callbacks.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17955"
+NAME="AEN17979"
 ></A
 ><P
 ></P
@@ -2115,7 +2115,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17980"
+NAME="AEN18004"
 ></A
 ><H3
 ><A
@@ -2143,7 +2143,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17986"
+NAME="AEN18010"
 ></A
 ><P
 ></P
@@ -2213,7 +2213,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18003"
+NAME="AEN18027"
 ></A
 ><H3
 ><A
@@ -2247,7 +2247,7 @@ in the callbacks. The last callback has a size of 0 block.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18010"
+NAME="AEN18034"
 ></A
 ><P
 ></P
@@ -2351,7 +2351,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18035"
+NAME="AEN18059"
 ></A
 ><H3
 ><A
@@ -2391,7 +2391,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18043"
+NAME="AEN18067"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index badb34fc..980ba774 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -123,7 +123,7 @@ NAME="LIBXML-NANOHTTP"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17220"
+NAME="AEN17244"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN17220"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17223"
+NAME="AEN17247"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@ HREF="libxml-nanohttp.html#XMLNANOHTTPCLOSE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17239"
+NAME="AEN17263"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +234,14 @@ NAME="AEN17239"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17242"
+NAME="AEN17266"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17244"
+NAME="AEN17268"
 ></A
 ><H3
 ><A
@@ -270,7 +270,7 @@ Currently it just checks for proxy informations</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17250"
+NAME="AEN17274"
 ></A
 ><H3
 ><A
@@ -298,7 +298,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17256"
+NAME="AEN17280"
 ></A
 ><H3
 ><A
@@ -328,7 +328,7 @@ A NULL URL cleans up proxy informations.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17262"
+NAME="AEN17286"
 ></A
 ><P
 ></P
@@ -366,7 +366,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17271"
+NAME="AEN17295"
 ></A
 ><H3
 ><A
@@ -396,7 +396,7 @@ and save it's content in the file.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17277"
+NAME="AEN17301"
 ></A
 ><P
 ></P
@@ -485,7 +485,7 @@ if provided must be freed by the caller</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17298"
+NAME="AEN17322"
 ></A
 ><H3
 ><A
@@ -524,7 +524,7 @@ and the input buffer for the request content.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17305"
+NAME="AEN17329"
 ></A
 ><P
 ></P
@@ -636,7 +636,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  input length</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -647,7 +647,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17334"
+NAME="AEN17358"
 ></A
 ><H3
 ><A
@@ -687,7 +687,7 @@ and the input buffer for the request content.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17341"
+NAME="AEN17365"
 ></A
 ><P
 ></P
@@ -816,7 +816,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  input length</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -827,7 +827,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17374"
+NAME="AEN17398"
 ></A
 ><H3
 ><A
@@ -856,7 +856,7 @@ via HTTP GET.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17380"
+NAME="AEN17404"
 ></A
 ><P
 ></P
@@ -912,7 +912,7 @@ returned at that location</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17393"
+NAME="AEN17417"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@ via HTTP GET.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17399"
+NAME="AEN17423"
 ></A
 ><P
 ></P
@@ -1004,7 +1004,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if availble the redirected URL will be returned</TD
+> if available the redirected URL will be returned</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1015,7 +1015,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17416"
+NAME="AEN17440"
 ></A
 ><H3
 ><A
@@ -1042,7 +1042,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17422"
+NAME="AEN17446"
 ></A
 ><P
 ></P
@@ -1095,7 +1095,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17435"
+NAME="AEN17459"
 ></A
 ><H3
 ><A
@@ -1122,7 +1122,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17441"
+NAME="AEN17465"
 ></A
 ><P
 ></P
@@ -1176,7 +1176,7 @@ header.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17454"
+NAME="AEN17478"
 ></A
 ><H3
 ><A
@@ -1216,7 +1216,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17462"
+NAME="AEN17486"
 ></A
 ><P
 ></P
@@ -1304,7 +1304,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17483"
+NAME="AEN17507"
 ></A
 ><H3
 ><A
@@ -1333,7 +1333,7 @@ It closes and free the context at the end</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17489"
+NAME="AEN17513"
 ></A
 ><P
 ></P
@@ -1403,7 +1403,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17506"
+NAME="AEN17530"
 ></A
 ><H3
 ><A
@@ -1431,7 +1431,7 @@ free all data related to it.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17512"
+NAME="AEN17536"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index e81d169d..a253838c 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -1382,7 +1382,7 @@ CLASS="PROGRAMLISTING"
     const char *directory;            /* the directory/base of the file */
     const xmlChar *base;              /* Base of the array to parse */
     const xmlChar *cur;               /* Current char being parsed */
-    const xmlChar *end;               /* end of the arry to parse */
+    const xmlChar *end;               /* end of the array to parse */
     int length;                       /* length if known */
     int line;                         /* Current line */
     int col;                          /* Current column */
@@ -1547,7 +1547,7 @@ CLASS="PROGRAMLISTING"
     XML_PARSER_EOF = -1,	/* nothing is to be parsed */
     XML_PARSER_START = 0,	/* nothing has been parsed */
     XML_PARSER_MISC,		/* Misc* before int subset */
-    XML_PARSER_PI,		/* Whithin a processing instruction */
+    XML_PARSER_PI,		/* Within a processing instruction */
     XML_PARSER_DTD,		/* within some DTD content */
     XML_PARSER_PROLOG,		/* Misc* after internal subset */
     XML_PARSER_COMMENT,		/* within a comment */
@@ -1567,7 +1567,7 @@ CLASS="PROGRAMLISTING"
 ></TABLE
 ><P
 >The parser is now working also as a state based parser
-The recursive one use the stagte info for entities processing</P
+The recursive one use the state info for entities processing</P
 ><P
 ></P
 ></DIV
@@ -4919,7 +4919,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the XML parser context </TD
 ></TR
 ><TR
 ><TD
@@ -4934,7 +4934,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the entity input parser</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4966,7 +4966,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->global variable controlling the entity substitution default behaviour</P
+>global variable controlling the entity substitution default behavior</P
 ><P
 ></P
 ></DIV
@@ -5737,7 +5737,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>the xmlChar * for the first occurrence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5844,7 +5844,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>the xmlChar * for the first occurrence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5951,7 +5951,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>the xmlChar * for the first occurrence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6058,7 +6058,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>the xmlChar * for the first occurrence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6853,7 +6853,12 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->a strncat for array of xmlChar's, it will extend cur with the len
+>a strncat for array of xmlChar's, it will extend <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+> with the len
 first bytes of <TT
 CLASS="PARAMETER"
 ><I
@@ -6865,7 +6870,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1571"
+NAME="AEN1572"
 ></A
 ><P
 ></P
@@ -6963,7 +6968,7 @@ and should not be freed</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1594"
+NAME="AEN1595"
 ></A
 ><H3
 ><A
@@ -6996,7 +7001,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1602"
+NAME="AEN1603"
 ></A
 ><P
 ></P
@@ -7049,7 +7054,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1615"
+NAME="AEN1616"
 ></A
 ><H3
 ><A
@@ -7080,7 +7085,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1622"
+NAME="AEN1623"
 ></A
 ><P
 ></P
@@ -7150,7 +7155,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1639"
+NAME="AEN1640"
 ></A
 ><H3
 ><A
@@ -7181,7 +7186,7 @@ compressed document is provided by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1646"
+NAME="AEN1647"
 ></A
 ><P
 ></P
@@ -7235,7 +7240,7 @@ NULL otherwise.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1659"
+NAME="AEN1660"
 ></A
 ><H3
 ><A
@@ -7259,10 +7264,10 @@ CLASS="PROGRAMLISTING"
 >Set and return the previous value for default entity support.
 Initially the parser always keep entity references instead of substituting
 entity values in the output. This function has to be used to change the
-default parser behaviour
+default parser behavior
 SAX::<GTKDOCLINK
-HREF="SUBTITUTEENTITIES"
->subtituteEntities</GTKDOCLINK
+HREF="SUBSTITUTEENTITIES"
+>substituteEntities</GTKDOCLINK
 >() has to be used for changing that on a file by
 file basis.</P
 ><P
@@ -7270,7 +7275,7 @@ file basis.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1666"
+NAME="AEN1667"
 ></A
 ><P
 ></P
@@ -7323,7 +7328,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1679"
+NAME="AEN1680"
 ></A
 ><H3
 ><A
@@ -7362,7 +7367,7 @@ HREF="libxml-sax.html#IGNORABLEWHITESPACE"
 >() are only generated when running the parser in
 validating mode and when the current element doesn't allow CDATA or
 mixed content.
-This function is provided as a way to force the standard behaviour 
+This function is provided as a way to force the standard behavior 
 on 1.X libs and to switch back to the old mode for compatibility when
 running 1.X client code on 2.X . Upgrade of 1.X code should be done
 by using <A
@@ -7377,7 +7382,7 @@ if blanks sections are kept, indentation is not generated.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1689"
+NAME="AEN1690"
 ></A
 ><P
 ></P
@@ -7430,7 +7435,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1702"
+NAME="AEN1703"
 ></A
 ><H3
 ><A
@@ -7460,7 +7465,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1709"
+NAME="AEN1710"
 ></A
 ><P
 ></P
@@ -7498,7 +7503,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1718"
+NAME="AEN1719"
 ></A
 ><H3
 ><A
@@ -7525,7 +7530,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1724"
+NAME="AEN1725"
 ></A
 ><P
 ></P
@@ -7578,7 +7583,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1737"
+NAME="AEN1738"
 ></A
 ><H3
 ><A
@@ -7606,7 +7611,7 @@ contents. This may break on old application and is turned off by default.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1743"
+NAME="AEN1744"
 ></A
 ><P
 ></P
@@ -7659,7 +7664,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1756"
+NAME="AEN1757"
 ></A
 ><H3
 ><A
@@ -7693,7 +7698,7 @@ In the case the document is not Well Formed, a tree is built anyway</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1764"
+NAME="AEN1765"
 ></A
 ><P
 ></P
@@ -7746,7 +7751,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1777"
+NAME="AEN1778"
 ></A
 ><H3
 ><A
@@ -7778,7 +7783,7 @@ In the case the document is not Well Formed, a tree is built anyway</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1784"
+NAME="AEN1785"
 ></A
 ><P
 ></P
@@ -7848,7 +7853,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1801"
+NAME="AEN1802"
 ></A
 ><H3
 ><A
@@ -7880,7 +7885,7 @@ In the case the document is not Well Formed, a tree is built anyway</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1808"
+NAME="AEN1809"
 ></A
 ><P
 ></P
@@ -7933,7 +7938,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1821"
+NAME="AEN1822"
 ></A
 ><H3
 ><A
@@ -7968,7 +7973,7 @@ interface).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1830"
+NAME="AEN1831"
 ></A
 ><P
 ></P
@@ -8022,7 +8027,7 @@ as a result of the parsing.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1843"
+NAME="AEN1844"
 ></A
 ><H3
 ><A
@@ -8046,7 +8051,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->parse a genreral parsed entity
+>parse a general parsed entity
 An external general parsed entity is well-formed if it matches the
 production labeled extParsedEnt.</P
 ><P
@@ -8056,7 +8061,7 @@ production labeled extParsedEnt.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1851"
+NAME="AEN1852"
 ></A
 ><P
 ></P
@@ -8110,7 +8115,7 @@ as a result of the parsing.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1864"
+NAME="AEN1865"
 ></A
 ><H3
 ><A
@@ -8150,7 +8155,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1873"
+NAME="AEN1874"
 ></A
 ><P
 ></P
@@ -8238,7 +8243,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1894"
+NAME="AEN1895"
 ></A
 ><H3
 ><A
@@ -8271,7 +8276,7 @@ Automatic support for ZLIB/Compress compressed document is provided</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1901"
+NAME="AEN1902"
 ></A
 ><P
 ></P
@@ -8358,7 +8363,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1922"
+NAME="AEN1923"
 ></A
 ><H3
 ><A
@@ -8392,7 +8397,7 @@ parse an XML in-memory buffer and call the given SAX handler routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1929"
+NAME="AEN1930"
 ></A
 ><P
 ></P
@@ -8496,7 +8501,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1954"
+NAME="AEN1955"
 ></A
 ><H3
 ><A
@@ -8534,7 +8539,7 @@ DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1962"
+NAME="AEN1963"
 ></A
 ><P
 ></P
@@ -8639,7 +8644,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1987"
+NAME="AEN1988"
 ></A
 ><H3
 ><A
@@ -8677,7 +8682,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1995"
+NAME="AEN1996"
 ></A
 ><P
 ></P
@@ -8765,7 +8770,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2016"
+NAME="AEN2017"
 ></A
 ><H3
 ><A
@@ -8807,7 +8812,7 @@ available nearly everywhere in libxml.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2025"
+NAME="AEN2026"
 ></A
 ><P
 ></P
@@ -8912,7 +8917,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2050"
+NAME="AEN2051"
 ></A
 ><H3
 ><A
@@ -8952,7 +8957,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2060"
+NAME="AEN2061"
 ></A
 ><P
 ></P
@@ -9022,7 +9027,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2077"
+NAME="AEN2078"
 ></A
 ><H3
 ><A
@@ -9056,7 +9061,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2086"
+NAME="AEN2087"
 ></A
 ><P
 ></P
@@ -9109,7 +9114,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2099"
+NAME="AEN2100"
 ></A
 ><H3
 ><A
@@ -9146,7 +9151,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2108"
+NAME="AEN2109"
 ></A
 ><P
 ></P
@@ -9216,7 +9221,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2125"
+NAME="AEN2126"
 ></A
 ><H3
 ><A
@@ -9257,7 +9262,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2135"
+NAME="AEN2136"
 ></A
 ><P
 ></P
@@ -9344,7 +9349,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2156"
+NAME="AEN2157"
 ></A
 ><H3
 ><A
@@ -9385,7 +9390,7 @@ HREF="libxml-encoding.html#XMLCHARENCODING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2166"
+NAME="AEN2167"
 ></A
 ><P
 ></P
@@ -9478,7 +9483,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2188"
+NAME="AEN2189"
 ></A
 ><H3
 ><A
@@ -9527,7 +9532,7 @@ the content production in the XML grammar:</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2199"
+NAME="AEN2200"
 ></A
 ><P
 ></P
@@ -9666,7 +9671,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2232"
+NAME="AEN2233"
 ></A
 ><H3
 ><A
@@ -9718,7 +9723,7 @@ production labeled extParsedEnt.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2244"
+NAME="AEN2245"
 ></A
 ><P
 ></P
@@ -9874,7 +9879,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2281"
+NAME="AEN2282"
 ></A
 ><H3
 ><A
@@ -9920,7 +9925,7 @@ production labeled extParsedEnt.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2292"
+NAME="AEN2293"
 ></A
 ><P
 ></P
@@ -10025,7 +10030,7 @@ the parser error code otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2317"
+NAME="AEN2318"
 ></A
 ><H3
 ><A
@@ -10053,7 +10058,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2323"
+NAME="AEN2324"
 ></A
 ><H3
 ><A
@@ -10081,7 +10086,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2329"
+NAME="AEN2330"
 ></A
 ><H3
 ><A
@@ -10111,7 +10116,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2336"
+NAME="AEN2337"
 ></A
 ><P
 ></P
@@ -10149,7 +10154,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2345"
+NAME="AEN2346"
 ></A
 ><H3
 ><A
@@ -10179,7 +10184,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2352"
+NAME="AEN2353"
 ></A
 ><P
 ></P
@@ -10217,7 +10222,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2361"
+NAME="AEN2362"
 ></A
 ><H3
 ><A
@@ -10248,7 +10253,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2368"
+NAME="AEN2369"
 ></A
 ><P
 ></P
@@ -10286,7 +10291,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2377"
+NAME="AEN2378"
 ></A
 ><H3
 ><A
@@ -10323,7 +10328,7 @@ NULL, but the filename parameter can be</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2385"
+NAME="AEN2386"
 ></A
 ><P
 ></P
@@ -10395,7 +10400,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2402"
+NAME="AEN2403"
 ></A
 ><H3
 ><A
@@ -10428,7 +10433,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2410"
+NAME="AEN2411"
 ></A
 ><P
 ></P
@@ -10481,7 +10486,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2423"
+NAME="AEN2424"
 ></A
 ><H3
 ><A
@@ -10519,7 +10524,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2431"
+NAME="AEN2432"
 ></A
 ><P
 ></P
@@ -10591,7 +10596,7 @@ strings must not be deallocated</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2448"
+NAME="AEN2449"
 ></A
 ><H3
 ><A
@@ -10623,7 +10628,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2455"
+NAME="AEN2456"
 ></A
 ><P
 ></P
@@ -10710,7 +10715,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2476"
+NAME="AEN2477"
 ></A
 ><H3
 ><A
@@ -10742,7 +10747,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2483"
+NAME="AEN2484"
 ></A
 ><P
 ></P
@@ -10829,7 +10834,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2504"
+NAME="AEN2505"
 ></A
 ><H3
 ><A
@@ -10879,7 +10884,7 @@ and error/warning reports.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2514"
+NAME="AEN2515"
 ></A
 ><P
 ></P
@@ -11000,7 +11005,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2543"
+NAME="AEN2544"
 ></A
 ><H3
 ><A
@@ -11033,7 +11038,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2550"
+NAME="AEN2551"
 ></A
 ><P
 ></P
@@ -11137,7 +11142,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2575"
+NAME="AEN2576"
 ></A
 ><H3
 ><A
@@ -11185,7 +11190,7 @@ I/O stream</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2586"
+NAME="AEN2587"
 ></A
 ><P
 ></P
@@ -11323,7 +11328,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2619"
+NAME="AEN2620"
 ></A
 ><H3
 ><A
@@ -11370,7 +11375,7 @@ a stream suitable for the parser.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2630"
+NAME="AEN2631"
 ></A
 ><P
 ></P
@@ -11457,7 +11462,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2651"
+NAME="AEN2652"
 ></A
 ><H3
 ><A
@@ -11495,7 +11500,7 @@ HREF="libxml-tree.html#XMLNODE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2660"
+NAME="AEN2661"
 ></A
 ><P
 ></P
@@ -11565,7 +11570,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2677"
+NAME="AEN2678"
 ></A
 ><H3
 ><A
@@ -11595,7 +11600,7 @@ HREF="libxml-parser.html#XMLPARSERNODEINFOSEQPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2684"
+NAME="AEN2685"
 ></A
 ><P
 ></P
@@ -11633,7 +11638,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2693"
+NAME="AEN2694"
 ></A
 ><H3
 ><A
@@ -11664,7 +11669,7 @@ info sequence</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2700"
+NAME="AEN2701"
 ></A
 ><P
 ></P
@@ -11702,7 +11707,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2709"
+NAME="AEN2710"
 ></A
 ><H3
 ><A
@@ -11740,7 +11745,7 @@ the given node is or should be at in a sorted sequence</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2718"
+NAME="AEN2719"
 ></A
 ><P
 ></P
@@ -11810,7 +11815,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2735"
+NAME="AEN2736"
 ></A
 ><H3
 ><A
@@ -11844,7 +11849,7 @@ HREF="libxml-parser.html#XMLPARSERNODEINFO"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2743"
+NAME="AEN2744"
 ></A
 ><P
 ></P
@@ -11899,7 +11904,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2756"
+NAME="AEN2757"
 ></A
 ><H3
 ><A
@@ -11929,7 +11934,7 @@ HREF="libxml-parser.html#XMLEXTERNALENTITYLOADER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2763"
+NAME="AEN2764"
 ></A
 ><P
 ></P
@@ -11967,7 +11972,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2772"
+NAME="AEN2773"
 ></A
 ><H3
 ><A
@@ -11998,7 +12003,7 @@ HREF="libxml-parser.html#XMLEXTERNALENTITYLOADER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2779"
+NAME="AEN2780"
 ></A
 ><P
 ></P
@@ -12034,7 +12039,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2788"
+NAME="AEN2789"
 ></A
 ><H3
 ><A
@@ -12065,13 +12070,13 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><P
 >Load an external entity, note that the use of this function for
 unparsed entities may generate problems
-TODO: a more generic External entitiy API must be designed</P
+TODO: a more generic External entity API must be designed</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2796"
+NAME="AEN2797"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 9efe154e..6f9cccc6 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -123,7 +123,7 @@ NAME="LIBXML-PARSERINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20794"
+NAME="AEN20818"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN20794"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20797"
+NAME="AEN20821"
 ></A
 ><H2
 >Synopsis</H2
@@ -1132,7 +1132,7 @@ HREF="libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21072"
+NAME="AEN21096"
 ></A
 ><H2
 >Description</H2
@@ -1142,14 +1142,14 @@ NAME="AEN21072"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21075"
+NAME="AEN21099"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21077"
+NAME="AEN21101"
 ></A
 ><H3
 ><A
@@ -1178,7 +1178,7 @@ at runtime.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21083"
+NAME="AEN21107"
 ></A
 ><H3
 ><A
@@ -1207,7 +1207,7 @@ one of the point is providing context when reporting errors</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21089"
+NAME="AEN21113"
 ></A
 ><H3
 ><A
@@ -1265,7 +1265,7 @@ any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21105"
+NAME="AEN21129"
 ></A
 ><P
 ></P
@@ -1303,7 +1303,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21114"
+NAME="AEN21138"
 ></A
 ><H3
 ><A
@@ -1344,7 +1344,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21125"
+NAME="AEN21149"
 ></A
 ><P
 ></P
@@ -1382,7 +1382,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21134"
+NAME="AEN21158"
 ></A
 ><H3
 ><A
@@ -1411,7 +1411,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21141"
+NAME="AEN21165"
 ></A
 ><P
 ></P
@@ -1449,7 +1449,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21150"
+NAME="AEN21174"
 ></A
 ><H3
 ><A
@@ -1478,7 +1478,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21157"
+NAME="AEN21181"
 ></A
 ><P
 ></P
@@ -1516,7 +1516,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21166"
+NAME="AEN21190"
 ></A
 ><H3
 ><A
@@ -1545,7 +1545,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21173"
+NAME="AEN21197"
 ></A
 ><P
 ></P
@@ -1583,7 +1583,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21182"
+NAME="AEN21206"
 ></A
 ><H3
 ><A
@@ -1656,7 +1656,7 @@ HREF="X30FE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21203"
+NAME="AEN21227"
 ></A
 ><P
 ></P
@@ -1694,7 +1694,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21212"
+NAME="AEN21236"
 ></A
 ><H3
 ><A
@@ -1738,7 +1738,7 @@ HREF="X3029"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21224"
+NAME="AEN21248"
 ></A
 ><P
 ></P
@@ -1776,7 +1776,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21233"
+NAME="AEN21257"
 ></A
 ><H3
 ><A
@@ -1805,7 +1805,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21240"
+NAME="AEN21264"
 ></A
 ><P
 ></P
@@ -1843,7 +1843,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21249"
+NAME="AEN21273"
 ></A
 ><H3
 ><A
@@ -1881,7 +1881,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21259"
+NAME="AEN21283"
 ></A
 ><P
 ></P
@@ -1919,7 +1919,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21268"
+NAME="AEN21292"
 ></A
 ><H3
 ><A
@@ -1946,7 +1946,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21274"
+NAME="AEN21298"
 ></A
 ><P
 ></P
@@ -1984,7 +1984,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21283"
+NAME="AEN21307"
 ></A
 ><H3
 ><A
@@ -2011,7 +2011,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21289"
+NAME="AEN21313"
 ></A
 ><P
 ></P
@@ -2049,7 +2049,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21298"
+NAME="AEN21322"
 ></A
 ><H3
 ><A
@@ -2076,7 +2076,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21304"
+NAME="AEN21328"
 ></A
 ><P
 ></P
@@ -2114,7 +2114,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21313"
+NAME="AEN21337"
 ></A
 ><H3
 ><A
@@ -2156,7 +2156,7 @@ HREF="X"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21323"
+NAME="AEN21347"
 ></A
 ><P
 ></P
@@ -2209,7 +2209,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21336"
+NAME="AEN21360"
 ></A
 ><H3
 ><A
@@ -2253,7 +2253,7 @@ HREF="libxml-parserinternals.html#IS-BLANK-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21347"
+NAME="AEN21371"
 ></A
 ><P
 ></P
@@ -2306,7 +2306,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21360"
+NAME="AEN21384"
 ></A
 ><H3
 ><A
@@ -2343,7 +2343,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21369"
+NAME="AEN21393"
 ></A
 ><P
 ></P
@@ -2396,7 +2396,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21382"
+NAME="AEN21406"
 ></A
 ><H3
 ><A
@@ -2424,7 +2424,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21388"
+NAME="AEN21412"
 ></A
 ><P
 ></P
@@ -2477,7 +2477,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21401"
+NAME="AEN21425"
 ></A
 ><H3
 ><A
@@ -2505,7 +2505,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21407"
+NAME="AEN21431"
 ></A
 ><P
 ></P
@@ -2558,7 +2558,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21420"
+NAME="AEN21444"
 ></A
 ><H3
 ><A
@@ -2601,7 +2601,7 @@ HREF="X3029"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21431"
+NAME="AEN21455"
 ></A
 ><P
 ></P
@@ -2654,7 +2654,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21444"
+NAME="AEN21468"
 ></A
 ><H3
 ><A
@@ -2682,7 +2682,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21450"
+NAME="AEN21474"
 ></A
 ><P
 ></P
@@ -2735,7 +2735,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21463"
+NAME="AEN21487"
 ></A
 ><H3
 ><A
@@ -2807,7 +2807,7 @@ HREF="X30FE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21483"
+NAME="AEN21507"
 ></A
 ><P
 ></P
@@ -2860,7 +2860,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21496"
+NAME="AEN21520"
 ></A
 ><H3
 ><A
@@ -2921,7 +2921,7 @@ HREF="libxml-parserinternals.html#IS-CHAR-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21512"
+NAME="AEN21536"
 ></A
 ><P
 ></P
@@ -2974,7 +2974,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21525"
+NAME="AEN21549"
 ></A
 ><H3
 ><A
@@ -3007,7 +3007,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21533"
+NAME="AEN21557"
 ></A
 ><P
 ></P
@@ -3060,7 +3060,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21546"
+NAME="AEN21570"
 ></A
 ><H3
 ><A
@@ -3092,7 +3092,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21553"
+NAME="AEN21577"
 ></A
 ><P
 ></P
@@ -3145,7 +3145,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21566"
+NAME="AEN21590"
 ></A
 ><H3
 ><A
@@ -3176,7 +3176,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21573"
+NAME="AEN21597"
 ></A
 ><P
 ></P
@@ -3246,7 +3246,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21590"
+NAME="AEN21614"
 ></A
 ><H3
 ><A
@@ -3276,7 +3276,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21597"
+NAME="AEN21621"
 ></A
 ><P
 ></P
@@ -3312,7 +3312,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21606"
+NAME="AEN21630"
 ></A
 ><H3
 ><A
@@ -3355,7 +3355,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21616"
+NAME="AEN21640"
 ></A
 ><P
 ></P
@@ -3416,7 +3416,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a posible base for the target URI</TD
+>  a possible base for the target URI</TD
 ></TR
 ><TR
 ><TD
@@ -3442,7 +3442,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21637"
+NAME="AEN21661"
 ></A
 ><H3
 ><A
@@ -3477,7 +3477,7 @@ of a given entity.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21645"
+NAME="AEN21669"
 ></A
 ><P
 ></P
@@ -3547,7 +3547,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21662"
+NAME="AEN21686"
 ></A
 ><H3
 ><A
@@ -3582,7 +3582,7 @@ of a given entity.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21670"
+NAME="AEN21694"
 ></A
 ><P
 ></P
@@ -3652,7 +3652,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21687"
+NAME="AEN21711"
 ></A
 ><H3
 ><A
@@ -3683,7 +3683,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21694"
+NAME="AEN21718"
 ></A
 ><P
 ></P
@@ -3721,7 +3721,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21703"
+NAME="AEN21727"
 ></A
 ><H3
 ><A
@@ -3758,7 +3758,7 @@ stream ? When do we just handle that as a set of chars ?</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21712"
+NAME="AEN21736"
 ></A
 ><P
 ></P
@@ -3813,7 +3813,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21725"
+NAME="AEN21749"
 ></A
 ><H3
 ><A
@@ -3850,7 +3850,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21734"
+NAME="AEN21758"
 ></A
 ><P
 ></P
@@ -3920,7 +3920,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21751"
+NAME="AEN21775"
 ></A
 ><H3
 ><A
@@ -3957,7 +3957,7 @@ HREF="libxml-entities.html#XMLENTITYPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21760"
+NAME="AEN21784"
 ></A
 ><P
 ></P
@@ -4027,7 +4027,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21777"
+NAME="AEN21801"
 ></A
 ><H3
 ><A
@@ -4062,7 +4062,7 @@ of the previous one(s).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21785"
+NAME="AEN21809"
 ></A
 ><P
 ></P
@@ -4117,7 +4117,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21798"
+NAME="AEN21822"
 ></A
 ><H3
 ><A
@@ -4151,7 +4151,7 @@ pop it and return the next char.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21806"
+NAME="AEN21830"
 ></A
 ><P
 ></P
@@ -4204,7 +4204,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21819"
+NAME="AEN21843"
 ></A
 ><H3
 ><A
@@ -4234,7 +4234,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21826"
+NAME="AEN21850"
 ></A
 ><P
 ></P
@@ -4272,7 +4272,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21835"
+NAME="AEN21859"
 ></A
 ><H3
 ><A
@@ -4306,7 +4306,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21843"
+NAME="AEN21867"
 ></A
 ><P
 ></P
@@ -4376,7 +4376,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21860"
+NAME="AEN21884"
 ></A
 ><H3
 ><A
@@ -4409,7 +4409,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21868"
+NAME="AEN21892"
 ></A
 ><P
 ></P
@@ -4462,7 +4462,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21881"
+NAME="AEN21905"
 ></A
 ><H3
 ><A
@@ -4509,7 +4509,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21894"
+NAME="AEN21918"
 ></A
 ><P
 ></P
@@ -4597,7 +4597,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21915"
+NAME="AEN21939"
 ></A
 ><H3
 ><A
@@ -4638,7 +4638,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21926"
+NAME="AEN21950"
 ></A
 ><P
 ></P
@@ -4691,7 +4691,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21939"
+NAME="AEN21963"
 ></A
 ><H3
 ><A
@@ -4737,7 +4737,7 @@ top of the SAX interfaces, i.e. not on raw input.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21952"
+NAME="AEN21976"
 ></A
 ><P
 ></P
@@ -4808,7 +4808,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21969"
+NAME="AEN21993"
 ></A
 ><H3
 ><A
@@ -4848,7 +4848,7 @@ top of the SAX interfaces, i.e. not on raw input.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21980"
+NAME="AEN22004"
 ></A
 ><P
 ></P
@@ -4901,7 +4901,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21993"
+NAME="AEN22017"
 ></A
 ><H3
 ><A
@@ -4936,7 +4936,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22002"
+NAME="AEN22026"
 ></A
 ><P
 ></P
@@ -4989,7 +4989,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22015"
+NAME="AEN22039"
 ></A
 ><H3
 ><A
@@ -5027,7 +5027,7 @@ if it was declared on the root of the Tree:-(</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22025"
+NAME="AEN22049"
 ></A
 ><P
 ></P
@@ -5065,7 +5065,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22034"
+NAME="AEN22058"
 ></A
 ><H3
 ><A
@@ -5109,7 +5109,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22046"
+NAME="AEN22070"
 ></A
 ><P
 ></P
@@ -5162,7 +5162,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22059"
+NAME="AEN22083"
 ></A
 ><H3
 ><A
@@ -5202,7 +5202,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22070"
+NAME="AEN22094"
 ></A
 ><P
 ></P
@@ -5255,7 +5255,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22083"
+NAME="AEN22107"
 ></A
 ><H3
 ><A
@@ -5292,7 +5292,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22093"
+NAME="AEN22117"
 ></A
 ><P
 ></P
@@ -5345,7 +5345,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22106"
+NAME="AEN22130"
 ></A
 ><H3
 ><A
@@ -5385,7 +5385,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22116"
+NAME="AEN22140"
 ></A
 ><P
 ></P
@@ -5444,7 +5444,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the EntityValue parsed with reference substitued or NULL</TD
+>the EntityValue parsed with reference substituted or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5455,7 +5455,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22133"
+NAME="AEN22157"
 ></A
 ><H3
 ><A
@@ -5545,7 +5545,7 @@ by a non-validating parser as if declared CDATA.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22154"
+NAME="AEN22178"
 ></A
 ><P
 ></P
@@ -5598,7 +5598,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22167"
+NAME="AEN22191"
 ></A
 ><H3
 ><A
@@ -5633,7 +5633,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22176"
+NAME="AEN22200"
 ></A
 ><P
 ></P
@@ -5686,7 +5686,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22189"
+NAME="AEN22213"
 ></A
 ><H3
 ><A
@@ -5721,7 +5721,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22198"
+NAME="AEN22222"
 ></A
 ><P
 ></P
@@ -5774,7 +5774,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22211"
+NAME="AEN22235"
 ></A
 ><H3
 ><A
@@ -5813,7 +5813,7 @@ string is not marking the end of a CDATA section. </P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22220"
+NAME="AEN22244"
 ></A
 ><P
 ></P
@@ -5868,7 +5868,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22233"
+NAME="AEN22257"
 ></A
 ><H3
 ><A
@@ -5902,7 +5902,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><P
 >Parse an External ID or a Public ID</P
 ><P
->NOTE: Productions [75] and [83] interract badly since [75] can generate
+>NOTE: Productions [75] and [83] interact badly since [75] can generate
 'PUBLIC' S PubidLiteral S SystemLiteral</P
 ><P
 >[75] ExternalID ::= 'SYSTEM' S SystemLiteral
@@ -5914,7 +5914,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22245"
+NAME="AEN22269"
 ></A
 ><P
 ></P
@@ -6004,7 +6004,7 @@ it is possible to return NULL and have publicID set.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22266"
+NAME="AEN22290"
 ></A
 ><H3
 ><A
@@ -6038,7 +6038,7 @@ must not occur within comments. "</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22274"
+NAME="AEN22298"
 ></A
 ><P
 ></P
@@ -6076,7 +6076,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22283"
+NAME="AEN22307"
 ></A
 ><H3
 ><A
@@ -6111,7 +6111,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22292"
+NAME="AEN22316"
 ></A
 ><P
 ></P
@@ -6164,7 +6164,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22305"
+NAME="AEN22329"
 ></A
 ><H3
 ><A
@@ -6198,7 +6198,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22314"
+NAME="AEN22338"
 ></A
 ><P
 ></P
@@ -6236,7 +6236,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22323"
+NAME="AEN22347"
 ></A
 ><H3
 ><A
@@ -6278,7 +6278,7 @@ HREF="libxml-parserinternals.html#XMLPARSEEXTERNALID"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22334"
+NAME="AEN22358"
 ></A
 ><P
 ></P
@@ -6316,7 +6316,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22343"
+NAME="AEN22367"
 ></A
 ><H3
 ><A
@@ -6361,7 +6361,7 @@ The Name must match the declared name of a notation.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22357"
+NAME="AEN22381"
 ></A
 ><P
 ></P
@@ -6399,7 +6399,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22366"
+NAME="AEN22390"
 ></A
 ><H3
 ><A
@@ -6472,7 +6472,7 @@ HREF="libxml-parserinternals.html#XMLPARSEATTVALUE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22386"
+NAME="AEN22410"
 ></A
 ><P
 ></P
@@ -6543,7 +6543,7 @@ or XML_ATTRIBUTE_FIXED. </TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22403"
+NAME="AEN22427"
 ></A
 ><H3
 ><A
@@ -6584,7 +6584,7 @@ in the declaration; all notation names in the declaration must be declared.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22414"
+NAME="AEN22438"
 ></A
 ><P
 ></P
@@ -6637,7 +6637,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22427"
+NAME="AEN22451"
 ></A
 ><H3
 ><A
@@ -6676,7 +6676,7 @@ the declaration</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22437"
+NAME="AEN22461"
 ></A
 ><P
 ></P
@@ -6729,7 +6729,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22450"
+NAME="AEN22474"
 ></A
 ><H3
 ><A
@@ -6767,7 +6767,7 @@ HREF="libxml-tree.html#XMLENUMERATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22460"
+NAME="AEN22484"
 ></A
 ><P
 ></P
@@ -6837,7 +6837,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22477"
+NAME="AEN22501"
 ></A
 ><H3
 ><A
@@ -6916,7 +6916,7 @@ of type NMTOKENS must match Nmtokens.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22498"
+NAME="AEN22522"
 ></A
 ><P
 ></P
@@ -6986,7 +6986,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22515"
+NAME="AEN22539"
 ></A
 ><H3
 ><A
@@ -7020,7 +7020,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22524"
+NAME="AEN22548"
 ></A
 ><P
 ></P
@@ -7058,7 +7058,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22533"
+NAME="AEN22557"
 ></A
 ><H3
 ><A
@@ -7108,7 +7108,7 @@ mixed-content declaration.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22546"
+NAME="AEN22570"
 ></A
 ><P
 ></P
@@ -7161,7 +7161,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22559"
+NAME="AEN22583"
 ></A
 ><H3
 ><A
@@ -7198,7 +7198,7 @@ HREF="libxml-parserinternals.html#XMLPARSEELEMENTCHILDRENCONTENTDECL"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22568"
+NAME="AEN22592"
 ></A
 ><P
 ></P
@@ -7252,7 +7252,7 @@ hierarchy.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22581"
+NAME="AEN22605"
 ></A
 ><H3
 ><A
@@ -7293,7 +7293,7 @@ The leading '(' and spaces have been skipped in xmlParseElementContentDecl</P
 ><P
 >[ VC: Proper Group/PE Nesting ] applies to [49] and [50]
 TODO Parameter-entity replacement text must be properly nested
-with parenthetized groups. That is to say, if either of the
+with parenthesized groups. That is to say, if either of the
 opening or closing parentheses in a choice, seq, or Mixed
 construct is contained in the replacement text for a parameter
 entity, both must be contained in the same replacement text. For
@@ -7306,7 +7306,7 @@ the replacement text should be a connector (| or ,).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22594"
+NAME="AEN22618"
 ></A
 ><P
 ></P
@@ -7360,7 +7360,7 @@ hierarchy.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22607"
+NAME="AEN22631"
 ></A
 ><H3
 ><A
@@ -7401,7 +7401,7 @@ the cases EMPTY and ANY are handled directly in xmlParseElementDecl</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22617"
+NAME="AEN22641"
 ></A
 ><P
 ></P
@@ -7488,7 +7488,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22638"
+NAME="AEN22662"
 ></A
 ><H3
 ><A
@@ -7523,7 +7523,7 @@ No element type may be declared more than once</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22647"
+NAME="AEN22671"
 ></A
 ><P
 ></P
@@ -7576,7 +7576,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22660"
+NAME="AEN22684"
 ></A
 ><H3
 ><A
@@ -7622,7 +7622,7 @@ entities or to the external subset.)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22670"
+NAME="AEN22694"
 ></A
 ><P
 ></P
@@ -7660,7 +7660,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22679"
+NAME="AEN22703"
 ></A
 ><H3
 ><A
@@ -7700,7 +7700,7 @@ production for Char.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22689"
+NAME="AEN22713"
 ></A
 ><P
 ></P
@@ -7753,7 +7753,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22702"
+NAME="AEN22726"
 ></A
 ><H3
 ><A
@@ -7806,7 +7806,7 @@ An entity reference must not contain the name of an unparsed entity</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22713"
+NAME="AEN22737"
 ></A
 ><P
 ></P
@@ -7859,7 +7859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22726"
+NAME="AEN22750"
 ></A
 ><H3
 ><A
@@ -7900,7 +7900,7 @@ or if the parser was asked to switch to that mode.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22736"
+NAME="AEN22760"
 ></A
 ><P
 ></P
@@ -7938,7 +7938,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22745"
+NAME="AEN22769"
 ></A
 ><H3
 ><A
@@ -7991,7 +7991,7 @@ NOTE: misleading but this is handled.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22757"
+NAME="AEN22781"
 ></A
 ><P
 ></P
@@ -8029,7 +8029,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22766"
+NAME="AEN22790"
 ></A
 ><H3
 ><A
@@ -8066,7 +8066,7 @@ type of the root element.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22775"
+NAME="AEN22799"
 ></A
 ><P
 ></P
@@ -8104,7 +8104,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22784"
+NAME="AEN22808"
 ></A
 ><H3
 ><A
@@ -8164,7 +8164,7 @@ definition.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22801"
+NAME="AEN22825"
 ></A
 ><P
 ></P
@@ -8234,7 +8234,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22818"
+NAME="AEN22842"
 ></A
 ><H3
 ><A
@@ -8286,7 +8286,7 @@ empty-element tag. </P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22833"
+NAME="AEN22857"
 ></A
 ><P
 ></P
@@ -8339,7 +8339,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22846"
+NAME="AEN22870"
 ></A
 ><H3
 ><A
@@ -8375,7 +8375,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22856"
+NAME="AEN22880"
 ></A
 ><P
 ></P
@@ -8413,7 +8413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22865"
+NAME="AEN22889"
 ></A
 ><H3
 ><A
@@ -8451,7 +8451,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22876"
+NAME="AEN22900"
 ></A
 ><P
 ></P
@@ -8489,7 +8489,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22885"
+NAME="AEN22909"
 ></A
 ><H3
 ><A
@@ -8521,7 +8521,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22893"
+NAME="AEN22917"
 ></A
 ><P
 ></P
@@ -8559,7 +8559,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22902"
+NAME="AEN22926"
 ></A
 ><H3
 ><A
@@ -8608,7 +8608,7 @@ been declared.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22912"
+NAME="AEN22936"
 ></A
 ><P
 ></P
@@ -8646,7 +8646,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22921"
+NAME="AEN22945"
 ></A
 ><H3
 ><A
@@ -8681,7 +8681,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22930"
+NAME="AEN22954"
 ></A
 ><P
 ></P
@@ -8734,7 +8734,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22943"
+NAME="AEN22967"
 ></A
 ><H3
 ><A
@@ -8771,7 +8771,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22953"
+NAME="AEN22977"
 ></A
 ><P
 ></P
@@ -8824,7 +8824,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22966"
+NAME="AEN22990"
 ></A
 ><H3
 ><A
@@ -8859,7 +8859,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22975"
+NAME="AEN22999"
 ></A
 ><P
 ></P
@@ -8912,7 +8912,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22988"
+NAME="AEN23012"
 ></A
 ><H3
 ><A
@@ -8949,7 +8949,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22998"
+NAME="AEN23022"
 ></A
 ><P
 ></P
@@ -9002,7 +9002,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23011"
+NAME="AEN23035"
 ></A
 ><H3
 ><A
@@ -9049,7 +9049,7 @@ within any instance of those types.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23020"
+NAME="AEN23044"
 ></A
 ><P
 ></P
@@ -9102,7 +9102,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23033"
+NAME="AEN23057"
 ></A
 ><H3
 ><A
@@ -9134,7 +9134,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23041"
+NAME="AEN23065"
 ></A
 ><P
 ></P
@@ -9172,7 +9172,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23050"
+NAME="AEN23074"
 ></A
 ><H3
 ><A
@@ -9206,7 +9206,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23059"
+NAME="AEN23083"
 ></A
 ><P
 ></P
@@ -9244,7 +9244,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23068"
+NAME="AEN23092"
 ></A
 ><H3
 ><A
@@ -9268,7 +9268,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->parse an XML Misc* optionnal field.</P
+>parse an XML Misc* optional field.</P
 ><P
 >[27] Misc ::= Comment | PI |  S</P
 ><P
@@ -9276,7 +9276,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23076"
+NAME="AEN23100"
 ></A
 ><P
 ></P
@@ -9314,7 +9314,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23085"
+NAME="AEN23109"
 ></A
 ><H3
 ><A
@@ -9356,7 +9356,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23096"
+NAME="AEN23120"
 ></A
 ><P
 ></P
@@ -9428,7 +9428,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23113"
+NAME="AEN23137"
 ></A
 ><H3
 ><A
@@ -9449,14 +9449,14 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->If no entities need to be substitued</P
+>If no entities need to be substituted</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23119"
+NAME="AEN23143"
 ></A
 ><H3
 ><A
@@ -9477,14 +9477,14 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Whether general entities need to be substitued</P
+>Whether general entities need to be substituted</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23125"
+NAME="AEN23149"
 ></A
 ><H3
 ><A
@@ -9505,14 +9505,14 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Whether parameter entities need to be substitued</P
+>Whether parameter entities need to be substituted</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23131"
+NAME="AEN23155"
 ></A
 ><H3
 ><A
@@ -9533,14 +9533,14 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Both general and parameter entities need to be substitued</P
+>Both general and parameter entities need to be substituted</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23137"
+NAME="AEN23161"
 ></A
 ><H3
 ><A
@@ -9594,7 +9594,7 @@ through xmlStringDecodeEntities</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23151"
+NAME="AEN23175"
 ></A
 ><P
 ></P
@@ -9733,7 +9733,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23184"
+NAME="AEN23208"
 ></A
 ><H3
 ><A
@@ -9777,7 +9777,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Takes a entity string content and process to do the adequate subtitutions.</P
+>Takes a entity string content and process to do the adequate substitutions.</P
 ><P
 >[67] Reference ::= EntityRef | CharRef</P
 ><P
@@ -9787,7 +9787,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23198"
+NAME="AEN23222"
 ></A
 ><P
 ></P
@@ -9926,7 +9926,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23231"
+NAME="AEN23255"
 ></A
 ><H3
 ><A
@@ -9960,7 +9960,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23239"
+NAME="AEN23263"
 ></A
 ><P
 ></P
@@ -10030,7 +10030,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23256"
+NAME="AEN23280"
 ></A
 ><H3
 ><A
@@ -10063,7 +10063,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23264"
+NAME="AEN23288"
 ></A
 ><P
 ></P
@@ -10116,7 +10116,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23277"
+NAME="AEN23301"
 ></A
 ><H3
 ><A
@@ -10150,7 +10150,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23285"
+NAME="AEN23309"
 ></A
 ><P
 ></P
@@ -10220,7 +10220,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23302"
+NAME="AEN23326"
 ></A
 ><H3
 ><A
@@ -10253,7 +10253,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23310"
+NAME="AEN23334"
 ></A
 ><P
 ></P
@@ -10306,7 +10306,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23323"
+NAME="AEN23347"
 ></A
 ><H3
 ><A
@@ -10339,7 +10339,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23331"
+NAME="AEN23355"
 ></A
 ><P
 ></P
@@ -10392,7 +10392,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23344"
+NAME="AEN23368"
 ></A
 ><H3
 ><A
@@ -10426,7 +10426,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23352"
+NAME="AEN23376"
 ></A
 ><P
 ></P
@@ -10496,7 +10496,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23369"
+NAME="AEN23393"
 ></A
 ><H3
 ><A
@@ -10527,7 +10527,7 @@ It pops up finished entities in the process if allowable at that point.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23376"
+NAME="AEN23400"
 ></A
 ><P
 ></P
@@ -10580,7 +10580,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23389"
+NAME="AEN23413"
 ></A
 ><H3
 ><A
@@ -10609,14 +10609,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->The current char value, if using UTF-8 this may actaully span multiple
+>The current char value, if using UTF-8 this may actually span multiple
 bytes in the input buffer.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23397"
+NAME="AEN23421"
 ></A
 ><P
 ></P
@@ -10703,7 +10703,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23418"
+NAME="AEN23442"
 ></A
 ><H3
 ><A
@@ -10756,13 +10756,13 @@ HREF="ENTPROC"
 >
 i.e. 
 - Included in literal in entity values
-- Included as Paraemeter Entity reference within DTDs</P
+- Included as Parameter Entity reference within DTDs</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23431"
+NAME="AEN23455"
 ></A
 ><P
 ></P
@@ -10800,7 +10800,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23440"
+NAME="AEN23464"
 ></A
 ><H3
 ><A
@@ -10846,7 +10846,7 @@ HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
 ><P
->A PEReference may have been detectect in the current input stream
+>A PEReference may have been detected in the current input stream
 the handling is done accordingly to 
 http://www.w3.org/TR/REC-xml<GTKDOCLINK
 HREF="ENTPROC"
@@ -10857,7 +10857,7 @@ HREF="ENTPROC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23455"
+NAME="AEN23479"
 ></A
 ><P
 ></P
@@ -10895,7 +10895,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23464"
+NAME="AEN23488"
 ></A
 ><H3
 ><A
@@ -10935,7 +10935,7 @@ the XML Second edition.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23473"
+NAME="AEN23497"
 ></A
 ><P
 ></P
@@ -10988,7 +10988,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23486"
+NAME="AEN23510"
 ></A
 ><H3
 ><A
@@ -11013,7 +11013,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ></TR
 ></TABLE
 ><P
->The current char value, if using UTF-8 this may actaully span multiple
+>The current char value, if using UTF-8 this may actually 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
@@ -11042,7 +11042,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23498"
+NAME="AEN23522"
 ></A
 ><P
 ></P
@@ -11112,7 +11112,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23515"
+NAME="AEN23539"
 ></A
 ><H3
 ><A
@@ -11143,7 +11143,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23522"
+NAME="AEN23546"
 ></A
 ><P
 ></P
@@ -11170,7 +11170,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an arry of xmlChar</TD
+>  pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -11213,7 +11213,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23539"
+NAME="AEN23563"
 ></A
 ><H3
 ><A
@@ -11245,7 +11245,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23546"
+NAME="AEN23570"
 ></A
 ><P
 ></P
@@ -11289,7 +11289,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an arry of xmlChar</TD
+>  pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -11332,7 +11332,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23567"
+NAME="AEN23591"
 ></A
 ><H3
 ><A
@@ -11362,7 +11362,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23574"
+NAME="AEN23598"
 ></A
 ><P
 ></P
@@ -11400,7 +11400,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23583"
+NAME="AEN23607"
 ></A
 ><H3
 ><A
@@ -11430,7 +11430,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23590"
+NAME="AEN23614"
 ></A
 ><P
 ></P
@@ -11468,7 +11468,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23599"
+NAME="AEN23623"
 ></A
 ><H3
 ><A
@@ -11501,7 +11501,7 @@ case of use in multithreaded programs.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23606"
+NAME="AEN23630"
 ></A
 ><H3
 ><A
@@ -11534,7 +11534,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23613"
+NAME="AEN23637"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index 7cb6c2f5..a2dbef55 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -123,7 +123,7 @@ NAME="LIBXML-SAX"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2822"
+NAME="AEN2823"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN2822"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2825"
+NAME="AEN2826"
 ></A
 ><H2
 >Synopsis</H2
@@ -532,7 +532,7 @@ HREF="libxml-sax.html#DOCBDEFAULTSAXHANDLERINIT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2923"
+NAME="AEN2924"
 ></A
 ><H2
 >Description</H2
@@ -542,14 +542,14 @@ NAME="AEN2923"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2926"
+NAME="AEN2927"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2928"
+NAME="AEN2929"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2935"
+NAME="AEN2936"
 ></A
 ><P
 ></P
@@ -632,7 +632,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2948"
+NAME="AEN2949"
 ></A
 ><H3
 ><A
@@ -663,7 +663,7 @@ http://www.sgmlsource.com/dtds/memo.dtd</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2955"
+NAME="AEN2956"
 ></A
 ><P
 ></P
@@ -716,7 +716,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2968"
+NAME="AEN2969"
 ></A
 ><H3
 ><A
@@ -748,7 +748,7 @@ Everything is available on the context, so this is useless in our case.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2975"
+NAME="AEN2976"
 ></A
 ><P
 ></P
@@ -803,7 +803,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2988"
+NAME="AEN2989"
 ></A
 ><H3
 ><A
@@ -830,7 +830,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2994"
+NAME="AEN2995"
 ></A
 ><P
 ></P
@@ -883,7 +883,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3007"
+NAME="AEN3008"
 ></A
 ><H3
 ><A
@@ -910,7 +910,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3013"
+NAME="AEN3014"
 ></A
 ><P
 ></P
@@ -963,7 +963,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3026"
+NAME="AEN3027"
 ></A
 ><H3
 ><A
@@ -990,7 +990,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3032"
+NAME="AEN3033"
 ></A
 ><P
 ></P
@@ -1043,7 +1043,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3045"
+NAME="AEN3046"
 ></A
 ><H3
 ><A
@@ -1070,7 +1070,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3051"
+NAME="AEN3052"
 ></A
 ><P
 ></P
@@ -1123,7 +1123,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3064"
+NAME="AEN3065"
 ></A
 ><H3
 ><A
@@ -1150,7 +1150,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3070"
+NAME="AEN3071"
 ></A
 ><P
 ></P
@@ -1203,7 +1203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3083"
+NAME="AEN3084"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3092"
+NAME="AEN3093"
 ></A
 ><P
 ></P
@@ -1331,7 +1331,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3113"
+NAME="AEN3114"
 ></A
 ><H3
 ><A
@@ -1370,7 +1370,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3122"
+NAME="AEN3123"
 ></A
 ><P
 ></P
@@ -1459,7 +1459,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3143"
+NAME="AEN3144"
 ></A
 ><H3
 ><A
@@ -1493,7 +1493,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3151"
+NAME="AEN3152"
 ></A
 ><P
 ></P
@@ -1563,7 +1563,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3168"
+NAME="AEN3169"
 ></A
 ><H3
 ><A
@@ -1597,7 +1597,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3176"
+NAME="AEN3177"
 ></A
 ><P
 ></P
@@ -1667,7 +1667,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3193"
+NAME="AEN3194"
 ></A
 ><H3
 ><A
@@ -1715,7 +1715,7 @@ set up it's own entity resolution routine</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3204"
+NAME="AEN3205"
 ></A
 ><P
 ></P
@@ -1802,7 +1802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3225"
+NAME="AEN3226"
 ></A
 ><H3
 ><A
@@ -1846,7 +1846,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3235"
+NAME="AEN3236"
 ></A
 ><P
 ></P
@@ -1969,7 +1969,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3264"
+NAME="AEN3265"
 ></A
 ><H3
 ><A
@@ -2014,7 +2014,7 @@ HREF="libxml-tree.html#XMLENUMERATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3274"
+NAME="AEN3275"
 ></A
 ><P
 ></P
@@ -2154,7 +2154,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3307"
+NAME="AEN3308"
 ></A
 ><H3
 ><A
@@ -2190,7 +2190,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3315"
+NAME="AEN3316"
 ></A
 ><P
 ></P
@@ -2279,7 +2279,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3336"
+NAME="AEN3337"
 ></A
 ><H3
 ><A
@@ -2318,7 +2318,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3345"
+NAME="AEN3346"
 ></A
 ><P
 ></P
@@ -2407,7 +2407,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3366"
+NAME="AEN3367"
 ></A
 ><H3
 ><A
@@ -2450,7 +2450,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3376"
+NAME="AEN3377"
 ></A
 ><P
 ></P
@@ -2556,7 +2556,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3401"
+NAME="AEN3402"
 ></A
 ><H3
 ><A
@@ -2583,7 +2583,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3407"
+NAME="AEN3408"
 ></A
 ><P
 ></P
@@ -2621,7 +2621,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3416"
+NAME="AEN3417"
 ></A
 ><H3
 ><A
@@ -2648,7 +2648,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3422"
+NAME="AEN3423"
 ></A
 ><P
 ></P
@@ -2686,7 +2686,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3431"
+NAME="AEN3432"
 ></A
 ><H3
 ><A
@@ -2724,7 +2724,7 @@ the element.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3439"
+NAME="AEN3440"
 ></A
 ><P
 ></P
@@ -2796,7 +2796,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3456"
+NAME="AEN3457"
 ></A
 ><H3
 ><A
@@ -2831,7 +2831,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3464"
+NAME="AEN3465"
 ></A
 ><P
 ></P
@@ -2903,7 +2903,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3481"
+NAME="AEN3482"
 ></A
 ><H3
 ><A
@@ -2934,7 +2934,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3488"
+NAME="AEN3489"
 ></A
 ><P
 ></P
@@ -2989,7 +2989,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3501"
+NAME="AEN3502"
 ></A
 ><H3
 ><A
@@ -3020,7 +3020,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3508"
+NAME="AEN3509"
 ></A
 ><P
 ></P
@@ -3075,7 +3075,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3521"
+NAME="AEN3522"
 ></A
 ><H3
 ><A
@@ -3107,7 +3107,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3528"
+NAME="AEN3529"
 ></A
 ><P
 ></P
@@ -3179,7 +3179,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3545"
+NAME="AEN3546"
 ></A
 ><H3
 ><A
@@ -3212,7 +3212,7 @@ UNUSED: by default the DOM building will use characters</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3552"
+NAME="AEN3553"
 ></A
 ><P
 ></P
@@ -3284,7 +3284,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3569"
+NAME="AEN3570"
 ></A
 ><H3
 ><A
@@ -3319,7 +3319,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3577"
+NAME="AEN3578"
 ></A
 ><P
 ></P
@@ -3391,7 +3391,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3594"
+NAME="AEN3595"
 ></A
 ><H3
 ><A
@@ -3426,7 +3426,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3602"
+NAME="AEN3603"
 ></A
 ><P
 ></P
@@ -3498,7 +3498,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3619"
+NAME="AEN3620"
 ></A
 ><H3
 ><A
@@ -3529,7 +3529,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3626"
+NAME="AEN3627"
 ></A
 ><P
 ></P
@@ -3584,7 +3584,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3639"
+NAME="AEN3640"
 ></A
 ><H3
 ><A
@@ -3614,7 +3614,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3646"
+NAME="AEN3647"
 ></A
 ><P
 ></P
@@ -3667,7 +3667,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3659"
+NAME="AEN3660"
 ></A
 ><H3
 ><A
@@ -3699,7 +3699,7 @@ one read upon parsing.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3666"
+NAME="AEN3667"
 ></A
 ><P
 ></P
@@ -3769,7 +3769,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3683"
+NAME="AEN3684"
 ></A
 ><H3
 ><A
@@ -3804,7 +3804,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3691"
+NAME="AEN3692"
 ></A
 ><P
 ></P
@@ -3876,7 +3876,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3708"
+NAME="AEN3709"
 ></A
 ><H3
 ><A
@@ -3907,7 +3907,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3715"
+NAME="AEN3716"
 ></A
 ><P
 ></P
@@ -3962,7 +3962,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3728"
+NAME="AEN3729"
 ></A
 ><H3
 ><A
@@ -3994,7 +3994,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3735"
+NAME="AEN3736"
 ></A
 ><P
 ></P
@@ -4066,7 +4066,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3752"
+NAME="AEN3753"
 ></A
 ><H3
 ><A
@@ -4095,7 +4095,7 @@ HREF="libxml-parser.html#XMLSAXHANDLER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3758"
+NAME="AEN3759"
 ></A
 ><P
 ></P
@@ -4150,7 +4150,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3771"
+NAME="AEN3772"
 ></A
 ><H3
 ><A
@@ -4178,7 +4178,7 @@ HREF="libxml-parser.html#XMLSAXHANDLER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3777"
+NAME="AEN3778"
 ></A
 ><P
 ></P
@@ -4216,7 +4216,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3786"
+NAME="AEN3787"
 ></A
 ><H3
 ><A
@@ -4244,7 +4244,7 @@ HREF="libxml-parser.html#XMLSAXHANDLER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3792"
+NAME="AEN3793"
 ></A
 ><P
 ></P
@@ -4282,7 +4282,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3801"
+NAME="AEN3802"
 ></A
 ><H3
 ><A
@@ -4310,7 +4310,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3807"
+NAME="AEN3808"
 ></A
 ><H3
 ><A
@@ -4338,7 +4338,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3813"
+NAME="AEN3814"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-threads.html b/doc/html/libxml-threads.html
index c155b06e..e38263ff 100644
--- a/doc/html/libxml-threads.html
+++ b/doc/html/libxml-threads.html
@@ -123,7 +123,7 @@ NAME="LIBXML-THREADS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19905"
+NAME="AEN19929"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN19905"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19908"
+NAME="AEN19932"
 ></A
 ><H2
 >Synopsis</H2
@@ -256,7 +256,7 @@ HREF="libxml-threads.html#XMLGETGLOBALSTATE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19939"
+NAME="AEN19963"
 ></A
 ><H2
 >Description</H2
@@ -266,14 +266,14 @@ NAME="AEN19939"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19942"
+NAME="AEN19966"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19944"
+NAME="AEN19968"
 ></A
 ><H3
 ><A
@@ -299,7 +299,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19949"
+NAME="AEN19973"
 ></A
 ><H3
 ><A
@@ -331,7 +331,7 @@ synchronizing access to data.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19956"
+NAME="AEN19980"
 ></A
 ><H3
 ><A
@@ -359,7 +359,7 @@ HREF="libxml-threads.html#XMLMUTEXPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19962"
+NAME="AEN19986"
 ></A
 ><P
 ></P
@@ -395,7 +395,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19971"
+NAME="AEN19995"
 ></A
 ><H3
 ><A
@@ -428,7 +428,7 @@ HREF="libxml-threads.html#XMLMUTEXLOCK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19979"
+NAME="AEN20003"
 ></A
 ><P
 ></P
@@ -466,7 +466,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19988"
+NAME="AEN20012"
 ></A
 ><H3
 ><A
@@ -499,7 +499,7 @@ HREF="libxml-threads.html#XMLMUTEXUNLOCK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19996"
+NAME="AEN20020"
 ></A
 ><P
 ></P
@@ -537,7 +537,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20005"
+NAME="AEN20029"
 ></A
 ><H3
 ><A
@@ -571,7 +571,7 @@ struct.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20013"
+NAME="AEN20037"
 ></A
 ><P
 ></P
@@ -609,7 +609,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20022"
+NAME="AEN20046"
 ></A
 ><H3
 ><A
@@ -635,7 +635,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20027"
+NAME="AEN20051"
 ></A
 ><H3
 ><A
@@ -661,7 +661,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20032"
+NAME="AEN20056"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@ HREF="libxml-threads.html#XMLRMUTEXPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20038"
+NAME="AEN20062"
 ></A
 ><P
 ></P
@@ -725,7 +725,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20047"
+NAME="AEN20071"
 ></A
 ><H3
 ><A
@@ -758,7 +758,7 @@ HREF="libxml-threads.html#XMLRMUTEXLOCK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20055"
+NAME="AEN20079"
 ></A
 ><P
 ></P
@@ -796,7 +796,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20064"
+NAME="AEN20088"
 ></A
 ><H3
 ><A
@@ -829,7 +829,7 @@ HREF="libxml-threads.html#XMLRMUTEXUNLOCK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20072"
+NAME="AEN20096"
 ></A
 ><P
 ></P
@@ -867,7 +867,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20081"
+NAME="AEN20105"
 ></A
 ><H3
 ><A
@@ -895,7 +895,7 @@ HREF="libxml-threads.html#XMLRMUTEXPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20087"
+NAME="AEN20111"
 ></A
 ><P
 ></P
@@ -933,7 +933,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20096"
+NAME="AEN20120"
 ></A
 ><H3
 ><A
@@ -965,7 +965,7 @@ data of the libxml2 library.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20103"
+NAME="AEN20127"
 ></A
 ><H3
 ><A
@@ -997,7 +997,7 @@ library.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20110"
+NAME="AEN20134"
 ></A
 ><H3
 ><A
@@ -1029,7 +1029,7 @@ library.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20117"
+NAME="AEN20141"
 ></A
 ><H3
 ><A
@@ -1059,7 +1059,7 @@ HREF="libxml-threads.html#XMLGETTHREADID"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20124"
+NAME="AEN20148"
 ></A
 ><P
 ></P
@@ -1095,7 +1095,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20133"
+NAME="AEN20157"
 ></A
 ><H3
 ><A
@@ -1119,13 +1119,13 @@ CLASS="PROGRAMLISTING"
 ><A
 HREF="libxml-threads.html#XMLISMAINTHREAD"
 >xmlIsMainThread</A
->() check wether the current thread is the main thread.</P
+>() check whether the current thread is the main thread.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20140"
+NAME="AEN20164"
 ></A
 ><P
 ></P
@@ -1161,7 +1161,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20149"
+NAME="AEN20173"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@ data of the libxml2 library once processing has ended.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20156"
+NAME="AEN20180"
 ></A
 ><H3
 ><A
@@ -1226,7 +1226,7 @@ HREF="libxml-threads.html#XMLGETGLOBALSTATE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20164"
+NAME="AEN20188"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 8dcf9873..dd0cc257 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -123,7 +123,7 @@ NAME="LIBXML-TREE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3824"
+NAME="AEN3825"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN3824"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3827"
+NAME="AEN3828"
 ></A
 ><H2
 >Synopsis</H2
@@ -1597,10 +1597,7 @@ HREF="libxml-tree.html#XMLNODESETSPACEPRESERVE"
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > cur,
-                                             <GTKDOCLINK
-HREF="INTVAL"
->intval</GTKDOCLINK
->);
+                                             int val);
 <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
@@ -1632,7 +1629,7 @@ HREF="libxml-tree.html#XMLREMOVEPROP"
 >                   (<A
 HREF="libxml-tree.html#XMLATTRPTR"
 >xmlAttrPtr</A
-> attr);
+> cur);
 int         <A
 HREF="libxml-tree.html#XMLUNSETPROP"
 >xmlUnsetProp</A
@@ -2079,7 +2076,7 @@ CLASS="PROGRAMLISTING"
     const char *directory;            /* the directory/base of the file */
     const xmlChar *base;              /* Base of the array to parse */
     const xmlChar *cur;               /* Current char being parsed */
-    const xmlChar *end;               /* end of the arry to parse */
+    const xmlChar *end;               /* end of the array to parse */
     int length;                       /* length if known */
     int line;                         /* Current line */
     int col;                          /* Current column */
@@ -2747,7 +2744,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Possible definitions of element content occurences</P
+>Possible definitions of element content occurrences</P
 ><P
 ></P
 ></DIV
@@ -2844,7 +2841,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->the differnt possibility for an element content type</P
+>the different possibilities for an element content type</P
 ><P
 ></P
 ></DIV
@@ -3002,7 +2999,7 @@ CLASS="PROGRAMLISTING"
 ><P
 >An XML namespace.
 Note that prefix == NULL is valid, it defines the default namespace
-within the subtree (until overriden).</P
+within the subtree (until overridden).</P
 ><P
 >xmlNsType is unified with xmlElementType</P
 ><P
@@ -3077,7 +3074,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->An XML DtD, as defined by &lt;!DOCTYPE ... There is actually one for
+>An XML DTD, as defined by &lt;!DOCTYPE ... There is actually one for
 the internal subset and for the external subset</P
 ><P
 ></P
@@ -3196,7 +3193,7 @@ CLASS="PROGRAMLISTING"
 >struct xmlID {
     struct _xmlID    *next;	/* next ID */
     const xmlChar    *value;	/* The ID name */
-    xmlAttrPtr        attr;	/* The attribut holding it */
+    xmlAttrPtr        attr;	/* The attribute holding it */
 };</PRE
 ></TD
 ></TR
@@ -3254,7 +3251,7 @@ CLASS="PROGRAMLISTING"
 >struct xmlRef {
     struct _xmlRef    *next;	/* next Ref */
     const xmlChar     *value;	/* The Ref name */
-    xmlAttrPtr        attr;	/* The attribut holding it */
+    xmlAttrPtr        attr;	/* The attribute holding it */
 };</PRE
 ></TD
 ></TR
@@ -3410,14 +3407,14 @@ CLASS="PROGRAMLISTING"
     struct _xmlNode *next;	/* next sibling link  */
     struct _xmlNode *prev;	/* previous sibling link  */
     struct _xmlDoc  *doc;	/* the containing document */
+
+    /* End of common part */
     xmlNs           *ns;        /* pointer to the associated namespace */
 #ifndef XML_USE_BUFFER_CONTENT    
     xmlChar         *content;   /* the content */
 #else
     xmlBufferPtr     content;   /* the content in a buffer */
 #endif
-
-    /* End of common part */
     struct _xmlAttr *properties;/* properties list */
     xmlNs           *nsDef;     /* namespace definitions on this node */
 };</PRE
@@ -4042,7 +4039,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ></TR
 ></TABLE
 ><P
->Resize a buffer to accomodate minimum size of <TT
+>Resize a buffer to accommodate minimum size of <TT
 CLASS="PARAMETER"
 ><I
 >size</I
@@ -4284,7 +4281,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>the number of <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> written</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4295,7 +4295,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4750"
+NAME="AEN4751"
 ></A
 ><H3
 ><A
@@ -4331,7 +4331,7 @@ str is recomputed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4758"
+NAME="AEN4759"
 ></A
 ><P
 ></P
@@ -4375,7 +4375,10 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>  the <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> string</TD
 ></TR
 ><TR
 ><TD
@@ -4392,7 +4395,10 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>  the number of <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4403,7 +4409,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4775"
+NAME="AEN4778"
 ></A
 ><H3
 ><A
@@ -4444,7 +4450,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4784"
+NAME="AEN4787"
 ></A
 ><P
 ></P
@@ -4488,7 +4494,10 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>  the <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> string</TD
 ></TR
 ><TR
 ><TD
@@ -4505,7 +4514,10 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>  the number of <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4516,7 +4528,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4801"
+NAME="AEN4806"
 ></A
 ><H3
 ><A
@@ -4550,7 +4562,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4809"
+NAME="AEN4814"
 ></A
 ><P
 ></P
@@ -4594,7 +4606,10 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>  the <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4605,7 +4620,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4822"
+NAME="AEN4828"
 ></A
 ><H3
 ><A
@@ -4636,7 +4651,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4829"
+NAME="AEN4835"
 ></A
 ><P
 ></P
@@ -4691,7 +4706,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4842"
+NAME="AEN4848"
 ></A
 ><H3
 ><A
@@ -4722,7 +4737,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4849"
+NAME="AEN4855"
 ></A
 ><P
 ></P
@@ -4781,7 +4796,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar removed, or -1 in case of failure.</TD
+>the number of <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> removed, or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4792,7 +4810,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4866"
+NAME="AEN4873"
 ></A
 ><H3
 ><A
@@ -4823,7 +4841,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4873"
+NAME="AEN4880"
 ></A
 ><P
 ></P
@@ -4893,7 +4911,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4890"
+NAME="AEN4897"
 ></A
 ><H3
 ><A
@@ -4923,7 +4941,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4897"
+NAME="AEN4904"
 ></A
 ><P
 ></P
@@ -4961,7 +4979,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4906"
+NAME="AEN4913"
 ></A
 ><H3
 ><A
@@ -4994,7 +5012,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4914"
+NAME="AEN4921"
 ></A
 ><P
 ></P
@@ -5047,7 +5065,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4927"
+NAME="AEN4934"
 ></A
 ><H3
 ><A
@@ -5081,7 +5099,7 @@ HREF="libxml-tree.html#XMLBUFFERALLOCATIONSCHEME"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4935"
+NAME="AEN4942"
 ></A
 ><P
 ></P
@@ -5136,7 +5154,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4948"
+NAME="AEN4955"
 ></A
 ><H3
 ><A
@@ -5166,7 +5184,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4955"
+NAME="AEN4962"
 ></A
 ><P
 ></P
@@ -5219,7 +5237,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4968"
+NAME="AEN4975"
 ></A
 ><H3
 ><A
@@ -5264,7 +5282,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4979"
+NAME="AEN4986"
 ></A
 ><P
 ></P
@@ -5368,7 +5386,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5004"
+NAME="AEN5011"
 ></A
 ><H3
 ><A
@@ -5417,7 +5435,7 @@ HREF="libxml-tree.html#XMLCREATEINTSUBSET"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5016"
+NAME="AEN5023"
 ></A
 ><P
 ></P
@@ -5521,7 +5539,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5041"
+NAME="AEN5048"
 ></A
 ><H3
 ><A
@@ -5554,7 +5572,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5049"
+NAME="AEN5056"
 ></A
 ><P
 ></P
@@ -5607,7 +5625,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5062"
+NAME="AEN5069"
 ></A
 ><H3
 ><A
@@ -5637,7 +5655,7 @@ HREF="libxml-tree.html#XMLDTDPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5069"
+NAME="AEN5076"
 ></A
 ><P
 ></P
@@ -5675,7 +5693,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5078"
+NAME="AEN5085"
 ></A
 ><H3
 ><A
@@ -5718,7 +5736,7 @@ It now create a namespace on the root element of the document if found.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5088"
+NAME="AEN5095"
 ></A
 ><P
 ></P
@@ -5794,7 +5812,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL this functionnality had been removed</TD
+>NULL this functionality had been removed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5805,7 +5823,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5109"
+NAME="AEN5116"
 ></A
 ><H3
 ><A
@@ -5850,7 +5868,7 @@ was not defined.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5119"
+NAME="AEN5126"
 ></A
 ><P
 ></P
@@ -5926,7 +5944,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->returns a new namespace pointer or NULL</TD
+>a new namespace pointer or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5937,7 +5955,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5140"
+NAME="AEN5147"
 ></A
 ><H3
 ><A
@@ -5967,7 +5985,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5147"
+NAME="AEN5154"
 ></A
 ><P
 ></P
@@ -6005,7 +6023,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5156"
+NAME="AEN5163"
 ></A
 ><H3
 ><A
@@ -6035,7 +6053,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5163"
+NAME="AEN5170"
 ></A
 ><P
 ></P
@@ -6073,7 +6091,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5172"
+NAME="AEN5179"
 ></A
 ><H3
 ><A
@@ -6106,7 +6124,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5180"
+NAME="AEN5187"
 ></A
 ><P
 ></P
@@ -6159,7 +6177,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5193"
+NAME="AEN5200"
 ></A
 ><H3
 ><A
@@ -6189,7 +6207,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5200"
+NAME="AEN5207"
 ></A
 ><P
 ></P
@@ -6216,8 +6234,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document
-@:  </TD
+>  pointer to the document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6228,7 +6245,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5209"
+NAME="AEN5216"
 ></A
 ><H3
 ><A
@@ -6269,7 +6286,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5219"
+NAME="AEN5226"
 ></A
 ><P
 ></P
@@ -6356,7 +6373,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5240"
+NAME="AEN5247"
 ></A
 ><H3
 ><A
@@ -6397,7 +6414,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5250"
+NAME="AEN5257"
 ></A
 ><P
 ></P
@@ -6484,7 +6501,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5271"
+NAME="AEN5278"
 ></A
 ><H3
 ><A
@@ -6529,7 +6546,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5282"
+NAME="AEN5289"
 ></A
 ><P
 ></P
@@ -6633,7 +6650,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5307"
+NAME="AEN5314"
 ></A
 ><H3
 ><A
@@ -6663,7 +6680,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5314"
+NAME="AEN5321"
 ></A
 ><P
 ></P
@@ -6701,7 +6718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5323"
+NAME="AEN5330"
 ></A
 ><H3
 ><A
@@ -6731,7 +6748,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5330"
+NAME="AEN5337"
 ></A
 ><P
 ></P
@@ -6769,7 +6786,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5339"
+NAME="AEN5346"
 ></A
 ><H3
 ><A
@@ -6806,7 +6823,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5348"
+NAME="AEN5355"
 ></A
 ><P
 ></P
@@ -6865,7 +6882,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6876,7 +6896,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5365"
+NAME="AEN5373"
 ></A
 ><H3
 ><A
@@ -6913,7 +6933,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5374"
+NAME="AEN5382"
 ></A
 ><P
 ></P
@@ -6972,7 +6992,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6983,7 +7006,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5391"
+NAME="AEN5400"
 ></A
 ><H3
 ><A
@@ -7016,7 +7039,7 @@ HREF="libxml-tree.html#XMLDTDPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5399"
+NAME="AEN5408"
 ></A
 ><P
 ></P
@@ -7058,7 +7081,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDtdPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7069,7 +7095,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5412"
+NAME="AEN5422"
 ></A
 ><H3
 ><A
@@ -7098,13 +7124,13 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ></TABLE
 ><P
 >Do a copy of the document info. If recursive, the content tree will
-be copied too as well as Dtd, namespaces and entities.</P
+be copied too as well as DTD, namespaces and entities.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5420"
+NAME="AEN5430"
 ></A
 ><P
 ></P
@@ -7163,7 +7189,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDocPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7174,7 +7203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5437"
+NAME="AEN5448"
 ></A
 ><H3
 ><A
@@ -7224,7 +7253,7 @@ CLASS="PARAMETER"
 >content</I
 ></TT
 >
-are optionnal (NULL).
+are optional (NULL).
 NOTE: <TT
 CLASS="PARAMETER"
 ><I
@@ -7245,7 +7274,7 @@ need entities support.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5453"
+NAME="AEN5464"
 ></A
 ><P
 ></P
@@ -7349,7 +7378,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5478"
+NAME="AEN5489"
 ></A
 ><H3
 ><A
@@ -7399,13 +7428,13 @@ CLASS="PARAMETER"
 >content</I
 ></TT
 >
-are optionnal (NULL).</P
+are optional (NULL).</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5491"
+NAME="AEN5502"
 ></A
 ><P
 ></P
@@ -7509,7 +7538,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5516"
+NAME="AEN5527"
 ></A
 ><H3
 ><A
@@ -7545,13 +7574,13 @@ CLASS="PARAMETER"
 ><I
 >ns</I
 ></TT
-> is optionnal (NULL).</P
+> is optional (NULL).</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5526"
+NAME="AEN5537"
 ></A
 ><P
 ></P
@@ -7621,7 +7650,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5543"
+NAME="AEN5554"
 ></A
 ><H3
 ><A
@@ -7676,7 +7705,7 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
-> parameters are optionnal (NULL). If content is non NULL,
+> parameters are optional (NULL). If content is non NULL,
 a child list containing the TEXTs and ENTITY_REFs node will be created.
 NOTE: <TT
 CLASS="PARAMETER"
@@ -7698,7 +7727,7 @@ support is not needed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5560"
+NAME="AEN5571"
 ></A
 ><P
 ></P
@@ -7802,7 +7831,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5585"
+NAME="AEN5596"
 ></A
 ><H3
 ><A
@@ -7857,14 +7886,14 @@ CLASS="PARAMETER"
 ><I
 >content</I
 ></TT
-> parameters are optionnal (NULL). If content is non NULL,
+> parameters are optional (NULL). If content is non NULL,
 a child TEXT node will be created containing the string content.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5599"
+NAME="AEN5610"
 ></A
 ><P
 ></P
@@ -7968,7 +7997,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5624"
+NAME="AEN5635"
 ></A
 ><H3
 ><A
@@ -8005,7 +8034,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5633"
+NAME="AEN5644"
 ></A
 ><P
 ></P
@@ -8075,7 +8104,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5650"
+NAME="AEN5661"
 ></A
 ><H3
 ><A
@@ -8108,7 +8137,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5658"
+NAME="AEN5669"
 ></A
 ><P
 ></P
@@ -8161,7 +8190,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5671"
+NAME="AEN5682"
 ></A
 ><H3
 ><A
@@ -8198,7 +8227,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5680"
+NAME="AEN5691"
 ></A
 ><P
 ></P
@@ -8268,7 +8297,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5697"
+NAME="AEN5708"
 ></A
 ><H3
 ><A
@@ -8307,7 +8336,7 @@ text node pertain to a given document.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5706"
+NAME="AEN5717"
 ></A
 ><P
 ></P
@@ -8394,7 +8423,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5727"
+NAME="AEN5738"
 ></A
 ><H3
 ><A
@@ -8428,7 +8457,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5735"
+NAME="AEN5746"
 ></A
 ><P
 ></P
@@ -8498,7 +8527,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5752"
+NAME="AEN5763"
 ></A
 ><H3
 ><A
@@ -8529,13 +8558,13 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Creation of a new node containing a commentwithin a document.</P
+>Creation of a new node containing a comment within a document.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5761"
+NAME="AEN5772"
 ></A
 ><P
 ></P
@@ -8605,7 +8634,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5778"
+NAME="AEN5789"
 ></A
 ><H3
 ><A
@@ -8638,7 +8667,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5786"
+NAME="AEN5797"
 ></A
 ><P
 ></P
@@ -8691,7 +8720,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5799"
+NAME="AEN5810"
 ></A
 ><H3
 ><A
@@ -8723,13 +8752,13 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Creation of a new node containing a CData block.</P
+>Creation of a new node containing a CDATA block.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5808"
+NAME="AEN5819"
 ></A
 ><P
 ></P
@@ -8773,7 +8802,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the CData block content content</TD
+>  the CDATA block content content</TD
 ></TR
 ><TR
 ><TD
@@ -8816,7 +8845,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5829"
+NAME="AEN5840"
 ></A
 ><H3
 ><A
@@ -8853,7 +8882,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5838"
+NAME="AEN5849"
 ></A
 ><P
 ></P
@@ -8923,7 +8952,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5855"
+NAME="AEN5866"
 ></A
 ><H3
 ><A
@@ -8960,7 +8989,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5864"
+NAME="AEN5875"
 ></A
 ><P
 ></P
@@ -9030,7 +9059,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5881"
+NAME="AEN5892"
 ></A
 ><H3
 ><A
@@ -9064,7 +9093,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5889"
+NAME="AEN5900"
 ></A
 ><P
 ></P
@@ -9123,7 +9152,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9134,7 +9166,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5906"
+NAME="AEN5918"
 ></A
 ><H3
 ><A
@@ -9172,7 +9204,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5915"
+NAME="AEN5927"
 ></A
 ><P
 ></P
@@ -9216,7 +9248,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9248,7 +9280,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9259,7 +9294,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5936"
+NAME="AEN5949"
 ></A
 ><H3
 ><A
@@ -9292,7 +9327,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5944"
+NAME="AEN5957"
 ></A
 ><P
 ></P
@@ -9334,7 +9369,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9345,7 +9383,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5957"
+NAME="AEN5971"
 ></A
 ><H3
 ><A
@@ -9378,7 +9416,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5965"
+NAME="AEN5979"
 ></A
 ><P
 ></P
@@ -9431,7 +9469,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5978"
+NAME="AEN5992"
 ></A
 ><H3
 ><A
@@ -9459,13 +9497,13 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TABLE
 ><P
 >Get line number of node. this requires activation of this option
-before inoking the parser by calling xmlLineNumbersDefault(1)</P
+before invoking the parser by calling xmlLineNumbersDefault(1)</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5986"
+NAME="AEN6000"
 ></A
 ><P
 ></P
@@ -9507,7 +9545,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the line number if sucessfull, -1 otherwise</TD
+>the line number if successful, -1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9518,7 +9556,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5999"
+NAME="AEN6013"
 ></A
 ><H3
 ><A
@@ -9551,7 +9589,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6007"
+NAME="AEN6021"
 ></A
 ><P
 ></P
@@ -9605,7 +9643,7 @@ the returned string</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6020"
+NAME="AEN6034"
 ></A
 ><H3
 ><A
@@ -9639,7 +9677,7 @@ containing possibly comments, PIs, etc ...).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6028"
+NAME="AEN6042"
 ></A
 ><P
 ></P
@@ -9681,7 +9719,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNodePtr for the root or NULL</TD
+>the <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> for the root or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9692,7 +9733,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6041"
+NAME="AEN6056"
 ></A
 ><H3
 ><A
@@ -9725,7 +9766,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6049"
+NAME="AEN6064"
 ></A
 ><P
 ></P
@@ -9778,7 +9819,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6062"
+NAME="AEN6077"
 ></A
 ><H3
 ><A
@@ -9808,7 +9849,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6069"
+NAME="AEN6084"
 ></A
 ><P
 ></P
@@ -9861,7 +9902,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6082"
+NAME="AEN6097"
 ></A
 ><H3
 ><A
@@ -9892,7 +9933,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6089"
+NAME="AEN6104"
 ></A
 ><P
 ></P
@@ -9945,7 +9986,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6102"
+NAME="AEN6117"
 ></A
 ><H3
 ><A
@@ -9983,7 +10024,7 @@ containing possibly comments, PIs, etc ...).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6111"
+NAME="AEN6126"
 ></A
 ><P
 ></P
@@ -10053,7 +10094,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6128"
+NAME="AEN6143"
 ></A
 ><H3
 ><A
@@ -10087,7 +10128,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6136"
+NAME="AEN6151"
 ></A
 ><P
 ></P
@@ -10142,7 +10183,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6149"
+NAME="AEN6164"
 ></A
 ><H3
 ><A
@@ -10190,7 +10231,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6160"
+NAME="AEN6175"
 ></A
 ><P
 ></P
@@ -10260,7 +10301,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6177"
+NAME="AEN6192"
 ></A
 ><H3
 ><A
@@ -10303,7 +10344,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6187"
+NAME="AEN6202"
 ></A
 ><P
 ></P
@@ -10373,7 +10414,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6204"
+NAME="AEN6219"
 ></A
 ><H3
 ><A
@@ -10405,14 +10446,19 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TABLE
 ><P
 >Unlink the old node from it's current context, prune the new one
-at the same place. If cur was already inserted in a document it is
+at the same place. If <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+> was already inserted in a document it is
 first unlinked from its existing context.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6213"
+NAME="AEN6229"
 ></A
 ><P
 ></P
@@ -10471,7 +10517,12 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old node</TD
+>the <TT
+CLASS="PARAMETER"
+><I
+>old</I
+></TT
+> node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10482,7 +10533,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6230"
+NAME="AEN6247"
 ></A
 ><H3
 ><A
@@ -10537,7 +10588,7 @@ first unlinked from its existing context.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6242"
+NAME="AEN6259"
 ></A
 ><P
 ></P
@@ -10607,7 +10658,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6259"
+NAME="AEN6276"
 ></A
 ><H3
 ><A
@@ -10662,7 +10713,7 @@ first unlinked from its existing context.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6271"
+NAME="AEN6288"
 ></A
 ><P
 ></P
@@ -10732,7 +10783,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6288"
+NAME="AEN6305"
 ></A
 ><H3
 ><A
@@ -10787,7 +10838,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6300"
+NAME="AEN6317"
 ></A
 ><P
 ></P
@@ -10857,7 +10908,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6317"
+NAME="AEN6334"
 ></A
 ><H3
 ><A
@@ -10887,7 +10938,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6324"
+NAME="AEN6341"
 ></A
 ><P
 ></P
@@ -10925,7 +10976,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6333"
+NAME="AEN6350"
 ></A
 ><H3
 ><A
@@ -10962,7 +11013,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6342"
+NAME="AEN6359"
 ></A
 ><P
 ></P
@@ -11032,7 +11083,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6359"
+NAME="AEN6376"
 ></A
 ><H3
 ><A
@@ -11067,7 +11118,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6367"
+NAME="AEN6384"
 ></A
 ><P
 ></P
@@ -11144,7 +11195,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6385"
+NAME="AEN6402"
 ></A
 ><H3
 ><A
@@ -11175,7 +11226,7 @@ the children are freed too.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6392"
+NAME="AEN6409"
 ></A
 ><P
 ></P
@@ -11213,7 +11264,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6401"
+NAME="AEN6418"
 ></A
 ><H3
 ><A
@@ -11247,7 +11298,7 @@ HREF="libxml-tree.html#XMLUNLINKNODE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6409"
+NAME="AEN6426"
 ></A
 ><P
 ></P
@@ -11285,7 +11336,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6418"
+NAME="AEN6435"
 ></A
 ><H3
 ><A
@@ -11319,7 +11370,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6426"
+NAME="AEN6443"
 ></A
 ><P
 ></P
@@ -11374,7 +11425,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6439"
+NAME="AEN6456"
 ></A
 ><H3
 ><A
@@ -11408,7 +11459,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6447"
+NAME="AEN6464"
 ></A
 ><P
 ></P
@@ -11435,7 +11486,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first element</TD
 ></TR
 ><TR
 ><TD
@@ -11463,7 +11514,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6460"
+NAME="AEN6477"
 ></A
 ><H3
 ><A
@@ -11515,7 +11566,7 @@ is generated to cover this case.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6471"
+NAME="AEN6488"
 ></A
 ><P
 ></P
@@ -11602,7 +11653,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6492"
+NAME="AEN6509"
 ></A
 ><H3
 ><A
@@ -11644,7 +11695,7 @@ the defined namespace or return NULL otherwise.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6502"
+NAME="AEN6519"
 ></A
 ><P
 ></P
@@ -11731,7 +11782,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6523"
+NAME="AEN6540"
 ></A
 ><H3
 ><A
@@ -11768,7 +11819,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6532"
+NAME="AEN6549"
 ></A
 ><P
 ></P
@@ -11827,7 +11878,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an NULL terminated array of all the xmlNsPtr found
+>an NULL terminated array of all the <A
+HREF="libxml-tree.html#XMLNSPTR"
+>xmlNsPtr</A
+> found
 that need to be freed by the caller or NULL if no
 namespace if defined</TD
 ></TR
@@ -11840,7 +11894,7 @@ namespace if defined</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6549"
+NAME="AEN6567"
 ></A
 ><H3
 ><A
@@ -11874,7 +11928,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6557"
+NAME="AEN6575"
 ></A
 ><P
 ></P
@@ -11929,7 +11983,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6570"
+NAME="AEN6588"
 ></A
 ><H3
 ><A
@@ -11962,7 +12016,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6578"
+NAME="AEN6596"
 ></A
 ><P
 ></P
@@ -12004,7 +12058,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLNSPTR"
+>xmlNsPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12015,7 +12072,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6591"
+NAME="AEN6610"
 ></A
 ><H3
 ><A
@@ -12048,7 +12105,7 @@ HREF="libxml-tree.html#XMLNSPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6599"
+NAME="AEN6618"
 ></A
 ><P
 ></P
@@ -12090,7 +12147,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+> a new <A
+HREF="libxml-tree.html#XMLNSPTR"
+>xmlNsPtr</A
+>, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12101,7 +12161,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6612"
+NAME="AEN6632"
 ></A
 ><H3
 ><A
@@ -12142,7 +12202,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6622"
+NAME="AEN6642"
 ></A
 ><P
 ></P
@@ -12229,7 +12289,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6643"
+NAME="AEN6663"
 ></A
 ><H3
 ><A
@@ -12272,7 +12332,7 @@ default declaration values unless DTD use has been turned off.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6653"
+NAME="AEN6673"
 ></A
 ><P
 ></P
@@ -12343,7 +12403,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6670"
+NAME="AEN6690"
 ></A
 ><H3
 ><A
@@ -12385,7 +12445,7 @@ default declaration values unless DTD use has been turned off.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6680"
+NAME="AEN6700"
 ></A
 ><P
 ></P
@@ -12456,7 +12516,7 @@ neither was found.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6697"
+NAME="AEN6717"
 ></A
 ><H3
 ><A
@@ -12504,7 +12564,7 @@ default declaration values unless DTD use has been turned off.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6708"
+NAME="AEN6728"
 ></A
 ><P
 ></P
@@ -12592,7 +12652,7 @@ if neither was found.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6729"
+NAME="AEN6749"
 ></A
 ><H3
 ><A
@@ -12638,7 +12698,7 @@ The ns structure must be in scope, this is not checked.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6740"
+NAME="AEN6760"
 ></A
 ><P
 ></P
@@ -12742,7 +12802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6765"
+NAME="AEN6785"
 ></A
 ><H3
 ><A
@@ -12790,7 +12850,7 @@ default declaration values unless DTD use has been turned off.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6776"
+NAME="AEN6796"
 ></A
 ><P
 ></P
@@ -12878,7 +12938,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6797"
+NAME="AEN6817"
 ></A
 ><H3
 ><A
@@ -12916,7 +12976,7 @@ produce a flat tree with only TEXTs and ENTITY_REFs.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6806"
+NAME="AEN6826"
 ></A
 ><P
 ></P
@@ -12986,7 +13046,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6823"
+NAME="AEN6843"
 ></A
 ><H3
 ><A
@@ -13025,7 +13085,7 @@ produce a flat tree with only TEXTs and ENTITY_REFs.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6832"
+NAME="AEN6852"
 ></A
 ><P
 ></P
@@ -13112,7 +13172,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6853"
+NAME="AEN6873"
 ></A
 ><H3
 ><A
@@ -13151,7 +13211,7 @@ made of TEXTs and ENTITY_REFs</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6862"
+NAME="AEN6882"
 ></A
 ><P
 ></P
@@ -13227,7 +13287,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>a pointer to the string copy, the caller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13238,7 +13298,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6883"
+NAME="AEN6903"
 ></A
 ><H3
 ><A
@@ -13281,7 +13341,7 @@ this function doesn't do any character encoding handling.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6893"
+NAME="AEN6913"
 ></A
 ><P
 ></P
@@ -13357,7 +13417,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>a pointer to the string copy, the caller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13368,7 +13428,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6914"
+NAME="AEN6934"
 ></A
 ><H3
 ><A
@@ -13402,7 +13462,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6922"
+NAME="AEN6942"
 ></A
 ><P
 ></P
@@ -13457,7 +13517,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6935"
+NAME="AEN6955"
 ></A
 ><H3
 ><A
@@ -13492,7 +13552,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6943"
+NAME="AEN6963"
 ></A
 ><P
 ></P
@@ -13569,7 +13629,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6961"
+NAME="AEN6981"
 ></A
 ><H3
 ><A
@@ -13603,7 +13663,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6969"
+NAME="AEN6989"
 ></A
 ><P
 ></P
@@ -13658,7 +13718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6982"
+NAME="AEN7002"
 ></A
 ><H3
 ><A
@@ -13693,7 +13753,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6990"
+NAME="AEN7010"
 ></A
 ><P
 ></P
@@ -13770,7 +13830,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7008"
+NAME="AEN7028"
 ></A
 ><H3
 ><A
@@ -13800,13 +13860,13 @@ HREF="libxml-tree.html#XMLNODEPTR"
 >Read the value of a node, this can be either the text carried
 directly by this node if it's a TEXT node or the aggregate string
 of the values carried by this node child's (TEXT and ENTITY_REF).
-Entity references are substitued.</P
+Entity references are substituted.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7016"
+NAME="AEN7036"
 ></A
 ><P
 ></P
@@ -13848,7 +13908,10 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL if no content is available.
+>a new <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> * or NULL if no content is available.
 It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
@@ -13860,7 +13923,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7029"
+NAME="AEN7050"
 ></A
 ><H3
 ><A
@@ -13894,7 +13957,7 @@ attribute or the one carried by the nearest ancestor.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7037"
+NAME="AEN7058"
 ></A
 ><P
 ></P
@@ -13948,7 +14011,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7050"
+NAME="AEN7071"
 ></A
 ><H3
 ><A
@@ -13983,7 +14046,7 @@ attribute.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7058"
+NAME="AEN7079"
 ></A
 ><P
 ></P
@@ -14027,7 +14090,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the langage description</TD
+>  the language description</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14038,7 +14101,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7071"
+NAME="AEN7092"
 ></A
 ><H3
 ><A
@@ -14070,7 +14133,7 @@ ancestor.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7078"
+NAME="AEN7099"
 ></A
 ><P
 ></P
@@ -14112,7 +14175,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
+>-1 if xml:space is not inherited, 0 if "default", 1 if "preserve"</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14123,7 +14186,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7091"
+NAME="AEN7112"
 ></A
 ><H3
 ><A
@@ -14143,10 +14206,7 @@ CLASS="PROGRAMLISTING"
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > cur,
-                                             <GTKDOCLINK
-HREF="INTVAL"
->intval</GTKDOCLINK
->);</PRE
+                                             int val);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -14158,7 +14218,7 @@ value of the xml:space attribute.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7099"
+NAME="AEN7119"
 ></A
 ><P
 ></P
@@ -14195,14 +14255,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->Param2</I
+>val</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xml:space value ("0": default, 1: "preserve")</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14213,7 +14273,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7112"
+NAME="AEN7132"
 ></A
 ><H3
 ><A
@@ -14260,7 +14320,7 @@ HREF="XMLDOCUMENTGETBASE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7122"
+NAME="AEN7142"
 ></A
 ><P
 ></P
@@ -14331,7 +14391,7 @@ It's up to the caller to free the memory.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7139"
+NAME="AEN7159"
 ></A
 ><H3
 ><A
@@ -14366,7 +14426,7 @@ xml:base attribute.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7147"
+NAME="AEN7167"
 ></A
 ><P
 ></P
@@ -14421,7 +14481,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7160"
+NAME="AEN7180"
 ></A
 ><H3
 ><A
@@ -14440,7 +14500,7 @@ CLASS="PROGRAMLISTING"
 >int         xmlRemoveProp                   (<A
 HREF="libxml-tree.html#XMLATTRPTR"
 >xmlAttrPtr</A
-> attr);</PRE
+> cur);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -14452,7 +14512,7 @@ Note this doesn't work for namespace definition attributes</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7167"
+NAME="AEN7187"
 ></A
 ><P
 ></P
@@ -14472,14 +14532,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->attr</I
+>cur</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute</TD
 ></TR
 ><TR
 ><TD
@@ -14505,7 +14565,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7180"
+NAME="AEN7200"
 ></A
 ><H3
 ><A
@@ -14539,7 +14599,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7188"
+NAME="AEN7208"
 ></A
 ><P
 ></P
@@ -14609,7 +14669,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7205"
+NAME="AEN7225"
 ></A
 ><H3
 ><A
@@ -14647,7 +14707,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7214"
+NAME="AEN7234"
 ></A
 ><P
 ></P
@@ -14734,7 +14794,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7235"
+NAME="AEN7255"
 ></A
 ><H3
 ><A
@@ -14770,7 +14830,7 @@ xmlChars at the end of the buffer.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7243"
+NAME="AEN7263"
 ></A
 ><P
 ></P
@@ -14825,7 +14885,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7256"
+NAME="AEN7276"
 ></A
 ><H3
 ><A
@@ -14860,7 +14920,7 @@ xmlChars at the end of the buffer.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7264"
+NAME="AEN7284"
 ></A
 ><P
 ></P
@@ -14915,7 +14975,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7277"
+NAME="AEN7297"
 ></A
 ><H3
 ><A
@@ -14947,7 +15007,7 @@ C chars at the end of the array.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7284"
+NAME="AEN7304"
 ></A
 ><P
 ></P
@@ -15002,7 +15062,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7297"
+NAME="AEN7317"
 ></A
 ><H3
 ><A
@@ -15031,14 +15091,17 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TABLE
 ><P
 >routine which manage and grows an output buffer. This one writes
-a quoted or double quoted xmlChar string, checking first if it holds
+a quoted or double quoted <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> string, checking first if it holds
 quote or double-quotes internally</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7305"
+NAME="AEN7326"
 ></A
 ><P
 ></P
@@ -15093,7 +15156,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7318"
+NAME="AEN7339"
 ></A
 ><H3
 ><A
@@ -15125,7 +15188,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 tree are properly declared. This is needed for example after Copy or Cut
 and then paste operations. The subtree may still hold pointers to
 namespace declarations outside the subtree or invalid/masked. As much
-as possible the function try tu reuse the existing namespaces found in
+as possible the function try to reuse the existing namespaces found in
 the new environment. If not possible the new namespaces are redeclared
 on <TT
 CLASS="PARAMETER"
@@ -15138,7 +15201,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7327"
+NAME="AEN7348"
 ></A
 ><P
 ></P
@@ -15208,7 +15271,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7344"
+NAME="AEN7365"
 ></A
 ><H3
 ><A
@@ -15238,14 +15301,17 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Dump an XML document in memory and return the xmlChar * and it's size.
+>Dump an XML document in memory and return the <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> * and it's size.
 It's up to the caller to free the memory.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7352"
+NAME="AEN7374"
 ></A
 ><P
 ></P
@@ -15334,7 +15400,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7373"
+NAME="AEN7395"
 ></A
 ><H3
 ><A
@@ -15363,14 +15429,17 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Dump an XML document in memory and return the xmlChar * and it's size.
+>Dump an XML document in memory and return the <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> * and it's size.
 It's up to the caller to free the memory.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7381"
+NAME="AEN7404"
 ></A
 ><P
 ></P
@@ -15442,7 +15511,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7398"
+NAME="AEN7421"
 ></A
 ><H3
 ><A
@@ -15480,7 +15549,7 @@ allocated memory.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7406"
+NAME="AEN7429"
 ></A
 ><P
 ></P
@@ -15569,7 +15638,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7427"
+NAME="AEN7450"
 ></A
 ><H3
 ><A
@@ -15608,7 +15677,7 @@ allocated memory.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7435"
+NAME="AEN7458"
 ></A
 ><P
 ></P
@@ -15714,7 +15783,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7460"
+NAME="AEN7483"
 ></A
 ><H3
 ><A
@@ -15748,7 +15817,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7468"
+NAME="AEN7491"
 ></A
 ><P
 ></P
@@ -15807,7 +15876,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15818,7 +15887,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7485"
+NAME="AEN7508"
 ></A
 ><H3
 ><A
@@ -15850,13 +15919,13 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->Dump an XML/HTML node, recursive behaviour,children are printed too.</P
+>Dump an XML/HTML node, recursive behaviour, children are printed too.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7494"
+NAME="AEN7517"
 ></A
 ><P
 ></P
@@ -15928,7 +15997,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7511"
+NAME="AEN7534"
 ></A
 ><H3
 ><A
@@ -15966,7 +16035,7 @@ used.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7519"
+NAME="AEN7542"
 ></A
 ><P
 ></P
@@ -16025,7 +16094,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16036,7 +16105,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7536"
+NAME="AEN7559"
 ></A
 ><H3
 ><A
@@ -16069,13 +16138,18 @@ CLASS="PARAMETER"
 >filename</I
 ></TT
 > is "-" the stdout file is
-used. If format is set then the document will be indented on output.</P
+used. If <TT
+CLASS="PARAMETER"
+><I
+>format</I
+></TT
+> is set then the document will be indented on output.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7544"
+NAME="AEN7568"
 ></A
 ><P
 ></P
@@ -16151,7 +16225,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16162,7 +16236,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7565"
+NAME="AEN7589"
 ></A
 ><H3
 ><A
@@ -16202,7 +16276,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7574"
+NAME="AEN7598"
 ></A
 ><P
 ></P
@@ -16308,7 +16382,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7599"
+NAME="AEN7623"
 ></A
 ><H3
 ><A
@@ -16343,7 +16417,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7607"
+NAME="AEN7631"
 ></A
 ><P
 ></P
@@ -16404,7 +16478,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding if any assuming the i/O layer handles the trancoding</TD
+>  the encoding if any assuming the I/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -16419,7 +16493,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16430,7 +16504,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7628"
+NAME="AEN7652"
 ></A
 ><H3
 ><A
@@ -16466,7 +16540,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7636"
+NAME="AEN7660"
 ></A
 ><P
 ></P
@@ -16527,7 +16601,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding if any assuming the i/O layer handles the trancoding</TD
+>  the encoding if any assuming the I/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -16559,7 +16633,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16570,7 +16644,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7661"
+NAME="AEN7685"
 ></A
 ><H3
 ><A
@@ -16605,13 +16679,13 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->Dump an XML node, recursive behaviour,children are printed too.</P
+>Dump an XML node, recursive behaviour, children are printed too.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7670"
+NAME="AEN7694"
 ></A
 ><P
 ></P
@@ -16734,7 +16808,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7699"
+NAME="AEN7723"
 ></A
 ><H3
 ><A
@@ -16767,7 +16841,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7706"
+NAME="AEN7730"
 ></A
 ><P
 ></P
@@ -16860,7 +16934,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of bytes written or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16871,7 +16945,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7731"
+NAME="AEN7755"
 ></A
 ><H3
 ><A
@@ -16903,7 +16977,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7738"
+NAME="AEN7762"
 ></A
 ><P
 ></P
@@ -16979,7 +17053,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+> the number of bytes written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16990,7 +17064,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7759"
+NAME="AEN7783"
 ></A
 ><H3
 ><A
@@ -17020,7 +17094,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7766"
+NAME="AEN7790"
 ></A
 ><P
 ></P
@@ -17073,7 +17147,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7779"
+NAME="AEN7803"
 ></A
 ><H3
 ><A
@@ -17105,7 +17179,7 @@ Correct values: 0 (uncompressed) to 9 (max compression)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7786"
+NAME="AEN7810"
 ></A
 ><P
 ></P
@@ -17160,7 +17234,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7799"
+NAME="AEN7823"
 ></A
 ><H3
 ><A
@@ -17187,7 +17261,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7805"
+NAME="AEN7829"
 ></A
 ><P
 ></P
@@ -17223,7 +17297,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7814"
+NAME="AEN7838"
 ></A
 ><H3
 ><A
@@ -17251,7 +17325,7 @@ Correct values: 0 (uncompressed) to 9 (max compression)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7820"
+NAME="AEN7844"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index c16fda0d..b41a9fe5 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -123,7 +123,7 @@ NAME="LIBXML-URI"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10154"
+NAME="AEN10178"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN10154"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10157"
+NAME="AEN10181"
 ></A
 ><H2
 >Synopsis</H2
@@ -259,7 +259,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10189"
+NAME="AEN10213"
 ></A
 ><H2
 >Description</H2
@@ -269,14 +269,14 @@ NAME="AEN10189"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10192"
+NAME="AEN10216"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10194"
+NAME="AEN10218"
 ></A
 ><H3
 ><A
@@ -316,7 +316,7 @@ as described in RFC 2396 but separated for further processing</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10200"
+NAME="AEN10224"
 ></A
 ><H3
 ><A
@@ -342,7 +342,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10205"
+NAME="AEN10229"
 ></A
 ><H3
 ><A
@@ -372,7 +372,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10212"
+NAME="AEN10236"
 ></A
 ><P
 ></P
@@ -408,7 +408,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10221"
+NAME="AEN10245"
 ></A
 ><H3
 ><A
@@ -450,7 +450,7 @@ RFC 2396</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10231"
+NAME="AEN10255"
 ></A
 ><P
 ></P
@@ -521,7 +521,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10248"
+NAME="AEN10272"
 ></A
 ><H3
 ><A
@@ -553,7 +553,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10256"
+NAME="AEN10280"
 ></A
 ><P
 ></P
@@ -606,7 +606,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10269"
+NAME="AEN10293"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10278"
+NAME="AEN10302"
 ></A
 ><P
 ></P
@@ -715,7 +715,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10295"
+NAME="AEN10319"
 ></A
 ><H3
 ><A
@@ -748,7 +748,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10303"
+NAME="AEN10327"
 ></A
 ><P
 ></P
@@ -801,7 +801,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10316"
+NAME="AEN10340"
 ></A
 ><H3
 ><A
@@ -840,7 +840,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10325"
+NAME="AEN10349"
 ></A
 ><P
 ></P
@@ -895,7 +895,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10338"
+NAME="AEN10362"
 ></A
 ><H3
 ><A
@@ -933,7 +933,7 @@ and the characters in the exception list.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10347"
+NAME="AEN10371"
 ></A
 ><P
 ></P
@@ -1003,7 +1003,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10364"
+NAME="AEN10388"
 ></A
 ><H3
 ><A
@@ -1036,7 +1036,7 @@ CLASS="LITERAL"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10371"
+NAME="AEN10395"
 ></A
 ><P
 ></P
@@ -1097,7 +1097,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optionnal destination buffer</TD
+>  optional destination buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1123,7 +1123,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10392"
+NAME="AEN10416"
 ></A
 ><H3
 ><A
@@ -1153,7 +1153,7 @@ Section 5.2, steps 6.c through 6.g.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10399"
+NAME="AEN10423"
 ></A
 ><P
 ></P
@@ -1206,7 +1206,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10412"
+NAME="AEN10436"
 ></A
 ><H3
 ><A
@@ -1241,7 +1241,7 @@ based it's impossible to be sure.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10420"
+NAME="AEN10444"
 ></A
 ><P
 ></P
@@ -1299,7 +1299,7 @@ according to RFC2396.
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10433"
+NAME="AEN10457"
 ></A
 ><H3
 ><A
@@ -1329,7 +1329,7 @@ HREF="libxml-uri.html#XMLURIPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10440"
+NAME="AEN10464"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index a3332341..5e84f0f5 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -123,7 +123,7 @@ NAME="LIBXML-VALID"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8306"
+NAME="AEN8330"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN8306"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8309"
+NAME="AEN8333"
 ></A
 ><H2
 >Synopsis</H2
@@ -972,7 +972,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8533"
+NAME="AEN8557"
 ></A
 ><H2
 >Description</H2
@@ -982,14 +982,14 @@ NAME="AEN8533"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8536"
+NAME="AEN8560"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8538"
+NAME="AEN8562"
 ></A
 ><H3
 ><A
@@ -1015,7 +1015,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8543"
+NAME="AEN8567"
 ></A
 ><H3
 ><A
@@ -1041,7 +1041,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8548"
+NAME="AEN8572"
 ></A
 ><H3
 ><A
@@ -1068,7 +1068,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8553"
+NAME="AEN8577"
 ></A
 ><P
 ></P
@@ -1140,7 +1140,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8570"
+NAME="AEN8594"
 ></A
 ><H3
 ><A
@@ -1167,7 +1167,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8575"
+NAME="AEN8599"
 ></A
 ><P
 ></P
@@ -1239,7 +1239,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8592"
+NAME="AEN8616"
 ></A
 ><H3
 ><A
@@ -1285,7 +1285,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8597"
+NAME="AEN8621"
 ></A
 ><H3
 ><A
@@ -1311,7 +1311,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8602"
+NAME="AEN8626"
 ></A
 ><H3
 ><A
@@ -1337,7 +1337,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8607"
+NAME="AEN8631"
 ></A
 ><H3
 ><A
@@ -1363,7 +1363,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8612"
+NAME="AEN8636"
 ></A
 ><H3
 ><A
@@ -1389,7 +1389,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8617"
+NAME="AEN8641"
 ></A
 ><H3
 ><A
@@ -1415,7 +1415,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8622"
+NAME="AEN8646"
 ></A
 ><H3
 ><A
@@ -1441,7 +1441,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8627"
+NAME="AEN8651"
 ></A
 ><H3
 ><A
@@ -1484,7 +1484,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8639"
+NAME="AEN8663"
 ></A
 ><P
 ></P
@@ -1555,7 +1555,7 @@ is updated to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8656"
+NAME="AEN8680"
 ></A
 ><H3
 ><A
@@ -1604,7 +1604,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8668"
+NAME="AEN8692"
 ></A
 ><P
 ></P
@@ -1714,7 +1714,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>NULL if not, otherwise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1725,7 +1725,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8697"
+NAME="AEN8721"
 ></A
 ><H3
 ><A
@@ -1758,7 +1758,7 @@ HREF="libxml-valid.html#XMLNOTATIONTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8705"
+NAME="AEN8729"
 ></A
 ><P
 ></P
@@ -1811,7 +1811,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8718"
+NAME="AEN8742"
 ></A
 ><H3
 ><A
@@ -1841,7 +1841,7 @@ HREF="libxml-valid.html#XMLNOTATIONTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8725"
+NAME="AEN8749"
 ></A
 ><P
 ></P
@@ -1879,7 +1879,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8734"
+NAME="AEN8758"
 ></A
 ><H3
 ><A
@@ -1913,7 +1913,7 @@ HREF="libxml-tree.html#XMLNOTATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8742"
+NAME="AEN8766"
 ></A
 ><P
 ></P
@@ -1968,7 +1968,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8755"
+NAME="AEN8779"
 ></A
 ><H3
 ><A
@@ -2002,7 +2002,7 @@ HREF="libxml-valid.html#XMLNOTATIONTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8763"
+NAME="AEN8787"
 ></A
 ><P
 ></P
@@ -2057,7 +2057,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8776"
+NAME="AEN8800"
 ></A
 ><H3
 ><A
@@ -2094,7 +2094,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTTYPE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8785"
+NAME="AEN8809"
 ></A
 ><P
 ></P
@@ -2153,7 +2153,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new element content structure</TD
+>NULL if not, otherwise the new element content structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2164,7 +2164,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8802"
+NAME="AEN8826"
 ></A
 ><H3
 ><A
@@ -2197,7 +2197,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8810"
+NAME="AEN8834"
 ></A
 ><P
 ></P
@@ -2250,7 +2250,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8823"
+NAME="AEN8847"
 ></A
 ><H3
 ><A
@@ -2280,7 +2280,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8830"
+NAME="AEN8854"
 ></A
 ><P
 ></P
@@ -2318,7 +2318,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8839"
+NAME="AEN8863"
 ></A
 ><H3
 ><A
@@ -2352,7 +2352,7 @@ Intended just for the debug routine</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8846"
+NAME="AEN8870"
 ></A
 ><P
 ></P
@@ -2441,7 +2441,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8867"
+NAME="AEN8891"
 ></A
 ><H3
 ><A
@@ -2473,7 +2473,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8874"
+NAME="AEN8898"
 ></A
 ><P
 ></P
@@ -2545,7 +2545,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8891"
+NAME="AEN8915"
 ></A
 ><H3
 ><A
@@ -2594,7 +2594,7 @@ HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8903"
+NAME="AEN8927"
 ></A
 ><P
 ></P
@@ -2704,7 +2704,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>NULL if not, otherwise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2715,7 +2715,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8932"
+NAME="AEN8956"
 ></A
 ><H3
 ><A
@@ -2748,7 +2748,7 @@ HREF="libxml-valid.html#XMLELEMENTTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8940"
+NAME="AEN8964"
 ></A
 ><P
 ></P
@@ -2801,7 +2801,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8953"
+NAME="AEN8977"
 ></A
 ><H3
 ><A
@@ -2831,7 +2831,7 @@ HREF="libxml-valid.html#XMLELEMENTTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8960"
+NAME="AEN8984"
 ></A
 ><P
 ></P
@@ -2869,7 +2869,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8969"
+NAME="AEN8993"
 ></A
 ><H3
 ><A
@@ -2903,7 +2903,7 @@ HREF="libxml-valid.html#XMLELEMENTTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8977"
+NAME="AEN9001"
 ></A
 ><P
 ></P
@@ -2958,7 +2958,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8990"
+NAME="AEN9014"
 ></A
 ><H3
 ><A
@@ -2993,7 +2993,7 @@ DTD definition</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8998"
+NAME="AEN9022"
 ></A
 ><P
 ></P
@@ -3048,7 +3048,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9011"
+NAME="AEN9035"
 ></A
 ><H3
 ><A
@@ -3081,7 +3081,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9019"
+NAME="AEN9043"
 ></A
 ><P
 ></P
@@ -3135,7 +3135,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9032"
+NAME="AEN9056"
 ></A
 ><H3
 ><A
@@ -3165,7 +3165,7 @@ HREF="libxml-tree.html#XMLENUMERATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9039"
+NAME="AEN9063"
 ></A
 ><P
 ></P
@@ -3203,7 +3203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9048"
+NAME="AEN9072"
 ></A
 ><H3
 ><A
@@ -3236,7 +3236,7 @@ HREF="libxml-tree.html#XMLENUMERATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9056"
+NAME="AEN9080"
 ></A
 ><P
 ></P
@@ -3290,7 +3290,7 @@ of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9069"
+NAME="AEN9093"
 ></A
 ><H3
 ><A
@@ -3361,7 +3361,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9086"
+NAME="AEN9110"
 ></A
 ><P
 ></P
@@ -3539,7 +3539,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not new, othervise the attribute decl</TD
+>NULL if not new, otherwise the attribute decl</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3550,7 +3550,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9131"
+NAME="AEN9155"
 ></A
 ><H3
 ><A
@@ -3583,7 +3583,7 @@ HREF="libxml-valid.html#XMLATTRIBUTETABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9139"
+NAME="AEN9163"
 ></A
 ><P
 ></P
@@ -3636,7 +3636,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9152"
+NAME="AEN9176"
 ></A
 ><H3
 ><A
@@ -3666,7 +3666,7 @@ HREF="libxml-valid.html#XMLATTRIBUTETABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9159"
+NAME="AEN9183"
 ></A
 ><P
 ></P
@@ -3704,7 +3704,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9168"
+NAME="AEN9192"
 ></A
 ><H3
 ><A
@@ -3738,7 +3738,7 @@ HREF="libxml-valid.html#XMLATTRIBUTETABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9176"
+NAME="AEN9200"
 ></A
 ><P
 ></P
@@ -3793,7 +3793,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9189"
+NAME="AEN9213"
 ></A
 ><H3
 ><A
@@ -3828,7 +3828,7 @@ DTD definition</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9197"
+NAME="AEN9221"
 ></A
 ><P
 ></P
@@ -3883,7 +3883,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9210"
+NAME="AEN9234"
 ></A
 ><H3
 ><A
@@ -3928,7 +3928,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9221"
+NAME="AEN9245"
 ></A
 ><P
 ></P
@@ -4021,7 +4021,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlIDPtr</TD
+>NULL if not, otherwise the new xmlIDPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4032,7 +4032,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9246"
+NAME="AEN9270"
 ></A
 ><H3
 ><A
@@ -4062,7 +4062,7 @@ HREF="libxml-valid.html#XMLIDTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9253"
+NAME="AEN9277"
 ></A
 ><P
 ></P
@@ -4100,7 +4100,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9262"
+NAME="AEN9286"
 ></A
 ><H3
 ><A
@@ -4137,7 +4137,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9271"
+NAME="AEN9295"
 ></A
 ><P
 ></P
@@ -4207,7 +4207,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9288"
+NAME="AEN9312"
 ></A
 ><H3
 ><A
@@ -4239,7 +4239,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ></TR
 ></TABLE
 ><P
->Determine whether an attribute is of type ID. In case we have Dtd(s)
+>Determine whether an attribute is of type ID. In case we have DTD(s)
 then this is simple, otherwise we use an heuristic: name ID (upper
 or lowercase).</P
 ><P
@@ -4247,7 +4247,7 @@ or lowercase).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9297"
+NAME="AEN9321"
 ></A
 ><P
 ></P
@@ -4334,7 +4334,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9318"
+NAME="AEN9342"
 ></A
 ><H3
 ><A
@@ -4368,7 +4368,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9326"
+NAME="AEN9350"
 ></A
 ><P
 ></P
@@ -4438,7 +4438,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9343"
+NAME="AEN9367"
 ></A
 ><H3
 ><A
@@ -4483,7 +4483,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9354"
+NAME="AEN9378"
 ></A
 ><P
 ></P
@@ -4576,7 +4576,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlRefPtr</TD
+>NULL if not, otherwise the new xmlRefPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4587,7 +4587,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9379"
+NAME="AEN9403"
 ></A
 ><H3
 ><A
@@ -4617,7 +4617,7 @@ HREF="libxml-valid.html#XMLREFTABLEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9386"
+NAME="AEN9410"
 ></A
 ><P
 ></P
@@ -4655,7 +4655,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9395"
+NAME="AEN9419"
 ></A
 ><H3
 ><A
@@ -4687,7 +4687,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ></TR
 ></TABLE
 ><P
->Determine whether an attribute is of type Ref. In case we have Dtd(s)
+>Determine whether an attribute is of type Ref. In case we have DTD(s)
 then this is simple, otherwise we use an heuristic: name Ref (upper
 or lowercase).</P
 ><P
@@ -4695,7 +4695,7 @@ or lowercase).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9404"
+NAME="AEN9428"
 ></A
 ><P
 ></P
@@ -4782,7 +4782,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9425"
+NAME="AEN9449"
 ></A
 ><H3
 ><A
@@ -4816,7 +4816,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9433"
+NAME="AEN9457"
 ></A
 ><P
 ></P
@@ -4886,7 +4886,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9450"
+NAME="AEN9474"
 ></A
 ><H3
 ><A
@@ -4923,7 +4923,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9459"
+NAME="AEN9483"
 ></A
 ><P
 ></P
@@ -4993,7 +4993,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9476"
+NAME="AEN9500"
 ></A
 ><H3
 ><A
@@ -5031,7 +5031,7 @@ it doesn't try to recurse or apply other check to the element</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9484"
+NAME="AEN9508"
 ></A
 ><P
 ></P
@@ -5101,7 +5101,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9501"
+NAME="AEN9525"
 ></A
 ><H3
 ><A
@@ -5144,7 +5144,7 @@ XML-1.0 recommendation:
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9510"
+NAME="AEN9534"
 ></A
 ><P
 ></P
@@ -5231,7 +5231,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9531"
+NAME="AEN9555"
 ></A
 ><H3
 ><A
@@ -5291,7 +5291,7 @@ HREF="X20"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9546"
+NAME="AEN9570"
 ></A
 ><P
 ></P
@@ -5396,7 +5396,7 @@ the caller must free the returned value.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9571"
+NAME="AEN9595"
 ></A
 ><H3
 ><A
@@ -5441,7 +5441,7 @@ XML-1.0 recommendation:
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9581"
+NAME="AEN9605"
 ></A
 ><P
 ></P
@@ -5528,7 +5528,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9602"
+NAME="AEN9626"
 ></A
 ><H3
 ><A
@@ -5577,7 +5577,7 @@ of type NMTOKENS must match Nmtokens.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9614"
+NAME="AEN9638"
 ></A
 ><P
 ></P
@@ -5647,7 +5647,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9631"
+NAME="AEN9655"
 ></A
 ><H3
 ><A
@@ -5682,14 +5682,14 @@ HREF="libxml-tree.html#XMLNOTATIONPTR"
 >Try to validate a single notation definition
 basically it does the following checks as described by the
 XML-1.0 recommendation:
-- it seems that no validity constraing exist on notation declarations
+- it seems that no validity constraint exists on notation declarations
 But this function get called anyway ...</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9640"
+NAME="AEN9664"
 ></A
 ><P
 ></P
@@ -5776,7 +5776,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9661"
+NAME="AEN9685"
 ></A
 ><H3
 ><A
@@ -5816,7 +5816,7 @@ HREF="libxml-tree.html#XMLDTDPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9671"
+NAME="AEN9695"
 ></A
 ><P
 ></P
@@ -5903,7 +5903,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9692"
+NAME="AEN9716"
 ></A
 ><H3
 ><A
@@ -5944,7 +5944,7 @@ possible values matches one of the defined notations.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9701"
+NAME="AEN9725"
 ></A
 ><P
 ></P
@@ -6014,7 +6014,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9718"
+NAME="AEN9742"
 ></A
 ><H3
 ><A
@@ -6052,7 +6052,7 @@ and validate the document tree.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9727"
+NAME="AEN9751"
 ></A
 ><P
 ></P
@@ -6122,7 +6122,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9744"
+NAME="AEN9768"
 ></A
 ><H3
 ><A
@@ -6160,7 +6160,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9753"
+NAME="AEN9777"
 ></A
 ><P
 ></P
@@ -6247,7 +6247,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9774"
+NAME="AEN9798"
 ></A
 ><H3
 ><A
@@ -6295,7 +6295,7 @@ HREF="libxml-valid.html#XMLVALIDATEONEATTRIBUTE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9785"
+NAME="AEN9809"
 ></A
 ><P
 ></P
@@ -6382,7 +6382,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9806"
+NAME="AEN9830"
 ></A
 ><H3
 ><A
@@ -6440,7 +6440,7 @@ XML-1.0 recommendation:
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9818"
+NAME="AEN9842"
 ></A
 ><P
 ></P
@@ -6561,7 +6561,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9847"
+NAME="AEN9871"
 ></A
 ><H3
 ><A
@@ -6598,7 +6598,7 @@ incremental validation steps have been completed</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9856"
+NAME="AEN9880"
 ></A
 ><P
 ></P
@@ -6668,7 +6668,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9873"
+NAME="AEN9897"
 ></A
 ><H3
 ><A
@@ -6700,14 +6700,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Validate that the given mame match a notation declaration.
+>Validate that the given name match a notation declaration.
 - [ VC: Notation Declared ]</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9882"
+NAME="AEN9906"
 ></A
 ><P
 ></P
@@ -6794,7 +6794,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9903"
+NAME="AEN9927"
 ></A
 ><H3
 ><A
@@ -6829,7 +6829,7 @@ basically if it is supposed to accept text childs</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9911"
+NAME="AEN9935"
 ></A
 ><P
 ></P
@@ -6899,7 +6899,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9928"
+NAME="AEN9952"
 ></A
 ><H3
 ><A
@@ -6934,14 +6934,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Search the Dtd for the description of this attribute on
+>Search the DTD for the description of this attribute on
 this element.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9938"
+NAME="AEN9962"
 ></A
 ><P
 ></P
@@ -7028,7 +7028,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9959"
+NAME="AEN9983"
 ></A
 ><H3
 ><A
@@ -7067,14 +7067,14 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Search the Dtd for the description of this qualified attribute on
+>Search the DTD for the description of this qualified attribute on
 this element.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9970"
+NAME="AEN9994"
 ></A
 ><P
 ></P
@@ -7178,7 +7178,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9995"
+NAME="AEN10019"
 ></A
 ><H3
 ><A
@@ -7209,13 +7209,13 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Search the Dtd for the description of this notation</P
+>Search the DTD for the description of this notation</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10004"
+NAME="AEN10028"
 ></A
 ><P
 ></P
@@ -7285,7 +7285,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10021"
+NAME="AEN10045"
 ></A
 ><H3
 ><A
@@ -7320,13 +7320,13 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Search the Dtd for the description of this element</P
+>Search the DTD for the description of this element</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10031"
+NAME="AEN10055"
 ></A
 ><P
 ></P
@@ -7413,7 +7413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10052"
+NAME="AEN10076"
 ></A
 ><H3
 ><A
@@ -7444,13 +7444,13 @@ HREF="libxml-tree.html#XMLCHAR"
 ></TR
 ></TABLE
 ><P
->Search the Dtd for the description of this element</P
+>Search the DTD for the description of this element</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10061"
+NAME="AEN10085"
 ></A
 ><P
 ></P
@@ -7520,7 +7520,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10078"
+NAME="AEN10102"
 ></A
 ><H3
 ><A
@@ -7580,7 +7580,7 @@ and do not need to be freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10090"
+NAME="AEN10114"
 ></A
 ><P
 ></P
@@ -7691,7 +7691,7 @@ receiving array and retry.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10116"
+NAME="AEN10140"
 ></A
 ><H3
 ><A
@@ -7727,7 +7727,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10124"
+NAME="AEN10148"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index e7796417..989fbeb2 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XINCLUDE"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17181"
+NAME="AEN17205"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN17181"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17184"
+NAME="AEN17208"
 ></A
 ><H2
 >Synopsis</H2
@@ -160,7 +160,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17189"
+NAME="AEN17213"
 ></A
 ><H2
 >Description</H2
@@ -170,14 +170,14 @@ NAME="AEN17189"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17192"
+NAME="AEN17216"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17194"
+NAME="AEN17218"
 ></A
 ><H3
 ><A
@@ -212,7 +212,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17202"
+NAME="AEN17226"
 ></A
 ><P
 ></P
@@ -254,7 +254,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no substition were done, -1 if some processing failed
+>0 if no substitution were done, -1 if some processing failed
 or the number of substitutions done.</TD
 ></TR
 ></TBODY
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index df425aba..ff2452cf 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XMLERROR"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10454"
+NAME="AEN10478"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN10454"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10457"
+NAME="AEN10481"
 ></A
 ><H2
 >Synopsis</H2
@@ -216,7 +216,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10474"
+NAME="AEN10498"
 ></A
 ><H2
 >Description</H2
@@ -226,14 +226,14 @@ NAME="AEN10474"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10477"
+NAME="AEN10501"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10479"
+NAME="AEN10503"
 ></A
 ><H3
 ><A
@@ -388,7 +388,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10484"
+NAME="AEN10508"
 ></A
 ><H3
 ><A
@@ -415,7 +415,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10489"
+NAME="AEN10513"
 ></A
 ><P
 ></P
@@ -487,7 +487,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10506"
+NAME="AEN10530"
 ></A
 ><H3
 ><A
@@ -549,7 +549,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10518"
+NAME="AEN10542"
 ></A
 ><P
 ></P
@@ -604,7 +604,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10531"
+NAME="AEN10555"
 ></A
 ><H3
 ><A
@@ -632,7 +632,7 @@ HREF="libxml-xmlerror.html#XMLGENERICERRORFUNC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10537"
+NAME="AEN10561"
 ></A
 ><P
 ></P
@@ -670,7 +670,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10546"
+NAME="AEN10570"
 ></A
 ><H3
 ><A
@@ -700,7 +700,7 @@ extra parameters.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10552"
+NAME="AEN10576"
 ></A
 ><P
 ></P
@@ -772,7 +772,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10569"
+NAME="AEN10593"
 ></A
 ><H3
 ><A
@@ -802,7 +802,7 @@ extra parameters.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10575"
+NAME="AEN10599"
 ></A
 ><P
 ></P
@@ -874,7 +874,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10592"
+NAME="AEN10616"
 ></A
 ><H3
 ><A
@@ -904,7 +904,7 @@ line, position and extra parameters.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10598"
+NAME="AEN10622"
 ></A
 ><P
 ></P
@@ -976,7 +976,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10615"
+NAME="AEN10639"
 ></A
 ><H3
 ><A
@@ -1006,7 +1006,7 @@ position and extra parameters.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10621"
+NAME="AEN10645"
 ></A
 ><P
 ></P
@@ -1078,7 +1078,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10638"
+NAME="AEN10662"
 ></A
 ><H3
 ><A
@@ -1108,7 +1108,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10645"
+NAME="AEN10669"
 ></A
 ><P
 ></P
@@ -1146,7 +1146,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10654"
+NAME="AEN10678"
 ></A
 ><H3
 ><A
@@ -1176,7 +1176,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10661"
+NAME="AEN10685"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index d5f5c183..04dd6540 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XMLIO"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18069"
+NAME="AEN18093"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN18069"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18072"
+NAME="AEN18096"
 ></A
 ><H2
 >Synopsis</H2
@@ -505,7 +505,7 @@ HREF="libxml-tree.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18163"
+NAME="AEN18187"
 ></A
 ><H2
 >Description</H2
@@ -515,14 +515,14 @@ NAME="AEN18163"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18166"
+NAME="AEN18190"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18168"
+NAME="AEN18192"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18173"
+NAME="AEN18197"
 ></A
 ><P
 ></P
@@ -600,7 +600,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18186"
+NAME="AEN18210"
 ></A
 ><H3
 ><A
@@ -625,7 +625,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18191"
+NAME="AEN18215"
 ></A
 ><P
 ></P
@@ -663,7 +663,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18200"
+NAME="AEN18224"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18205"
+NAME="AEN18229"
 ></A
 ><P
 ></P
@@ -777,7 +777,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18226"
+NAME="AEN18250"
 ></A
 ><H3
 ><A
@@ -802,7 +802,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18231"
+NAME="AEN18255"
 ></A
 ><P
 ></P
@@ -855,7 +855,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18244"
+NAME="AEN18268"
 ></A
 ><H3
 ><A
@@ -890,7 +890,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18249"
+NAME="AEN18273"
 ></A
 ><H3
 ><A
@@ -915,7 +915,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18254"
+NAME="AEN18278"
 ></A
 ><P
 ></P
@@ -968,7 +968,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18267"
+NAME="AEN18291"
 ></A
 ><H3
 ><A
@@ -993,7 +993,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18272"
+NAME="AEN18296"
 ></A
 ><P
 ></P
@@ -1031,7 +1031,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18281"
+NAME="AEN18305"
 ></A
 ><H3
 ><A
@@ -1058,7 +1058,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18286"
+NAME="AEN18310"
 ></A
 ><P
 ></P
@@ -1145,7 +1145,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18307"
+NAME="AEN18331"
 ></A
 ><H3
 ><A
@@ -1170,7 +1170,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18312"
+NAME="AEN18336"
 ></A
 ><P
 ></P
@@ -1223,7 +1223,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18325"
+NAME="AEN18349"
 ></A
 ><H3
 ><A
@@ -1259,7 +1259,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18330"
+NAME="AEN18354"
 ></A
 ><H3
 ><A
@@ -1288,7 +1288,7 @@ compiled-in I/O.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18336"
+NAME="AEN18360"
 ></A
 ><H3
 ><A
@@ -1317,7 +1317,7 @@ compiled-in I/O callbacks.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18342"
+NAME="AEN18366"
 ></A
 ><H3
 ><A
@@ -1346,7 +1346,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18348"
+NAME="AEN18372"
 ></A
 ><H3
 ><A
@@ -1380,7 +1380,7 @@ HREF="libxml-encoding.html#XMLCHARENCODING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18356"
+NAME="AEN18380"
 ></A
 ><P
 ></P
@@ -1433,7 +1433,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18369"
+NAME="AEN18393"
 ></A
 ><H3
 ><A
@@ -1471,7 +1471,7 @@ HREF="libxml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILENAME"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18378"
+NAME="AEN18402"
 ></A
 ><P
 ></P
@@ -1541,7 +1541,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18395"
+NAME="AEN18419"
 ></A
 ><H3
 ><A
@@ -1580,7 +1580,7 @@ Do an encoding check if enc == XML_CHAR_ENCODING_NONE</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18403"
+NAME="AEN18427"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18420"
+NAME="AEN18444"
 ></A
 ><H3
 ><A
@@ -1689,7 +1689,7 @@ buffered C I/O</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18429"
+NAME="AEN18453"
 ></A
 ><P
 ></P
@@ -1759,7 +1759,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18446"
+NAME="AEN18470"
 ></A
 ><H3
 ><A
@@ -1795,7 +1795,7 @@ from a file descriptor</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18454"
+NAME="AEN18478"
 ></A
 ><P
 ></P
@@ -1865,7 +1865,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18471"
+NAME="AEN18495"
 ></A
 ><H3
 ><A
@@ -1902,7 +1902,7 @@ from a memory area.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18479"
+NAME="AEN18503"
 ></A
 ><P
 ></P
@@ -1989,7 +1989,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18500"
+NAME="AEN18524"
 ></A
 ><H3
 ><A
@@ -2033,7 +2033,7 @@ from an I/O handler</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18510"
+NAME="AEN18534"
 ></A
 ><P
 ></P
@@ -2137,7 +2137,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18535"
+NAME="AEN18559"
 ></A
 ><H3
 ><A
@@ -2170,7 +2170,7 @@ This routine handle the I18N transcoding to internal UTF-8</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18542"
+NAME="AEN18566"
 ></A
 ><P
 ></P
@@ -2241,7 +2241,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18559"
+NAME="AEN18583"
 ></A
 ><H3
 ><A
@@ -2270,14 +2270,14 @@ HREF="libxml-tree.html#XMLPARSERINPUTBUFFERPTR"
 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
+>TODO: one should be able to remove one extra copy by copying directly
 onto in-&gt;buffer or in-&gt;raw</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18567"
+NAME="AEN18591"
 ></A
 ><P
 ></P
@@ -2348,7 +2348,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18584"
+NAME="AEN18608"
 ></A
 ><H3
 ><A
@@ -2382,7 +2382,7 @@ This is used when operating the parser in progressive (push) mode.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18591"
+NAME="AEN18615"
 ></A
 ><P
 ></P
@@ -2470,7 +2470,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18612"
+NAME="AEN18636"
 ></A
 ><H3
 ><A
@@ -2500,7 +2500,7 @@ HREF="libxml-tree.html#XMLPARSERINPUTBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18619"
+NAME="AEN18643"
 ></A
 ><P
 ></P
@@ -2538,7 +2538,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18628"
+NAME="AEN18652"
 ></A
 ><H3
 ><A
@@ -2565,7 +2565,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18634"
+NAME="AEN18658"
 ></A
 ><P
 ></P
@@ -2618,7 +2618,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18647"
+NAME="AEN18671"
 ></A
 ><H3
 ><A
@@ -2660,7 +2660,7 @@ HREF="libxml-xmlio.html#XMLINPUTCLOSECALLBACK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18657"
+NAME="AEN18681"
 ></A
 ><P
 ></P
@@ -2764,7 +2764,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18682"
+NAME="AEN18706"
 ></A
 ><H3
 ><A
@@ -2793,7 +2793,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18688"
+NAME="AEN18712"
 ></A
 ><H3
 ><A
@@ -2826,7 +2826,7 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18696"
+NAME="AEN18720"
 ></A
 ><P
 ></P
@@ -2879,7 +2879,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18709"
+NAME="AEN18733"
 ></A
 ><H3
 ><A
@@ -2920,7 +2920,7 @@ writing to a local file.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18717"
+NAME="AEN18741"
 ></A
 ><P
 ></P
@@ -3007,7 +3007,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18738"
+NAME="AEN18762"
 ></A
 ><H3
 ><A
@@ -3046,7 +3046,7 @@ buffered C I/O</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18747"
+NAME="AEN18771"
 ></A
 ><P
 ></P
@@ -3116,7 +3116,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18764"
+NAME="AEN18788"
 ></A
 ><H3
 ><A
@@ -3151,7 +3151,7 @@ to a file descriptor</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18772"
+NAME="AEN18796"
 ></A
 ><P
 ></P
@@ -3221,7 +3221,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18789"
+NAME="AEN18813"
 ></A
 ><H3
 ><A
@@ -3264,7 +3264,7 @@ to an I/O handler</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18799"
+NAME="AEN18823"
 ></A
 ><P
 ></P
@@ -3368,7 +3368,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18824"
+NAME="AEN18848"
 ></A
 ><H3
 ><A
@@ -3403,7 +3403,7 @@ or delayed writes.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18831"
+NAME="AEN18855"
 ></A
 ><P
 ></P
@@ -3491,7 +3491,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18852"
+NAME="AEN18876"
 ></A
 ><H3
 ><A
@@ -3525,7 +3525,7 @@ or delayed writes.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18859"
+NAME="AEN18883"
 ></A
 ><P
 ></P
@@ -3596,7 +3596,7 @@ in case of error.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18876"
+NAME="AEN18900"
 ></A
 ><H3
 ><A
@@ -3626,7 +3626,7 @@ HREF="libxml-tree.html#XMLOUTPUTBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18883"
+NAME="AEN18907"
 ></A
 ><P
 ></P
@@ -3679,7 +3679,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18896"
+NAME="AEN18920"
 ></A
 ><H3
 ><A
@@ -3710,7 +3710,7 @@ and free up all the associated resources</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18903"
+NAME="AEN18927"
 ></A
 ><P
 ></P
@@ -3763,7 +3763,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18916"
+NAME="AEN18940"
 ></A
 ><H3
 ><A
@@ -3805,7 +3805,7 @@ HREF="libxml-xmlio.html#XMLOUTPUTCLOSECALLBACK"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18926"
+NAME="AEN18950"
 ></A
 ><P
 ></P
@@ -3909,7 +3909,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18951"
+NAME="AEN18975"
 ></A
 ><H3
 ><A
@@ -3938,7 +3938,7 @@ request.  Non-static as is called from the output buffer creation routine.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18957"
+NAME="AEN18981"
 ></A
 ><P
 ></P
@@ -3993,7 +3993,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18970"
+NAME="AEN18994"
 ></A
 ><H3
 ><A
@@ -4023,7 +4023,7 @@ method instead.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18976"
+NAME="AEN19000"
 ></A
 ><H3
 ><A
@@ -4060,7 +4060,7 @@ allowing local catalog accesses for resolution.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18984"
+NAME="AEN19008"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 95879400..aa22ef63 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -111,7 +111,7 @@ NAME="LIBXML-XMLMEMORY"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN26074"
+NAME="AEN26144"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@ NAME="AEN26074"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN26077"
+NAME="AEN26147"
 ></A
 ><H2
 >Synopsis</H2
@@ -274,7 +274,7 @@ HREF="libxml-xmlmemory.html#XMLMEMSTRDUPLOC"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26113"
+NAME="AEN26183"
 ></A
 ><H2
 >Description</H2
@@ -284,14 +284,14 @@ NAME="AEN26113"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26116"
+NAME="AEN26186"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26118"
+NAME="AEN26188"
 ></A
 ><H3
 ><A
@@ -322,7 +322,7 @@ libxml i.e. if libxml has been configured with --with-debug-mem too</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26124"
+NAME="AEN26194"
 ></A
 ><H3
 ><A
@@ -350,7 +350,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26130"
+NAME="AEN26200"
 ></A
 ><H3
 ><A
@@ -375,7 +375,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26135"
+NAME="AEN26205"
 ></A
 ><P
 ></P
@@ -413,7 +413,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26144"
+NAME="AEN26214"
 ></A
 ><H3
 ><A
@@ -441,7 +441,7 @@ HREF="SIZE-T"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26150"
+NAME="AEN26220"
 ></A
 ><P
 ></P
@@ -479,7 +479,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26159"
+NAME="AEN26229"
 ></A
 ><H3
 ><A
@@ -508,7 +508,7 @@ HREF="SIZE-T"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26165"
+NAME="AEN26235"
 ></A
 ><P
 ></P
@@ -563,7 +563,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26178"
+NAME="AEN26248"
 ></A
 ><H3
 ><A
@@ -588,7 +588,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26183"
+NAME="AEN26253"
 ></A
 ><P
 ></P
@@ -641,7 +641,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26196"
+NAME="AEN26266"
 ></A
 ><H3
 ><A
@@ -687,7 +687,7 @@ done ?</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26207"
+NAME="AEN26277"
 ></A
 ><P
 ></P
@@ -803,7 +803,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26236"
+NAME="AEN26306"
 ></A
 ><H3
 ><A
@@ -845,7 +845,7 @@ HREF="libxml-xmlmemory.html#XMLSTRDUPFUNC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26246"
+NAME="AEN26316"
 ></A
 ><P
 ></P
@@ -961,7 +961,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26275"
+NAME="AEN26345"
 ></A
 ><H3
 ><A
@@ -988,7 +988,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26281"
+NAME="AEN26351"
 ></A
 ><P
 ></P
@@ -1024,7 +1024,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26290"
+NAME="AEN26360"
 ></A
 ><H3
 ><A
@@ -1051,7 +1051,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26296"
+NAME="AEN26366"
 ></A
 ><P
 ></P
@@ -1087,7 +1087,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26305"
+NAME="AEN26375"
 ></A
 ><H3
 ><A
@@ -1117,7 +1117,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26312"
+NAME="AEN26382"
 ></A
 ><P
 ></P
@@ -1156,7 +1156,7 @@ written to the file .memorylist</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26321"
+NAME="AEN26391"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26329"
+NAME="AEN26399"
 ></A
 ><P
 ></P
@@ -1248,7 +1248,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26342"
+NAME="AEN26412"
 ></A
 ><H3
 ><A
@@ -1276,7 +1276,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26348"
+NAME="AEN26418"
 ></A
 ><H3
 ><A
@@ -1306,7 +1306,7 @@ HREF="MALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26355"
+NAME="AEN26425"
 ></A
 ><P
 ></P
@@ -1344,7 +1344,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26364"
+NAME="AEN26434"
 ></A
 ><H3
 ><A
@@ -1374,7 +1374,7 @@ HREF="REALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26371"
+NAME="AEN26441"
 ></A
 ><P
 ></P
@@ -1429,7 +1429,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26384"
+NAME="AEN26454"
 ></A
 ><H3
 ><A
@@ -1462,7 +1462,7 @@ HREF="libxml-parser.html#XMLSTRDUP"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26392"
+NAME="AEN26462"
 ></A
 ><P
 ></P
@@ -1500,7 +1500,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26401"
+NAME="AEN26471"
 ></A
 ><H3
 ><A
@@ -1535,7 +1535,7 @@ HREF="MALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26409"
+NAME="AEN26479"
 ></A
 ><P
 ></P
@@ -1607,7 +1607,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26426"
+NAME="AEN26496"
 ></A
 ><H3
 ><A
@@ -1643,7 +1643,7 @@ HREF="REALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26434"
+NAME="AEN26504"
 ></A
 ><P
 ></P
@@ -1732,7 +1732,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26455"
+NAME="AEN26525"
 ></A
 ><H3
 ><A
@@ -1764,7 +1764,7 @@ HREF="STRDUP"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26462"
+NAME="AEN26532"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index fede8e71..485d41c4 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XPATH"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11837"
+NAME="AEN11861"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN11837"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11840"
+NAME="AEN11864"
 ></A
 ><H2
 >Synopsis</H2
@@ -527,7 +527,7 @@ HREF="libxml-tree.html#XMLCHAR"
                                              <A
 HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 >xmlXPathContextPtr</A
-> ctxt);
+> ctx);
 <A
 HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
@@ -591,7 +591,7 @@ HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11966"
+NAME="AEN11990"
 ></A
 ><H2
 >Description</H2
@@ -601,14 +601,14 @@ NAME="AEN11966"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11969"
+NAME="AEN11993"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11971"
+NAME="AEN11995"
 ></A
 ><H3
 ><A
@@ -697,7 +697,7 @@ the next binary incompatible release.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11977"
+NAME="AEN12001"
 ></A
 ><H3
 ><A
@@ -723,7 +723,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11982"
+NAME="AEN12006"
 ></A
 ><H3
 ><A
@@ -767,7 +767,7 @@ an xmlXPathContext, and the stack of objects.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11988"
+NAME="AEN12012"
 ></A
 ><H3
 ><A
@@ -793,7 +793,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11993"
+NAME="AEN12017"
 ></A
 ><H3
 ><A
@@ -842,7 +842,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11998"
+NAME="AEN12022"
 ></A
 ><H3
 ><A
@@ -872,7 +872,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12003"
+NAME="AEN12027"
 ></A
 ><H3
 ><A
@@ -898,7 +898,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12008"
+NAME="AEN12032"
 ></A
 ><H3
 ><A
@@ -935,7 +935,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12013"
+NAME="AEN12037"
 ></A
 ><H3
 ><A
@@ -971,7 +971,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12018"
+NAME="AEN12042"
 ></A
 ><H3
 ><A
@@ -997,7 +997,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12023"
+NAME="AEN12047"
 ></A
 ><H3
 ><A
@@ -1026,7 +1026,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12029"
+NAME="AEN12053"
 ></A
 ><P
 ></P
@@ -1096,7 +1096,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12046"
+NAME="AEN12070"
 ></A
 ><H3
 ><A
@@ -1125,7 +1125,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12051"
+NAME="AEN12075"
 ></A
 ><H3
 ><A
@@ -1151,7 +1151,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12056"
+NAME="AEN12080"
 ></A
 ><H3
 ><A
@@ -1180,7 +1180,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12061"
+NAME="AEN12085"
 ></A
 ><H3
 ><A
@@ -1206,7 +1206,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12066"
+NAME="AEN12090"
 ></A
 ><H3
 ><A
@@ -1237,7 +1237,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12073"
+NAME="AEN12097"
 ></A
 ><P
 ></P
@@ -1292,7 +1292,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12086"
+NAME="AEN12110"
 ></A
 ><H3
 ><A
@@ -1321,7 +1321,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12091"
+NAME="AEN12115"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12096"
+NAME="AEN12120"
 ></A
 ><H3
 ><A
@@ -1382,7 +1382,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12104"
+NAME="AEN12128"
 ></A
 ><P
 ></P
@@ -1452,7 +1452,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12121"
+NAME="AEN12145"
 ></A
 ><H3
 ><A
@@ -1481,7 +1481,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12126"
+NAME="AEN12150"
 ></A
 ><H3
 ><A
@@ -1507,7 +1507,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12131"
+NAME="AEN12155"
 ></A
 ><H3
 ><A
@@ -1539,7 +1539,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12138"
+NAME="AEN12162"
 ></A
 ><H3
 ><A
@@ -1565,7 +1565,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12143"
+NAME="AEN12167"
 ></A
 ><H3
 ><A
@@ -1597,7 +1597,7 @@ and the result is pushed on the stack.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12150"
+NAME="AEN12174"
 ></A
 ><P
 ></P
@@ -1633,7 +1633,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12159"
+NAME="AEN12183"
 ></A
 ><H3
 ><A
@@ -1668,7 +1668,7 @@ http://sourceforge.net/projects/ctrio/</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12167"
+NAME="AEN12191"
 ></A
 ><P
 ></P
@@ -1721,7 +1721,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12180"
+NAME="AEN12204"
 ></A
 ><H3
 ><A
@@ -1756,7 +1756,7 @@ http://sourceforge.net/projects/ctrio/</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12188"
+NAME="AEN12212"
 ></A
 ><P
 ></P
@@ -1809,7 +1809,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12201"
+NAME="AEN12225"
 ></A
 ><H3
 ><A
@@ -1830,13 +1830,13 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Implement a functionnality similar to the DOM NodeList.length</P
+>Implement a functionality similar to the DOM NodeList.length</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12207"
+NAME="AEN12231"
 ></A
 ><P
 ></P
@@ -1874,7 +1874,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12216"
+NAME="AEN12240"
 ></A
 ><H3
 ><A
@@ -1895,7 +1895,7 @@ CLASS="PROGRAMLISTING"
 ></TR
 ></TABLE
 ><P
->Implements a functionnality similar to the DOM NodeList.<GTKDOCLINK
+>Implements a functionality similar to the DOM NodeList.<GTKDOCLINK
 HREF="ITEM"
 >item</GTKDOCLINK
 >()</P
@@ -1904,7 +1904,7 @@ HREF="ITEM"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12223"
+NAME="AEN12247"
 ></A
 ><P
 ></P
@@ -1959,7 +1959,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12236"
+NAME="AEN12260"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12243"
+NAME="AEN12267"
 ></A
 ><P
 ></P
@@ -2029,7 +2029,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12252"
+NAME="AEN12276"
 ></A
 ><H3
 ><A
@@ -2059,7 +2059,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12259"
+NAME="AEN12283"
 ></A
 ><P
 ></P
@@ -2097,7 +2097,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12268"
+NAME="AEN12292"
 ></A
 ><H3
 ><A
@@ -2135,7 +2135,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12277"
+NAME="AEN12301"
 ></A
 ><P
 ></P
@@ -2188,7 +2188,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12290"
+NAME="AEN12314"
 ></A
 ><H3
 ><A
@@ -2227,7 +2227,7 @@ HREF="libxml-xpath.html#XMLXPATHFREEOBJECT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12299"
+NAME="AEN12323"
 ></A
 ><P
 ></P
@@ -2265,7 +2265,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12308"
+NAME="AEN12332"
 ></A
 ><H3
 ><A
@@ -2295,7 +2295,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12315"
+NAME="AEN12339"
 ></A
 ><P
 ></P
@@ -2333,7 +2333,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12324"
+NAME="AEN12348"
 ></A
 ><H3
 ><A
@@ -2366,7 +2366,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12332"
+NAME="AEN12356"
 ></A
 ><P
 ></P
@@ -2419,7 +2419,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12345"
+NAME="AEN12369"
 ></A
 ><H3
 ><A
@@ -2453,7 +2453,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12353"
+NAME="AEN12377"
 ></A
 ><P
 ></P
@@ -2524,7 +2524,7 @@ that's the same node, -1 otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12370"
+NAME="AEN12394"
 ></A
 ><H3
 ><A
@@ -2554,7 +2554,7 @@ HREF="DOUBLE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12377"
+NAME="AEN12401"
 ></A
 ><P
 ></P
@@ -2607,7 +2607,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12390"
+NAME="AEN12414"
 ></A
 ><H3
 ><A
@@ -2637,7 +2637,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12397"
+NAME="AEN12421"
 ></A
 ><P
 ></P
@@ -2690,7 +2690,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12410"
+NAME="AEN12434"
 ></A
 ><H3
 ><A
@@ -2720,7 +2720,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12417"
+NAME="AEN12441"
 ></A
 ><P
 ></P
@@ -2773,7 +2773,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12430"
+NAME="AEN12454"
 ></A
 ><H3
 ><A
@@ -2803,7 +2803,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12437"
+NAME="AEN12461"
 ></A
 ><P
 ></P
@@ -2856,7 +2856,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12450"
+NAME="AEN12474"
 ></A
 ><H3
 ><A
@@ -2886,7 +2886,7 @@ HREF="DOUBLE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12457"
+NAME="AEN12481"
 ></A
 ><P
 ></P
@@ -2939,7 +2939,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12470"
+NAME="AEN12494"
 ></A
 ><H3
 ><A
@@ -2972,7 +2972,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12478"
+NAME="AEN12502"
 ></A
 ><P
 ></P
@@ -3025,7 +3025,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12491"
+NAME="AEN12515"
 ></A
 ><H3
 ><A
@@ -3058,7 +3058,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12499"
+NAME="AEN12523"
 ></A
 ><P
 ></P
@@ -3111,7 +3111,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12512"
+NAME="AEN12536"
 ></A
 ><H3
 ><A
@@ -3144,7 +3144,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12520"
+NAME="AEN12544"
 ></A
 ><P
 ></P
@@ -3197,7 +3197,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12533"
+NAME="AEN12557"
 ></A
 ><H3
 ><A
@@ -3230,7 +3230,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12541"
+NAME="AEN12565"
 ></A
 ><P
 ></P
@@ -3283,7 +3283,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12554"
+NAME="AEN12578"
 ></A
 ><H3
 ><A
@@ -3313,7 +3313,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12561"
+NAME="AEN12585"
 ></A
 ><P
 ></P
@@ -3366,7 +3366,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12574"
+NAME="AEN12598"
 ></A
 ><H3
 ><A
@@ -3399,7 +3399,7 @@ HREF="DOUBLE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12582"
+NAME="AEN12606"
 ></A
 ><P
 ></P
@@ -3452,7 +3452,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12595"
+NAME="AEN12619"
 ></A
 ><H3
 ><A
@@ -3485,7 +3485,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12603"
+NAME="AEN12627"
 ></A
 ><P
 ></P
@@ -3538,7 +3538,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12616"
+NAME="AEN12640"
 ></A
 ><H3
 ><A
@@ -3571,7 +3571,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12624"
+NAME="AEN12648"
 ></A
 ><P
 ></P
@@ -3624,7 +3624,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12637"
+NAME="AEN12661"
 ></A
 ><H3
 ><A
@@ -3660,7 +3660,7 @@ HREF="STRING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12646"
+NAME="AEN12670"
 ></A
 ><P
 ></P
@@ -3703,7 +3703,12 @@ WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
 >the string value of the object, NULL in case of error.
-A new string is allocated only if needed (val isn't a
+A new string is allocated only if needed (<TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+> isn't a
 string object).</TD
 ></TR
 ></TBODY
@@ -3715,7 +3720,7 @@ string object).</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12659"
+NAME="AEN12684"
 ></A
 ><H3
 ><A
@@ -3751,7 +3756,7 @@ HREF="BOOLEAN"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12668"
+NAME="AEN12693"
 ></A
 ><P
 ></P
@@ -3810,7 +3815,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12682"
+NAME="AEN12707"
 ></A
 ><H3
 ><A
@@ -3846,7 +3851,7 @@ HREF="NUMBER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12691"
+NAME="AEN12716"
 ></A
 ><P
 ></P
@@ -3905,7 +3910,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12705"
+NAME="AEN12730"
 ></A
 ><H3
 ><A
@@ -3941,7 +3946,7 @@ HREF="STRING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12714"
+NAME="AEN12739"
 ></A
 ><P
 ></P
@@ -4000,7 +4005,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12728"
+NAME="AEN12753"
 ></A
 ><H3
 ><A
@@ -4028,7 +4033,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12734"
+NAME="AEN12759"
 ></A
 ><H3
 ><A
@@ -4061,7 +4066,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12742"
+NAME="AEN12767"
 ></A
 ><P
 ></P
@@ -4114,7 +4119,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12755"
+NAME="AEN12780"
 ></A
 ><H3
 ><A
@@ -4144,7 +4149,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12762"
+NAME="AEN12787"
 ></A
 ><P
 ></P
@@ -4182,7 +4187,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12771"
+NAME="AEN12796"
 ></A
 ><H3
 ><A
@@ -4208,7 +4213,7 @@ HREF="libxml-tree.html#XMLCHAR"
                                              <A
 HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 >xmlXPathContextPtr</A
-> ctxt);</PRE
+> ctx);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4219,7 +4224,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12780"
+NAME="AEN12805"
 ></A
 ><P
 ></P
@@ -4256,14 +4261,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->ctxt</I
+>ctx</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -4278,7 +4283,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
 the caller has to free the object.</TD
 ></TR
 ></TBODY
@@ -4290,7 +4295,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12797"
+NAME="AEN12822"
 ></A
 ><H3
 ><A
@@ -4327,7 +4332,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12806"
+NAME="AEN12831"
 ></A
 ><P
 ></P
@@ -4398,7 +4403,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12823"
+NAME="AEN12848"
 ></A
 ><H3
 ><A
@@ -4433,15 +4438,13 @@ be converted to true if the number is equal to the position of the
 context node in the context node list (as returned by the position
 function) and will be converted to false otherwise; if the result
 is not a number, then the result will be converted as if by a call
-to the boolean function. </P
-><P
->Return 1 if predicate is true, 0 otherwise</P
+to the boolean function.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12832"
+NAME="AEN12856"
 ></A
 ><P
 ></P
@@ -4500,7 +4503,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if predicate is true, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4511,7 +4514,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12849"
+NAME="AEN12873"
 ></A
 ><H3
 ><A
@@ -4544,7 +4547,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12857"
+NAME="AEN12881"
 ></A
 ><P
 ></P
@@ -4586,7 +4589,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
 the caller has to free the object.</TD
 ></TR
 ></TBODY
@@ -4598,7 +4601,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12870"
+NAME="AEN12894"
 ></A
 ><H3
 ><A
@@ -4635,7 +4638,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12879"
+NAME="AEN12903"
 ></A
 ><P
 ></P
@@ -4694,7 +4697,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
 the caller has to free the object.</TD
 ></TR
 ></TBODY
@@ -4706,7 +4709,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12896"
+NAME="AEN12920"
 ></A
 ><H3
 ><A
@@ -4741,7 +4744,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12904"
+NAME="AEN12928"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 65dc5388..5886d0cf 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XPATHINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12918"
+NAME="AEN12942"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN12918"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12921"
+NAME="AEN12945"
 ></A
 ><H2
 >Synopsis</H2
@@ -333,7 +333,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 HREF="libxml-xpathinternals.html#XMLXPATHVARIABLELOOKUPFUNC"
 >xmlXPathVariableLookupFunc</A
 > f,
-                                             void *varCtxt);
+                                             void *data);
 <GTKDOCLINK
 HREF="TYPEDEF"
 >typedef</GTKDOCLINK
@@ -597,7 +597,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
                                              const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
-> *ns_uri);
+> *prefix);
 void        <A
 HREF="libxml-xpathinternals.html#XMLXPATHREGISTEREDNSCLEANUP"
 >xmlXPathRegisteredNsCleanup</A
@@ -1531,7 +1531,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13301"
+NAME="AEN13325"
 ></A
 ><H2
 >Description</H2
@@ -1541,14 +1541,14 @@ NAME="AEN13301"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13304"
+NAME="AEN13328"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13306"
+NAME="AEN13330"
 ></A
 ><H3
 ><A
@@ -1575,7 +1575,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13312"
+NAME="AEN13336"
 ></A
 ><P
 ></P
@@ -1630,7 +1630,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13325"
+NAME="AEN13349"
 ></A
 ><H3
 ><A
@@ -1657,7 +1657,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13331"
+NAME="AEN13355"
 ></A
 ><P
 ></P
@@ -1695,7 +1695,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13340"
+NAME="AEN13364"
 ></A
 ><H3
 ><A
@@ -1722,7 +1722,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13346"
+NAME="AEN13370"
 ></A
 ><P
 ></P
@@ -1760,7 +1760,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13355"
+NAME="AEN13379"
 ></A
 ><H3
 ><A
@@ -1787,7 +1787,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13361"
+NAME="AEN13385"
 ></A
 ><P
 ></P
@@ -1825,7 +1825,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13370"
+NAME="AEN13394"
 ></A
 ><H3
 ><A
@@ -1852,7 +1852,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13376"
+NAME="AEN13400"
 ></A
 ><P
 ></P
@@ -1890,7 +1890,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13385"
+NAME="AEN13409"
 ></A
 ><H3
 ><A
@@ -1917,7 +1917,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13391"
+NAME="AEN13415"
 ></A
 ><P
 ></P
@@ -1955,7 +1955,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13400"
+NAME="AEN13424"
 ></A
 ><H3
 ><A
@@ -1982,7 +1982,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13406"
+NAME="AEN13430"
 ></A
 ><P
 ></P
@@ -2020,7 +2020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13415"
+NAME="AEN13439"
 ></A
 ><H3
 ><A
@@ -2054,7 +2054,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13423"
+NAME="AEN13447"
 ></A
 ><P
 ></P
@@ -2107,7 +2107,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13436"
+NAME="AEN13460"
 ></A
 ><H3
 ><A
@@ -2144,7 +2144,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13445"
+NAME="AEN13469"
 ></A
 ><P
 ></P
@@ -2197,7 +2197,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13458"
+NAME="AEN13482"
 ></A
 ><H3
 ><A
@@ -2234,7 +2234,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13467"
+NAME="AEN13491"
 ></A
 ><P
 ></P
@@ -2287,7 +2287,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13480"
+NAME="AEN13504"
 ></A
 ><H3
 ><A
@@ -2324,7 +2324,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13489"
+NAME="AEN13513"
 ></A
 ><P
 ></P
@@ -2377,7 +2377,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13502"
+NAME="AEN13526"
 ></A
 ><H3
 ><A
@@ -2401,7 +2401,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ></TR
 ></TABLE
 ><P
->Pops an external oject from the stack, handling conversion if needed.
+>Pops an external object from the stack, handling conversion if needed.
 Check error with <A
 HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 >xmlXPathCheckError</A
@@ -2411,7 +2411,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHCHECKERROR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13510"
+NAME="AEN13534"
 ></A
 ><P
 ></P
@@ -2449,7 +2449,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13519"
+NAME="AEN13543"
 ></A
 ><H3
 ><A
@@ -2481,7 +2481,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13526"
+NAME="AEN13550"
 ></A
 ><P
 ></P
@@ -2536,7 +2536,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13539"
+NAME="AEN13563"
 ></A
 ><H3
 ><A
@@ -2563,7 +2563,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13545"
+NAME="AEN13569"
 ></A
 ><P
 ></P
@@ -2601,7 +2601,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13554"
+NAME="AEN13578"
 ></A
 ><H3
 ><A
@@ -2628,7 +2628,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13560"
+NAME="AEN13584"
 ></A
 ><P
 ></P
@@ -2666,7 +2666,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13569"
+NAME="AEN13593"
 ></A
 ><H3
 ><A
@@ -2698,7 +2698,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13576"
+NAME="AEN13600"
 ></A
 ><P
 ></P
@@ -2753,7 +2753,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13589"
+NAME="AEN13613"
 ></A
 ><H3
 ><A
@@ -2785,7 +2785,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13596"
+NAME="AEN13620"
 ></A
 ><P
 ></P
@@ -2840,7 +2840,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13609"
+NAME="AEN13633"
 ></A
 ><H3
 ><A
@@ -2867,7 +2867,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13615"
+NAME="AEN13639"
 ></A
 ><P
 ></P
@@ -2905,7 +2905,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13624"
+NAME="AEN13648"
 ></A
 ><H3
 ><A
@@ -2937,7 +2937,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13631"
+NAME="AEN13655"
 ></A
 ><P
 ></P
@@ -2992,7 +2992,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13644"
+NAME="AEN13668"
 ></A
 ><H3
 ><A
@@ -3019,7 +3019,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13650"
+NAME="AEN13674"
 ></A
 ><P
 ></P
@@ -3074,7 +3074,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13663"
+NAME="AEN13687"
 ></A
 ><H3
 ><A
@@ -3101,7 +3101,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13669"
+NAME="AEN13693"
 ></A
 ><P
 ></P
@@ -3156,7 +3156,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13682"
+NAME="AEN13706"
 ></A
 ><H3
 ><A
@@ -3184,7 +3184,7 @@ an XSLT value tree</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13688"
+NAME="AEN13712"
 ></A
 ><P
 ></P
@@ -3222,7 +3222,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13697"
+NAME="AEN13721"
 ></A
 ><H3
 ><A
@@ -3250,7 +3250,7 @@ object.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13703"
+NAME="AEN13727"
 ></A
 ><P
 ></P
@@ -3288,7 +3288,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13712"
+NAME="AEN13736"
 ></A
 ><H3
 ><A
@@ -3315,7 +3315,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13718"
+NAME="AEN13742"
 ></A
 ><P
 ></P
@@ -3353,7 +3353,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13727"
+NAME="AEN13751"
 ></A
 ><H3
 ><A
@@ -3381,7 +3381,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13733"
+NAME="AEN13757"
 ></A
 ><H3
 ><A
@@ -3409,7 +3409,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13739"
+NAME="AEN13763"
 ></A
 ><H3
 ><A
@@ -3436,7 +3436,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13745"
+NAME="AEN13769"
 ></A
 ><P
 ></P
@@ -3474,7 +3474,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13754"
+NAME="AEN13778"
 ></A
 ><H3
 ><A
@@ -3501,7 +3501,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13760"
+NAME="AEN13784"
 ></A
 ><P
 ></P
@@ -3539,7 +3539,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13769"
+NAME="AEN13793"
 ></A
 ><H3
 ><A
@@ -3567,7 +3567,7 @@ type.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13775"
+NAME="AEN13799"
 ></A
 ><P
 ></P
@@ -3605,7 +3605,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13784"
+NAME="AEN13808"
 ></A
 ><H3
 ><A
@@ -3633,7 +3633,7 @@ type. return(0) in case of failure</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13790"
+NAME="AEN13814"
 ></A
 ><P
 ></P
@@ -3671,7 +3671,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13799"
+NAME="AEN13823"
 ></A
 ><H3
 ><A
@@ -3698,7 +3698,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13805"
+NAME="AEN13829"
 ></A
 ><P
 ></P
@@ -3736,7 +3736,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13814"
+NAME="AEN13838"
 ></A
 ><H3
 ><A
@@ -3764,7 +3764,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13820"
+NAME="AEN13844"
 ></A
 ><H3
 ><A
@@ -3792,7 +3792,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13826"
+NAME="AEN13850"
 ></A
 ><H3
 ><A
@@ -3820,7 +3820,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13832"
+NAME="AEN13856"
 ></A
 ><H3
 ><A
@@ -3857,7 +3857,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13840"
+NAME="AEN13864"
 ></A
 ><P
 ></P
@@ -3944,7 +3944,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13861"
+NAME="AEN13885"
 ></A
 ><H3
 ><A
@@ -3968,7 +3968,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 HREF="libxml-xpathinternals.html#XMLXPATHVARIABLELOOKUPFUNC"
 >xmlXPathVariableLookupFunc</A
 > f,
-                                             void *varCtxt);</PRE
+                                             void *data);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3979,7 +3979,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHVARIABLELOOKUPFUNC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13869"
+NAME="AEN13893"
 ></A
 ><P
 ></P
@@ -4033,14 +4033,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->varCtxt</I
+>data</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lookup data</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4051,7 +4051,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13886"
+NAME="AEN13910"
 ></A
 ><H3
 ><A
@@ -4083,7 +4083,7 @@ and the result is pushed on the stack.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13893"
+NAME="AEN13917"
 ></A
 ><P
 ></P
@@ -4119,7 +4119,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13902"
+NAME="AEN13926"
 ></A
 ><H3
 ><A
@@ -4148,13 +4148,13 @@ HREF="XMLXPATHFUNCLOOKUPFUNC"
 ></TR
 ></TABLE
 ><P
->Registers an external mecanism to do function lookup.</P
+>Registers an external mechanism to do function lookup.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13910"
+NAME="AEN13934"
 ></A
 ><P
 ></P
@@ -4215,7 +4215,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lookup data</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4226,7 +4226,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13927"
+NAME="AEN13951"
 ></A
 ><H3
 ><A
@@ -4259,7 +4259,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13934"
+NAME="AEN13958"
 ></A
 ><P
 ></P
@@ -4348,7 +4348,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13955"
+NAME="AEN13979"
 ></A
 ><H3
 ><A
@@ -4383,7 +4383,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13963"
+NAME="AEN13987"
 ></A
 ><P
 ></P
@@ -4455,7 +4455,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13980"
+NAME="AEN14004"
 ></A
 ><H3
 ><A
@@ -4490,7 +4490,7 @@ HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13988"
+NAME="AEN14012"
 ></A
 ><P
 ></P
@@ -4562,7 +4562,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14005"
+NAME="AEN14029"
 ></A
 ><H3
 ><A
@@ -4606,7 +4606,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14015"
+NAME="AEN14039"
 ></A
 ><P
 ></P
@@ -4686,7 +4686,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14034"
+NAME="AEN14058"
 ></A
 ><H3
 ><A
@@ -4727,7 +4727,7 @@ node-set set:difference (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14044"
+NAME="AEN14068"
 ></A
 ><P
 ></P
@@ -4798,7 +4798,7 @@ nodes2 is empty</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14061"
+NAME="AEN14085"
 ></A
 ><H3
 ><A
@@ -4839,7 +4839,7 @@ node-set set:intersection (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14071"
+NAME="AEN14095"
 ></A
 ><P
 ></P
@@ -4910,7 +4910,7 @@ node sets passed as arguments</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14088"
+NAME="AEN14112"
 ></A
 ><H3
 ><A
@@ -4947,7 +4947,7 @@ node-set set:distinct (node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14097"
+NAME="AEN14121"
 ></A
 ><P
 ></P
@@ -5011,7 +5011,7 @@ it is empty</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14112"
+NAME="AEN14136"
 ></A
 ><H3
 ><A
@@ -5058,7 +5058,7 @@ is called with the sorted node-set</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14123"
+NAME="AEN14147"
 ></A
 ><P
 ></P
@@ -5122,7 +5122,7 @@ it is empty</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14138"
+NAME="AEN14162"
 ></A
 ><H3
 ><A
@@ -5157,7 +5157,7 @@ boolean set:has-same-node(node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14146"
+NAME="AEN14170"
 ></A
 ><P
 ></P
@@ -5238,7 +5238,7 @@ otherwise</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14165"
+NAME="AEN14189"
 ></A
 ><H3
 ><A
@@ -5279,7 +5279,7 @@ node-set set:leading (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14175"
+NAME="AEN14199"
 ></A
 ><P
 ></P
@@ -5381,7 +5381,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14198"
+NAME="AEN14222"
 ></A
 ><H3
 ><A
@@ -5422,7 +5422,7 @@ node-set set:leading (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14208"
+NAME="AEN14232"
 ></A
 ><P
 ></P
@@ -5524,7 +5524,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14231"
+NAME="AEN14255"
 ></A
 ><H3
 ><A
@@ -5575,7 +5575,7 @@ is called.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14243"
+NAME="AEN14267"
 ></A
 ><P
 ></P
@@ -5677,7 +5677,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14266"
+NAME="AEN14290"
 ></A
 ><H3
 ><A
@@ -5733,7 +5733,7 @@ HREF="EXSLSETSLEADINGSORTED"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14279"
+NAME="AEN14303"
 ></A
 ><P
 ></P
@@ -5835,7 +5835,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14302"
+NAME="AEN14326"
 ></A
 ><H3
 ><A
@@ -5876,7 +5876,7 @@ node-set set:trailing (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14312"
+NAME="AEN14336"
 ></A
 ><P
 ></P
@@ -5978,7 +5978,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14335"
+NAME="AEN14359"
 ></A
 ><H3
 ><A
@@ -6019,7 +6019,7 @@ node-set set:trailing (node-set, node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14345"
+NAME="AEN14369"
 ></A
 ><P
 ></P
@@ -6121,7 +6121,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14368"
+NAME="AEN14392"
 ></A
 ><H3
 ><A
@@ -6172,7 +6172,7 @@ is called.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14380"
+NAME="AEN14404"
 ></A
 ><P
 ></P
@@ -6274,7 +6274,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14403"
+NAME="AEN14427"
 ></A
 ><H3
 ><A
@@ -6330,7 +6330,7 @@ HREF="libxml-xpathinternals.html#XMLXPATHTRAILINGSORTED"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14416"
+NAME="AEN14440"
 ></A
 ><P
 ></P
@@ -6432,7 +6432,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14439"
+NAME="AEN14463"
 ></A
 ><H3
 ><A
@@ -6476,7 +6476,7 @@ the namespace</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14449"
+NAME="AEN14473"
 ></A
 ><P
 ></P
@@ -6563,7 +6563,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14470"
+NAME="AEN14494"
 ></A
 ><H3
 ><A
@@ -6589,7 +6589,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
                                              const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
-> *ns_uri);</PRE
+> *prefix);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -6601,7 +6601,7 @@ namespace name associated to the given prefix</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14479"
+NAME="AEN14503"
 ></A
 ><P
 ></P
@@ -6638,14 +6638,14 @@ VALIGN="TOP"
 ><TT
 CLASS="PARAMETER"
 ><I
->ns_uri</I
+>prefix</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix value</TD
 ></TR
 ><TR
 ><TD
@@ -6671,7 +6671,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14496"
+NAME="AEN14520"
 ></A
 ><H3
 ><A
@@ -6701,7 +6701,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14503"
+NAME="AEN14527"
 ></A
 ><P
 ></P
@@ -6739,7 +6739,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14512"
+NAME="AEN14536"
 ></A
 ><H3
 ><A
@@ -6782,7 +6782,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14522"
+NAME="AEN14546"
 ></A
 ><P
 ></P
@@ -6869,7 +6869,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14543"
+NAME="AEN14567"
 ></A
 ><H3
 ><A
@@ -6916,7 +6916,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14554"
+NAME="AEN14578"
 ></A
 ><P
 ></P
@@ -7020,7 +7020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14579"
+NAME="AEN14603"
 ></A
 ><H3
 ><A
@@ -7064,7 +7064,7 @@ the variable</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14589"
+NAME="AEN14613"
 ></A
 ><P
 ></P
@@ -7151,7 +7151,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14610"
+NAME="AEN14634"
 ></A
 ><H3
 ><A
@@ -7199,7 +7199,7 @@ the variable</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14621"
+NAME="AEN14645"
 ></A
 ><P
 ></P
@@ -7303,7 +7303,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14646"
+NAME="AEN14670"
 ></A
 ><H3
 ><A
@@ -7341,7 +7341,7 @@ function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14655"
+NAME="AEN14679"
 ></A
 ><P
 ></P
@@ -7411,7 +7411,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14672"
+NAME="AEN14696"
 ></A
 ><H3
 ><A
@@ -7453,7 +7453,7 @@ function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14682"
+NAME="AEN14706"
 ></A
 ><P
 ></P
@@ -7540,7 +7540,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14703"
+NAME="AEN14727"
 ></A
 ><H3
 ><A
@@ -7570,7 +7570,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14710"
+NAME="AEN14734"
 ></A
 ><P
 ></P
@@ -7608,7 +7608,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14719"
+NAME="AEN14743"
 ></A
 ><H3
 ><A
@@ -7646,7 +7646,7 @@ variable value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14728"
+NAME="AEN14752"
 ></A
 ><P
 ></P
@@ -7716,7 +7716,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14745"
+NAME="AEN14769"
 ></A
 ><H3
 ><A
@@ -7758,7 +7758,7 @@ variable value.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14755"
+NAME="AEN14779"
 ></A
 ><P
 ></P
@@ -7845,7 +7845,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14776"
+NAME="AEN14800"
 ></A
 ><H3
 ><A
@@ -7876,7 +7876,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14783"
+NAME="AEN14807"
 ></A
 ><P
 ></P
@@ -7914,7 +7914,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14792"
+NAME="AEN14816"
 ></A
 ><H3
 ><A
@@ -7952,7 +7952,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14801"
+NAME="AEN14825"
 ></A
 ><P
 ></P
@@ -8022,7 +8022,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14818"
+NAME="AEN14842"
 ></A
 ><H3
 ><A
@@ -8052,7 +8052,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14825"
+NAME="AEN14849"
 ></A
 ><P
 ></P
@@ -8090,7 +8090,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14834"
+NAME="AEN14858"
 ></A
 ><H3
 ><A
@@ -8123,7 +8123,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14842"
+NAME="AEN14866"
 ></A
 ><P
 ></P
@@ -8176,7 +8176,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14855"
+NAME="AEN14879"
 ></A
 ><H3
 ><A
@@ -8210,7 +8210,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14863"
+NAME="AEN14887"
 ></A
 ><P
 ></P
@@ -8269,7 +8269,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of items on the value stack</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8280,7 +8280,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14880"
+NAME="AEN14904"
 ></A
 ><H3
 ><A
@@ -8318,7 +8318,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14889"
+NAME="AEN14913"
 ></A
 ><P
 ></P
@@ -8371,7 +8371,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14902"
+NAME="AEN14926"
 ></A
 ><H3
 ><A
@@ -8406,7 +8406,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14910"
+NAME="AEN14934"
 ></A
 ><P
 ></P
@@ -8459,7 +8459,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14923"
+NAME="AEN14947"
 ></A
 ><H3
 ><A
@@ -8497,7 +8497,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14932"
+NAME="AEN14956"
 ></A
 ><P
 ></P
@@ -8550,7 +8550,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14945"
+NAME="AEN14969"
 ></A
 ><H3
 ><A
@@ -8580,7 +8580,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14952"
+NAME="AEN14976"
 ></A
 ><P
 ></P
@@ -8633,7 +8633,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14965"
+NAME="AEN14989"
 ></A
 ><H3
 ><A
@@ -8671,7 +8671,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14974"
+NAME="AEN14998"
 ></A
 ><P
 ></P
@@ -8724,7 +8724,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14987"
+NAME="AEN15011"
 ></A
 ><H3
 ><A
@@ -8759,7 +8759,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14995"
+NAME="AEN15019"
 ></A
 ><P
 ></P
@@ -8812,7 +8812,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15008"
+NAME="AEN15032"
 ></A
 ><H3
 ><A
@@ -8851,7 +8851,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15017"
+NAME="AEN15041"
 ></A
 ><P
 ></P
@@ -8904,7 +8904,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15030"
+NAME="AEN15054"
 ></A
 ><H3
 ><A
@@ -8943,7 +8943,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15039"
+NAME="AEN15063"
 ></A
 ><P
 ></P
@@ -8996,7 +8996,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15052"
+NAME="AEN15076"
 ></A
 ><H3
 ><A
@@ -9024,13 +9024,13 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->add a new xmlNodePtr ot an existing NodeSet</P
+>add a new xmlNodePtr to an existing NodeSet</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15060"
+NAME="AEN15084"
 ></A
 ><P
 ></P
@@ -9085,7 +9085,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15073"
+NAME="AEN15097"
 ></A
 ><H3
 ><A
@@ -9113,14 +9113,14 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ></TR
 ></TABLE
 ><P
->add a new xmlNodePtr ot an existing NodeSet, optimized version
+>add a new xmlNodePtr to an existing NodeSet, optimized version
 when we are sure the node is not already in the set.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15081"
+NAME="AEN15105"
 ></A
 ><P
 ></P
@@ -9175,7 +9175,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15094"
+NAME="AEN15118"
 ></A
 ><H3
 ><A
@@ -9205,7 +9205,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15101"
+NAME="AEN15125"
 ></A
 ><P
 ></P
@@ -9243,7 +9243,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15110"
+NAME="AEN15134"
 ></A
 ><H3
 ><A
@@ -9288,7 +9288,7 @@ have a unique ID equal to any of the tokens in the list.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15118"
+NAME="AEN15142"
 ></A
 ><P
 ></P
@@ -9343,7 +9343,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15131"
+NAME="AEN15155"
 ></A
 ><H3
 ><A
@@ -9373,7 +9373,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15138"
+NAME="AEN15162"
 ></A
 ><P
 ></P
@@ -9411,7 +9411,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15147"
+NAME="AEN15171"
 ></A
 ><H3
 ><A
@@ -9442,7 +9442,7 @@ then push the result on the context stack</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15154"
+NAME="AEN15178"
 ></A
 ><P
 ></P
@@ -9480,7 +9480,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15163"
+NAME="AEN15187"
 ></A
 ><H3
 ><A
@@ -9518,7 +9518,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15173"
+NAME="AEN15197"
 ></A
 ><P
 ></P
@@ -9571,7 +9571,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15186"
+NAME="AEN15210"
 ></A
 ><H3
 ><A
@@ -9609,7 +9609,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15196"
+NAME="AEN15220"
 ></A
 ><P
 ></P
@@ -9662,7 +9662,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15209"
+NAME="AEN15233"
 ></A
 ><H3
 ><A
@@ -9703,7 +9703,7 @@ negative values : '-' Number.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15219"
+NAME="AEN15243"
 ></A
 ><P
 ></P
@@ -9756,7 +9756,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15232"
+NAME="AEN15256"
 ></A
 ><H3
 ><A
@@ -9791,15 +9791,13 @@ be converted to true if the number is equal to the position of the
 context node in the context node list (as returned by the position
 function) and will be converted to false otherwise; if the result
 is not a number, then the result will be converted as if by a call
-to the boolean function. </P
-><P
->Return 1 if predicate is true, 0 otherwise</P
+to the boolean function.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15241"
+NAME="AEN15264"
 ></A
 ><P
 ></P
@@ -9858,7 +9856,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if predicate is true, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9869,7 +9867,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15258"
+NAME="AEN15281"
 ></A
 ><H3
 ><A
@@ -9897,7 +9895,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15264"
+NAME="AEN15287"
 ></A
 ><H3
 ><A
@@ -9945,7 +9943,7 @@ Number including a decimal point with at least one digit
 before the decimal point and at least one digit after the
 decimal point, preceded by a minus sign (-) if the number
 is negative; there must be no leading zeros before the decimal
-point apart possibly from the one required digit immediatelyi
+point apart possibly from the one required digit immediately
 before the decimal point; beyond the one required digit
 after the decimal point there must be as many, but only as
 many, more digits as are needed to uniquely distinguish the
@@ -9960,7 +9958,7 @@ context node as its only member.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15273"
+NAME="AEN15296"
 ></A
 ><P
 ></P
@@ -10015,7 +10013,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15286"
+NAME="AEN15309"
 ></A
 ><H3
 ><A
@@ -10045,7 +10043,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15293"
+NAME="AEN15316"
 ></A
 ><P
 ></P
@@ -10083,7 +10081,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15302"
+NAME="AEN15325"
 ></A
 ><H3
 ><A
@@ -10121,7 +10119,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15311"
+NAME="AEN15334"
 ></A
 ><P
 ></P
@@ -10174,7 +10172,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15324"
+NAME="AEN15347"
 ></A
 ><H3
 ><A
@@ -10232,7 +10230,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15337"
+NAME="AEN15360"
 ></A
 ><P
 ></P
@@ -10291,7 +10289,12 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->val1 once extended or NULL in case of error.</TD
+><TT
+CLASS="PARAMETER"
+><I
+>val1</I
+></TT
+> once extended or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10302,7 +10305,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15354"
+NAME="AEN15378"
 ></A
 ><H3
 ><A
@@ -10336,7 +10339,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15362"
+NAME="AEN15386"
 ></A
 ><P
 ></P
@@ -10391,7 +10394,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15375"
+NAME="AEN15399"
 ></A
 ><H3
 ><A
@@ -10422,7 +10425,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15382"
+NAME="AEN15406"
 ></A
 ><P
 ></P
@@ -10477,7 +10480,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15395"
+NAME="AEN15419"
 ></A
 ><H3
 ><A
@@ -10507,7 +10510,7 @@ HREF="libxml-xpath.html#XMLNODESETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15402"
+NAME="AEN15426"
 ></A
 ><P
 ></P
@@ -10545,7 +10548,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15411"
+NAME="AEN15435"
 ></A
 ><H3
 ><A
@@ -10584,7 +10587,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15420"
+NAME="AEN15444"
 ></A
 ><P
 ></P
@@ -10637,7 +10640,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15433"
+NAME="AEN15457"
 ></A
 ><H3
 ><A
@@ -10675,7 +10678,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15442"
+NAME="AEN15466"
 ></A
 ><P
 ></P
@@ -10728,7 +10731,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15455"
+NAME="AEN15479"
 ></A
 ><H3
 ><A
@@ -10763,7 +10766,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15463"
+NAME="AEN15487"
 ></A
 ><P
 ></P
@@ -10816,7 +10819,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15476"
+NAME="AEN15500"
 ></A
 ><H3
 ><A
@@ -10855,7 +10858,7 @@ HREF="libxml-xpath.html#XMLXPATHFREEOBJECT"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15485"
+NAME="AEN15509"
 ></A
 ><P
 ></P
@@ -10893,7 +10896,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15494"
+NAME="AEN15518"
 ></A
 ><H3
 ><A
@@ -10923,7 +10926,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15501"
+NAME="AEN15525"
 ></A
 ><P
 ></P
@@ -10961,7 +10964,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15510"
+NAME="AEN15534"
 ></A
 ><H3
 ><A
@@ -10994,7 +10997,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15518"
+NAME="AEN15542"
 ></A
 ><P
 ></P
@@ -11047,7 +11050,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15531"
+NAME="AEN15555"
 ></A
 ><H3
 ><A
@@ -11077,7 +11080,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15538"
+NAME="AEN15562"
 ></A
 ><P
 ></P
@@ -11115,7 +11118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15547"
+NAME="AEN15571"
 ></A
 ><H3
 ><A
@@ -11155,7 +11158,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15556"
+NAME="AEN15580"
 ></A
 ><P
 ></P
@@ -11208,7 +11211,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15569"
+NAME="AEN15593"
 ></A
 ><H3
 ><A
@@ -11294,7 +11297,7 @@ is greater than or equal to the second number.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15585"
+NAME="AEN15609"
 ></A
 ><P
 ></P
@@ -11370,7 +11373,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the comparaison succeeded, 0 if it failed</TD
+>1 if the comparison succeeded, 0 if it failed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11381,7 +11384,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15606"
+NAME="AEN15630"
 ></A
 ><H3
 ><A
@@ -11413,7 +11416,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15613"
+NAME="AEN15637"
 ></A
 ><P
 ></P
@@ -11451,7 +11454,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15622"
+NAME="AEN15646"
 ></A
 ><H3
 ><A
@@ -11483,7 +11486,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15629"
+NAME="AEN15653"
 ></A
 ><P
 ></P
@@ -11521,7 +11524,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15638"
+NAME="AEN15662"
 ></A
 ><H3
 ><A
@@ -11545,7 +11548,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ></TR
 ></TABLE
 ><P
->Implement the substraction operation on XPath objects:
+>Implement the subtraction operation on XPath objects:
 The numeric operators convert their operands to numbers as if
 by calling the number function.</P
 ><P
@@ -11553,7 +11556,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15645"
+NAME="AEN15669"
 ></A
 ><P
 ></P
@@ -11591,7 +11594,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15654"
+NAME="AEN15678"
 ></A
 ><H3
 ><A
@@ -11623,7 +11626,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15661"
+NAME="AEN15685"
 ></A
 ><P
 ></P
@@ -11661,7 +11664,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15670"
+NAME="AEN15694"
 ></A
 ><H3
 ><A
@@ -11703,7 +11706,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15679"
+NAME="AEN15703"
 ></A
 ><P
 ></P
@@ -11741,7 +11744,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15688"
+NAME="AEN15712"
 ></A
 ><H3
 ><A
@@ -11783,7 +11786,7 @@ by calling the number function.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15697"
+NAME="AEN15721"
 ></A
 ><P
 ></P
@@ -11821,7 +11824,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15706"
+NAME="AEN15730"
 ></A
 ><H3
 ><A
@@ -11856,7 +11859,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15714"
+NAME="AEN15738"
 ></A
 ><P
 ></P
@@ -11909,7 +11912,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15727"
+NAME="AEN15751"
 ></A
 ><H3
 ><A
@@ -11947,7 +11950,7 @@ The self axis contains just the context node itself</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15736"
+NAME="AEN15760"
 ></A
 ><P
 ></P
@@ -12017,7 +12020,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15753"
+NAME="AEN15777"
 ></A
 ><H3
 ><A
@@ -12055,7 +12058,7 @@ The child axis contains the children of the context node in document order.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15762"
+NAME="AEN15786"
 ></A
 ><P
 ></P
@@ -12125,7 +12128,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15779"
+NAME="AEN15803"
 ></A
 ><H3
 ><A
@@ -12164,7 +12167,7 @@ order; a descendant is a child or a child of a child and so on.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15788"
+NAME="AEN15812"
 ></A
 ><P
 ></P
@@ -12234,7 +12237,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15805"
+NAME="AEN15829"
 ></A
 ><H3
 ><A
@@ -12275,7 +12278,7 @@ on the axis</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15814"
+NAME="AEN15838"
 ></A
 ><P
 ></P
@@ -12345,7 +12348,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15831"
+NAME="AEN15855"
 ></A
 ><H3
 ><A
@@ -12383,7 +12386,7 @@ The parent axis contains the parent of the context node, if there is one.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15840"
+NAME="AEN15864"
 ></A
 ><P
 ></P
@@ -12453,7 +12456,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15857"
+NAME="AEN15881"
 ></A
 ><H3
 ><A
@@ -12494,7 +12497,7 @@ parent here is defined the same as with the parent axis.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15866"
+NAME="AEN15890"
 ></A
 ><P
 ></P
@@ -12564,7 +12567,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15883"
+NAME="AEN15907"
 ></A
 ><H3
 ><A
@@ -12603,7 +12606,7 @@ node in document order.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15892"
+NAME="AEN15916"
 ></A
 ><P
 ></P
@@ -12673,7 +12676,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15909"
+NAME="AEN15933"
 ></A
 ><H3
 ><A
@@ -12714,7 +12717,7 @@ are ordered in document order</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15918"
+NAME="AEN15942"
 ></A
 ><P
 ></P
@@ -12784,7 +12787,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15935"
+NAME="AEN15959"
 ></A
 ><H3
 ><A
@@ -12826,7 +12829,7 @@ be empty unless the context node is an element</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15945"
+NAME="AEN15969"
 ></A
 ><P
 ></P
@@ -12896,7 +12899,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15962"
+NAME="AEN15986"
 ></A
 ><H3
 ><A
@@ -12934,7 +12937,7 @@ TODO: support DTD inherited default attributes</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15971"
+NAME="AEN15995"
 ></A
 ><P
 ></P
@@ -13004,7 +13007,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15988"
+NAME="AEN16012"
 ></A
 ><H3
 ><A
@@ -13045,7 +13048,7 @@ ordered in reverse document order</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15997"
+NAME="AEN16021"
 ></A
 ><P
 ></P
@@ -13115,7 +13118,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16014"
+NAME="AEN16038"
 ></A
 ><H3
 ><A
@@ -13157,7 +13160,7 @@ node on the axis</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16023"
+NAME="AEN16047"
 ></A
 ><P
 ></P
@@ -13227,7 +13230,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16040"
+NAME="AEN16064"
 ></A
 ><H3
 ><A
@@ -13267,7 +13270,7 @@ axis; the sibling preceding that node is the second on the axis and so on.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16049"
+NAME="AEN16073"
 ></A
 ><P
 ></P
@@ -13337,7 +13340,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16066"
+NAME="AEN16090"
 ></A
 ><H3
 ><A
@@ -13376,7 +13379,7 @@ The last function returns the number of nodes in the context node list.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16075"
+NAME="AEN16099"
 ></A
 ><P
 ></P
@@ -13431,7 +13434,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16088"
+NAME="AEN16112"
 ></A
 ><H3
 ><A
@@ -13465,7 +13468,7 @@ HREF="POSITION"
 >position</GTKDOCLINK
 >()
 The position function returns the position of the context node in the
-context node list. The first position is 1, and so the last positionr
+context node list. The first position is 1, and so the last position
 will be equal to <GTKDOCLINK
 HREF="LAST"
 >last</GTKDOCLINK
@@ -13475,7 +13478,7 @@ HREF="LAST"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16098"
+NAME="AEN16122"
 ></A
 ><P
 ></P
@@ -13530,7 +13533,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16111"
+NAME="AEN16135"
 ></A
 ><H3
 ><A
@@ -13565,7 +13568,7 @@ number count(node-set)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16119"
+NAME="AEN16143"
 ></A
 ><P
 ></P
@@ -13620,7 +13623,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16132"
+NAME="AEN16156"
 ></A
 ><H3
 ><A
@@ -13660,7 +13663,7 @@ defaults to the context node.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16140"
+NAME="AEN16164"
 ></A
 ><P
 ></P
@@ -13715,7 +13718,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16153"
+NAME="AEN16177"
 ></A
 ><H3
 ><A
@@ -13756,7 +13759,7 @@ defaults to the context node.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16161"
+NAME="AEN16185"
 ></A
 ><P
 ></P
@@ -13811,7 +13814,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16174"
+NAME="AEN16198"
 ></A
 ><H3
 ><A
@@ -13850,7 +13853,7 @@ of the context node.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16182"
+NAME="AEN16206"
 ></A
 ><P
 ></P
@@ -13905,7 +13908,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16195"
+NAME="AEN16219"
 ></A
 ><H3
 ><A
@@ -13941,7 +13944,7 @@ The concat function returns the concatenation of its arguments.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16203"
+NAME="AEN16227"
 ></A
 ><P
 ></P
@@ -13996,7 +13999,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16216"
+NAME="AEN16240"
 ></A
 ><H3
 ><A
@@ -14033,7 +14036,7 @@ contains the second argument string, and otherwise returns false.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16224"
+NAME="AEN16248"
 ></A
 ><P
 ></P
@@ -14088,7 +14091,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16237"
+NAME="AEN16261"
 ></A
 ><H3
 ><A
@@ -14125,7 +14128,7 @@ starts with the second argument string, and otherwise returns false.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16245"
+NAME="AEN16269"
 ></A
 ><P
 ></P
@@ -14180,7 +14183,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16258"
+NAME="AEN16282"
 ></A
 ><H3
 ><A
@@ -14235,7 +14238,7 @@ and addition used for the above follow the standard IEEE 754 rules. Thus:
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16266"
+NAME="AEN16290"
 ></A
 ><P
 ></P
@@ -14290,7 +14293,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16279"
+NAME="AEN16303"
 ></A
 ><H3
 ><A
@@ -14330,7 +14333,7 @@ string. For example, substring-before("1999/04/01","/") returns 1999.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16287"
+NAME="AEN16311"
 ></A
 ><P
 ></P
@@ -14385,7 +14388,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16300"
+NAME="AEN16324"
 ></A
 ><H3
 ><A
@@ -14426,7 +14429,7 @@ and substring-after("1999/04/01","19") returns 99/04/01.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16308"
+NAME="AEN16332"
 ></A
 ><P
 ></P
@@ -14481,7 +14484,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16321"
+NAME="AEN16345"
 ></A
 ><H3
 ><A
@@ -14522,7 +14525,7 @@ node converted to a string, in other words the value of the context node.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16329"
+NAME="AEN16353"
 ></A
 ><P
 ></P
@@ -14577,7 +14580,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16342"
+NAME="AEN16366"
 ></A
 ><H3
 ><A
@@ -14621,7 +14624,7 @@ string are removed. For example, translate("--aaa--","abc-","ABC")</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16350"
+NAME="AEN16374"
 ></A
 ><P
 ></P
@@ -14676,7 +14679,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16363"
+NAME="AEN16387"
 ></A
 ><H3
 ><A
@@ -14713,7 +14716,7 @@ and false otherwise.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16371"
+NAME="AEN16395"
 ></A
 ><P
 ></P
@@ -14768,7 +14771,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16384"
+NAME="AEN16408"
 ></A
 ><H3
 ><A
@@ -14806,7 +14809,7 @@ HREF="TRUE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16393"
+NAME="AEN16417"
 ></A
 ><P
 ></P
@@ -14861,7 +14864,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16406"
+NAME="AEN16430"
 ></A
 ><H3
 ><A
@@ -14899,7 +14902,7 @@ HREF="FALSE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16415"
+NAME="AEN16439"
 ></A
 ><P
 ></P
@@ -14954,7 +14957,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16428"
+NAME="AEN16452"
 ></A
 ><H3
 ><A
@@ -14997,7 +15000,7 @@ has an xml:lang attribute. If there is no such attribute, then lang</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16436"
+NAME="AEN16460"
 ></A
 ><P
 ></P
@@ -15052,7 +15055,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16449"
+NAME="AEN16473"
 ></A
 ><H3
 ><A
@@ -15087,7 +15090,7 @@ number number(object?)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16457"
+NAME="AEN16481"
 ></A
 ><P
 ></P
@@ -15142,7 +15145,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16470"
+NAME="AEN16494"
 ></A
 ><H3
 ><A
@@ -15179,7 +15182,7 @@ the argument node-set.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16478"
+NAME="AEN16502"
 ></A
 ><P
 ></P
@@ -15234,7 +15237,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16491"
+NAME="AEN16515"
 ></A
 ><H3
 ><A
@@ -15271,7 +15274,7 @@ number that is not greater than the argument and that is an integer.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16499"
+NAME="AEN16523"
 ></A
 ><P
 ></P
@@ -15326,7 +15329,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16512"
+NAME="AEN16536"
 ></A
 ><H3
 ><A
@@ -15363,7 +15366,7 @@ number that is not less than the argument and that is an integer.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16520"
+NAME="AEN16544"
 ></A
 ><P
 ></P
@@ -15418,7 +15421,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16533"
+NAME="AEN16557"
 ></A
 ><H3
 ><A
@@ -15456,7 +15459,7 @@ then the one that is even is returned.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16541"
+NAME="AEN16565"
 ></A
 ><P
 ></P
@@ -15511,7 +15514,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16554"
+NAME="AEN16578"
 ></A
 ><H3
 ><A
@@ -15551,7 +15554,7 @@ negative zero nor NaN
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16562"
+NAME="AEN16586"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index 5bb71132..da453788 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -123,7 +123,7 @@ NAME="LIBXML-XPOINTER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16580"
+NAME="AEN16604"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@ NAME="AEN16580"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16583"
+NAME="AEN16607"
 ></A
 ><H2
 >Synopsis</H2
@@ -411,7 +411,7 @@ HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16658"
+NAME="AEN16682"
 ></A
 ><H2
 >Description</H2
@@ -421,14 +421,14 @@ NAME="AEN16658"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16661"
+NAME="AEN16685"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16663"
+NAME="AEN16687"
 ></A
 ><H3
 ><A
@@ -458,7 +458,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16668"
+NAME="AEN16692"
 ></A
 ><H3
 ><A
@@ -484,7 +484,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16673"
+NAME="AEN16697"
 ></A
 ><H3
 ><A
@@ -522,7 +522,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16682"
+NAME="AEN16706"
 ></A
 ><P
 ></P
@@ -575,7 +575,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16695"
+NAME="AEN16719"
 ></A
 ><H3
 ><A
@@ -605,7 +605,7 @@ HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16702"
+NAME="AEN16726"
 ></A
 ><P
 ></P
@@ -643,7 +643,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16711"
+NAME="AEN16735"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16722"
+NAME="AEN16746"
 ></A
 ><P
 ></P
@@ -760,7 +760,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16739"
+NAME="AEN16763"
 ></A
 ><H3
 ><A
@@ -799,7 +799,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16748"
+NAME="AEN16772"
 ></A
 ><P
 ></P
@@ -903,7 +903,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16773"
+NAME="AEN16797"
 ></A
 ><H3
 ><A
@@ -940,7 +940,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16782"
+NAME="AEN16806"
 ></A
 ><P
 ></P
@@ -1010,7 +1010,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16799"
+NAME="AEN16823"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16808"
+NAME="AEN16832"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16825"
+NAME="AEN16849"
 ></A
 ><H3
 ><A
@@ -1154,7 +1154,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16834"
+NAME="AEN16858"
 ></A
 ><P
 ></P
@@ -1224,7 +1224,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16851"
+NAME="AEN16875"
 ></A
 ><H3
 ><A
@@ -1261,7 +1261,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16860"
+NAME="AEN16884"
 ></A
 ><P
 ></P
@@ -1331,7 +1331,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16877"
+NAME="AEN16901"
 ></A
 ><H3
 ><A
@@ -1380,7 +1380,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16888"
+NAME="AEN16912"
 ></A
 ><P
 ></P
@@ -1450,7 +1450,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16905"
+NAME="AEN16929"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16914"
+NAME="AEN16938"
 ></A
 ><P
 ></P
@@ -1543,7 +1543,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16927"
+NAME="AEN16951"
 ></A
 ><H3
 ><A
@@ -1580,7 +1580,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16936"
+NAME="AEN16960"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16953"
+NAME="AEN16977"
 ></A
 ><H3
 ><A
@@ -1683,7 +1683,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16961"
+NAME="AEN16985"
 ></A
 ><P
 ></P
@@ -1736,7 +1736,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16974"
+NAME="AEN16998"
 ></A
 ><H3
 ><A
@@ -1764,7 +1764,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ></TR
 ></TABLE
 ><P
->add a new xmlXPathObjectPtr ot an existing LocationSet
+>add a new xmlXPathObjectPtr to an existing LocationSet
 If the location already exist in the set <TT
 CLASS="PARAMETER"
 ><I
@@ -1776,7 +1776,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16983"
+NAME="AEN17007"
 ></A
 ><P
 ></P
@@ -1831,7 +1831,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16996"
+NAME="AEN17020"
 ></A
 ><H3
 ><A
@@ -1869,7 +1869,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17005"
+NAME="AEN17029"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17018"
+NAME="AEN17042"
 ></A
 ><H3
 ><A
@@ -1956,7 +1956,7 @@ HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17026"
+NAME="AEN17050"
 ></A
 ><P
 ></P
@@ -2011,7 +2011,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17039"
+NAME="AEN17063"
 ></A
 ><H3
 ><A
@@ -2042,7 +2042,7 @@ HREF="libxml-xpointer.html#XMLLOCATIONSETPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17046"
+NAME="AEN17070"
 ></A
 ><P
 ></P
@@ -2097,7 +2097,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17059"
+NAME="AEN17083"
 ></A
 ><H3
 ><A
@@ -2138,7 +2138,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17069"
+NAME="AEN17093"
 ></A
 ><P
 ></P
@@ -2226,7 +2226,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17090"
+NAME="AEN17114"
 ></A
 ><H3
 ><A
@@ -2263,7 +2263,7 @@ HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17099"
+NAME="AEN17123"
 ></A
 ><P
 ></P
@@ -2322,7 +2322,7 @@ CLASS="EMPHASIS"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
 the caller has to free the object.</TD
 ></TR
 ></TBODY
@@ -2334,7 +2334,7 @@ the caller has to free the object.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17116"
+NAME="AEN17140"
 ></A
 ><H3
 ><A
@@ -2368,7 +2368,7 @@ HREF="TO"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17124"
+NAME="AEN17148"
 ></A
 ><P
 ></P
@@ -2423,7 +2423,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17137"
+NAME="AEN17161"
 ></A
 ><H3
 ><A
@@ -2457,7 +2457,7 @@ This will drop Attributes and Namespace declarations.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17145"
+NAME="AEN17169"
 ></A
 ><P
 ></P
@@ -2511,7 +2511,7 @@ the caller has to free the node tree.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17158"
+NAME="AEN17182"
 ></A
 ><H3
 ><A
@@ -2548,7 +2548,7 @@ a Location Set instead of a node set</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17167"
+NAME="AEN17191"
 ></A
 ><P
 ></P