diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 016ec7e1..6b2d30d3 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -820,6 +820,7 @@
 <ANCHOR id ="XMLCATALOGRESOLVEURI" href="libxml/libxml-catalog.html#XMLCATALOGRESOLVEURI">
 <ANCHOR id ="XMLCATALOGADD" href="libxml/libxml-catalog.html#XMLCATALOGADD">
 <ANCHOR id ="XMLCATALOGREMOVE" href="libxml/libxml-catalog.html#XMLCATALOGREMOVE">
+<ANCHOR id ="XMLPARSECATALOGFILE" href="libxml/libxml-catalog.html#XMLPARSECATALOGFILE">
 <ANCHOR id ="XMLCATALOGFREELOCAL" href="libxml/libxml-catalog.html#XMLCATALOGFREELOCAL">
 <ANCHOR id ="XMLCATALOGADDLOCAL" href="libxml/libxml-catalog.html#XMLCATALOGADDLOCAL">
 <ANCHOR id ="XMLCATALOGLOCALRESOLVE" href="libxml/libxml-catalog.html#XMLCATALOGLOCALRESOLVE">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index af6005c3..da3f97b4 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -250,6 +250,13 @@ HREF="libxml-catalog.html#XMLCATALOGREMOVE"
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *value);
+<A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+>   <A
+HREF="libxml-catalog.html#XMLPARSECATALOGFILE"
+>xmlParseCatalogFile</A
+>             (const char *filename);
 void        <A
 HREF="libxml-catalog.html#XMLCATALOGFREELOCAL"
 >xmlCatalogFreeLocal</A
@@ -343,7 +350,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18746"
+NAME="AEN18748"
 ></A
 ><H2
 >Description</H2
@@ -353,14 +360,14 @@ NAME="AEN18746"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18749"
+NAME="AEN18751"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18751"
+NAME="AEN18753"
 ></A
 ><H3
 ><A
@@ -388,7 +395,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18757"
+NAME="AEN18759"
 ></A
 ><H3
 ><A
@@ -414,7 +421,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18762"
+NAME="AEN18764"
 ></A
 ><H3
 ><A
@@ -444,7 +451,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18767"
+NAME="AEN18769"
 ></A
 ><H3
 ><A
@@ -475,7 +482,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18772"
+NAME="AEN18774"
 ></A
 ><H3
 ><A
@@ -505,7 +512,7 @@ preferably be done once at startup</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18778"
+NAME="AEN18780"
 ></A
 ><H3
 ><A
@@ -535,7 +542,7 @@ preferably be done once at startup</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18784"
+NAME="AEN18786"
 ></A
 ><P
 ></P
@@ -588,7 +595,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18797"
+NAME="AEN18799"
 ></A
 ><H3
 ><A
@@ -618,7 +625,7 @@ preferably be done once at startup</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18803"
+NAME="AEN18805"
 ></A
 ><P
 ></P
@@ -656,7 +663,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18812"
+NAME="AEN18814"
 ></A
 ><H3
 ><A
@@ -684,7 +691,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18818"
+NAME="AEN18820"
 ></A
 ><H3
 ><A
@@ -714,7 +721,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18825"
+NAME="AEN18827"
 ></A
 ><P
 ></P
@@ -752,7 +759,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18834"
+NAME="AEN18836"
 ></A
 ><H3
 ><A
@@ -789,7 +796,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18843"
+NAME="AEN18845"
 ></A
 ><P
 ></P
@@ -860,7 +867,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18860"
+NAME="AEN18862"
 ></A
 ><H3
 ><A
@@ -893,7 +900,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18868"
+NAME="AEN18870"
 ></A
 ><P
 ></P
@@ -947,7 +954,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18881"
+NAME="AEN18883"
 ></A
 ><H3
 ><A
@@ -980,7 +987,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18889"
+NAME="AEN18891"
 ></A
 ><P
 ></P
@@ -1034,7 +1041,7 @@ must be freed by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18902"
+NAME="AEN18904"
 ></A
 ><H3
 ><A
@@ -1067,7 +1074,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18910"
+NAME="AEN18912"
 ></A
 ><P
 ></P
@@ -1121,7 +1128,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18923"
+NAME="AEN18925"
 ></A
 ><H3
 ><A
@@ -1160,7 +1167,7 @@ different entries.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18932"
+NAME="AEN18934"
 ></A
 ><P
 ></P
@@ -1247,7 +1254,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18953"
+NAME="AEN18955"
 ></A
 ><H3
 ><A
@@ -1277,7 +1284,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18960"
+NAME="AEN18962"
 ></A
 ><P
 ></P
@@ -1330,7 +1337,94 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18973"
+NAME="AEN18975"
+></A
+><H3
+><A
+NAME="XMLPARSECATALOGFILE"
+></A
+>xmlParseCatalogFile ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+>   xmlParseCatalogFile             (const char *filename);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse an XML file and build a tree. It's like <A
+HREF="libxml-parser.html#XMLPARSEFILE"
+>xmlParseFile</A
+>()
+except it bypass all catalog lookups.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18983"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the filename</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the resulting document tree or NULL in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18996"
 ></A
 ><H3
 ><A
@@ -1357,7 +1451,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18979"
+NAME="AEN19002"
 ></A
 ><P
 ></P
@@ -1395,7 +1489,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18988"
+NAME="AEN19011"
 ></A
 ><H3
 ><A
@@ -1426,7 +1520,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18995"
+NAME="AEN19018"
 ></A
 ><P
 ></P
@@ -1481,7 +1575,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19008"
+NAME="AEN19031"
 ></A
 ><H3
 ><A
@@ -1520,7 +1614,7 @@ document's private catalog list</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19017"
+NAME="AEN19040"
 ></A
 ><P
 ></P
@@ -1608,7 +1702,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19038"
+NAME="AEN19061"
 ></A
 ><H3
 ><A
@@ -1643,7 +1737,7 @@ document's private catalog list</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19046"
+NAME="AEN19069"
 ></A
 ><P
 ></P
@@ -1714,7 +1808,7 @@ by the caller.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19063"
+NAME="AEN19086"
 ></A
 ><H3
 ><A
@@ -1742,7 +1836,7 @@ debugging, 1 enable it</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19069"
+NAME="AEN19092"
 ></A
 ><P
 ></P
@@ -1795,7 +1889,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19082"
+NAME="AEN19105"
 ></A
 ><H3
 ><A
@@ -1830,7 +1924,7 @@ Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19090"
+NAME="AEN19113"
 ></A
 ><P
 ></P
@@ -1883,7 +1977,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19103"
+NAME="AEN19126"
 ></A
 ><H3
 ><A
@@ -1914,7 +2008,7 @@ be accepted</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19110"
+NAME="AEN19133"
 ></A
 ><P
 ></P
@@ -1952,7 +2046,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19119"
+NAME="AEN19142"
 ></A
 ><H3
 ><A
@@ -1983,7 +2077,7 @@ be accepted</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19126"
+NAME="AEN19149"
 ></A
 ><P
 ></P
@@ -2019,7 +2113,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19135"
+NAME="AEN19158"
 ></A
 ><H3
 ><A
@@ -2056,7 +2150,7 @@ HREF="libxml-catalog.html#XMLCATALOGRESOLVESYSTEM"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19144"
+NAME="AEN19167"
 ></A
 ><P
 ></P
@@ -2109,7 +2203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19157"
+NAME="AEN19180"
 ></A
 ><H3
 ><A
@@ -2146,7 +2240,7 @@ HREF="libxml-catalog.html#XMLCATALOGRESOLVEPUBLIC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19166"
+NAME="AEN19189"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index 6f9e5c42..f50b7d53 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -122,7 +122,7 @@ NAME="LIBXML-DEBUGXML"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23127"
+NAME="AEN23150"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN23127"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23130"
+NAME="AEN23153"
 ></A
 ><H2
 >Synopsis</H2
@@ -311,7 +311,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23174"
+NAME="AEN23197"
 ></A
 ><H2
 >Description</H2
@@ -321,14 +321,14 @@ NAME="AEN23174"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23177"
+NAME="AEN23200"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23179"
+NAME="AEN23202"
 ></A
 ><H3
 ><A
@@ -362,7 +362,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23187"
+NAME="AEN23210"
 ></A
 ><P
 ></P
@@ -417,7 +417,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23200"
+NAME="AEN23223"
 ></A
 ><H3
 ><A
@@ -452,7 +452,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23208"
+NAME="AEN23231"
 ></A
 ><P
 ></P
@@ -524,7 +524,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23225"
+NAME="AEN23248"
 ></A
 ><H3
 ><A
@@ -559,7 +559,7 @@ HREF="libxml-tree.html#XMLATTRPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23233"
+NAME="AEN23256"
 ></A
 ><P
 ></P
@@ -631,7 +631,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23250"
+NAME="AEN23273"
 ></A
 ><H3
 ><A
@@ -666,7 +666,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23258"
+NAME="AEN23281"
 ></A
 ><P
 ></P
@@ -738,7 +738,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23275"
+NAME="AEN23298"
 ></A
 ><H3
 ><A
@@ -773,7 +773,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23283"
+NAME="AEN23306"
 ></A
 ><P
 ></P
@@ -845,7 +845,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23300"
+NAME="AEN23323"
 ></A
 ><H3
 ><A
@@ -880,7 +880,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23308"
+NAME="AEN23331"
 ></A
 ><P
 ></P
@@ -952,7 +952,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23325"
+NAME="AEN23348"
 ></A
 ><H3
 ><A
@@ -986,7 +986,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23333"
+NAME="AEN23356"
 ></A
 ><P
 ></P
@@ -1041,7 +1041,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23346"
+NAME="AEN23369"
 ></A
 ><H3
 ><A
@@ -1075,7 +1075,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23354"
+NAME="AEN23377"
 ></A
 ><P
 ></P
@@ -1130,7 +1130,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23367"
+NAME="AEN23390"
 ></A
 ><H3
 ><A
@@ -1164,7 +1164,7 @@ HREF="libxml-tree.html#XMLDTDPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23375"
+NAME="AEN23398"
 ></A
 ><P
 ></P
@@ -1219,7 +1219,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23388"
+NAME="AEN23411"
 ></A
 ><H3
 ><A
@@ -1253,7 +1253,7 @@ HREF="libxml-tree.html#XMLDOCPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23396"
+NAME="AEN23419"
 ></A
 ><P
 ></P
@@ -1308,7 +1308,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23409"
+NAME="AEN23432"
 ></A
 ><H3
 ><A
@@ -1335,7 +1335,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23415"
+NAME="AEN23438"
 ></A
 ><P
 ></P
@@ -1388,7 +1388,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23428"
+NAME="AEN23451"
 ></A
 ><H3
 ><A
@@ -1425,7 +1425,7 @@ TODO: add the defined function tables.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23434"
+NAME="AEN23457"
 ></A
 ><H3
 ><A
@@ -1451,7 +1451,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23439"
+NAME="AEN23462"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23448"
+NAME="AEN23471"
 ></A
 ><P
 ></P
@@ -1594,7 +1594,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23473"
+NAME="AEN23496"
 ></A
 ><H3
 ><A
@@ -1635,7 +1635,7 @@ using a environment similar to a UNIX commandline.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23482"
+NAME="AEN23505"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index 99fa21ec..12850892 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -122,7 +122,7 @@ NAME="LIBXML-DOCBPARSER"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19184"
+NAME="AEN19207"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN19184"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19187"
+NAME="AEN19210"
 ></A
 ><H2
 >Synopsis</H2
@@ -294,7 +294,7 @@ HREF="libxml-docbparser.html#DOCBPARSERCTXTPTR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19224"
+NAME="AEN19247"
 ></A
 ><H2
 >Description</H2
@@ -304,14 +304,14 @@ NAME="AEN19224"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19227"
+NAME="AEN19250"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19229"
+NAME="AEN19252"
 ></A
 ><H3
 ><A
@@ -337,7 +337,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19234"
+NAME="AEN19257"
 ></A
 ><H3
 ><A
@@ -363,7 +363,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19239"
+NAME="AEN19262"
 ></A
 ><H3
 ><A
@@ -389,7 +389,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19244"
+NAME="AEN19267"
 ></A
 ><H3
 ><A
@@ -415,7 +415,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19249"
+NAME="AEN19272"
 ></A
 ><H3
 ><A
@@ -441,7 +441,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19254"
+NAME="AEN19277"
 ></A
 ><H3
 ><A
@@ -467,7 +467,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19259"
+NAME="AEN19282"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19264"
+NAME="AEN19287"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19269"
+NAME="AEN19292"
 ></A
 ><H3
 ><A
@@ -545,7 +545,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19274"
+NAME="AEN19297"
 ></A
 ><H3
 ><A
@@ -577,7 +577,7 @@ plus SGML entities block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19280"
+NAME="AEN19303"
 ></A
 ><P
 ></P
@@ -721,7 +721,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19313"
+NAME="AEN19336"
 ></A
 ><H3
 ><A
@@ -762,7 +762,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19322"
+NAME="AEN19345"
 ></A
 ><P
 ></P
@@ -866,7 +866,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19347"
+NAME="AEN19370"
 ></A
 ><H3
 ><A
@@ -900,7 +900,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19355"
+NAME="AEN19378"
 ></A
 ><P
 ></P
@@ -970,7 +970,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19372"
+NAME="AEN19395"
 ></A
 ><H3
 ><A
@@ -1009,7 +1009,7 @@ If sax is NULL, fallback to the default DOM tree building routines.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19380"
+NAME="AEN19403"
 ></A
 ><P
 ></P
@@ -1113,7 +1113,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19405"
+NAME="AEN19428"
 ></A
 ><H3
 ><A
@@ -1146,7 +1146,7 @@ at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19412"
+NAME="AEN19435"
 ></A
 ><P
 ></P
@@ -1216,7 +1216,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19429"
+NAME="AEN19452"
 ></A
 ><H3
 ><A
@@ -1247,7 +1247,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19436"
+NAME="AEN19459"
 ></A
 ><P
 ></P
@@ -1285,7 +1285,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19445"
+NAME="AEN19468"
 ></A
 ><H3
 ><A
@@ -1339,7 +1339,7 @@ and error/warning reports.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19456"
+NAME="AEN19479"
 ></A
 ><P
 ></P
@@ -1477,7 +1477,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19489"
+NAME="AEN19512"
 ></A
 ><H3
 ><A
@@ -1510,7 +1510,7 @@ HREF="libxml-docbparser.html#DOCBPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19496"
+NAME="AEN19519"
 ></A
 ><P
 ></P
@@ -1614,7 +1614,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19521"
+NAME="AEN19544"
 ></A
 ><H3
 ><A
@@ -1647,7 +1647,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19528"
+NAME="AEN19551"
 ></A
 ><P
 ></P
@@ -1717,7 +1717,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19545"
+NAME="AEN19568"
 ></A
 ><H3
 ><A
@@ -1748,7 +1748,7 @@ interface).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19552"
+NAME="AEN19575"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 424bb8a6..7dd09976 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -122,7 +122,7 @@ NAME="LIBXML-ENCODING"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22411"
+NAME="AEN22434"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN22411"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22414"
+NAME="AEN22437"
 ></A
 ><H2
 >Synopsis</H2
@@ -381,7 +381,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22474"
+NAME="AEN22497"
 ></A
 ><H2
 >Description</H2
@@ -391,14 +391,14 @@ NAME="AEN22474"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22477"
+NAME="AEN22500"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22479"
+NAME="AEN22502"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@ support needed.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22486"
+NAME="AEN22509"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@ it to an UTF-8 block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22492"
+NAME="AEN22515"
 ></A
 ><P
 ></P
@@ -623,7 +623,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22521"
+NAME="AEN22544"
 ></A
 ><H3
 ><A
@@ -656,7 +656,7 @@ in = NULL. If stateful this should also initialize the encoder state</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22527"
+NAME="AEN22550"
 ></A
 ><P
 ></P
@@ -784,7 +784,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22556"
+NAME="AEN22579"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22561"
+NAME="AEN22584"
 ></A
 ><H3
 ><A
@@ -844,7 +844,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22566"
+NAME="AEN22589"
 ></A
 ><H3
 ><A
@@ -875,7 +875,7 @@ in normal processing.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22572"
+NAME="AEN22595"
 ></A
 ><H3
 ><A
@@ -904,7 +904,7 @@ unregisters all the encoding handlers and the aliases.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22578"
+NAME="AEN22601"
 ></A
 ><H3
 ><A
@@ -934,7 +934,7 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22585"
+NAME="AEN22608"
 ></A
 ><P
 ></P
@@ -972,7 +972,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22594"
+NAME="AEN22617"
 ></A
 ><H3
 ><A
@@ -1006,7 +1006,7 @@ HREF="libxml-encoding.html#XMLCHARENCODING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22602"
+NAME="AEN22625"
 ></A
 ><P
 ></P
@@ -1059,7 +1059,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22615"
+NAME="AEN22638"
 ></A
 ><H3
 ><A
@@ -1090,7 +1090,7 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22622"
+NAME="AEN22645"
 ></A
 ><P
 ></P
@@ -1143,7 +1143,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22635"
+NAME="AEN22658"
 ></A
 ><H3
 ><A
@@ -1182,7 +1182,7 @@ will be overwritten.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22643"
+NAME="AEN22666"
 ></A
 ><P
 ></P
@@ -1252,7 +1252,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22660"
+NAME="AEN22683"
 ></A
 ><H3
 ><A
@@ -1284,7 +1284,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22667"
+NAME="AEN22690"
 ></A
 ><P
 ></P
@@ -1337,7 +1337,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22680"
+NAME="AEN22703"
 ></A
 ><H3
 ><A
@@ -1364,7 +1364,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22686"
+NAME="AEN22709"
 ></A
 ><P
 ></P
@@ -1417,7 +1417,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22699"
+NAME="AEN22722"
 ></A
 ><H3
 ><A
@@ -1445,7 +1445,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22705"
+NAME="AEN22728"
 ></A
 ><H3
 ><A
@@ -1477,7 +1477,7 @@ that the comparison is case insensitive accordingly to the section
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22712"
+NAME="AEN22735"
 ></A
 ><P
 ></P
@@ -1531,7 +1531,7 @@ if not recognized.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22725"
+NAME="AEN22748"
 ></A
 ><H3
 ><A
@@ -1566,7 +1566,7 @@ Section 4.3.3  Character Encoding in Entities</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22733"
+NAME="AEN22756"
 ></A
 ><P
 ></P
@@ -1619,7 +1619,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22746"
+NAME="AEN22769"
 ></A
 ><H3
 ><A
@@ -1651,7 +1651,7 @@ accordingly of the non-normative appendix F of the XML-1.0 recommendation.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22753"
+NAME="AEN22776"
 ></A
 ><P
 ></P
@@ -1722,7 +1722,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22770"
+NAME="AEN22793"
 ></A
 ><H3
 ><A
@@ -1770,7 +1770,7 @@ the content will be automatically remapped to a CharRef sequence.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22780"
+NAME="AEN22803"
 ></A
 ><P
 ></P
@@ -1860,7 +1860,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22801"
+NAME="AEN22824"
 ></A
 ><H3
 ><A
@@ -1898,7 +1898,7 @@ HREF="libxml-tree.html#XMLBUFFERPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22810"
+NAME="AEN22833"
 ></A
 ><P
 ></P
@@ -1988,7 +1988,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22831"
+NAME="AEN22854"
 ></A
 ><H3
 ><A
@@ -2027,7 +2027,7 @@ the very first line, i.e. limit itself to 45 chars.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22840"
+NAME="AEN22863"
 ></A
 ><P
 ></P
@@ -2117,7 +2117,7 @@ the result of transformation can't fit into the encoding we want), or</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22861"
+NAME="AEN22884"
 ></A
 ><H3
 ><A
@@ -2147,7 +2147,7 @@ HREF="libxml-encoding.html#XMLCHARENCODINGHANDLER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22868"
+NAME="AEN22891"
 ></A
 ><P
 ></P
@@ -2200,7 +2200,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22881"
+NAME="AEN22904"
 ></A
 ><H3
 ><A
@@ -2231,7 +2231,7 @@ block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22887"
+NAME="AEN22910"
 ></A
 ><P
 ></P
@@ -2358,7 +2358,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22916"
+NAME="AEN22939"
 ></A
 ><H3
 ><A
@@ -2389,7 +2389,7 @@ block of chars out.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22922"
+NAME="AEN22945"
 ></A
 ><P
 ></P
@@ -2516,7 +2516,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22951"
+NAME="AEN22974"
 ></A
 ><H3
 ><A
@@ -2558,7 +2558,7 @@ routine checks for the 4-byte maxiumum size, but does not check for
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22959"
+NAME="AEN22982"
 ></A
 ><P
 ></P
@@ -2616,7 +2616,7 @@ CLASS="PARAMETER"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22973"
+NAME="AEN22996"
 ></A
 ><H3
 ><A
@@ -2647,7 +2647,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22980"
+NAME="AEN23003"
 ></A
 ><P
 ></P
@@ -2718,7 +2718,7 @@ the first 'len' characters of ARRAY&#13;</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22997"
+NAME="AEN23020"
 ></A
 ><H3
 ><A
@@ -2752,7 +2752,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23005"
+NAME="AEN23028"
 ></A
 ><P
 ></P
@@ -2827,7 +2827,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23023"
+NAME="AEN23046"
 ></A
 ><H3
 ><A
@@ -2862,7 +2862,7 @@ character from a string array</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23031"
+NAME="AEN23054"
 ></A
 ><P
 ></P
@@ -2932,7 +2932,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23048"
+NAME="AEN23071"
 ></A
 ><H3
 ><A
@@ -2966,7 +2966,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23056"
+NAME="AEN23079"
 ></A
 ><P
 ></P
@@ -3037,7 +3037,7 @@ or -1 if not found</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23073"
+NAME="AEN23096"
 ></A
 ><H3
 ><A
@@ -3072,7 +3072,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23081"
+NAME="AEN23104"
 ></A
 ><P
 ></P
@@ -3160,7 +3160,7 @@ or NULL if any problem</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23102"
+NAME="AEN23125"
 ></A
 ><H3
 ><A
@@ -3191,7 +3191,7 @@ checking of the content of the string.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23109"
+NAME="AEN23132"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 5f6caca9..2c3c207d 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -12012,7 +12012,7 @@ CLASS="PARAMETER"
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>  the Public ID for the entity to load</TD
 ></TR
 ><TR
 ><TD
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index e506d201..f670b93c 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -122,7 +122,7 @@ NAME="LIBXML-PARSERINTERNALS"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19570"
+NAME="AEN19593"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@ NAME="AEN19570"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19573"
+NAME="AEN19596"
 ></A
 ><H2
 >Synopsis</H2
@@ -1131,7 +1131,7 @@ HREF="libxml-parserinternals.html#HTMLCREATEFILEPARSERCTXT"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19848"
+NAME="AEN19871"
 ></A
 ><H2
 >Description</H2
@@ -1141,14 +1141,14 @@ NAME="AEN19848"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19851"
+NAME="AEN19874"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19853"
+NAME="AEN19876"
 ></A
 ><H3
 ><A
@@ -1177,7 +1177,7 @@ at runtime.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19859"
+NAME="AEN19882"
 ></A
 ><H3
 ><A
@@ -1206,7 +1206,7 @@ one of the point is providing context when reporting errors</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19865"
+NAME="AEN19888"
 ></A
 ><H3
 ><A
@@ -1264,7 +1264,7 @@ any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19881"
+NAME="AEN19904"
 ></A
 ><P
 ></P
@@ -1302,7 +1302,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19890"
+NAME="AEN19913"
 ></A
 ><H3
 ><A
@@ -1343,7 +1343,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19901"
+NAME="AEN19924"
 ></A
 ><P
 ></P
@@ -1381,7 +1381,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19910"
+NAME="AEN19933"
 ></A
 ><H3
 ><A
@@ -1410,7 +1410,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19917"
+NAME="AEN19940"
 ></A
 ><P
 ></P
@@ -1448,7 +1448,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19926"
+NAME="AEN19949"
 ></A
 ><H3
 ><A
@@ -1477,7 +1477,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19933"
+NAME="AEN19956"
 ></A
 ><P
 ></P
@@ -1515,7 +1515,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19942"
+NAME="AEN19965"
 ></A
 ><H3
 ><A
@@ -1544,7 +1544,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19949"
+NAME="AEN19972"
 ></A
 ><P
 ></P
@@ -1582,7 +1582,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19958"
+NAME="AEN19981"
 ></A
 ><H3
 ><A
@@ -1655,7 +1655,7 @@ HREF="X30FE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19979"
+NAME="AEN20002"
 ></A
 ><P
 ></P
@@ -1693,7 +1693,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19988"
+NAME="AEN20011"
 ></A
 ><H3
 ><A
@@ -1737,7 +1737,7 @@ HREF="X3029"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20000"
+NAME="AEN20023"
 ></A
 ><P
 ></P
@@ -1775,7 +1775,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20009"
+NAME="AEN20032"
 ></A
 ><H3
 ><A
@@ -1804,7 +1804,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20016"
+NAME="AEN20039"
 ></A
 ><P
 ></P
@@ -1842,7 +1842,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20025"
+NAME="AEN20048"
 ></A
 ><H3
 ><A
@@ -1880,7 +1880,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20035"
+NAME="AEN20058"
 ></A
 ><P
 ></P
@@ -1918,7 +1918,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20044"
+NAME="AEN20067"
 ></A
 ><H3
 ><A
@@ -1945,7 +1945,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20050"
+NAME="AEN20073"
 ></A
 ><P
 ></P
@@ -1983,7 +1983,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20059"
+NAME="AEN20082"
 ></A
 ><H3
 ><A
@@ -2010,7 +2010,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20065"
+NAME="AEN20088"
 ></A
 ><P
 ></P
@@ -2048,7 +2048,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20074"
+NAME="AEN20097"
 ></A
 ><H3
 ><A
@@ -2075,7 +2075,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20080"
+NAME="AEN20103"
 ></A
 ><P
 ></P
@@ -2113,7 +2113,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20089"
+NAME="AEN20112"
 ></A
 ><H3
 ><A
@@ -2155,7 +2155,7 @@ HREF="X"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20099"
+NAME="AEN20122"
 ></A
 ><P
 ></P
@@ -2208,7 +2208,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20112"
+NAME="AEN20135"
 ></A
 ><H3
 ><A
@@ -2252,7 +2252,7 @@ HREF="libxml-parserinternals.html#IS-BLANK-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20123"
+NAME="AEN20146"
 ></A
 ><P
 ></P
@@ -2305,7 +2305,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20136"
+NAME="AEN20159"
 ></A
 ><H3
 ><A
@@ -2342,7 +2342,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20145"
+NAME="AEN20168"
 ></A
 ><P
 ></P
@@ -2395,7 +2395,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20158"
+NAME="AEN20181"
 ></A
 ><H3
 ><A
@@ -2423,7 +2423,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20164"
+NAME="AEN20187"
 ></A
 ><P
 ></P
@@ -2476,7 +2476,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20177"
+NAME="AEN20200"
 ></A
 ><H3
 ><A
@@ -2504,7 +2504,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20183"
+NAME="AEN20206"
 ></A
 ><P
 ></P
@@ -2557,7 +2557,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20196"
+NAME="AEN20219"
 ></A
 ><H3
 ><A
@@ -2600,7 +2600,7 @@ HREF="X3029"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20207"
+NAME="AEN20230"
 ></A
 ><P
 ></P
@@ -2653,7 +2653,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20220"
+NAME="AEN20243"
 ></A
 ><H3
 ><A
@@ -2681,7 +2681,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20226"
+NAME="AEN20249"
 ></A
 ><P
 ></P
@@ -2734,7 +2734,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20239"
+NAME="AEN20262"
 ></A
 ><H3
 ><A
@@ -2806,7 +2806,7 @@ HREF="X30FE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20259"
+NAME="AEN20282"
 ></A
 ><P
 ></P
@@ -2859,7 +2859,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20272"
+NAME="AEN20295"
 ></A
 ><H3
 ><A
@@ -2920,7 +2920,7 @@ HREF="libxml-parserinternals.html#IS-CHAR-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20288"
+NAME="AEN20311"
 ></A
 ><P
 ></P
@@ -2973,7 +2973,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20301"
+NAME="AEN20324"
 ></A
 ><H3
 ><A
@@ -3006,7 +3006,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20309"
+NAME="AEN20332"
 ></A
 ><P
 ></P
@@ -3059,7 +3059,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20322"
+NAME="AEN20345"
 ></A
 ><H3
 ><A
@@ -3091,7 +3091,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20329"
+NAME="AEN20352"
 ></A
 ><P
 ></P
@@ -3144,7 +3144,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20342"
+NAME="AEN20365"
 ></A
 ><H3
 ><A
@@ -3175,7 +3175,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20349"
+NAME="AEN20372"
 ></A
 ><P
 ></P
@@ -3245,7 +3245,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20366"
+NAME="AEN20389"
 ></A
 ><H3
 ><A
@@ -3275,7 +3275,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20373"
+NAME="AEN20396"
 ></A
 ><P
 ></P
@@ -3311,7 +3311,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20382"
+NAME="AEN20405"
 ></A
 ><H3
 ><A
@@ -3354,7 +3354,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20392"
+NAME="AEN20415"
 ></A
 ><P
 ></P
@@ -3441,7 +3441,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20413"
+NAME="AEN20436"
 ></A
 ><H3
 ><A
@@ -3476,7 +3476,7 @@ of a given entity.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20421"
+NAME="AEN20444"
 ></A
 ><P
 ></P
@@ -3546,7 +3546,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20438"
+NAME="AEN20461"
 ></A
 ><H3
 ><A
@@ -3581,7 +3581,7 @@ of a given entity.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20446"
+NAME="AEN20469"
 ></A
 ><P
 ></P
@@ -3651,7 +3651,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20463"
+NAME="AEN20486"
 ></A
 ><H3
 ><A
@@ -3682,7 +3682,7 @@ document in ctxt-&gt;myDoc is not freed.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20470"
+NAME="AEN20493"
 ></A
 ><P
 ></P
@@ -3720,7 +3720,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20479"
+NAME="AEN20502"
 ></A
 ><H3
 ><A
@@ -3757,7 +3757,7 @@ stream ? When do we just handle that as a set of chars ?</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20488"
+NAME="AEN20511"
 ></A
 ><P
 ></P
@@ -3812,7 +3812,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20501"
+NAME="AEN20524"
 ></A
 ><H3
 ><A
@@ -3849,7 +3849,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20510"
+NAME="AEN20533"
 ></A
 ><P
 ></P
@@ -3919,7 +3919,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20527"
+NAME="AEN20550"
 ></A
 ><H3
 ><A
@@ -3956,7 +3956,7 @@ HREF="libxml-entities.html#XMLENTITYPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20536"
+NAME="AEN20559"
 ></A
 ><P
 ></P
@@ -4026,7 +4026,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20553"
+NAME="AEN20576"
 ></A
 ><H3
 ><A
@@ -4061,7 +4061,7 @@ of the previous one(s).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20561"
+NAME="AEN20584"
 ></A
 ><P
 ></P
@@ -4116,7 +4116,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20574"
+NAME="AEN20597"
 ></A
 ><H3
 ><A
@@ -4150,7 +4150,7 @@ pop it and return the next char.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20582"
+NAME="AEN20605"
 ></A
 ><P
 ></P
@@ -4203,7 +4203,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20595"
+NAME="AEN20618"
 ></A
 ><H3
 ><A
@@ -4233,7 +4233,7 @@ HREF="libxml-parser.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20602"
+NAME="AEN20625"
 ></A
 ><P
 ></P
@@ -4271,7 +4271,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20611"
+NAME="AEN20634"
 ></A
 ><H3
 ><A
@@ -4305,7 +4305,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20619"
+NAME="AEN20642"
 ></A
 ><P
 ></P
@@ -4375,7 +4375,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20636"
+NAME="AEN20659"
 ></A
 ><H3
 ><A
@@ -4408,7 +4408,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20644"
+NAME="AEN20667"
 ></A
 ><P
 ></P
@@ -4461,7 +4461,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20657"
+NAME="AEN20680"
 ></A
 ><H3
 ><A
@@ -4508,7 +4508,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20670"
+NAME="AEN20693"
 ></A
 ><P
 ></P
@@ -4596,7 +4596,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20691"
+NAME="AEN20714"
 ></A
 ><H3
 ><A
@@ -4637,7 +4637,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20702"
+NAME="AEN20725"
 ></A
 ><P
 ></P
@@ -4690,7 +4690,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20715"
+NAME="AEN20738"
 ></A
 ><H3
 ><A
@@ -4736,7 +4736,7 @@ top of the SAX interfaces, i.e. not on raw input.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20728"
+NAME="AEN20751"
 ></A
 ><P
 ></P
@@ -4807,7 +4807,7 @@ to get the Prefix if any.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20745"
+NAME="AEN20768"
 ></A
 ><H3
 ><A
@@ -4847,7 +4847,7 @@ top of the SAX interfaces, i.e. not on raw input.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20756"
+NAME="AEN20779"
 ></A
 ><P
 ></P
@@ -4900,7 +4900,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20769"
+NAME="AEN20792"
 ></A
 ><H3
 ><A
@@ -4935,7 +4935,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20778"
+NAME="AEN20801"
 ></A
 ><P
 ></P
@@ -4988,7 +4988,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20791"
+NAME="AEN20814"
 ></A
 ><H3
 ><A
@@ -5026,7 +5026,7 @@ if it was declared on the root of the Tree:-(</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20801"
+NAME="AEN20824"
 ></A
 ><P
 ></P
@@ -5064,7 +5064,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20810"
+NAME="AEN20833"
 ></A
 ><H3
 ><A
@@ -5108,7 +5108,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20822"
+NAME="AEN20845"
 ></A
 ><P
 ></P
@@ -5161,7 +5161,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20835"
+NAME="AEN20858"
 ></A
 ><H3
 ><A
@@ -5201,7 +5201,7 @@ CombiningChar | Extender</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20846"
+NAME="AEN20869"
 ></A
 ><P
 ></P
@@ -5254,7 +5254,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20859"
+NAME="AEN20882"
 ></A
 ><H3
 ><A
@@ -5291,7 +5291,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20869"
+NAME="AEN20892"
 ></A
 ><P
 ></P
@@ -5344,7 +5344,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20882"
+NAME="AEN20905"
 ></A
 ><H3
 ><A
@@ -5384,7 +5384,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20892"
+NAME="AEN20915"
 ></A
 ><P
 ></P
@@ -5454,7 +5454,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20909"
+NAME="AEN20932"
 ></A
 ><H3
 ><A
@@ -5544,7 +5544,7 @@ by a non-validating parser as if declared CDATA.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20930"
+NAME="AEN20953"
 ></A
 ><P
 ></P
@@ -5597,7 +5597,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20943"
+NAME="AEN20966"
 ></A
 ><H3
 ><A
@@ -5632,7 +5632,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20952"
+NAME="AEN20975"
 ></A
 ><P
 ></P
@@ -5685,7 +5685,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20965"
+NAME="AEN20988"
 ></A
 ><H3
 ><A
@@ -5720,7 +5720,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20974"
+NAME="AEN20997"
 ></A
 ><P
 ></P
@@ -5773,7 +5773,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20987"
+NAME="AEN21010"
 ></A
 ><H3
 ><A
@@ -5812,7 +5812,7 @@ string is not marking the end of a CDATA section. </P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20996"
+NAME="AEN21019"
 ></A
 ><P
 ></P
@@ -5867,7 +5867,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21009"
+NAME="AEN21032"
 ></A
 ><H3
 ><A
@@ -5913,7 +5913,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21021"
+NAME="AEN21044"
 ></A
 ><P
 ></P
@@ -6003,7 +6003,7 @@ it is possible to return NULL and have publicID set.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21042"
+NAME="AEN21065"
 ></A
 ><H3
 ><A
@@ -6037,7 +6037,7 @@ must not occur within comments. "</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21050"
+NAME="AEN21073"
 ></A
 ><P
 ></P
@@ -6075,7 +6075,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21059"
+NAME="AEN21082"
 ></A
 ><H3
 ><A
@@ -6110,7 +6110,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21068"
+NAME="AEN21091"
 ></A
 ><P
 ></P
@@ -6163,7 +6163,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21081"
+NAME="AEN21104"
 ></A
 ><H3
 ><A
@@ -6197,7 +6197,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21090"
+NAME="AEN21113"
 ></A
 ><P
 ></P
@@ -6235,7 +6235,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21099"
+NAME="AEN21122"
 ></A
 ><H3
 ><A
@@ -6277,89 +6277,6 @@ HREF="libxml-parserinternals.html#XMLPARSEEXTERNALID"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21110"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN21119"
-></A
-><H3
-><A
-NAME="XMLPARSEENTITYDECL"
-></A
->xmlParseEntityDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlParseEntityDecl              (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse &lt;!ENTITY declarations</P
-><P
->[70] EntityDecl ::= GEDecl | PEDecl</P
-><P
->[71] GEDecl ::= '&lt;!ENTITY' S Name S EntityDef S? '&gt;'</P
-><P
->[72] PEDecl ::= '&lt;!ENTITY' S '%' S Name S PEDef S? '&gt;'</P
-><P
->[73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)</P
-><P
->[74] PEDef ::= EntityValue | ExternalID</P
-><P
->[76] NDataDecl ::= S 'NDATA' S Name</P
-><P
->[ VC: Notation Declared ]
-The Name must match the declared name of a notation.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN21133"
 ></A
 ><P
@@ -6402,6 +6319,89 @@ NAME="AEN21142"
 ></A
 ><H3
 ><A
+NAME="XMLPARSEENTITYDECL"
+></A
+>xmlParseEntityDecl ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlParseEntityDecl              (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse &lt;!ENTITY declarations</P
+><P
+>[70] EntityDecl ::= GEDecl | PEDecl</P
+><P
+>[71] GEDecl ::= '&lt;!ENTITY' S Name S EntityDef S? '&gt;'</P
+><P
+>[72] PEDecl ::= '&lt;!ENTITY' S '%' S Name S PEDef S? '&gt;'</P
+><P
+>[73] EntityDef ::= EntityValue | (ExternalID NDataDecl?)</P
+><P
+>[74] PEDef ::= EntityValue | ExternalID</P
+><P
+>[76] NDataDecl ::= S 'NDATA' S Name</P
+><P
+>[ VC: Notation Declared ]
+The Name must match the declared name of a notation.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN21156"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XML parser context</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN21165"
+></A
+><H3
+><A
 NAME="XMLPARSEDEFAULTDECL"
 ></A
 >xmlParseDefaultDecl ()</H3
@@ -6471,7 +6471,7 @@ HREF="libxml-parserinternals.html#XMLPARSEATTVALUE"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21162"
+NAME="AEN21185"
 ></A
 ><P
 ></P
@@ -6542,7 +6542,7 @@ or XML_ATTRIBUTE_FIXED. </TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21179"
+NAME="AEN21202"
 ></A
 ><H3
 ><A
@@ -6583,7 +6583,7 @@ in the declaration; all notation names in the declaration must be declared.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21190"
+NAME="AEN21213"
 ></A
 ><P
 ></P
@@ -6636,7 +6636,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21203"
+NAME="AEN21226"
 ></A
 ><H3
 ><A
@@ -6675,7 +6675,7 @@ the declaration</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21213"
+NAME="AEN21236"
 ></A
 ><P
 ></P
@@ -6728,7 +6728,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21226"
+NAME="AEN21249"
 ></A
 ><H3
 ><A
@@ -6766,7 +6766,7 @@ HREF="libxml-tree.html#XMLENUMERATIONPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21236"
+NAME="AEN21259"
 ></A
 ><P
 ></P
@@ -6836,7 +6836,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21253"
+NAME="AEN21276"
 ></A
 ><H3
 ><A
@@ -6915,7 +6915,7 @@ of type NMTOKENS must match Nmtokens.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21274"
+NAME="AEN21297"
 ></A
 ><P
 ></P
@@ -6985,7 +6985,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21291"
+NAME="AEN21314"
 ></A
 ><H3
 ><A
@@ -7019,7 +7019,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21300"
+NAME="AEN21323"
 ></A
 ><P
 ></P
@@ -7057,7 +7057,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21309"
+NAME="AEN21332"
 ></A
 ><H3
 ><A
@@ -7107,7 +7107,7 @@ mixed-content declaration.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21322"
+NAME="AEN21345"
 ></A
 ><P
 ></P
@@ -7160,7 +7160,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21335"
+NAME="AEN21358"
 ></A
 ><H3
 ><A
@@ -7197,7 +7197,7 @@ HREF="libxml-parserinternals.html#XMLPARSEELEMENTCHILDRENCONTENTDECL"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21344"
+NAME="AEN21367"
 ></A
 ><P
 ></P
@@ -7251,7 +7251,7 @@ hierarchy.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21357"
+NAME="AEN21380"
 ></A
 ><H3
 ><A
@@ -7305,7 +7305,7 @@ the replacement text should be a connector (| or ,).</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21370"
+NAME="AEN21393"
 ></A
 ><P
 ></P
@@ -7359,7 +7359,7 @@ hierarchy.</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21383"
+NAME="AEN21406"
 ></A
 ><H3
 ><A
@@ -7400,7 +7400,7 @@ the cases EMPTY and ANY are handled directly in xmlParseElementDecl</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21393"
+NAME="AEN21416"
 ></A
 ><P
 ></P
@@ -7487,7 +7487,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21414"
+NAME="AEN21437"
 ></A
 ><H3
 ><A
@@ -7522,7 +7522,7 @@ No element type may be declared more than once</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21423"
+NAME="AEN21446"
 ></A
 ><P
 ></P
@@ -7575,7 +7575,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21436"
+NAME="AEN21459"
 ></A
 ><H3
 ><A
@@ -7621,7 +7621,7 @@ entities or to the external subset.)</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21446"
+NAME="AEN21469"
 ></A
 ><P
 ></P
@@ -7659,7 +7659,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21455"
+NAME="AEN21478"
 ></A
 ><H3
 ><A
@@ -7699,7 +7699,7 @@ production for Char.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21465"
+NAME="AEN21488"
 ></A
 ><P
 ></P
@@ -7752,7 +7752,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21478"
+NAME="AEN21501"
 ></A
 ><H3
 ><A
@@ -7805,7 +7805,7 @@ An entity reference must not contain the name of an unparsed entity</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21489"
+NAME="AEN21512"
 ></A
 ><P
 ></P
@@ -7858,7 +7858,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21502"
+NAME="AEN21525"
 ></A
 ><H3
 ><A
@@ -7899,7 +7899,7 @@ or if the parser was asked to switch to that mode.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21512"
+NAME="AEN21535"
 ></A
 ><P
 ></P
@@ -7937,7 +7937,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21521"
+NAME="AEN21544"
 ></A
 ><H3
 ><A
@@ -7990,7 +7990,7 @@ NOTE: misleading but this is handled.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21533"
+NAME="AEN21556"
 ></A
 ><P
 ></P
@@ -8028,7 +8028,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21542"
+NAME="AEN21565"
 ></A
 ><H3
 ><A
@@ -8065,7 +8065,7 @@ type of the root element.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21551"
+NAME="AEN21574"
 ></A
 ><P
 ></P
@@ -8103,7 +8103,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21560"
+NAME="AEN21583"
 ></A
 ><H3
 ><A
@@ -8163,7 +8163,7 @@ definition.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21577"
+NAME="AEN21600"
 ></A
 ><P
 ></P
@@ -8233,7 +8233,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21594"
+NAME="AEN21617"
 ></A
 ><H3
 ><A
@@ -8285,7 +8285,7 @@ empty-element tag. </P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21609"
+NAME="AEN21632"
 ></A
 ><P
 ></P
@@ -8338,7 +8338,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21622"
+NAME="AEN21645"
 ></A
 ><H3
 ><A
@@ -8374,7 +8374,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21632"
+NAME="AEN21655"
 ></A
 ><P
 ></P
@@ -8412,7 +8412,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21641"
+NAME="AEN21664"
 ></A
 ><H3
 ><A
@@ -8450,7 +8450,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21652"
+NAME="AEN21675"
 ></A
 ><P
 ></P
@@ -8488,7 +8488,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21661"
+NAME="AEN21684"
 ></A
 ><H3
 ><A
@@ -8520,7 +8520,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21669"
+NAME="AEN21692"
 ></A
 ><P
 ></P
@@ -8558,7 +8558,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21678"
+NAME="AEN21701"
 ></A
 ><H3
 ><A
@@ -8607,7 +8607,7 @@ been declared.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21688"
+NAME="AEN21711"
 ></A
 ><P
 ></P
@@ -8645,7 +8645,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21697"
+NAME="AEN21720"
 ></A
 ><H3
 ><A
@@ -8680,7 +8680,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21706"
+NAME="AEN21729"
 ></A
 ><P
 ></P
@@ -8733,7 +8733,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21719"
+NAME="AEN21742"
 ></A
 ><H3
 ><A
@@ -8770,7 +8770,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21729"
+NAME="AEN21752"
 ></A
 ><P
 ></P
@@ -8823,7 +8823,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21742"
+NAME="AEN21765"
 ></A
 ><H3
 ><A
@@ -8858,7 +8858,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21751"
+NAME="AEN21774"
 ></A
 ><P
 ></P
@@ -8911,7 +8911,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21764"
+NAME="AEN21787"
 ></A
 ><H3
 ><A
@@ -8948,7 +8948,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21774"
+NAME="AEN21797"
 ></A
 ><P
 ></P
@@ -9001,7 +9001,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21787"
+NAME="AEN21810"
 ></A
 ><H3
 ><A
@@ -9048,7 +9048,7 @@ within any instance of those types.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21796"
+NAME="AEN21819"
 ></A
 ><P
 ></P
@@ -9101,7 +9101,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21809"
+NAME="AEN21832"
 ></A
 ><H3
 ><A
@@ -9133,7 +9133,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21817"
+NAME="AEN21840"
 ></A
 ><P
 ></P
@@ -9171,7 +9171,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21826"
+NAME="AEN21849"
 ></A
 ><H3
 ><A
@@ -9205,7 +9205,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21835"
+NAME="AEN21858"
 ></A
 ><P
 ></P
@@ -9243,7 +9243,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21844"
+NAME="AEN21867"
 ></A
 ><H3
 ><A
@@ -9275,7 +9275,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21852"
+NAME="AEN21875"
 ></A
 ><P
 ></P
@@ -9313,7 +9313,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21861"
+NAME="AEN21884"
 ></A
 ><H3
 ><A
@@ -9355,7 +9355,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21872"
+NAME="AEN21895"
 ></A
 ><P
 ></P
@@ -9427,7 +9427,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21889"
+NAME="AEN21912"
 ></A
 ><H3
 ><A
@@ -9455,7 +9455,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21895"
+NAME="AEN21918"
 ></A
 ><H3
 ><A
@@ -9483,7 +9483,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21901"
+NAME="AEN21924"
 ></A
 ><H3
 ><A
@@ -9511,7 +9511,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21907"
+NAME="AEN21930"
 ></A
 ><H3
 ><A
@@ -9539,7 +9539,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21913"
+NAME="AEN21936"
 ></A
 ><H3
 ><A
@@ -9593,7 +9593,7 @@ through xmlStringDecodeEntities</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21927"
+NAME="AEN21950"
 ></A
 ><P
 ></P
@@ -9732,7 +9732,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21960"
+NAME="AEN21983"
 ></A
 ><H3
 ><A
@@ -9786,7 +9786,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21974"
+NAME="AEN21997"
 ></A
 ><P
 ></P
@@ -9925,7 +9925,7 @@ must deallocate it !</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22007"
+NAME="AEN22030"
 ></A
 ><H3
 ><A
@@ -9959,7 +9959,7 @@ HREF="libxml-tree.html#XMLNODEPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22015"
+NAME="AEN22038"
 ></A
 ><P
 ></P
@@ -10029,7 +10029,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22032"
+NAME="AEN22055"
 ></A
 ><H3
 ><A
@@ -10062,7 +10062,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22040"
+NAME="AEN22063"
 ></A
 ><P
 ></P
@@ -10115,7 +10115,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22053"
+NAME="AEN22076"
 ></A
 ><H3
 ><A
@@ -10149,7 +10149,7 @@ HREF="libxml-parser.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22061"
+NAME="AEN22084"
 ></A
 ><P
 ></P
@@ -10219,7 +10219,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22078"
+NAME="AEN22101"
 ></A
 ><H3
 ><A
@@ -10252,7 +10252,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22086"
+NAME="AEN22109"
 ></A
 ><P
 ></P
@@ -10305,7 +10305,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22099"
+NAME="AEN22122"
 ></A
 ><H3
 ><A
@@ -10338,7 +10338,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22107"
+NAME="AEN22130"
 ></A
 ><P
 ></P
@@ -10391,7 +10391,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22120"
+NAME="AEN22143"
 ></A
 ><H3
 ><A
@@ -10425,7 +10425,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22128"
+NAME="AEN22151"
 ></A
 ><P
 ></P
@@ -10495,7 +10495,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22145"
+NAME="AEN22168"
 ></A
 ><H3
 ><A
@@ -10526,7 +10526,7 @@ It pops up finished entities in the process if allowable at that point.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22152"
+NAME="AEN22175"
 ></A
 ><P
 ></P
@@ -10579,7 +10579,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22165"
+NAME="AEN22188"
 ></A
 ><H3
 ><A
@@ -10615,7 +10615,7 @@ bytes in the input buffer.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22173"
+NAME="AEN22196"
 ></A
 ><P
 ></P
@@ -10702,7 +10702,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22194"
+NAME="AEN22217"
 ></A
 ><H3
 ><A
@@ -10761,7 +10761,7 @@ i.e.
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22207"
+NAME="AEN22230"
 ></A
 ><P
 ></P
@@ -10799,7 +10799,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22216"
+NAME="AEN22239"
 ></A
 ><H3
 ><A
@@ -10856,7 +10856,7 @@ HREF="ENTPROC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22231"
+NAME="AEN22254"
 ></A
 ><P
 ></P
@@ -10894,7 +10894,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22240"
+NAME="AEN22263"
 ></A
 ><H3
 ><A
@@ -10934,7 +10934,7 @@ the XML Second edition.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22249"
+NAME="AEN22272"
 ></A
 ><P
 ></P
@@ -10987,7 +10987,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22262"
+NAME="AEN22285"
 ></A
 ><H3
 ><A
@@ -11041,7 +11041,7 @@ HREF="XA"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22274"
+NAME="AEN22297"
 ></A
 ><P
 ></P
@@ -11111,7 +11111,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22291"
+NAME="AEN22314"
 ></A
 ><H3
 ><A
@@ -11142,7 +11142,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22298"
+NAME="AEN22321"
 ></A
 ><P
 ></P
@@ -11212,7 +11212,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22315"
+NAME="AEN22338"
 ></A
 ><H3
 ><A
@@ -11244,7 +11244,7 @@ HREF="libxml-tree.html#XMLCHAR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22322"
+NAME="AEN22345"
 ></A
 ><P
 ></P
@@ -11331,7 +11331,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22343"
+NAME="AEN22366"
 ></A
 ><H3
 ><A
@@ -11361,7 +11361,7 @@ HREF="libxml-parser.html#XMLPARSERCTXTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22350"
+NAME="AEN22373"
 ></A
 ><P
 ></P
@@ -11399,7 +11399,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22359"
+NAME="AEN22382"
 ></A
 ><H3
 ><A
@@ -11429,7 +11429,7 @@ HREF="libxml-parser.html#XMLPARSERINPUTPTR"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22366"
+NAME="AEN22389"
 ></A
 ><P
 ></P
@@ -11467,7 +11467,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22375"
+NAME="AEN22398"
 ></A
 ><H3
 ><A
@@ -11500,7 +11500,7 @@ case of use in multithreaded programs.</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22382"
+NAME="AEN22405"
 ></A
 ><H3
 ><A
@@ -11533,7 +11533,7 @@ by default if found at compile-time.</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22389"
+NAME="AEN22412"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 05f51790..832cb292 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -110,7 +110,7 @@ NAME="LIBXML-XMLMEMORY"
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23508"
+NAME="AEN23531"
 ></A
 ><H2
 >Name</H2
@@ -118,7 +118,7 @@ NAME="AEN23508"
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23511"
+NAME="AEN23534"
 ></A
 ><H2
 >Synopsis</H2
@@ -273,7 +273,7 @@ HREF="libxml-xmlmemory.html#XMLMEMSTRDUPLOC"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23547"
+NAME="AEN23570"
 ></A
 ><H2
 >Description</H2
@@ -283,14 +283,14 @@ NAME="AEN23547"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23550"
+NAME="AEN23573"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23552"
+NAME="AEN23575"
 ></A
 ><H3
 ><A
@@ -321,7 +321,7 @@ libxml i.e. if libxml has been configured with --with-debug-mem too</P
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23558"
+NAME="AEN23581"
 ></A
 ><H3
 ><A
@@ -349,7 +349,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23564"
+NAME="AEN23587"
 ></A
 ><H3
 ><A
@@ -374,7 +374,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23569"
+NAME="AEN23592"
 ></A
 ><P
 ></P
@@ -412,7 +412,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23578"
+NAME="AEN23601"
 ></A
 ><H3
 ><A
@@ -440,7 +440,7 @@ HREF="SIZE-T"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23584"
+NAME="AEN23607"
 ></A
 ><P
 ></P
@@ -478,7 +478,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23593"
+NAME="AEN23616"
 ></A
 ><H3
 ><A
@@ -507,7 +507,7 @@ HREF="SIZE-T"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23599"
+NAME="AEN23622"
 ></A
 ><P
 ></P
@@ -562,7 +562,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23612"
+NAME="AEN23635"
 ></A
 ><H3
 ><A
@@ -587,7 +587,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23617"
+NAME="AEN23640"
 ></A
 ><P
 ></P
@@ -640,7 +640,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23630"
+NAME="AEN23653"
 ></A
 ><H3
 ><A
@@ -686,7 +686,7 @@ done ?</P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23641"
+NAME="AEN23664"
 ></A
 ><P
 ></P
@@ -802,7 +802,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23670"
+NAME="AEN23693"
 ></A
 ><H3
 ><A
@@ -844,7 +844,7 @@ HREF="libxml-xmlmemory.html#XMLSTRDUPFUNC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23680"
+NAME="AEN23703"
 ></A
 ><P
 ></P
@@ -960,7 +960,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23709"
+NAME="AEN23732"
 ></A
 ><H3
 ><A
@@ -987,7 +987,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23715"
+NAME="AEN23738"
 ></A
 ><P
 ></P
@@ -1023,7 +1023,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23724"
+NAME="AEN23747"
 ></A
 ><H3
 ><A
@@ -1050,7 +1050,7 @@ CLASS="PROGRAMLISTING"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23730"
+NAME="AEN23753"
 ></A
 ><P
 ></P
@@ -1086,7 +1086,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23739"
+NAME="AEN23762"
 ></A
 ><H3
 ><A
@@ -1116,7 +1116,7 @@ HREF="FILE-CAPS"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23746"
+NAME="AEN23769"
 ></A
 ><P
 ></P
@@ -1155,7 +1155,7 @@ written to the file .memorylist</TD
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23755"
+NAME="AEN23778"
 ></A
 ><H3
 ><A
@@ -1192,7 +1192,7 @@ CLASS="PARAMETER"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23763"
+NAME="AEN23786"
 ></A
 ><P
 ></P
@@ -1247,7 +1247,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23776"
+NAME="AEN23799"
 ></A
 ><H3
 ><A
@@ -1275,7 +1275,7 @@ CLASS="PROGRAMLISTING"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23782"
+NAME="AEN23805"
 ></A
 ><H3
 ><A
@@ -1305,7 +1305,7 @@ HREF="MALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23789"
+NAME="AEN23812"
 ></A
 ><P
 ></P
@@ -1343,7 +1343,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23798"
+NAME="AEN23821"
 ></A
 ><H3
 ><A
@@ -1373,7 +1373,7 @@ HREF="REALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23805"
+NAME="AEN23828"
 ></A
 ><P
 ></P
@@ -1428,7 +1428,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23818"
+NAME="AEN23841"
 ></A
 ><H3
 ><A
@@ -1461,7 +1461,7 @@ HREF="libxml-parser.html#XMLSTRDUP"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23826"
+NAME="AEN23849"
 ></A
 ><P
 ></P
@@ -1499,7 +1499,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23835"
+NAME="AEN23858"
 ></A
 ><H3
 ><A
@@ -1534,7 +1534,7 @@ HREF="MALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23843"
+NAME="AEN23866"
 ></A
 ><P
 ></P
@@ -1606,7 +1606,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23860"
+NAME="AEN23883"
 ></A
 ><H3
 ><A
@@ -1642,7 +1642,7 @@ HREF="REALLOC"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23868"
+NAME="AEN23891"
 ></A
 ><P
 ></P
@@ -1731,7 +1731,7 @@ VALIGN="TOP"
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23889"
+NAME="AEN23912"
 ></A
 ><H3
 ><A
@@ -1763,7 +1763,7 @@ HREF="STRDUP"
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23896"
+NAME="AEN23919"
 ></A
 ><P
 ></P