diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 80bba16..de2aad3 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -546,6 +546,7 @@
 <ANCHOR id ="XP-ERROR-CAPS" href="libxml/libxml-xpathinternals.html#XP-ERROR-CAPS">
 <ANCHOR id ="XP-ERROR0-CAPS" href="libxml/libxml-xpathinternals.html#XP-ERROR0-CAPS">
 <ANCHOR id ="CHECK-TYPE-CAPS" href="libxml/libxml-xpathinternals.html#CHECK-TYPE-CAPS">
+<ANCHOR id ="CHECK-TYPE0-CAPS" href="libxml/libxml-xpathinternals.html#CHECK-TYPE0-CAPS">
 <ANCHOR id ="CHECK-ARITY-CAPS" href="libxml/libxml-xpathinternals.html#CHECK-ARITY-CAPS">
 <ANCHOR id ="CAST-TO-STRING-CAPS" href="libxml/libxml-xpathinternals.html#CAST-TO-STRING-CAPS">
 <ANCHOR id ="CAST-TO-NUMBER-CAPS" href="libxml/libxml-xpathinternals.html#CAST-TO-NUMBER-CAPS">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 57e010c..180e9d9 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17394"
+NAME="AEN17483"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17397"
+NAME="AEN17486"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17412"
+NAME="AEN17501"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +205,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17415"
+NAME="AEN17504"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17417"
+NAME="AEN17506"
 ></A
 ><H3
 ><A
@@ -240,7 +240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17423"
+NAME="AEN17512"
 ></A
 ><H3
 ><A
@@ -265,7 +265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17428"
+NAME="AEN17517"
 ></A
 ><P
 ></P
@@ -318,7 +318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17441"
+NAME="AEN17530"
 ></A
 ><H3
 ><A
@@ -343,7 +343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17446"
+NAME="AEN17535"
 ></A
 ><P
 ></P
@@ -381,7 +381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17455"
+NAME="AEN17544"
 ></A
 ><H3
 ><A
@@ -409,7 +409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17461"
+NAME="AEN17550"
 ></A
 ><H3
 ><A
@@ -439,7 +439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17468"
+NAME="AEN17557"
 ></A
 ><P
 ></P
@@ -466,7 +466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -477,7 +477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17477"
+NAME="AEN17566"
 ></A
 ><H3
 ><A
@@ -510,7 +510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17485"
+NAME="AEN17574"
 ></A
 ><P
 ></P
@@ -537,7 +537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID string</TD
 ></TR
 ><TR
 ><TD
@@ -552,7 +552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resource name if found or NULL otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -563,7 +563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17498"
+NAME="AEN17587"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17506"
+NAME="AEN17595"
 ></A
 ><P
 ></P
@@ -623,7 +623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the public ID string</TD
 ></TR
 ><TR
 ><TD
@@ -638,7 +638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the system ID if found or NULL otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index 9cdf315..2bafe9a 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21422"
+NAME="AEN21543"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21425"
+NAME="AEN21546"
 ></A
 ><H2
 >Synopsis</H2
@@ -322,7 +322,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21472"
+NAME="AEN21593"
 ></A
 ><H2
 >Description</H2
@@ -332,14 +332,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21475"
+NAME="AEN21596"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21477"
+NAME="AEN21598"
 ></A
 ><H3
 ><A
@@ -371,7 +371,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21484"
+NAME="AEN21605"
 ></A
 ><P
 ></P
@@ -426,7 +426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21497"
+NAME="AEN21618"
 ></A
 ><H3
 ><A
@@ -459,7 +459,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21504"
+NAME="AEN21625"
 ></A
 ><P
 ></P
@@ -531,7 +531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21521"
+NAME="AEN21642"
 ></A
 ><H3
 ><A
@@ -564,7 +564,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21528"
+NAME="AEN21649"
 ></A
 ><P
 ></P
@@ -636,7 +636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21545"
+NAME="AEN21666"
 ></A
 ><H3
 ><A
@@ -669,7 +669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21552"
+NAME="AEN21673"
 ></A
 ><P
 ></P
@@ -741,7 +741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21569"
+NAME="AEN21690"
 ></A
 ><H3
 ><A
@@ -774,7 +774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21576"
+NAME="AEN21697"
 ></A
 ><P
 ></P
@@ -846,7 +846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21593"
+NAME="AEN21714"
 ></A
 ><H3
 ><A
@@ -879,7 +879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21600"
+NAME="AEN21721"
 ></A
 ><P
 ></P
@@ -951,7 +951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21617"
+NAME="AEN21738"
 ></A
 ><H3
 ><A
@@ -983,7 +983,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21624"
+NAME="AEN21745"
 ></A
 ><P
 ></P
@@ -1038,7 +1038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21637"
+NAME="AEN21758"
 ></A
 ><H3
 ><A
@@ -1070,7 +1070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21644"
+NAME="AEN21765"
 ></A
 ><P
 ></P
@@ -1125,7 +1125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21657"
+NAME="AEN21778"
 ></A
 ><H3
 ><A
@@ -1157,7 +1157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21664"
+NAME="AEN21785"
 ></A
 ><P
 ></P
@@ -1212,7 +1212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21677"
+NAME="AEN21798"
 ></A
 ><H3
 ><A
@@ -1244,7 +1244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21684"
+NAME="AEN21805"
 ></A
 ><P
 ></P
@@ -1299,7 +1299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21697"
+NAME="AEN21818"
 ></A
 ><H3
 ><A
@@ -1331,7 +1331,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21704"
+NAME="AEN21825"
 ></A
 ><P
 ></P
@@ -1386,7 +1386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21717"
+NAME="AEN21838"
 ></A
 ><H3
 ><A
@@ -1413,7 +1413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21723"
+NAME="AEN21844"
 ></A
 ><P
 ></P
@@ -1440,7 +1440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string prompt</TD
 ></TR
 ><TR
 ><TD
@@ -1455,7 +1455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a string which will be freed by the Shell</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1466,7 +1466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21736"
+NAME="AEN21857"
 ></A
 ><H3
 ><A
@@ -1503,20 +1503,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21742"
+NAME="AEN21863"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCTXTPTR"
 ></A
 >xmlShellCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlShellCtxt *xmlShellCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21746"
+NAME="AEN21868"
 ></A
 ><H3
 ><A
@@ -1555,7 +1568,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21755"
+NAME="AEN21877"
 ></A
 ><P
 ></P
@@ -1582,7 +1595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a shell context</TD
 ></TR
 ><TR
 ><TD
@@ -1599,7 +1612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string argument</TD
 ></TR
 ><TR
 ><TD
@@ -1616,7 +1629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a first node</TD
 ></TR
 ><TR
 ><TD
@@ -1633,7 +1646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a second node</TD
 ></TR
 ><TR
 ><TD
@@ -1648,7 +1661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int, negative returns indicating errors</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1659,7 +1672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21780"
+NAME="AEN21902"
 ></A
 ><H3
 ><A
@@ -1700,7 +1713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21789"
+NAME="AEN21911"
 ></A
 ><P
 ></P
@@ -1727,7 +1740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial document</TD
 ></TR
 ><TR
 ><TD
@@ -1744,7 +1757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the output buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1761,7 +1774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line reading function</TD
 ></TR
 ><TR
 ><TD
@@ -1778,7 +1791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the output FILE*</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index 4e58be5..b978d1b 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17524"
+NAME="AEN17613"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17527"
+NAME="AEN17616"
 ></A
 ><H2
 >Synopsis</H2
@@ -294,7 +294,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17564"
+NAME="AEN17653"
 ></A
 ><H2
 >Description</H2
@@ -304,131 +304,248 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17567"
+NAME="AEN17656"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17569"
+NAME="AEN17658"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERCTXT"
 ></A
 >docbParserCtxt</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxt docbParserCtxt;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17573"
+NAME="AEN17663"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERCTXTPTR"
 ></A
 >docbParserCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxtPtr docbParserCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17577"
+NAME="AEN17668"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERNODEINFO"
 ></A
 >docbParserNodeInfo</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfo docbParserNodeInfo;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17581"
+NAME="AEN17673"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXHANDLER"
 ></A
 >docbSAXHandler</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler docbSAXHandler;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17585"
+NAME="AEN17678"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXHANDLERPTR"
 ></A
 >docbSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandlerPtr docbSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17589"
+NAME="AEN17683"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERINPUT"
 ></A
 >docbParserInput</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput docbParserInput;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17593"
+NAME="AEN17688"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERINPUTPTR"
 ></A
 >docbParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInputPtr docbParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17597"
+NAME="AEN17693"
 ></A
 ><H3
 ><A
 NAME="DOCBDOCPTR"
 ></A
 >docbDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDocPtr docbDocPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17601"
+NAME="AEN17698"
 ></A
 ><H3
 ><A
 NAME="DOCBNODEPTR"
 ></A
 >docbNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNodePtr docbNodePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17605"
+NAME="AEN17703"
 ></A
 ><H3
 ><A
@@ -460,7 +577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17611"
+NAME="AEN17709"
 ></A
 ><P
 ></P
@@ -487,7 +604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -504,7 +621,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -521,7 +643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -538,7 +660,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -555,7 +682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the quote character to escape (' or ") or zero.</TD
 ></TR
 ><TR
 ><TD
@@ -570,7 +697,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of octets consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -581,7 +721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17640"
+NAME="AEN17742"
 ></A
 ><H3
 ><A
@@ -622,7 +762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17649"
+NAME="AEN17751"
 ></A
 ><P
 ></P
@@ -649,7 +789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -666,7 +806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the SGML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -683,7 +823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -700,7 +840,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -715,7 +855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -726,7 +866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17674"
+NAME="AEN17776"
 ></A
 ><H3
 ><A
@@ -760,7 +900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17682"
+NAME="AEN17784"
 ></A
 ><P
 ></P
@@ -787,7 +927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -804,7 +944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the SGML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -819,7 +959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -830,7 +970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17699"
+NAME="AEN17801"
 ></A
 ><H3
 ><A
@@ -869,7 +1009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17707"
+NAME="AEN17809"
 ></A
 ><P
 ></P
@@ -896,7 +1036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -913,7 +1053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the SGML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -930,7 +1070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -947,7 +1087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -962,7 +1102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -973,7 +1113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17732"
+NAME="AEN17834"
 ></A
 ><H3
 ><A
@@ -1006,7 +1146,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17739"
+NAME="AEN17841"
 ></A
 ><P
 ></P
@@ -1033,7 +1173,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1050,7 +1190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1065,7 +1205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1076,7 +1216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17756"
+NAME="AEN17858"
 ></A
 ><H3
 ><A
@@ -1107,7 +1247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17763"
+NAME="AEN17865"
 ></A
 ><P
 ></P
@@ -1134,7 +1274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an SGML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1145,7 +1285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17772"
+NAME="AEN17874"
 ></A
 ><H3
 ><A
@@ -1199,7 +1339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17783"
+NAME="AEN17885"
 ></A
 ><P
 ></P
@@ -1226,7 +1366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -1243,7 +1383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -1260,7 +1400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of chars</TD
 ></TR
 ><TR
 ><TD
@@ -1277,7 +1417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of chars in the array</TD
 ></TR
 ><TR
 ><TD
@@ -1294,7 +1434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional file name or URI</TD
 ></TR
 ><TR
 ><TD
@@ -1311,7 +1451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1326,7 +1466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1337,7 +1477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17816"
+NAME="AEN17918"
 ></A
 ><H3
 ><A
@@ -1370,7 +1510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17823"
+NAME="AEN17925"
 ></A
 ><P
 ></P
@@ -1397,7 +1537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1414,7 +1554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -1431,7 +1571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in byte of the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -1448,7 +1588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  last chunk indicator</TD
 ></TR
 ><TR
 ><TD
@@ -1463,7 +1603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>zero if no error, the xmlParserErrors otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1474,7 +1614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17848"
+NAME="AEN17950"
 ></A
 ><H3
 ><A
@@ -1507,7 +1647,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17855"
+NAME="AEN17957"
 ></A
 ><P
 ></P
@@ -1534,7 +1674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1551,7 +1691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SGML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1566,7 +1706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1577,7 +1717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17872"
+NAME="AEN17974"
 ></A
 ><H3
 ><A
@@ -1608,7 +1748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17879"
+NAME="AEN17981"
 ></A
 ><P
 ></P
@@ -1635,7 +1775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an SGML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1650,7 +1790,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 87fb099..1aacffe 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20723"
+NAME="AEN20825"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20726"
+NAME="AEN20828"
 ></A
 ><H2
 >Synopsis</H2
@@ -381,7 +381,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20786"
+NAME="AEN20888"
 ></A
 ><H2
 >Description</H2
@@ -391,14 +391,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20789"
+NAME="AEN20891"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20791"
+NAME="AEN20893"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20798"
+NAME="AEN20900"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20804"
+NAME="AEN20906"
 ></A
 ><P
 ></P
@@ -522,7 +522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of bytes to store the UTF-8 result</TD
 ></TR
 ><TR
 ><TD
@@ -539,7 +539,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -556,7 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of chars in the original encoding</TD
 ></TR
 ><TR
 ><TD
@@ -573,7 +578,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -588,7 +598,21 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written, or -1 by lack of space, or -2
+if the transcoding failed.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -599,7 +623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20829"
+NAME="AEN20935"
 ></A
 ><H3
 ><A
@@ -632,7 +656,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20835"
+NAME="AEN20941"
 ></A
 ><P
 ></P
@@ -659,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -676,7 +700,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -693,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -710,7 +739,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -725,7 +759,21 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written, or -1 by lack of space, or -2
+if the transcoding failed.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -736,7 +784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20860"
+NAME="AEN20970"
 ></A
 ><H3
 ><A
@@ -770,20 +818,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20865"
+NAME="AEN20975"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGHANDLERPTR"
 ></A
 >xmlCharEncodingHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20869"
+NAME="AEN20980"
 ></A
 ><H3
 ><A
@@ -814,7 +875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20875"
+NAME="AEN20986"
 ></A
 ><H3
 ><A
@@ -843,7 +904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20881"
+NAME="AEN20992"
 ></A
 ><H3
 ><A
@@ -873,7 +934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20888"
+NAME="AEN20999"
 ></A
 ><P
 ></P
@@ -900,7 +961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlCharEncodingHandlerPtr handler block</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -911,7 +972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20897"
+NAME="AEN21008"
 ></A
 ><H3
 ><A
@@ -945,7 +1006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20905"
+NAME="AEN21016"
 ></A
 ><P
 ></P
@@ -972,7 +1033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string describing the char encoding.</TD
 ></TR
 ><TR
 ><TD
@@ -987,7 +1048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the handler or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -998,7 +1059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20918"
+NAME="AEN21029"
 ></A
 ><H3
 ><A
@@ -1027,7 +1088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20924"
+NAME="AEN21035"
 ></A
 ><P
 ></P
@@ -1080,7 +1141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20937"
+NAME="AEN21048"
 ></A
 ><H3
 ><A
@@ -1119,7 +1180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20945"
+NAME="AEN21056"
 ></A
 ><P
 ></P
@@ -1146,7 +1207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1163,7 +1224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1178,7 +1239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1189,7 +1250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20962"
+NAME="AEN21073"
 ></A
 ><H3
 ><A
@@ -1221,7 +1282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20969"
+NAME="AEN21080"
 ></A
 ><P
 ></P
@@ -1248,7 +1309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1263,7 +1324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1274,7 +1335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20982"
+NAME="AEN21093"
 ></A
 ><H3
 ><A
@@ -1301,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20988"
+NAME="AEN21099"
 ></A
 ><P
 ></P
@@ -1328,7 +1389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1343,7 +1404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not found the original name otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1354,7 +1415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21001"
+NAME="AEN21112"
 ></A
 ><H3
 ><A
@@ -1382,7 +1443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21007"
+NAME="AEN21118"
 ></A
 ><H3
 ><A
@@ -1414,7 +1475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21014"
+NAME="AEN21125"
 ></A
 ><P
 ></P
@@ -1441,7 +1502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1456,7 +1517,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE
+if not recognized.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1467,7 +1529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21027"
+NAME="AEN21138"
 ></A
 ><H3
 ><A
@@ -1502,7 +1564,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21035"
+NAME="AEN21146"
 ></A
 ><P
 ></P
@@ -1529,7 +1591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1544,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the canonical name for the given encoding</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1555,7 +1617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21048"
+NAME="AEN21159"
 ></A
 ><H3
 ><A
@@ -1587,7 +1649,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21055"
+NAME="AEN21166"
 ></A
 ><P
 ></P
@@ -1614,7 +1676,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the first bytes of the XML entity, must be at least
+4 bytes long.</TD
 ></TR
 ><TR
 ><TD
@@ -1631,7 +1694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1646,7 +1709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>one of the XML_CHAR_ENCODING_... values.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1657,7 +1720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21072"
+NAME="AEN21183"
 ></A
 ><H3
 ><A
@@ -1705,7 +1768,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21082"
+NAME="AEN21193"
 ></A
 ><P
 ></P
@@ -1732,7 +1795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1749,7 +1812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -1766,7 +1829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1781,7 +1844,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1792,7 +1858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21103"
+NAME="AEN21214"
 ></A
 ><H3
 ><A
@@ -1830,7 +1896,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21112"
+NAME="AEN21223"
 ></A
 ><P
 ></P
@@ -1857,7 +1923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1874,7 +1940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -1891,7 +1957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1906,7 +1972,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1917,7 +1986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21133"
+NAME="AEN21244"
 ></A
 ><H3
 ><A
@@ -1956,7 +2025,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21142"
+NAME="AEN21253"
 ></A
 ><P
 ></P
@@ -1983,7 +2052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -2000,7 +2069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -2017,7 +2086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -2032,7 +2101,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2043,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21163"
+NAME="AEN21274"
 ></A
 ><H3
 ><A
@@ -2073,7 +2145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21170"
+NAME="AEN21281"
 ></A
 ><P
 ></P
@@ -2100,7 +2172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -2115,7 +2187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2126,7 +2198,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21183"
+NAME="AEN21294"
 ></A
 ><H3
 ><A
@@ -2157,7 +2229,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21189"
+NAME="AEN21300"
 ></A
 ><P
 ></P
@@ -2184,7 +2256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -2201,7 +2273,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2218,7 +2295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -2235,7 +2312,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2250,7 +2332,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2261,7 +2356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21214"
+NAME="AEN21329"
 ></A
 ><H3
 ><A
@@ -2292,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21220"
+NAME="AEN21335"
 ></A
 ><P
 ></P
@@ -2319,7 +2414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -2336,7 +2431,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2353,7 +2453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of ISO Latin 1 chars</TD
 ></TR
 ><TR
 ><TD
@@ -2370,7 +2470,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2385,7 +2490,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2396,7 +2514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21245"
+NAME="AEN21364"
 ></A
 ><H3
 ><A
@@ -2438,7 +2556,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21253"
+NAME="AEN21372"
 ></A
 ><P
 ></P
@@ -2465,7 +2583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> Pointer to putative utf-8 encoded string.</TD
 ></TR
 ><TR
 ><TD
@@ -2480,7 +2598,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> true if <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> is valid.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2491,7 +2614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21266"
+NAME="AEN21386"
 ></A
 ><H3
 ><A
@@ -2522,7 +2645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21273"
+NAME="AEN21393"
 ></A
 ><P
 ></P
@@ -2549,7 +2672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a sequence of UTF-8 encoded bytes</TD
 ></TR
 ><TR
 ><TD
@@ -2566,7 +2689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of characters in the array</TD
 ></TR
 ><TR
 ><TD
@@ -2581,7 +2704,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the storage size of
+the first 'len' characters of ARRAY&#13;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2592,7 +2716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21290"
+NAME="AEN21410"
 ></A
 ><H3
 ><A
@@ -2626,7 +2750,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21298"
+NAME="AEN21418"
 ></A
 ><P
 ></P
@@ -2653,7 +2777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input UTF8 *</TD
 ></TR
 ><TR
 ><TD
@@ -2670,7 +2794,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len of <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> (in chars)</TD
 ></TR
 ><TR
 ><TD
@@ -2685,7 +2814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new UTF8 * or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2696,7 +2825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21315"
+NAME="AEN21436"
 ></A
 ><H3
 ><A
@@ -2731,7 +2860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21323"
+NAME="AEN21444"
 ></A
 ><P
 ></P
@@ -2758,7 +2887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input UTF8 *</TD
 ></TR
 ><TR
 ><TD
@@ -2775,7 +2904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the position of the desired UTF8 char (in chars)</TD
 ></TR
 ><TR
 ><TD
@@ -2790,7 +2919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the UTF8 character or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2801,7 +2930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21340"
+NAME="AEN21461"
 ></A
 ><H3
 ><A
@@ -2835,7 +2964,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21348"
+NAME="AEN21469"
 ></A
 ><P
 ></P
@@ -2862,7 +2991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input UTF8 *</TD
 ></TR
 ><TR
 ><TD
@@ -2879,7 +3008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the UTF8 character to be found</TD
 ></TR
 ><TR
 ><TD
@@ -2894,7 +3023,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the relative character position of the desired char
+or -1 if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2905,7 +3035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21365"
+NAME="AEN21486"
 ></A
 ><H3
 ><A
@@ -2953,7 +3083,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21376"
+NAME="AEN21497"
 ></A
 ><P
 ></P
@@ -2980,7 +3110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a sequence of UTF-8 encoded bytes</TD
 ></TR
 ><TR
 ><TD
@@ -3029,7 +3159,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to a newly created string
+or NULL if any problem</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3040,7 +3171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21397"
+NAME="AEN21518"
 ></A
 ><H3
 ><A
@@ -3071,7 +3202,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21404"
+NAME="AEN21525"
 ></A
 ><P
 ></P
@@ -3098,7 +3229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a sequence of UTF-8 encoded bytes</TD
 ></TR
 ><TR
 ><TD
@@ -3113,7 +3244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of characters in the string or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 09e42d3..8d48c4a 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7453"
+NAME="AEN7482"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7456"
+NAME="AEN7485"
 ></A
 ><H2
 >Synopsis</H2
@@ -370,7 +370,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7519"
+NAME="AEN7548"
 ></A
 ><H2
 >Description</H2
@@ -380,14 +380,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7522"
+NAME="AEN7551"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7524"
+NAME="AEN7553"
 ></A
 ><H3
 ><A
@@ -420,7 +420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7529"
+NAME="AEN7558"
 ></A
 ><H3
 ><A
@@ -466,33 +466,59 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7534"
+NAME="AEN7563"
 ></A
 ><H3
 ><A
 NAME="XMLENTITYPTR"
 ></A
 >xmlEntityPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntity *xmlEntityPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7538"
+NAME="AEN7568"
 ></A
 ><H3
 ><A
 NAME="XMLENTITIESTABLEPTR"
 ></A
 >xmlEntitiesTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntitiesTable *xmlEntitiesTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7542"
+NAME="AEN7573"
 ></A
 ><H3
 ><A
@@ -520,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7548"
+NAME="AEN7579"
 ></A
 ><H3
 ><A
@@ -570,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7560"
+NAME="AEN7591"
 ></A
 ><P
 ></P
@@ -597,7 +623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -614,7 +640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -631,7 +657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -648,7 +674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -665,7 +691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -682,7 +708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ><TR
 ><TD
@@ -697,7 +723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the entity or NULL in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -708,7 +734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7593"
+NAME="AEN7624"
 ></A
 ><H3
 ><A
@@ -758,7 +784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7605"
+NAME="AEN7636"
 ></A
 ><P
 ></P
@@ -785,7 +811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -802,7 +828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -819,7 +845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -836,7 +862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -853,7 +879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -870,7 +896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ><TR
 ><TD
@@ -885,7 +911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the entity or NULL in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -896,7 +922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7638"
+NAME="AEN7669"
 ></A
 ><H3
 ><A
@@ -929,7 +955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7646"
+NAME="AEN7677"
 ></A
 ><P
 ></P
@@ -956,7 +982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -971,7 +997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -982,7 +1008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7659"
+NAME="AEN7690"
 ></A
 ><H3
 ><A
@@ -1021,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7668"
+NAME="AEN7699"
 ></A
 ><P
 ></P
@@ -1048,7 +1074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1065,7 +1091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1080,7 +1106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1091,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7685"
+NAME="AEN7716"
 ></A
 ><H3
 ><A
@@ -1129,7 +1155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7694"
+NAME="AEN7725"
 ></A
 ><P
 ></P
@@ -1156,7 +1182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1173,7 +1199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1188,7 +1214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1199,7 +1225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7711"
+NAME="AEN7742"
 ></A
 ><H3
 ><A
@@ -1237,7 +1263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7720"
+NAME="AEN7751"
 ></A
 ><P
 ></P
@@ -1264,7 +1290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1281,7 +1307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1296,7 +1322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1307,7 +1333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7737"
+NAME="AEN7768"
 ></A
 ><H3
 ><A
@@ -1351,7 +1377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7748"
+NAME="AEN7779"
 ></A
 ><P
 ></P
@@ -1378,7 +1404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1395,7 +1421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1410,7 +1436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1421,7 +1447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7765"
+NAME="AEN7796"
 ></A
 ><H3
 ><A
@@ -1461,7 +1487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7774"
+NAME="AEN7805"
 ></A
 ><P
 ></P
@@ -1488,7 +1514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1505,7 +1531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1520,7 +1546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1531,7 +1557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7791"
+NAME="AEN7822"
 ></A
 ><H3
 ><A
@@ -1569,7 +1595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7800"
+NAME="AEN7831"
 ></A
 ><P
 ></P
@@ -1596,7 +1622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1613,7 +1639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1628,7 +1654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1639,7 +1665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7817"
+NAME="AEN7848"
 ></A
 ><H3
 ><A
@@ -1669,7 +1695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7824"
+NAME="AEN7855"
 ></A
 ><P
 ></P
@@ -1694,7 +1720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntitiesTablePtr just created or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1705,7 +1731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7833"
+NAME="AEN7864"
 ></A
 ><H3
 ><A
@@ -1738,7 +1764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7841"
+NAME="AEN7872"
 ></A
 ><P
 ></P
@@ -1765,7 +1791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ><TR
 ><TD
@@ -1780,7 +1806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlEntitiesTablePtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1791,7 +1817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7854"
+NAME="AEN7885"
 ></A
 ><H3
 ><A
@@ -1821,7 +1847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7861"
+NAME="AEN7892"
 ></A
 ><P
 ></P
@@ -1848,7 +1874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1859,7 +1885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7870"
+NAME="AEN7901"
 ></A
 ><H3
 ><A
@@ -1893,7 +1919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7878"
+NAME="AEN7909"
 ></A
 ><P
 ></P
@@ -1920,7 +1946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An XML buffer.</TD
 ></TR
 ><TR
 ><TD
@@ -1937,7 +1963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1948,7 +1974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7891"
+NAME="AEN7922"
 ></A
 ><H3
 ><A
@@ -1982,7 +2008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7899"
+NAME="AEN7930"
 ></A
 ><P
 ></P
@@ -2009,7 +2035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An XML buffer.</TD
 ></TR
 ><TR
 ><TD
@@ -2026,7 +2052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2037,7 +2063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7912"
+NAME="AEN7943"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 8bab177..82df3f2 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10204"
+NAME="AEN10243"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10207"
+NAME="AEN10246"
 ></A
 ><H2
 >Synopsis</H2
@@ -394,7 +394,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10271"
+NAME="AEN10310"
 ></A
 ><H2
 >Description</H2
@@ -404,131 +404,248 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10274"
+NAME="AEN10313"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10276"
+NAME="AEN10315"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXT"
 ></A
 >htmlParserCtxt</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxt htmlParserCtxt;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10280"
+NAME="AEN10320"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXTPTR"
 ></A
 >htmlParserCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxtPtr htmlParserCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10284"
+NAME="AEN10325"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERNODEINFO"
 ></A
 >htmlParserNodeInfo</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfo htmlParserNodeInfo;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10288"
+NAME="AEN10330"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLER"
 ></A
 >htmlSAXHandler</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler htmlSAXHandler;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10292"
+NAME="AEN10335"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLERPTR"
 ></A
 >htmlSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10296"
+NAME="AEN10340"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUT"
 ></A
 >htmlParserInput</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput htmlParserInput;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10300"
+NAME="AEN10345"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUTPTR"
 ></A
 >htmlParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInputPtr htmlParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10304"
+NAME="AEN10350"
 ></A
 ><H3
 ><A
 NAME="HTMLDOCPTR"
 ></A
 >htmlDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDocPtr htmlDocPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10308"
+NAME="AEN10355"
 ></A
 ><H3
 ><A
 NAME="HTMLNODEPTR"
 ></A
 >htmlNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNodePtr htmlNodePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10312"
+NAME="AEN10360"
 ></A
 ><H3
 ><A
@@ -564,20 +681,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10317"
+NAME="AEN10365"
 ></A
 ><H3
 ><A
 NAME="HTMLELEMDESCPTR"
 ></A
 >htmlElemDescPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef htmlElemDesc *htmlElemDescPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10321"
+NAME="AEN10370"
 ></A
 ><H3
 ><A
@@ -607,20 +737,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10326"
+NAME="AEN10375"
 ></A
 ><H3
 ><A
 NAME="HTMLENTITYDESCPTR"
 ></A
 >htmlEntityDescPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef htmlEntityDesc *htmlEntityDescPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10330"
+NAME="AEN10380"
 ></A
 ><H3
 ><A
@@ -653,7 +796,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10338"
+NAME="AEN10388"
 ></A
 ><P
 ></P
@@ -680,7 +823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The tag name in lowercase</TD
 ></TR
 ><TR
 ><TD
@@ -695,7 +838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the related htmlElemDescPtr or NULL if not found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -706,7 +849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10351"
+NAME="AEN10401"
 ></A
 ><H3
 ><A
@@ -741,7 +884,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10360"
+NAME="AEN10410"
 ></A
 ><P
 ></P
@@ -768,7 +911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -783,7 +926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -794,7 +937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10373"
+NAME="AEN10423"
 ></A
 ><H3
 ><A
@@ -826,7 +969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10381"
+NAME="AEN10431"
 ></A
 ><P
 ></P
@@ -853,7 +996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity's unicode value</TD
 ></TR
 ><TR
 ><TD
@@ -868,7 +1011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -879,7 +1022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10394"
+NAME="AEN10444"
 ></A
 ><H3
 ><A
@@ -915,7 +1058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10402"
+NAME="AEN10452"
 ></A
 ><P
 ></P
@@ -942,7 +1085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML document</TD
 ></TR
 ><TR
 ><TD
@@ -959,7 +1102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML element</TD
 ></TR
 ><TR
 ><TD
@@ -974,7 +1117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if autoclosed, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -985,7 +1128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10419"
+NAME="AEN10469"
 ></A
 ><H3
 ><A
@@ -1026,7 +1169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10428"
+NAME="AEN10478"
 ></A
 ><P
 ></P
@@ -1053,7 +1196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML document</TD
 ></TR
 ><TR
 ><TD
@@ -1070,7 +1213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The tag name</TD
 ></TR
 ><TR
 ><TD
@@ -1087,7 +1230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML element</TD
 ></TR
 ><TR
 ><TD
@@ -1102,7 +1245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if autoclose, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1113,7 +1256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10449"
+NAME="AEN10499"
 ></A
 ><H3
 ><A
@@ -1152,7 +1295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10459"
+NAME="AEN10509"
 ></A
 ><P
 ></P
@@ -1179,7 +1322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1196,7 +1339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  location to store the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1211,7 +1354,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, or NULL otherwise,
+if non-NULL *str will have to be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1222,7 +1366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10476"
+NAME="AEN10526"
 ></A
 ><H3
 ><A
@@ -1258,7 +1402,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10485"
+NAME="AEN10535"
 ></A
 ><P
 ></P
@@ -1285,7 +1429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1300,7 +1444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the value parsed (as an int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1311,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10498"
+NAME="AEN10548"
 ></A
 ><H3
 ><A
@@ -1345,7 +1489,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10507"
+NAME="AEN10557"
 ></A
 ><P
 ></P
@@ -1372,7 +1516,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1383,7 +1527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10516"
+NAME="AEN10566"
 ></A
 ><H3
 ><A
@@ -1416,15 +1560,15 @@
 ></TR
 ></TABLE
 ><P
->parse an HTML in-memory document and build a tree.
-It use the given SAX function block to handle the parsing callback.
-If sax is NULL, fallback to the default DOM tree building routines.</P
+>Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks
+to handle parse events. If sax is NULL, fallback to the default DOM
+behavior and return a tree.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10525"
+NAME="AEN10575"
 ></A
 ><P
 ></P
@@ -1451,7 +1595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -1468,7 +1612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1485,7 +1629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -1502,7 +1646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -1517,7 +1661,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree unless SAX is NULL or the document is
+not well formed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1528,7 +1673,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10550"
+NAME="AEN10600"
 ></A
 ><H3
 ><A
@@ -1562,7 +1707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10558"
+NAME="AEN10608"
 ></A
 ><P
 ></P
@@ -1589,7 +1734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -1606,7 +1751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1621,7 +1766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1632,7 +1777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10575"
+NAME="AEN10625"
 ></A
 ><H3
 ><A
@@ -1671,7 +1816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10583"
+NAME="AEN10633"
 ></A
 ><P
 ></P
@@ -1698,7 +1843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1715,7 +1860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1732,7 +1877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -1749,7 +1894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -1764,7 +1909,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree unless SAX is NULL or the document is
+not well formed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1775,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10608"
+NAME="AEN10658"
 ></A
 ><H3
 ><A
@@ -1807,7 +1953,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10615"
+NAME="AEN10665"
 ></A
 ><P
 ></P
@@ -1834,7 +1980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1851,7 +1997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1866,7 +2012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1877,7 +2023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10632"
+NAME="AEN10682"
 ></A
 ><H3
 ><A
@@ -1908,7 +2054,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10638"
+NAME="AEN10688"
 ></A
 ><P
 ></P
@@ -1935,7 +2081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -1952,7 +2098,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -1969,7 +2120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -1986,7 +2137,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2001,7 +2157,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of octets consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2012,7 +2181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10663"
+NAME="AEN10717"
 ></A
 ><H3
 ><A
@@ -2044,7 +2213,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10669"
+NAME="AEN10723"
 ></A
 ><P
 ></P
@@ -2071,7 +2240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -2088,7 +2257,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2105,7 +2279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -2122,7 +2296,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2139,7 +2318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the quote character to escape (' or ") or zero.</TD
 ></TR
 ><TR
 ><TD
@@ -2154,7 +2333,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of octets consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2165,7 +2357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10698"
+NAME="AEN10756"
 ></A
 ><H3
 ><A
@@ -2195,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10705"
+NAME="AEN10763"
 ></A
 ><P
 ></P
@@ -2222,7 +2414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -2237,7 +2429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 is the attribute is a script 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2248,7 +2440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10718"
+NAME="AEN10776"
 ></A
 ><H3
 ><A
@@ -2275,7 +2467,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10724"
+NAME="AEN10782"
 ></A
 ><P
 ></P
@@ -2302,7 +2494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -2317,7 +2509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no handling, 1 for auto insertion.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2328,7 +2520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10737"
+NAME="AEN10795"
 ></A
 ><H3
 ><A
@@ -2359,7 +2551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10744"
+NAME="AEN10802"
 ></A
 ><P
 ></P
@@ -2386,7 +2578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2397,7 +2589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10753"
+NAME="AEN10811"
 ></A
 ><H3
 ><A
@@ -2451,7 +2643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10764"
+NAME="AEN10822"
 ></A
 ><P
 ></P
@@ -2478,7 +2670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -2495,7 +2687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -2512,7 +2704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of chars</TD
 ></TR
 ><TR
 ><TD
@@ -2529,7 +2721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of chars in the array</TD
 ></TR
 ><TR
 ><TD
@@ -2546,7 +2738,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional file name or URI</TD
 ></TR
 ><TR
 ><TD
@@ -2563,7 +2755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding</TD
 ></TR
 ><TR
 ><TD
@@ -2578,7 +2770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2589,7 +2781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10797"
+NAME="AEN10855"
 ></A
 ><H3
 ><A
@@ -2622,7 +2814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10804"
+NAME="AEN10862"
 ></A
 ><P
 ></P
@@ -2649,7 +2841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2666,7 +2858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -2683,7 +2875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in byte of the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -2700,7 +2892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  last chunk indicator</TD
 ></TR
 ><TR
 ><TD
@@ -2715,7 +2907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>zero if no error, the xmlParserErrors otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index e4fb7a7..9995c56 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10834"
+NAME="AEN10892"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10837"
+NAME="AEN10895"
 ></A
 ><H2
 >Synopsis</H2
@@ -318,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10883"
+NAME="AEN10941"
 ></A
 ><H2
 >Description</H2
@@ -328,14 +328,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10886"
+NAME="AEN10944"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10888"
+NAME="AEN10946"
 ></A
 ><H3
 ><A
@@ -351,7 +351,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_TEXT_NODE</PRE
+>#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -364,7 +364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10894"
+NAME="AEN10952"
 ></A
 ><H3
 ><A
@@ -380,7 +380,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_ENTITY_REF_NODE</PRE
+>#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -393,7 +393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10900"
+NAME="AEN10958"
 ></A
 ><H3
 ><A
@@ -409,7 +409,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_COMMENT_NODE</PRE
+>#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -422,7 +422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10906"
+NAME="AEN10964"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_PRESERVE_NODE</PRE
+>#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -451,7 +451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10912"
+NAME="AEN10970"
 ></A
 ><H3
 ><A
@@ -467,7 +467,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_PI_NODE</PRE
+>#define HTML_PI_NODE		XML_PI_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -480,7 +480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10918"
+NAME="AEN10976"
 ></A
 ><H3
 ><A
@@ -517,7 +517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10927"
+NAME="AEN10985"
 ></A
 ><P
 ></P
@@ -544,7 +544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  URI for the dtd, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -561,7 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID of the DTD, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -576,7 +576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -587,7 +587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10944"
+NAME="AEN11002"
 ></A
 ><H3
 ><A
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10953"
+NAME="AEN11011"
 ></A
 ><P
 ></P
@@ -651,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  URI for the dtd, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -668,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID of the DTD, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -683,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document, do not intialize the DTD if not provided</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -694,7 +694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10970"
+NAME="AEN11028"
 ></A
 ><H3
 ><A
@@ -727,7 +727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10978"
+NAME="AEN11036"
 ></A
 ><P
 ></P
@@ -754,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -769,7 +769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current encoding as flagged in the HTML source</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -780,7 +780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10991"
+NAME="AEN11049"
 ></A
 ><H3
 ><A
@@ -816,7 +816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10999"
+NAME="AEN11057"
 ></A
 ><P
 ></P
@@ -843,7 +843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -860,7 +860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding string</TD
 ></TR
 ><TR
 ><TD
@@ -875,7 +875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success and -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -886,7 +886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11016"
+NAME="AEN11074"
 ></A
 ><H3
 ><A
@@ -922,7 +922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11024"
+NAME="AEN11082"
 ></A
 ><P
 ></P
@@ -949,7 +949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -966,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -983,7 +983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory length</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -994,7 +994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11041"
+NAME="AEN11099"
 ></A
 ><H3
 ><A
@@ -1028,7 +1028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11049"
+NAME="AEN11107"
 ></A
 ><P
 ></P
@@ -1055,7 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE*</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1087,7 +1087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1098,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11066"
+NAME="AEN11124"
 ></A
 ><H3
 ><A
@@ -1135,7 +1135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11074"
+NAME="AEN11132"
 ></A
 ><P
 ></P
@@ -1162,7 +1162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -1179,7 +1179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1194,7 +1194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1205,7 +1205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11091"
+NAME="AEN11149"
 ></A
 ><H3
 ><A
@@ -1244,7 +1244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11100"
+NAME="AEN11158"
 ></A
 ><P
 ></P
@@ -1271,7 +1271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -1288,7 +1288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1305,7 +1305,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1316,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11117"
+NAME="AEN11175"
 ></A
 ><H3
 ><A
@@ -1355,7 +1355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11126"
+NAME="AEN11184"
 ></A
 ><P
 ></P
@@ -1382,7 +1382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE pointer</TD
 ></TR
 ><TR
 ><TD
@@ -1399,7 +1399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1416,7 +1416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1427,7 +1427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11143"
+NAME="AEN11201"
 ></A
 ><H3
 ><A
@@ -1469,7 +1469,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11153"
+NAME="AEN11211"
 ></A
 ><P
 ></P
@@ -1496,7 +1496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE pointer</TD
 ></TR
 ><TR
 ><TD
@@ -1513,7 +1513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1530,7 +1530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -1547,7 +1547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1564,7 +1564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -1579,7 +1579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1590,7 +1590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11182"
+NAME="AEN11240"
 ></A
 ><H3
 ><A
@@ -1623,7 +1623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11189"
+NAME="AEN11247"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1667,7 +1667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1684,7 +1684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1699,7 +1699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1710,7 +1710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11210"
+NAME="AEN11268"
 ></A
 ><H3
 ><A
@@ -1743,7 +1743,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11217"
+NAME="AEN11275"
 ></A
 ><P
 ></P
@@ -1770,7 +1770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1787,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1804,7 +1804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1821,7 +1821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -1836,7 +1836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index 4adae41..09a3648 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15847"
+NAME="AEN15933"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15850"
+NAME="AEN15936"
 ></A
 ><H2
 >Synopsis</H2
@@ -282,7 +282,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15879"
+NAME="AEN15965"
 ></A
 ><H2
 >Description</H2
@@ -292,14 +292,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15882"
+NAME="AEN15968"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15884"
+NAME="AEN15970"
 ></A
 ><H3
 ><A
@@ -341,7 +341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15891"
+NAME="AEN15977"
 ></A
 ><P
 ></P
@@ -368,7 +368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  user provided data for the callback</TD
 ></TR
 ><TR
 ><TD
@@ -385,7 +385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name (including "-&gt;" when links are shown)</TD
 ></TR
 ><TR
 ><TD
@@ -402,7 +402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute string</TD
 ></TR
 ><TR
 ><TD
@@ -419,7 +419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the owner string</TD
 ></TR
 ><TR
 ><TD
@@ -436,7 +436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the group string</TD
 ></TR
 ><TR
 ><TD
@@ -453,7 +453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file size</TD
 ></TR
 ><TR
 ><TD
@@ -470,7 +470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the link count</TD
 ></TR
 ><TR
 ><TD
@@ -487,7 +487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the year</TD
 ></TR
 ><TR
 ><TD
@@ -504,7 +504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the month</TD
 ></TR
 ><TR
 ><TD
@@ -521,7 +521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the day</TD
 ></TR
 ><TR
 ><TD
@@ -538,7 +538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the hour</TD
 ></TR
 ><TR
 ><TD
@@ -555,7 +555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the minute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -566,7 +566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15944"
+NAME="AEN16030"
 ></A
 ><H3
 ><A
@@ -595,7 +595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15950"
+NAME="AEN16036"
 ></A
 ><P
 ></P
@@ -622,7 +622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user provided context</TD
 ></TR
 ><TR
 ><TD
@@ -639,7 +639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the data received</TD
 ></TR
 ><TR
 ><TD
@@ -656,7 +656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> its size in bytes</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -667,7 +667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15967"
+NAME="AEN16053"
 ></A
 ><H3
 ><A
@@ -697,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15973"
+NAME="AEN16059"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15979"
+NAME="AEN16065"
 ></A
 ><H3
 ><A
@@ -752,7 +752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15985"
+NAME="AEN16071"
 ></A
 ><P
 ></P
@@ -779,7 +779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL used to initialize the context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -790,7 +790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15994"
+NAME="AEN16080"
 ></A
 ><H3
 ><A
@@ -817,7 +817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16000"
+NAME="AEN16086"
 ></A
 ><P
 ></P
@@ -844,7 +844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -855,7 +855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16009"
+NAME="AEN16095"
 ></A
 ><H3
 ><A
@@ -883,7 +883,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16015"
+NAME="AEN16101"
 ></A
 ><P
 ></P
@@ -910,7 +910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP server name</TD
 ></TR
 ><TR
 ><TD
@@ -927,7 +927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the port (use 21 if 0)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -938,7 +938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16028"
+NAME="AEN16114"
 ></A
 ><H3
 ><A
@@ -965,7 +965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16034"
+NAME="AEN16120"
 ></A
 ><P
 ></P
@@ -992,7 +992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the URL to the resource</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1003,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16043"
+NAME="AEN16129"
 ></A
 ><H3
 ><A
@@ -1030,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16049"
+NAME="AEN16135"
 ></A
 ><P
 ></P
@@ -1057,7 +1057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1083,7 +1083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16062"
+NAME="AEN16148"
 ></A
 ><H3
 ><A
@@ -1110,7 +1110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16068"
+NAME="AEN16154"
 ></A
 ><P
 ></P
@@ -1137,7 +1137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1152,7 +1152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1163,7 +1163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16081"
+NAME="AEN16167"
 ></A
 ><H3
 ><A
@@ -1190,7 +1190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16087"
+NAME="AEN16173"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1232,7 +1232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1243,7 +1243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16100"
+NAME="AEN16186"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16106"
+NAME="AEN16192"
 ></A
 ><P
 ></P
@@ -1300,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The proxy URL used to initialize the proxy context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1311,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16115"
+NAME="AEN16201"
 ></A
 ><H3
 ><A
@@ -1344,7 +1344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16121"
+NAME="AEN16207"
 ></A
 ><P
 ></P
@@ -1371,7 +1371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy host name</TD
 ></TR
 ><TR
 ><TD
@@ -1388,7 +1388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy port</TD
 ></TR
 ><TR
 ><TD
@@ -1405,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy user name</TD
 ></TR
 ><TR
 ><TD
@@ -1422,7 +1422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy password</TD
 ></TR
 ><TR
 ><TD
@@ -1439,7 +1439,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of proxy 1 for using SITE, 2 for USER a<TT
+CLASS="PARAMETER"
+><I
+>b</I
+></TT
+></TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1450,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16146"
+NAME="AEN16233"
 ></A
 ><H3
 ><A
@@ -1482,7 +1487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16152"
+NAME="AEN16239"
 ></A
 ><P
 ></P
@@ -1509,7 +1514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1526,7 +1531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL used to update the context</TD
 ></TR
 ><TR
 ><TD
@@ -1541,7 +1546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if Ok, -1 in case of error (other host).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1552,7 +1557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16169"
+NAME="AEN16256"
 ></A
 ><H3
 ><A
@@ -1579,7 +1584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16175"
+NAME="AEN16262"
 ></A
 ><P
 ></P
@@ -1606,7 +1611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1621,7 +1626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the code number</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1632,7 +1637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16188"
+NAME="AEN16275"
 ></A
 ><H3
 ><A
@@ -1659,7 +1664,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16194"
+NAME="AEN16281"
 ></A
 ><P
 ></P
@@ -1686,7 +1691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1701,7 +1706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the code number, or 0</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1712,7 +1717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16207"
+NAME="AEN16294"
 ></A
 ><H3
 ><A
@@ -1740,7 +1745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16213"
+NAME="AEN16300"
 ></A
 ><P
 ></P
@@ -1767,7 +1772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1784,7 +1789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a directory on the server</TD
 ></TR
 ><TR
 ><TD
@@ -1799,7 +1804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 1 if CWD worked, 0 if it failed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1810,7 +1815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16230"
+NAME="AEN16317"
 ></A
 ><H3
 ><A
@@ -1838,7 +1843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16236"
+NAME="AEN16323"
 ></A
 ><P
 ></P
@@ -1865,7 +1870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1880,7 +1885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1891,7 +1896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16249"
+NAME="AEN16336"
 ></A
 ><H3
 ><A
@@ -1918,7 +1923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16255"
+NAME="AEN16342"
 ></A
 ><P
 ></P
@@ -1945,7 +1950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1960,7 +1965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1971,7 +1976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16268"
+NAME="AEN16355"
 ></A
 ><H3
 ><A
@@ -2005,7 +2010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16275"
+NAME="AEN16362"
 ></A
 ><P
 ></P
@@ -2032,7 +2037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2049,7 +2054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback</TD
 ></TR
 ><TR
 ><TD
@@ -2066,7 +2071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback data</TD
 ></TR
 ><TR
 ><TD
@@ -2083,7 +2088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  optional files to list</TD
 ></TR
 ><TR
 ><TD
@@ -2098,7 +2103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2109,7 +2114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16300"
+NAME="AEN16387"
 ></A
 ><H3
 ><A
@@ -2137,7 +2142,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16306"
+NAME="AEN16393"
 ></A
 ><P
 ></P
@@ -2164,7 +2169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2181,7 +2186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file to retrieve (or NULL if path is in context).</TD
 ></TR
 ><TR
 ><TD
@@ -2196,7 +2201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the socket for the data connection, or &lt;0 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2207,7 +2212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16323"
+NAME="AEN16410"
 ></A
 ><H3
 ><A
@@ -2241,7 +2246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16330"
+NAME="AEN16417"
 ></A
 ><P
 ></P
@@ -2268,7 +2273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2285,7 +2290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback</TD
 ></TR
 ><TR
 ><TD
@@ -2302,7 +2307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback data</TD
 ></TR
 ><TR
 ><TD
@@ -2319,7 +2324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file to retrieve</TD
 ></TR
 ><TR
 ><TD
@@ -2334,7 +2339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2345,7 +2350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16355"
+NAME="AEN16442"
 ></A
 ><H3
 ><A
@@ -2385,7 +2390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16363"
+NAME="AEN16450"
 ></A
 ><P
 ></P
@@ -2412,7 +2417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2429,7 +2434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffer</TD
 ></TR
 ><TR
 ><TD
@@ -2446,7 +2451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer length</TD
 ></TR
 ><TR
 ><TD
@@ -2461,7 +2466,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte read. 0 is an indication of an end of connection.
+-1 indicates a parameter error.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index da7d1c9..fd272d3 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15550"
+NAME="AEN15636"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15553"
+NAME="AEN15639"
 ></A
 ><H2
 >Synopsis</H2
@@ -221,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15569"
+NAME="AEN15655"
 ></A
 ><H2
 >Description</H2
@@ -231,14 +231,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15572"
+NAME="AEN15658"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15574"
+NAME="AEN15660"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15580"
+NAME="AEN15666"
 ></A
 ><H3
 ><A
@@ -293,7 +293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15585"
+NAME="AEN15671"
 ></A
 ><H3
 ><A
@@ -323,7 +323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15591"
+NAME="AEN15677"
 ></A
 ><P
 ></P
@@ -350,7 +350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The proxy URL used to initialize the proxy context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -361,7 +361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15600"
+NAME="AEN15686"
 ></A
 ><H3
 ><A
@@ -391,7 +391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15606"
+NAME="AEN15692"
 ></A
 ><P
 ></P
@@ -418,7 +418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -435,7 +435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -452,7 +452,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -467,7 +468,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success. The contentType,
+if provided must be freed by the caller</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -478,7 +480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15627"
+NAME="AEN15713"
 ></A
 ><H3
 ><A
@@ -516,7 +518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15634"
+NAME="AEN15720"
 ></A
 ><P
 ></P
@@ -543,7 +545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -560,7 +562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP method to use</TD
 ></TR
 ><TR
 ><TD
@@ -577,7 +579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string if any</TD
 ></TR
 ><TR
 ><TD
@@ -594,7 +596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Content-Type information IN and OUT</TD
 ></TR
 ><TR
 ><TD
@@ -611,7 +613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra headers</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -622,7 +624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15659"
+NAME="AEN15745"
 ></A
 ><H3
 ><A
@@ -661,7 +663,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15666"
+NAME="AEN15752"
 ></A
 ><P
 ></P
@@ -688,7 +690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -705,7 +707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP method to use</TD
 ></TR
 ><TR
 ><TD
@@ -722,7 +724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string if any</TD
 ></TR
 ><TR
 ><TD
@@ -739,7 +741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Content-Type information IN and OUT</TD
 ></TR
 ><TR
 ><TD
@@ -756,7 +758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the redirected URL OUT</TD
 ></TR
 ><TR
 ><TD
@@ -773,7 +775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra headers</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -784,7 +786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15695"
+NAME="AEN15781"
 ></A
 ><H3
 ><A
@@ -813,7 +815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15701"
+NAME="AEN15787"
 ></A
 ><P
 ></P
@@ -840,7 +842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -857,7 +859,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -868,7 +871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15714"
+NAME="AEN15800"
 ></A
 ><H3
 ><A
@@ -898,7 +901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15720"
+NAME="AEN15806"
 ></A
 ><P
 ></P
@@ -925,7 +928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -942,7 +945,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -959,7 +963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if availble the redirected URL will be returned</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -970,7 +974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15737"
+NAME="AEN15823"
 ></A
 ><H3
 ><A
@@ -997,7 +1001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15743"
+NAME="AEN15829"
 ></A
 ><P
 ></P
@@ -1024,7 +1028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1039,7 +1043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the HTTP return code for the request.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1050,7 +1054,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15756"
+NAME="AEN15842"
 ></A
 ><H3
 ><A
@@ -1077,7 +1081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15762"
+NAME="AEN15848"
 ></A
 ><P
 ></P
@@ -1104,7 +1108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1119,7 +1123,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the stashed value of the WWW-Authenticate or Proxy-Authenticate
+header.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1130,7 +1135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15775"
+NAME="AEN15861"
 ></A
 ><H3
 ><A
@@ -1170,7 +1175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15783"
+NAME="AEN15869"
 ></A
 ><P
 ></P
@@ -1197,7 +1202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1214,7 +1219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1231,7 +1236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer length</TD
 ></TR
 ><TR
 ><TD
@@ -1246,7 +1251,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte read. 0 is an indication of an end of connection.
+-1 indicates a parameter error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1257,7 +1263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15804"
+NAME="AEN15890"
 ></A
 ><H3
 ><A
@@ -1286,7 +1292,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15810"
+NAME="AEN15896"
 ></A
 ><P
 ></P
@@ -1313,7 +1319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1330,7 +1336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -1345,7 +1351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1356,7 +1362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15827"
+NAME="AEN15913"
 ></A
 ><H3
 ><A
@@ -1384,7 +1390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15833"
+NAME="AEN15919"
 ></A
 ><P
 ></P
@@ -1411,7 +1417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 4bf1c0d..086b1c0 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -623,7 +623,7 @@
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
+                                             const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *val);
@@ -1270,7 +1270,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_DEFAULT_VERSION</PRE
+>#define XML_DEFAULT_VERSION	"1.0"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1403,13 +1403,26 @@
 NAME="XMLPARSERINPUTPTR"
 ></A
 >xmlParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput *xmlParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN350"
+NAME="AEN351"
 ></A
 ><H3
 ><A
@@ -1446,20 +1459,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN356"
+NAME="AEN357"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOPTR"
 ></A
 >xmlParserNodeInfoPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN360"
+NAME="AEN362"
 ></A
 ><H3
 ><A
@@ -1489,20 +1515,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN365"
+NAME="AEN367"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOSEQPTR"
 ></A
 >xmlParserNodeInfoSeqPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN369"
+NAME="AEN372"
 ></A
 ><H3
 ><A
@@ -1549,7 +1588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN375"
+NAME="AEN378"
 ></A
 ><H3
 ><A
@@ -1565,7 +1604,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_DETECT_IDS</PRE
+>#define XML_DETECT_IDS		2</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1578,7 +1617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN381"
+NAME="AEN384"
 ></A
 ><H3
 ><A
@@ -1594,7 +1633,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_COMPLETE_ATTRS</PRE
+>#define XML_COMPLETE_ATTRS	4</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1608,7 +1647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN387"
+NAME="AEN390"
 ></A
 ><H3
 ><A
@@ -1715,20 +1754,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN393"
+NAME="AEN396"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERCTXTPTR"
 ></A
 >xmlParserCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserCtxt *xmlParserCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN397"
+NAME="AEN401"
 ></A
 ><H3
 ><A
@@ -1761,20 +1813,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN403"
+NAME="AEN407"
 ></A
 ><H3
 ><A
 NAME="XMLSAXLOCATORPTR"
 ></A
 >xmlSAXLocatorPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN407"
+NAME="AEN412"
 ></A
 ><H3
 ><A
@@ -1810,7 +1875,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN415"
+NAME="AEN420"
 ></A
 ><P
 ></P
@@ -1897,7 +1962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN436"
+NAME="AEN441"
 ></A
 ><H3
 ><A
@@ -1934,7 +1999,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN444"
+NAME="AEN449"
 ></A
 ><P
 ></P
@@ -2023,7 +2088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN465"
+NAME="AEN470"
 ></A
 ><H3
 ><A
@@ -2060,7 +2125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN473"
+NAME="AEN478"
 ></A
 ><P
 ></P
@@ -2149,7 +2214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN494"
+NAME="AEN499"
 ></A
 ><H3
 ><A
@@ -2181,7 +2246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN501"
+NAME="AEN506"
 ></A
 ><P
 ></P
@@ -2251,7 +2316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN518"
+NAME="AEN523"
 ></A
 ><H3
 ><A
@@ -2283,7 +2348,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN525"
+NAME="AEN530"
 ></A
 ><P
 ></P
@@ -2353,7 +2418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN542"
+NAME="AEN547"
 ></A
 ><H3
 ><A
@@ -2395,7 +2460,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN551"
+NAME="AEN556"
 ></A
 ><P
 ></P
@@ -2518,7 +2583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN580"
+NAME="AEN585"
 ></A
 ><H3
 ><A
@@ -2555,7 +2620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN588"
+NAME="AEN593"
 ></A
 ><P
 ></P
@@ -2644,7 +2709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN609"
+NAME="AEN614"
 ></A
 ><H3
 ><A
@@ -2687,7 +2752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN618"
+NAME="AEN623"
 ></A
 ><P
 ></P
@@ -2827,7 +2892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN651"
+NAME="AEN656"
 ></A
 ><H3
 ><A
@@ -2861,7 +2926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN658"
+NAME="AEN663"
 ></A
 ><P
 ></P
@@ -2950,7 +3015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN679"
+NAME="AEN684"
 ></A
 ><H3
 ><A
@@ -2991,7 +3056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN688"
+NAME="AEN693"
 ></A
 ><P
 ></P
@@ -3097,7 +3162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN713"
+NAME="AEN718"
 ></A
 ><H3
 ><A
@@ -3126,7 +3191,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN719"
+NAME="AEN724"
 ></A
 ><P
 ></P
@@ -3181,7 +3246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN732"
+NAME="AEN737"
 ></A
 ><H3
 ><A
@@ -3206,7 +3271,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN737"
+NAME="AEN742"
 ></A
 ><P
 ></P
@@ -3244,7 +3309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN746"
+NAME="AEN751"
 ></A
 ><H3
 ><A
@@ -3269,7 +3334,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN751"
+NAME="AEN756"
 ></A
 ><P
 ></P
@@ -3307,7 +3372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN760"
+NAME="AEN765"
 ></A
 ><H3
 ><A
@@ -3340,7 +3405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN767"
+NAME="AEN772"
 ></A
 ><P
 ></P
@@ -3412,7 +3477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN784"
+NAME="AEN789"
 ></A
 ><H3
 ><A
@@ -3441,7 +3506,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN790"
+NAME="AEN795"
 ></A
 ><P
 ></P
@@ -3496,7 +3561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN803"
+NAME="AEN808"
 ></A
 ><H3
 ><A
@@ -3529,7 +3594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN810"
+NAME="AEN815"
 ></A
 ><P
 ></P
@@ -3601,7 +3666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN827"
+NAME="AEN832"
 ></A
 ><H3
 ><A
@@ -3630,7 +3695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN833"
+NAME="AEN838"
 ></A
 ><P
 ></P
@@ -3685,7 +3750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN846"
+NAME="AEN851"
 ></A
 ><H3
 ><A
@@ -3715,7 +3780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN852"
+NAME="AEN857"
 ></A
 ><P
 ></P
@@ -3787,7 +3852,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN869"
+NAME="AEN874"
 ></A
 ><H3
 ><A
@@ -3817,7 +3882,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN875"
+NAME="AEN880"
 ></A
 ><P
 ></P
@@ -3889,7 +3954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN892"
+NAME="AEN897"
 ></A
 ><H3
 ><A
@@ -3922,7 +3987,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN899"
+NAME="AEN904"
 ></A
 ><P
 ></P
@@ -3994,7 +4059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN916"
+NAME="AEN921"
 ></A
 ><H3
 ><A
@@ -4023,7 +4088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN922"
+NAME="AEN927"
 ></A
 ><P
 ></P
@@ -4078,7 +4143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN935"
+NAME="AEN940"
 ></A
 ><H3
 ><A
@@ -4108,7 +4173,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN941"
+NAME="AEN946"
 ></A
 ><P
 ></P
@@ -4180,7 +4245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN958"
+NAME="AEN963"
 ></A
 ><H3
 ><A
@@ -4207,7 +4272,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN963"
+NAME="AEN968"
 ></A
 ><P
 ></P
@@ -4279,7 +4344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN980"
+NAME="AEN985"
 ></A
 ><H3
 ><A
@@ -4306,7 +4371,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN985"
+NAME="AEN990"
 ></A
 ><P
 ></P
@@ -4378,7 +4443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1002"
+NAME="AEN1007"
 ></A
 ><H3
 ><A
@@ -4405,7 +4470,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1007"
+NAME="AEN1012"
 ></A
 ><P
 ></P
@@ -4477,7 +4542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1024"
+NAME="AEN1029"
 ></A
 ><H3
 ><A
@@ -4502,7 +4567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1029"
+NAME="AEN1034"
 ></A
 ><P
 ></P
@@ -4555,7 +4620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1042"
+NAME="AEN1047"
 ></A
 ><H3
 ><A
@@ -4580,7 +4645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1047"
+NAME="AEN1052"
 ></A
 ><P
 ></P
@@ -4633,7 +4698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1060"
+NAME="AEN1065"
 ></A
 ><H3
 ><A
@@ -4658,7 +4723,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1065"
+NAME="AEN1070"
 ></A
 ><P
 ></P
@@ -4711,7 +4776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1078"
+NAME="AEN1083"
 ></A
 ><H3
 ><A
@@ -4768,20 +4833,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1084"
+NAME="AEN1089"
 ></A
 ><H3
 ><A
 NAME="XMLSAXHANDLERPTR"
 ></A
 >xmlSAXHandlerPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1088"
+NAME="AEN1094"
 ></A
 ><H3
 ><A
@@ -4817,7 +4895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1096"
+NAME="AEN1102"
 ></A
 ><P
 ></P
@@ -4844,7 +4922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The System ID of the resource requested</TD
 ></TR
 ><TR
 ><TD
@@ -4861,7 +4939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The Public ID of the resource requested</TD
 ></TR
 ><TR
 ><TD
@@ -4904,7 +4982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1117"
+NAME="AEN1123"
 ></A
 ><H3
 ><A
@@ -4920,7 +4998,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlSubstituteEntitiesDefaultValue</PRE
+>#define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4930,7 +5008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1122"
+NAME="AEN1128"
 ></A
 ><H3
 ><A
@@ -4960,7 +5038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1128"
+NAME="AEN1134"
 ></A
 ><H3
 ><A
@@ -4991,7 +5069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1140"
 ></A
 ><H3
 ><A
@@ -5023,7 +5101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1141"
+NAME="AEN1147"
 ></A
 ><P
 ></P
@@ -5050,7 +5128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ><TR
 ><TD
@@ -5067,7 +5145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an indicative size for the lookahead</TD
 ></TR
 ><TR
 ><TD
@@ -5082,7 +5160,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5093,7 +5172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1158"
+NAME="AEN1164"
 ></A
 ><H3
 ><A
@@ -5125,7 +5204,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1165"
+NAME="AEN1171"
 ></A
 ><P
 ></P
@@ -5152,7 +5231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ><TR
 ><TD
@@ -5169,7 +5248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an indicative size for the lookahead</TD
 ></TR
 ><TR
 ><TD
@@ -5184,7 +5263,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5195,7 +5275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1182"
+NAME="AEN1188"
 ></A
 ><H3
 ><A
@@ -5230,7 +5310,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1190"
+NAME="AEN1196"
 ></A
 ><P
 ></P
@@ -5257,7 +5337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5272,7 +5352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5283,7 +5363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1203"
+NAME="AEN1209"
 ></A
 ><H3
 ><A
@@ -5317,7 +5397,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1211"
+NAME="AEN1217"
 ></A
 ><P
 ></P
@@ -5344,7 +5424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5361,7 +5441,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len of <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -5376,7 +5461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5387,7 +5472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1228"
+NAME="AEN1235"
 ></A
 ><H3
 ><A
@@ -5418,7 +5503,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1235"
+NAME="AEN1242"
 ></A
 ><P
 ></P
@@ -5445,7 +5530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input char *</TD
 ></TR
 ><TR
 ><TD
@@ -5462,7 +5547,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len of <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -5477,7 +5567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5488,7 +5578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1252"
+NAME="AEN1260"
 ></A
 ><H3
 ><A
@@ -5518,7 +5608,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1259"
+NAME="AEN1267"
 ></A
 ><P
 ></P
@@ -5545,7 +5635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input char *</TD
 ></TR
 ><TR
 ><TD
@@ -5560,7 +5650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5571,7 +5661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1272"
+NAME="AEN1280"
 ></A
 ><H3
 ><A
@@ -5606,7 +5696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1280"
+NAME="AEN1288"
 ></A
 ><P
 ></P
@@ -5633,7 +5723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5650,7 +5740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the index of the first char (zero based)</TD
 ></TR
 ><TR
 ><TD
@@ -5667,7 +5757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the substring</TD
 ></TR
 ><TR
 ><TD
@@ -5682,7 +5772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5693,7 +5783,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1301"
+NAME="AEN1309"
 ></A
 ><H3
 ><A
@@ -5730,7 +5820,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1310"
+NAME="AEN1318"
 ></A
 ><P
 ></P
@@ -5757,7 +5847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -5774,7 +5864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search</TD
 ></TR
 ><TR
 ><TD
@@ -5789,7 +5879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5800,7 +5890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1327"
+NAME="AEN1335"
 ></A
 ><H3
 ><A
@@ -5823,7 +5913,7 @@
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
+                                             const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *val);</PRE
@@ -5837,7 +5927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1336"
+NAME="AEN1344"
 ></A
 ><P
 ></P
@@ -5864,7 +5954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5881,7 +5971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search (needle)</TD
 ></TR
 ><TR
 ><TD
@@ -5896,7 +5986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5907,7 +5997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1353"
+NAME="AEN1361"
 ></A
 ><H3
 ><A
@@ -5944,7 +6034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1362"
+NAME="AEN1370"
 ></A
 ><P
 ></P
@@ -5971,7 +6061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5988,7 +6078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search (needle)</TD
 ></TR
 ><TR
 ><TD
@@ -6003,7 +6093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6014,7 +6104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1379"
+NAME="AEN1387"
 ></A
 ><H3
 ><A
@@ -6048,7 +6138,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1387"
+NAME="AEN1395"
 ></A
 ><P
 ></P
@@ -6075,7 +6165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6092,7 +6182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6107,7 +6197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6118,7 +6208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1404"
+NAME="AEN1412"
 ></A
 ><H3
 ><A
@@ -6153,7 +6243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1412"
+NAME="AEN1420"
 ></A
 ><P
 ></P
@@ -6180,7 +6270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6197,7 +6287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6214,7 +6304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the max comparison length</TD
 ></TR
 ><TR
 ><TD
@@ -6229,7 +6319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6240,7 +6330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1433"
+NAME="AEN1441"
 ></A
 ><H3
 ><A
@@ -6274,7 +6364,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1441"
+NAME="AEN1449"
 ></A
 ><P
 ></P
@@ -6301,7 +6391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6318,7 +6408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6333,7 +6423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6344,7 +6434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1458"
+NAME="AEN1466"
 ></A
 ><H3
 ><A
@@ -6379,7 +6469,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1466"
+NAME="AEN1474"
 ></A
 ><P
 ></P
@@ -6406,7 +6496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6423,7 +6513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6440,7 +6530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the max comparison length</TD
 ></TR
 ><TR
 ><TD
@@ -6455,7 +6545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6466,7 +6556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1487"
+NAME="AEN1495"
 ></A
 ><H3
 ><A
@@ -6504,7 +6594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1496"
+NAME="AEN1504"
 ></A
 ><P
 ></P
@@ -6531,7 +6621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6548,7 +6638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6563,7 +6653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if they are equal, 0 if they are different</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6574,7 +6664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1513"
+NAME="AEN1521"
 ></A
 ><H3
 ><A
@@ -6604,7 +6694,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1520"
+NAME="AEN1528"
 ></A
 ><P
 ></P
@@ -6631,7 +6721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6646,7 +6736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar contained in the ARRAY.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6657,7 +6747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1533"
+NAME="AEN1541"
 ></A
 ><H3
 ><A
@@ -6696,7 +6786,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1542"
+NAME="AEN1550"
 ></A
 ><P
 ></P
@@ -6723,7 +6813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the original xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6740,7 +6830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array added</TD
 ></TR
 ><TR
 ><TD
@@ -6755,7 +6845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * containing the concatenated string.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6766,7 +6856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1559"
+NAME="AEN1567"
 ></A
 ><H3
 ><A
@@ -6810,7 +6900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1569"
+NAME="AEN1577"
 ></A
 ><P
 ></P
@@ -6837,7 +6927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the original xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6854,7 +6944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array added</TD
 ></TR
 ><TR
 ><TD
@@ -6871,7 +6961,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>add</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -6886,7 +6981,13 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar *, the original <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+> is reallocated if needed
+and should not be freed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6897,7 +6998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1590"
+NAME="AEN1600"
 ></A
 ><H3
 ><A
@@ -6930,7 +7031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1598"
+NAME="AEN1608"
 ></A
 ><P
 ></P
@@ -6957,7 +7058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -6972,7 +7073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6983,7 +7084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1611"
+NAME="AEN1621"
 ></A
 ><H3
 ><A
@@ -7014,7 +7115,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1618"
+NAME="AEN1628"
 ></A
 ><P
 ></P
@@ -7041,7 +7142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -7058,7 +7159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7073,7 +7174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7084,7 +7185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1635"
+NAME="AEN1645"
 ></A
 ><H3
 ><A
@@ -7115,7 +7216,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1642"
+NAME="AEN1652"
 ></A
 ><P
 ></P
@@ -7142,7 +7243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -7157,7 +7258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7168,7 +7269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1655"
+NAME="AEN1665"
 ></A
 ><H3
 ><A
@@ -7203,7 +7304,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1662"
+NAME="AEN1672"
 ></A
 ><P
 ></P
@@ -7230,7 +7331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -7245,7 +7346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7256,7 +7357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1675"
+NAME="AEN1685"
 ></A
 ><H3
 ><A
@@ -7310,7 +7411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1685"
+NAME="AEN1695"
 ></A
 ><P
 ></P
@@ -7337,7 +7438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -7352,7 +7453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7363,7 +7464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1698"
+NAME="AEN1708"
 ></A
 ><H3
 ><A
@@ -7393,7 +7494,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1705"
+NAME="AEN1715"
 ></A
 ><P
 ></P
@@ -7420,7 +7521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7431,7 +7532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1714"
+NAME="AEN1724"
 ></A
 ><H3
 ><A
@@ -7458,7 +7559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1720"
+NAME="AEN1730"
 ></A
 ><P
 ></P
@@ -7485,7 +7586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -7500,7 +7601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7511,7 +7612,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1733"
+NAME="AEN1743"
 ></A
 ><H3
 ><A
@@ -7545,7 +7646,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1741"
+NAME="AEN1751"
 ></A
 ><P
 ></P
@@ -7572,7 +7673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -7587,7 +7688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7598,7 +7699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1754"
+NAME="AEN1764"
 ></A
 ><H3
 ><A
@@ -7630,7 +7731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1761"
+NAME="AEN1771"
 ></A
 ><P
 ></P
@@ -7657,7 +7758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -7674,7 +7775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7689,7 +7790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7700,7 +7801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1778"
+NAME="AEN1788"
 ></A
 ><H3
 ><A
@@ -7732,7 +7833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1785"
+NAME="AEN1795"
 ></A
 ><P
 ></P
@@ -7759,7 +7860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -7774,7 +7875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7785,7 +7886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1798"
+NAME="AEN1808"
 ></A
 ><H3
 ><A
@@ -7820,7 +7921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1807"
+NAME="AEN1817"
 ></A
 ><P
 ></P
@@ -7847,7 +7948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7862,7 +7963,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7873,7 +7975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1820"
+NAME="AEN1830"
 ></A
 ><H3
 ><A
@@ -7907,7 +8009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1828"
+NAME="AEN1838"
 ></A
 ><P
 ></P
@@ -7934,7 +8036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7949,7 +8051,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7960,7 +8063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1841"
+NAME="AEN1851"
 ></A
 ><H3
 ><A
@@ -8000,7 +8103,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1850"
+NAME="AEN1860"
 ></A
 ><P
 ></P
@@ -8027,7 +8130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8044,7 +8147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -8061,7 +8164,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8076,7 +8180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8087,7 +8191,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1871"
+NAME="AEN1881"
 ></A
 ><H3
 ><A
@@ -8120,7 +8224,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1878"
+NAME="AEN1888"
 ></A
 ><P
 ></P
@@ -8147,7 +8251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -8164,7 +8268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -8181,7 +8285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file name</TD
 ></TR
 ><TR
 ><TD
@@ -8196,7 +8300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success or a error number otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8207,7 +8311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1899"
+NAME="AEN1909"
 ></A
 ><H3
 ><A
@@ -8241,7 +8345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1906"
+NAME="AEN1916"
 ></A
 ><P
 ></P
@@ -8268,7 +8372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -8285,7 +8389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -8302,7 +8406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an in-memory XML document input</TD
 ></TR
 ><TR
 ><TD
@@ -8319,7 +8423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the XML document in bytes</TD
 ></TR
 ><TR
 ><TD
@@ -8334,7 +8438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success or a error number otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8345,7 +8449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1931"
+NAME="AEN1941"
 ></A
 ><H3
 ><A
@@ -8383,7 +8487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1939"
+NAME="AEN1949"
 ></A
 ><P
 ></P
@@ -8410,7 +8514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8427,7 +8531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -8444,7 +8548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -8461,7 +8565,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read not Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8476,7 +8581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8487,7 +8592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1964"
+NAME="AEN1974"
 ></A
 ><H3
 ><A
@@ -8525,7 +8630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1972"
+NAME="AEN1982"
 ></A
 ><P
 ></P
@@ -8552,7 +8657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8569,7 +8674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8586,7 +8691,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8601,7 +8707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8612,7 +8718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1993"
+NAME="AEN2003"
 ></A
 ><H3
 ><A
@@ -8652,7 +8758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2003"
+NAME="AEN2013"
 ></A
 ><P
 ></P
@@ -8679,7 +8785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8696,7 +8802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8711,7 +8817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8722,7 +8828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2020"
+NAME="AEN2030"
 ></A
 ><H3
 ><A
@@ -8756,7 +8862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2029"
+NAME="AEN2039"
 ></A
 ><P
 ></P
@@ -8783,7 +8889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8798,7 +8904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8809,7 +8915,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2042"
+NAME="AEN2052"
 ></A
 ><H3
 ><A
@@ -8846,7 +8952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2051"
+NAME="AEN2061"
 ></A
 ><P
 ></P
@@ -8873,7 +8979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the External ID of the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8890,7 +8996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the URL to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8905,7 +9011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8916,7 +9022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2068"
+NAME="AEN2078"
 ></A
 ><H3
 ><A
@@ -8957,7 +9063,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2078"
+NAME="AEN2088"
 ></A
 ><P
 ></P
@@ -8984,7 +9090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -9001,7 +9107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the External ID of the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -9018,7 +9124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the URL to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -9033,7 +9139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9044,7 +9150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2099"
+NAME="AEN2109"
 ></A
 ><H3
 ><A
@@ -9085,7 +9191,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2109"
+NAME="AEN2119"
 ></A
 ><P
 ></P
@@ -9112,7 +9218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -9129,7 +9235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Input Buffer</TD
 ></TR
 ><TR
 ><TD
@@ -9146,7 +9252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -9161,7 +9267,13 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting xmlDtdPtr or NULL in case of error.
+<TT
+CLASS="PARAMETER"
+><I
+>input</I
+></TT
+> will be freed at parsing end.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9172,7 +9284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2130"
+NAME="AEN2141"
 ></A
 ><H3
 ><A
@@ -9221,7 +9333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2141"
+NAME="AEN2152"
 ></A
 ><P
 ></P
@@ -9248,7 +9360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the chunk pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -9265,7 +9377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler bloc (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -9282,7 +9394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -9299,7 +9411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Used for loop detection, use 0</TD
 ></TR
 ><TR
 ><TD
@@ -9316,7 +9428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string in UTF8 or ISO-Latin (zero terminated)</TD
 ></TR
 ><TR
 ><TD
@@ -9333,7 +9445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the return value for the set of parsed nodes</TD
 ></TR
 ><TR
 ><TD
@@ -9348,7 +9460,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if the chunk is well balanced, -1 in case of args problem and
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9359,7 +9472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2174"
+NAME="AEN2185"
 ></A
 ><H3
 ><A
@@ -9411,7 +9524,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2186"
+NAME="AEN2197"
 ></A
 ><P
 ></P
@@ -9438,7 +9551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the chunk pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -9455,7 +9568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler bloc (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -9472,7 +9585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -9489,7 +9602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Used for loop detection, use 0</TD
 ></TR
 ><TR
 ><TD
@@ -9506,7 +9619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URL for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9523,7 +9636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the System ID for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9540,7 +9653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the return value for the set of parsed nodes</TD
 ></TR
 ><TR
 ><TD
@@ -9555,7 +9668,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if the entity is well formed, -1 in case of args problem and
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9566,7 +9680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2223"
+NAME="AEN2234"
 ></A
 ><H3
 ><A
@@ -9612,7 +9726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2234"
+NAME="AEN2245"
 ></A
 ><P
 ></P
@@ -9639,7 +9753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the existing parsing context</TD
 ></TR
 ><TR
 ><TD
@@ -9656,7 +9770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URL for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9673,7 +9787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the System ID for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9690,7 +9804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the return value for the set of parsed nodes</TD
 ></TR
 ><TR
 ><TD
@@ -9705,7 +9819,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if the entity is well formed, -1 in case of args problem and
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9716,7 +9831,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2259"
+NAME="AEN2270"
 ></A
 ><H3
 ><A
@@ -9744,7 +9859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2265"
+NAME="AEN2276"
 ></A
 ><H3
 ><A
@@ -9772,7 +9887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2271"
+NAME="AEN2282"
 ></A
 ><H3
 ><A
@@ -9802,7 +9917,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2278"
+NAME="AEN2289"
 ></A
 ><P
 ></P
@@ -9829,7 +9944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9840,7 +9955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2287"
+NAME="AEN2298"
 ></A
 ><H3
 ><A
@@ -9870,7 +9985,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2294"
+NAME="AEN2305"
 ></A
 ><P
 ></P
@@ -9897,7 +10012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9908,7 +10023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2303"
+NAME="AEN2314"
 ></A
 ><H3
 ><A
@@ -9939,7 +10054,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2310"
+NAME="AEN2321"
 ></A
 ><P
 ></P
@@ -9966,7 +10081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9977,7 +10092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2319"
+NAME="AEN2330"
 ></A
 ><H3
 ><A
@@ -10014,7 +10129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2327"
+NAME="AEN2338"
 ></A
 ><P
 ></P
@@ -10041,7 +10156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10058,7 +10173,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar * buffer</TD
 ></TR
 ><TR
 ><TD
@@ -10075,7 +10190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10086,7 +10201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2344"
+NAME="AEN2355"
 ></A
 ><H3
 ><A
@@ -10119,7 +10234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2352"
+NAME="AEN2363"
 ></A
 ><P
 ></P
@@ -10146,7 +10261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -10161,7 +10276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10172,7 +10287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2365"
+NAME="AEN2376"
 ></A
 ><H3
 ><A
@@ -10198,7 +10313,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2370"
+NAME="AEN2381"
 ></A
 ><P
 ></P
@@ -10268,7 +10383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2387"
+NAME="AEN2398"
 ></A
 ><H3
 ><A
@@ -10298,7 +10413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2393"
+NAME="AEN2404"
 ></A
 ><P
 ></P
@@ -10385,7 +10500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2414"
+NAME="AEN2425"
 ></A
 ><H3
 ><A
@@ -10415,7 +10530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2420"
+NAME="AEN2431"
 ></A
 ><P
 ></P
@@ -10502,7 +10617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2441"
+NAME="AEN2452"
 ></A
 ><H3
 ><A
@@ -10552,7 +10667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2451"
+NAME="AEN2462"
 ></A
 ><P
 ></P
@@ -10579,7 +10694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -10596,7 +10711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -10613,7 +10728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of chars</TD
 ></TR
 ><TR
 ><TD
@@ -10630,7 +10745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of chars in the array</TD
 ></TR
 ><TR
 ><TD
@@ -10647,7 +10762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional file name or URI</TD
 ></TR
 ><TR
 ><TD
@@ -10662,7 +10777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10673,7 +10788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2480"
+NAME="AEN2491"
 ></A
 ><H3
 ><A
@@ -10706,7 +10821,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2487"
+NAME="AEN2498"
 ></A
 ><P
 ></P
@@ -10733,7 +10848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10750,7 +10865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -10767,7 +10882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in byte of the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -10784,7 +10899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  last chunk indicator</TD
 ></TR
 ><TR
 ><TD
@@ -10799,7 +10914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>zero if no error, the xmlParserErrors otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10810,7 +10925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2512"
+NAME="AEN2523"
 ></A
 ><H3
 ><A
@@ -10858,7 +10973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2523"
+NAME="AEN2534"
 ></A
 ><P
 ></P
@@ -10885,7 +11000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -10902,7 +11017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -10919,7 +11034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O read function</TD
 ></TR
 ><TR
 ><TD
@@ -10936,7 +11051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -10953,7 +11068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -10970,7 +11085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -10985,7 +11100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10996,7 +11111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2556"
+NAME="AEN2567"
 ></A
 ><H3
 ><A
@@ -11043,7 +11158,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2567"
+NAME="AEN2578"
 ></A
 ><P
 ></P
@@ -11070,7 +11185,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11087,7 +11202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O Input</TD
 ></TR
 ><TR
 ><TD
@@ -11104,7 +11219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -11119,7 +11234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11130,7 +11245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2588"
+NAME="AEN2599"
 ></A
 ><H3
 ><A
@@ -11168,7 +11283,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2597"
+NAME="AEN2608"
 ></A
 ><P
 ></P
@@ -11195,7 +11310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11212,7 +11327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML node within the tree</TD
 ></TR
 ><TR
 ><TD
@@ -11227,7 +11342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an xmlParserNodeInfo block pointer or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11238,7 +11353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2614"
+NAME="AEN2625"
 ></A
 ><H3
 ><A
@@ -11268,7 +11383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2621"
+NAME="AEN2632"
 ></A
 ><P
 ></P
@@ -11295,7 +11410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11306,7 +11421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2630"
+NAME="AEN2641"
 ></A
 ><H3
 ><A
@@ -11337,7 +11452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2637"
+NAME="AEN2648"
 ></A
 ><P
 ></P
@@ -11364,7 +11479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11375,7 +11490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2646"
+NAME="AEN2657"
 ></A
 ><H3
 ><A
@@ -11413,7 +11528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2655"
+NAME="AEN2666"
 ></A
 ><P
 ></P
@@ -11440,7 +11555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ><TR
 ><TD
@@ -11457,7 +11572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML node pointer</TD
 ></TR
 ><TR
 ><TD
@@ -11472,7 +11587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a long indicating the position of the record</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11483,7 +11598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2672"
+NAME="AEN2683"
 ></A
 ><H3
 ><A
@@ -11517,7 +11632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2680"
+NAME="AEN2691"
 ></A
 ><P
 ></P
@@ -11544,7 +11659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11561,7 +11676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11572,7 +11687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2693"
+NAME="AEN2704"
 ></A
 ><H3
 ><A
@@ -11600,7 +11715,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2699"
+NAME="AEN2710"
 ></A
 ><P
 ></P
@@ -11638,7 +11753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2708"
+NAME="AEN2719"
 ></A
 ><H3
 ><A
@@ -11667,7 +11782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2714"
+NAME="AEN2725"
 ></A
 ><P
 ></P
@@ -11703,7 +11818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2723"
+NAME="AEN2734"
 ></A
 ><H3
 ><A
@@ -11736,7 +11851,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2730"
+NAME="AEN2741"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 5696d4f..c95e09b 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17897"
+NAME="AEN17999"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17900"
+NAME="AEN18002"
 ></A
 ><H2
 >Synopsis</H2
@@ -1131,7 +1131,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18175"
+NAME="AEN18277"
 ></A
 ><H2
 >Description</H2
@@ -1141,14 +1141,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18178"
+NAME="AEN18280"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18180"
+NAME="AEN18282"
 ></A
 ><H3
 ><A
@@ -1164,7 +1164,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MAX_NAMELEN</PRE
+>#define XML_MAX_NAMELEN 100</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1177,7 +1177,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18186"
+NAME="AEN18288"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     INPUT_CHUNK</PRE
+>#define INPUT_CHUNK	250</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1206,7 +1206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18192"
+NAME="AEN18294"
 ></A
 ><H3
 ><A
@@ -1264,7 +1264,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18208"
+NAME="AEN18310"
 ></A
 ><P
 ></P
@@ -1291,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1302,7 +1302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18217"
+NAME="AEN18319"
 ></A
 ><H3
 ><A
@@ -1343,7 +1343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18228"
+NAME="AEN18330"
 ></A
 ><P
 ></P
@@ -1370,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1381,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18237"
+NAME="AEN18339"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_BASECHAR(c)</PRE
+>#define IS_BASECHAR(c) xmlIsBaseChar(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1410,7 +1410,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18244"
+NAME="AEN18346"
 ></A
 ><P
 ></P
@@ -1437,7 +1437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1448,7 +1448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18253"
+NAME="AEN18355"
 ></A
 ><H3
 ><A
@@ -1464,7 +1464,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_DIGIT(c)</PRE
+>#define IS_DIGIT(c) xmlIsDigit(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1477,7 +1477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18260"
+NAME="AEN18362"
 ></A
 ><P
 ></P
@@ -1504,7 +1504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1515,7 +1515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18269"
+NAME="AEN18371"
 ></A
 ><H3
 ><A
@@ -1531,7 +1531,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_COMBINING(c)</PRE
+>#define IS_COMBINING(c) xmlIsCombining(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1544,7 +1544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18276"
+NAME="AEN18378"
 ></A
 ><P
 ></P
@@ -1571,7 +1571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1582,7 +1582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18285"
+NAME="AEN18387"
 ></A
 ><H3
 ><A
@@ -1598,7 +1598,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_EXTENDER(c)</PRE
+>#define IS_EXTENDER(c) xmlIsExtender(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1655,7 +1655,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18306"
+NAME="AEN18408"
 ></A
 ><P
 ></P
@@ -1682,7 +1682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1693,7 +1693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18315"
+NAME="AEN18417"
 ></A
 ><H3
 ><A
@@ -1709,7 +1709,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_IDEOGRAPHIC(c)</PRE
+>#define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1737,7 +1737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18327"
+NAME="AEN18429"
 ></A
 ><P
 ></P
@@ -1764,7 +1764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1775,7 +1775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18336"
+NAME="AEN18438"
 ></A
 ><H3
 ><A
@@ -1791,7 +1791,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_LETTER(c)</PRE
+>#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1804,7 +1804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18343"
+NAME="AEN18445"
 ></A
 ><P
 ></P
@@ -1831,7 +1831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1842,7 +1842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18352"
+NAME="AEN18454"
 ></A
 ><H3
 ><A
@@ -1858,7 +1858,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_PUBIDCHAR(c)</PRE
+>#define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1880,7 +1880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18362"
+NAME="AEN18464"
 ></A
 ><P
 ></P
@@ -1907,7 +1907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1918,7 +1918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18371"
+NAME="AEN18473"
 ></A
 ><H3
 ><A
@@ -1945,7 +1945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18377"
+NAME="AEN18479"
 ></A
 ><P
 ></P
@@ -1972,7 +1972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1983,7 +1983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18386"
+NAME="AEN18488"
 ></A
 ><H3
 ><A
@@ -2010,7 +2010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18392"
+NAME="AEN18494"
 ></A
 ><P
 ></P
@@ -2037,7 +2037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2048,7 +2048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18401"
+NAME="AEN18503"
 ></A
 ><H3
 ><A
@@ -2075,7 +2075,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18407"
+NAME="AEN18509"
 ></A
 ><P
 ></P
@@ -2102,7 +2102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2113,7 +2113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18416"
+NAME="AEN18518"
 ></A
 ><H3
 ><A
@@ -2155,7 +2155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18426"
+NAME="AEN18528"
 ></A
 ><P
 ></P
@@ -2182,7 +2182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2197,7 +2197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2208,7 +2208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18439"
+NAME="AEN18541"
 ></A
 ><H3
 ><A
@@ -2252,7 +2252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18450"
+NAME="AEN18552"
 ></A
 ><P
 ></P
@@ -2279,7 +2279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2294,7 +2294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2305,7 +2305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18463"
+NAME="AEN18565"
 ></A
 ><H3
 ><A
@@ -2342,7 +2342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18472"
+NAME="AEN18574"
 ></A
 ><P
 ></P
@@ -2369,7 +2369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2384,7 +2384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2395,7 +2395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18485"
+NAME="AEN18587"
 ></A
 ><H3
 ><A
@@ -2423,7 +2423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18491"
+NAME="AEN18593"
 ></A
 ><P
 ></P
@@ -2450,7 +2450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2465,7 +2465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2476,7 +2476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18504"
+NAME="AEN18606"
 ></A
 ><H3
 ><A
@@ -2504,7 +2504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18510"
+NAME="AEN18612"
 ></A
 ><P
 ></P
@@ -2531,7 +2531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2546,7 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2557,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18523"
+NAME="AEN18625"
 ></A
 ><H3
 ><A
@@ -2600,7 +2600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18534"
+NAME="AEN18636"
 ></A
 ><P
 ></P
@@ -2627,7 +2627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2642,7 +2642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2653,7 +2653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18547"
+NAME="AEN18649"
 ></A
 ><H3
 ><A
@@ -2681,7 +2681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18553"
+NAME="AEN18655"
 ></A
 ><P
 ></P
@@ -2708,7 +2708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2723,7 +2723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2734,7 +2734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18566"
+NAME="AEN18668"
 ></A
 ><H3
 ><A
@@ -2806,7 +2806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18586"
+NAME="AEN18688"
 ></A
 ><P
 ></P
@@ -2833,7 +2833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2848,7 +2848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2859,7 +2859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18599"
+NAME="AEN18701"
 ></A
 ><H3
 ><A
@@ -2920,7 +2920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18615"
+NAME="AEN18717"
 ></A
 ><P
 ></P
@@ -2947,7 +2947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2962,7 +2962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2973,7 +2973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18628"
+NAME="AEN18730"
 ></A
 ><H3
 ><A
@@ -3006,7 +3006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18636"
+NAME="AEN18738"
 ></A
 ><P
 ></P
@@ -3059,7 +3059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18649"
+NAME="AEN18751"
 ></A
 ><H3
 ><A
@@ -3091,7 +3091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18656"
+NAME="AEN18758"
 ></A
 ><P
 ></P
@@ -3118,7 +3118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -3133,7 +3133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3144,7 +3144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18669"
+NAME="AEN18771"
 ></A
 ><H3
 ><A
@@ -3175,7 +3175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18676"
+NAME="AEN18778"
 ></A
 ><P
 ></P
@@ -3202,7 +3202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -3219,7 +3219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -3234,7 +3234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3245,7 +3245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18693"
+NAME="AEN18795"
 ></A
 ><H3
 ><A
@@ -3275,7 +3275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18700"
+NAME="AEN18802"
 ></A
 ><P
 ></P
@@ -3300,7 +3300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlParserCtxtPtr or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3311,7 +3311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18709"
+NAME="AEN18811"
 ></A
 ><H3
 ><A
@@ -3354,7 +3354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18719"
+NAME="AEN18821"
 ></A
 ><P
 ></P
@@ -3381,7 +3381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity URL</TD
 ></TR
 ><TR
 ><TD
@@ -3398,7 +3398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity PUBLIC ID</TD
 ></TR
 ><TR
 ><TD
@@ -3415,7 +3415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a posible base for the target URI</TD
 ></TR
 ><TR
 ><TD
@@ -3430,7 +3430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3441,7 +3441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18740"
+NAME="AEN18842"
 ></A
 ><H3
 ><A
@@ -3476,7 +3476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18748"
+NAME="AEN18850"
 ></A
 ><P
 ></P
@@ -3503,7 +3503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3520,7 +3520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding value (number)</TD
 ></TR
 ><TR
 ><TD
@@ -3535,7 +3535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3546,7 +3546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18765"
+NAME="AEN18867"
 ></A
 ><H3
 ><A
@@ -3581,7 +3581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18773"
+NAME="AEN18875"
 ></A
 ><P
 ></P
@@ -3608,7 +3608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3625,7 +3625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding handler</TD
 ></TR
 ><TR
 ><TD
@@ -3640,7 +3640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3651,7 +3651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18790"
+NAME="AEN18892"
 ></A
 ><H3
 ><A
@@ -3682,7 +3682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18797"
+NAME="AEN18899"
 ></A
 ><P
 ></P
@@ -3720,7 +3720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18806"
+NAME="AEN18908"
 ></A
 ><H3
 ><A
@@ -3757,7 +3757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18815"
+NAME="AEN18917"
 ></A
 ><P
 ></P
@@ -3784,7 +3784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3801,7 +3801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML entity pointer.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3812,7 +3812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18828"
+NAME="AEN18930"
 ></A
 ><H3
 ><A
@@ -3849,7 +3849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18837"
+NAME="AEN18939"
 ></A
 ><P
 ></P
@@ -3876,7 +3876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3893,7 +3893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an memory buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3908,7 +3908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3919,7 +3919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18854"
+NAME="AEN18956"
 ></A
 ><H3
 ><A
@@ -3956,7 +3956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18863"
+NAME="AEN18965"
 ></A
 ><P
 ></P
@@ -3983,7 +3983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4000,7 +4000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Entity pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4015,7 +4015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4026,7 +4026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18880"
+NAME="AEN18982"
 ></A
 ><H3
 ><A
@@ -4061,7 +4061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18888"
+NAME="AEN18990"
 ></A
 ><P
 ></P
@@ -4088,7 +4088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4105,7 +4105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input fragment (entity, XML fragment ...).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4116,7 +4116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18901"
+NAME="AEN19003"
 ></A
 ><H3
 ><A
@@ -4150,7 +4150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18909"
+NAME="AEN19011"
 ></A
 ><P
 ></P
@@ -4177,7 +4177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4192,7 +4192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current xmlChar in the parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4203,7 +4203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18922"
+NAME="AEN19024"
 ></A
 ><H3
 ><A
@@ -4233,7 +4233,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18929"
+NAME="AEN19031"
 ></A
 ><P
 ></P
@@ -4260,7 +4260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlParserInputPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4271,7 +4271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18938"
+NAME="AEN19040"
 ></A
 ><H3
 ><A
@@ -4305,7 +4305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18946"
+NAME="AEN19048"
 ></A
 ><P
 ></P
@@ -4332,7 +4332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4349,7 +4349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename to use as entity</TD
 ></TR
 ><TR
 ><TD
@@ -4364,7 +4364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4375,7 +4375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18963"
+NAME="AEN19065"
 ></A
 ><H3
 ><A
@@ -4408,7 +4408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18971"
+NAME="AEN19073"
 ></A
 ><P
 ></P
@@ -4435,7 +4435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4450,7 +4450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4461,7 +4461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18984"
+NAME="AEN19086"
 ></A
 ><H3
 ><A
@@ -4508,7 +4508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18997"
+NAME="AEN19099"
 ></A
 ><P
 ></P
@@ -4535,7 +4535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4552,7 +4552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4569,7 +4569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** </TD
 ></TR
 ><TR
 ><TD
@@ -4584,7 +4584,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the local part, and prefix is updated
+to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4595,7 +4596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19018"
+NAME="AEN19120"
 ></A
 ><H3
 ><A
@@ -4636,7 +4637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19029"
+NAME="AEN19131"
 ></A
 ><P
 ></P
@@ -4663,7 +4664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4678,7 +4679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4689,7 +4690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19042"
+NAME="AEN19144"
 ></A
 ><H3
 ><A
@@ -4735,7 +4736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19055"
+NAME="AEN19157"
 ></A
 ><P
 ></P
@@ -4762,7 +4763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4779,7 +4780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** </TD
 ></TR
 ><TR
 ><TD
@@ -4794,7 +4795,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the local part, and prefix is updated
+to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4805,7 +4807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19072"
+NAME="AEN19174"
 ></A
 ><H3
 ><A
@@ -4845,7 +4847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19083"
+NAME="AEN19185"
 ></A
 ><P
 ></P
@@ -4872,7 +4874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4887,7 +4889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4898,7 +4900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19096"
+NAME="AEN19198"
 ></A
 ><H3
 ><A
@@ -4933,7 +4935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19105"
+NAME="AEN19207"
 ></A
 ><P
 ></P
@@ -4960,7 +4962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4975,7 +4977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the string parser or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4986,7 +4988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19118"
+NAME="AEN19220"
 ></A
 ><H3
 ><A
@@ -5024,7 +5026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19128"
+NAME="AEN19230"
 ></A
 ><P
 ></P
@@ -5051,7 +5053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5062,7 +5064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19137"
+NAME="AEN19239"
 ></A
 ><H3
 ><A
@@ -5106,7 +5108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19149"
+NAME="AEN19251"
 ></A
 ><P
 ></P
@@ -5133,7 +5135,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5148,7 +5150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Name parsed or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5159,7 +5161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19162"
+NAME="AEN19264"
 ></A
 ><H3
 ><A
@@ -5199,7 +5201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19173"
+NAME="AEN19275"
 ></A
 ><P
 ></P
@@ -5226,7 +5228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5241,7 +5243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Name parsed or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5252,7 +5254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19186"
+NAME="AEN19288"
 ></A
 ><H3
 ><A
@@ -5289,7 +5291,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19196"
+NAME="AEN19298"
 ></A
 ><P
 ></P
@@ -5316,7 +5318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5331,7 +5333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Nmtoken parsed or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5342,7 +5344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19209"
+NAME="AEN19311"
 ></A
 ><H3
 ><A
@@ -5382,7 +5384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19219"
+NAME="AEN19321"
 ></A
 ><P
 ></P
@@ -5409,7 +5411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5426,7 +5428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if non-NULL store a copy of the original entity value</TD
 ></TR
 ><TR
 ><TD
@@ -5441,7 +5443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the EntityValue parsed with reference substitued or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5452,7 +5454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19236"
+NAME="AEN19338"
 ></A
 ><H3
 ><A
@@ -5542,7 +5544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19257"
+NAME="AEN19359"
 ></A
 ><P
 ></P
@@ -5569,7 +5571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5584,7 +5586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the AttValue parsed or NULL. The value has to be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5595,7 +5597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19270"
+NAME="AEN19372"
 ></A
 ><H3
 ><A
@@ -5630,7 +5632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19279"
+NAME="AEN19381"
 ></A
 ><P
 ></P
@@ -5657,7 +5659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5672,7 +5674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the SystemLiteral parsed or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5683,7 +5685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19292"
+NAME="AEN19394"
 ></A
 ><H3
 ><A
@@ -5718,7 +5720,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19301"
+NAME="AEN19403"
 ></A
 ><P
 ></P
@@ -5745,7 +5747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5760,7 +5762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the PubidLiteral parsed or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5771,7 +5773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19314"
+NAME="AEN19416"
 ></A
 ><H3
 ><A
@@ -5810,7 +5812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19323"
+NAME="AEN19425"
 ></A
 ><P
 ></P
@@ -5837,7 +5839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5854,7 +5856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int indicating whether we are within a CDATA section</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5865,7 +5867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19336"
+NAME="AEN19438"
 ></A
 ><H3
 ><A
@@ -5911,7 +5913,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19348"
+NAME="AEN19450"
 ></A
 ><P
 ></P
@@ -5938,7 +5940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5955,7 +5957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar** receiving PubidLiteral</TD
 ></TR
 ><TR
 ><TD
@@ -5972,7 +5974,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> indicate whether we should restrict parsing to only
+production [75], see NOTE below</TD
 ></TR
 ><TR
 ><TD
@@ -5987,7 +5990,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the function returns SystemLiteral and in the second
+case publicID receives PubidLiteral, is strict is off
+it is possible to return NULL and have publicID set.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5998,7 +6003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19369"
+NAME="AEN19471"
 ></A
 ><H3
 ><A
@@ -6032,7 +6037,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19377"
+NAME="AEN19479"
 ></A
 ><P
 ></P
@@ -6059,7 +6064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6070,7 +6075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19386"
+NAME="AEN19488"
 ></A
 ><H3
 ><A
@@ -6105,7 +6110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19395"
+NAME="AEN19497"
 ></A
 ><P
 ></P
@@ -6132,7 +6137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6147,7 +6152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the PITarget name or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6158,7 +6163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19408"
+NAME="AEN19510"
 ></A
 ><H3
 ><A
@@ -6192,7 +6197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19417"
+NAME="AEN19519"
 ></A
 ><P
 ></P
@@ -6219,7 +6224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6230,7 +6235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19426"
+NAME="AEN19528"
 ></A
 ><H3
 ><A
@@ -6272,7 +6277,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19437"
+NAME="AEN19539"
 ></A
 ><P
 ></P
@@ -6299,7 +6304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6310,7 +6315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19446"
+NAME="AEN19548"
 ></A
 ><H3
 ><A
@@ -6355,7 +6360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19460"
+NAME="AEN19562"
 ></A
 ><P
 ></P
@@ -6382,7 +6387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6393,7 +6398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19469"
+NAME="AEN19571"
 ></A
 ><H3
 ><A
@@ -6466,7 +6471,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19489"
+NAME="AEN19591"
 ></A
 ><P
 ></P
@@ -6493,7 +6498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6510,7 +6515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Receive a possible fixed default value for the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6525,7 +6530,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
+or XML_ATTRIBUTE_FIXED. </TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6536,7 +6542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19506"
+NAME="AEN19608"
 ></A
 ><H3
 ><A
@@ -6577,7 +6583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19517"
+NAME="AEN19619"
 ></A
 ><P
 ></P
@@ -6604,7 +6610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6619,7 +6625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the notation attribute tree built while parsing</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6630,7 +6636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19530"
+NAME="AEN19632"
 ></A
 ><H3
 ><A
@@ -6669,7 +6675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19540"
+NAME="AEN19642"
 ></A
 ><P
 ></P
@@ -6696,7 +6702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6711,7 +6717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the enumeration attribute tree built while parsing</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6722,7 +6728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19553"
+NAME="AEN19655"
 ></A
 ><H3
 ><A
@@ -6760,7 +6766,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19563"
+NAME="AEN19665"
 ></A
 ><P
 ></P
@@ -6787,7 +6793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6804,7 +6810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration tree built while parsing</TD
 ></TR
 ><TR
 ><TD
@@ -6819,7 +6825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6830,7 +6836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19580"
+NAME="AEN19682"
 ></A
 ><H3
 ><A
@@ -6909,7 +6915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19601"
+NAME="AEN19703"
 ></A
 ><P
 ></P
@@ -6936,7 +6942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6953,7 +6959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration tree built while parsing</TD
 ></TR
 ><TR
 ><TD
@@ -6968,7 +6974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute type</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6979,7 +6985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19618"
+NAME="AEN19720"
 ></A
 ><H3
 ><A
@@ -7013,7 +7019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19627"
+NAME="AEN19729"
 ></A
 ><P
 ></P
@@ -7040,7 +7046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7051,7 +7057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19636"
+NAME="AEN19738"
 ></A
 ><H3
 ><A
@@ -7101,7 +7107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19649"
+NAME="AEN19751"
 ></A
 ><P
 ></P
@@ -7128,7 +7134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7143,7 +7149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the list of the xmlElementContentPtr describing the element choices</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7154,7 +7160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19662"
+NAME="AEN19764"
 ></A
 ><H3
 ><A
@@ -7186,7 +7192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19669"
+NAME="AEN19771"
 ></A
 ><P
 ></P
@@ -7239,7 +7245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19682"
+NAME="AEN19784"
 ></A
 ><H3
 ><A
@@ -7293,7 +7299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19695"
+NAME="AEN19797"
 ></A
 ><P
 ></P
@@ -7320,7 +7326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7335,7 +7341,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the tree of xmlElementContentPtr describing the element 
+hierarchy.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7346,7 +7353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19708"
+NAME="AEN19810"
 ></A
 ><H3
 ><A
@@ -7387,7 +7394,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19718"
+NAME="AEN19820"
 ></A
 ><P
 ></P
@@ -7414,7 +7421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7431,7 +7438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the element being defined.</TD
 ></TR
 ><TR
 ><TD
@@ -7448,7 +7455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Element Content pointer will be stored here if any</TD
 ></TR
 ><TR
 ><TD
@@ -7463,7 +7470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the type of element content XML_ELEMENT_TYPE_xxx</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7474,7 +7481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19739"
+NAME="AEN19841"
 ></A
 ><H3
 ><A
@@ -7509,7 +7516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19748"
+NAME="AEN19850"
 ></A
 ><P
 ></P
@@ -7536,7 +7543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7551,7 +7558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the type of the element, or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7562,7 +7569,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19761"
+NAME="AEN19863"
 ></A
 ><H3
 ><A
@@ -7608,7 +7615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19771"
+NAME="AEN19873"
 ></A
 ><P
 ></P
@@ -7635,7 +7642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7646,7 +7653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19780"
+NAME="AEN19882"
 ></A
 ><H3
 ><A
@@ -7686,7 +7693,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19790"
+NAME="AEN19892"
 ></A
 ><P
 ></P
@@ -7713,7 +7720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7728,7 +7735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the value parsed (as an int), 0 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7739,7 +7746,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19803"
+NAME="AEN19905"
 ></A
 ><H3
 ><A
@@ -7792,7 +7799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19814"
+NAME="AEN19916"
 ></A
 ><P
 ></P
@@ -7819,7 +7826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7834,7 +7841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found, or NULL otherwise.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7845,7 +7852,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19827"
+NAME="AEN19929"
 ></A
 ><H3
 ><A
@@ -7886,7 +7893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19837"
+NAME="AEN19939"
 ></A
 ><P
 ></P
@@ -7913,7 +7920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7924,7 +7931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19846"
+NAME="AEN19948"
 ></A
 ><H3
 ><A
@@ -7977,7 +7984,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19858"
+NAME="AEN19960"
 ></A
 ><P
 ></P
@@ -8004,7 +8011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8015,7 +8022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19867"
+NAME="AEN19969"
 ></A
 ><H3
 ><A
@@ -8052,7 +8059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19876"
+NAME="AEN19978"
 ></A
 ><P
 ></P
@@ -8079,7 +8086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8090,7 +8097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19885"
+NAME="AEN19987"
 ></A
 ><H3
 ><A
@@ -8150,7 +8157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19902"
+NAME="AEN20004"
 ></A
 ><P
 ></P
@@ -8177,7 +8184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8194,7 +8201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** used to store the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -8209,7 +8216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute name, and the value in *value.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8220,7 +8227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19919"
+NAME="AEN20021"
 ></A
 ><H3
 ><A
@@ -8272,7 +8279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19934"
+NAME="AEN20036"
 ></A
 ><P
 ></P
@@ -8299,7 +8306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8314,7 +8321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the element name parsed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8325,7 +8332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19947"
+NAME="AEN20049"
 ></A
 ><H3
 ><A
@@ -8361,7 +8368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19957"
+NAME="AEN20059"
 ></A
 ><P
 ></P
@@ -8388,7 +8395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8399,7 +8406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19966"
+NAME="AEN20068"
 ></A
 ><H3
 ><A
@@ -8437,7 +8444,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19977"
+NAME="AEN20079"
 ></A
 ><P
 ></P
@@ -8464,7 +8471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8475,7 +8482,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19986"
+NAME="AEN20088"
 ></A
 ><H3
 ><A
@@ -8507,7 +8514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19994"
+NAME="AEN20096"
 ></A
 ><P
 ></P
@@ -8534,7 +8541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8545,7 +8552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20003"
+NAME="AEN20105"
 ></A
 ><H3
 ><A
@@ -8594,7 +8601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20013"
+NAME="AEN20115"
 ></A
 ><P
 ></P
@@ -8621,7 +8628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8632,7 +8639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20022"
+NAME="AEN20124"
 ></A
 ><H3
 ><A
@@ -8667,7 +8674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20031"
+NAME="AEN20133"
 ></A
 ><P
 ></P
@@ -8694,7 +8701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8709,7 +8716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the string giving the XML version number, or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8720,7 +8727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20044"
+NAME="AEN20146"
 ></A
 ><H3
 ><A
@@ -8757,7 +8764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20054"
+NAME="AEN20156"
 ></A
 ><P
 ></P
@@ -8784,7 +8791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8799,7 +8806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the version string, e.g. "1.0"</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8810,7 +8817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20067"
+NAME="AEN20169"
 ></A
 ><H3
 ><A
@@ -8845,7 +8852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20076"
+NAME="AEN20178"
 ></A
 ><P
 ></P
@@ -8872,7 +8879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8887,7 +8894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the encoding name value or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8898,7 +8905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20089"
+NAME="AEN20191"
 ></A
 ><H3
 ><A
@@ -8935,7 +8942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20099"
+NAME="AEN20201"
 ></A
 ><P
 ></P
@@ -8962,7 +8969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8977,7 +8984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the encoding value or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8988,7 +8995,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20112"
+NAME="AEN20214"
 ></A
 ><H3
 ><A
@@ -9035,7 +9042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20121"
+NAME="AEN20223"
 ></A
 ><P
 ></P
@@ -9062,7 +9069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9077,7 +9084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if standalone, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9088,7 +9095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20134"
+NAME="AEN20236"
 ></A
 ><H3
 ><A
@@ -9120,7 +9127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20142"
+NAME="AEN20244"
 ></A
 ><P
 ></P
@@ -9147,7 +9154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9158,7 +9165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20151"
+NAME="AEN20253"
 ></A
 ><H3
 ><A
@@ -9192,7 +9199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20160"
+NAME="AEN20262"
 ></A
 ><P
 ></P
@@ -9219,7 +9226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9230,7 +9237,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20169"
+NAME="AEN20271"
 ></A
 ><H3
 ><A
@@ -9262,7 +9269,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20177"
+NAME="AEN20279"
 ></A
 ><P
 ></P
@@ -9289,7 +9296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9300,7 +9307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20186"
+NAME="AEN20288"
 ></A
 ><H3
 ><A
@@ -9342,7 +9349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20197"
+NAME="AEN20299"
 ></A
 ><P
 ></P
@@ -9369,7 +9376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9386,7 +9393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the external identifier</TD
 ></TR
 ><TR
 ><TD
@@ -9403,7 +9410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the system identifier (or URL)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9414,7 +9421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20214"
+NAME="AEN20316"
 ></A
 ><H3
 ><A
@@ -9430,7 +9437,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_NONE</PRE
+>#define XML_SUBSTITUTE_NONE	0</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9440,7 +9447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20219"
+NAME="AEN20321"
 ></A
 ><H3
 ><A
@@ -9456,7 +9463,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_REF</PRE
+>#define XML_SUBSTITUTE_REF	1</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9466,7 +9473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20224"
+NAME="AEN20326"
 ></A
 ><H3
 ><A
@@ -9482,7 +9489,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_PEREF</PRE
+>#define XML_SUBSTITUTE_PEREF	2</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9492,7 +9499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20229"
+NAME="AEN20331"
 ></A
 ><H3
 ><A
@@ -9508,7 +9515,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_BOTH</PRE
+>#define XML_SUBSTITUTE_BOTH 	3</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9518,7 +9525,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20234"
+NAME="AEN20336"
 ></A
 ><H3
 ><A
@@ -9572,7 +9579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20248"
+NAME="AEN20350"
 ></A
 ><P
 ></P
@@ -9599,7 +9606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9616,7 +9623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len to decode (in bytes !), -1 for no size limit</TD
 ></TR
 ><TR
 ><TD
@@ -9633,7 +9640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
 ></TR
 ><TR
 ><TD
@@ -9650,7 +9657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9667,7 +9674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9684,7 +9691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9699,7 +9706,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done. The caller
+must deallocate it !</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9710,7 +9718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20281"
+NAME="AEN20383"
 ></A
 ><H3
 ><A
@@ -9764,7 +9772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20295"
+NAME="AEN20397"
 ></A
 ><P
 ></P
@@ -9791,7 +9799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9808,7 +9816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string</TD
 ></TR
 ><TR
 ><TD
@@ -9825,7 +9833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
 ></TR
 ><TR
 ><TD
@@ -9842,7 +9850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9859,7 +9867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9876,7 +9884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9891,7 +9899,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done. The caller
+must deallocate it !</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9902,7 +9911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20328"
+NAME="AEN20430"
 ></A
 ><H3
 ><A
@@ -9934,7 +9943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20335"
+NAME="AEN20437"
 ></A
 ><P
 ></P
@@ -10004,7 +10013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20352"
+NAME="AEN20454"
 ></A
 ><H3
 ><A
@@ -10035,7 +10044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20359"
+NAME="AEN20461"
 ></A
 ><P
 ></P
@@ -10088,7 +10097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20372"
+NAME="AEN20474"
 ></A
 ><H3
 ><A
@@ -10120,7 +10129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20379"
+NAME="AEN20481"
 ></A
 ><P
 ></P
@@ -10190,7 +10199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20396"
+NAME="AEN20498"
 ></A
 ><H3
 ><A
@@ -10221,7 +10230,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20403"
+NAME="AEN20505"
 ></A
 ><P
 ></P
@@ -10274,7 +10283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20416"
+NAME="AEN20518"
 ></A
 ><H3
 ><A
@@ -10305,7 +10314,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20423"
+NAME="AEN20525"
 ></A
 ><P
 ></P
@@ -10358,7 +10367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20436"
+NAME="AEN20538"
 ></A
 ><H3
 ><A
@@ -10390,7 +10399,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20443"
+NAME="AEN20545"
 ></A
 ><P
 ></P
@@ -10460,7 +10469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20460"
+NAME="AEN20562"
 ></A
 ><H3
 ><A
@@ -10491,7 +10500,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20467"
+NAME="AEN20569"
 ></A
 ><P
 ></P
@@ -10518,7 +10527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10533,7 +10542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of space chars skipped</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10544,7 +10553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20480"
+NAME="AEN20582"
 ></A
 ><H3
 ><A
@@ -10580,7 +10589,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20488"
+NAME="AEN20590"
 ></A
 ><P
 ></P
@@ -10607,7 +10616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10624,7 +10633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the beginning of the char</TD
 ></TR
 ><TR
 ><TD
@@ -10641,7 +10650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the char read</TD
 ></TR
 ><TR
 ><TD
@@ -10656,7 +10665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current char value and its lenght</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10667,7 +10676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20509"
+NAME="AEN20611"
 ></A
 ><H3
 ><A
@@ -10726,7 +10735,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20522"
+NAME="AEN20624"
 ></A
 ><P
 ></P
@@ -10753,7 +10762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10764,7 +10773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20531"
+NAME="AEN20633"
 ></A
 ><H3
 ><A
@@ -10821,7 +10830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20546"
+NAME="AEN20648"
 ></A
 ><P
 ></P
@@ -10848,7 +10857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10859,7 +10868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20555"
+NAME="AEN20657"
 ></A
 ><H3
 ><A
@@ -10887,7 +10896,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20561"
+NAME="AEN20663"
 ></A
 ><P
 ></P
@@ -10940,7 +10949,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20574"
+NAME="AEN20676"
 ></A
 ><H3
 ><A
@@ -10994,7 +11003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20586"
+NAME="AEN20688"
 ></A
 ><P
 ></P
@@ -11021,7 +11030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11038,7 +11047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the char read</TD
 ></TR
 ><TR
 ><TD
@@ -11053,7 +11062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current char value and its lenght</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11064,7 +11073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20603"
+NAME="AEN20705"
 ></A
 ><H3
 ><A
@@ -11095,7 +11104,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20610"
+NAME="AEN20712"
 ></A
 ><P
 ></P
@@ -11122,7 +11131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to an arry of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -11139,7 +11148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char value</TD
 ></TR
 ><TR
 ><TD
@@ -11154,7 +11163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11165,7 +11174,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20627"
+NAME="AEN20729"
 ></A
 ><H3
 ><A
@@ -11197,7 +11206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20634"
+NAME="AEN20736"
 ></A
 ><P
 ></P
@@ -11224,7 +11233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Ignored, compatibility</TD
 ></TR
 ><TR
 ><TD
@@ -11241,7 +11250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to an arry of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -11258,7 +11267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char value</TD
 ></TR
 ><TR
 ><TD
@@ -11273,7 +11282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11284,7 +11293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20655"
+NAME="AEN20757"
 ></A
 ><H3
 ><A
@@ -11314,7 +11323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20662"
+NAME="AEN20764"
 ></A
 ><P
 ></P
@@ -11341,7 +11350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11352,7 +11361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20671"
+NAME="AEN20773"
 ></A
 ><H3
 ><A
@@ -11382,7 +11391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20678"
+NAME="AEN20780"
 ></A
 ><P
 ></P
@@ -11409,7 +11418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11420,7 +11429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20687"
+NAME="AEN20789"
 ></A
 ><H3
 ><A
@@ -11453,7 +11462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20694"
+NAME="AEN20796"
 ></A
 ><H3
 ><A
@@ -11486,7 +11495,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20701"
+NAME="AEN20803"
 ></A
 ><P
 ></P
@@ -11513,7 +11522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -11530,7 +11539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -11545,7 +11554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index dd10007..e258da0 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2756"
+NAME="AEN2767"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2759"
+NAME="AEN2770"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2851"
+NAME="AEN2862"
 ></A
 ><H2
 >Description</H2
@@ -519,14 +519,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2854"
+NAME="AEN2865"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2856"
+NAME="AEN2867"
 ></A
 ><H3
 ><A
@@ -556,7 +556,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2863"
+NAME="AEN2874"
 ></A
 ><P
 ></P
@@ -583,7 +583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -598,7 +598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a xmlChar *</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -609,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2876"
+NAME="AEN2887"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2883"
+NAME="AEN2894"
 ></A
 ><P
 ></P
@@ -667,7 +667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -682,7 +682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a xmlChar *</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -693,7 +693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2896"
+NAME="AEN2907"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2903"
+NAME="AEN2914"
 ></A
 ><P
 ></P
@@ -752,7 +752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -769,7 +769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> A SAX Locator</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -780,7 +780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2916"
+NAME="AEN2927"
 ></A
 ><H3
 ><A
@@ -807,7 +807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2922"
+NAME="AEN2933"
 ></A
 ><P
 ></P
@@ -834,7 +834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -849,7 +849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -860,7 +860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2935"
+NAME="AEN2946"
 ></A
 ><H3
 ><A
@@ -887,7 +887,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2941"
+NAME="AEN2952"
 ></A
 ><P
 ></P
@@ -914,7 +914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -929,7 +929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -940,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2954"
+NAME="AEN2965"
 ></A
 ><H3
 ><A
@@ -967,7 +967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2960"
+NAME="AEN2971"
 ></A
 ><P
 ></P
@@ -994,7 +994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1009,7 +1009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1020,7 +1020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2973"
+NAME="AEN2984"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2979"
+NAME="AEN2990"
 ></A
 ><P
 ></P
@@ -1074,7 +1074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1089,7 +1089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1100,7 +1100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2992"
+NAME="AEN3003"
 ></A
 ><H3
 ><A
@@ -1127,7 +1127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2998"
+NAME="AEN3009"
 ></A
 ><P
 ></P
@@ -1154,7 +1154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1169,7 +1169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1180,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3011"
+NAME="AEN3022"
 ></A
 ><H3
 ><A
@@ -1219,7 +1219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3020"
+NAME="AEN3031"
 ></A
 ><P
 ></P
@@ -1246,7 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1263,7 +1263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the root element name</TD
 ></TR
 ><TR
 ><TD
@@ -1280,7 +1280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -1297,7 +1297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SYSTEM ID (e.g. filename or URL)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1308,7 +1308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3041"
+NAME="AEN3052"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3050"
+NAME="AEN3061"
 ></A
 ><P
 ></P
@@ -1374,7 +1374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1391,7 +1391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the root element name</TD
 ></TR
 ><TR
 ><TD
@@ -1408,7 +1408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -1425,7 +1425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SYSTEM ID (e.g. filename or URL)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1436,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3071"
+NAME="AEN3082"
 ></A
 ><H3
 ><A
@@ -1470,7 +1470,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3079"
+NAME="AEN3090"
 ></A
 ><P
 ></P
@@ -1497,7 +1497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1514,7 +1514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1529,7 +1529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1540,7 +1540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3096"
+NAME="AEN3107"
 ></A
 ><H3
 ><A
@@ -1574,7 +1574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3104"
+NAME="AEN3115"
 ></A
 ><P
 ></P
@@ -1601,7 +1601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1618,7 +1618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1633,7 +1633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1644,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3121"
+NAME="AEN3132"
 ></A
 ><H3
 ><A
@@ -1692,7 +1692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3132"
+NAME="AEN3143"
 ></A
 ><P
 ></P
@@ -1719,7 +1719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1736,7 +1736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1753,7 +1753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1768,7 +1768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1779,7 +1779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3153"
+NAME="AEN3164"
 ></A
 ><H3
 ><A
@@ -1823,7 +1823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3163"
+NAME="AEN3174"
 ></A
 ><P
 ></P
@@ -1850,7 +1850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1867,7 +1867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name </TD
 ></TR
 ><TR
 ><TD
@@ -1884,7 +1884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type </TD
 ></TR
 ><TR
 ><TD
@@ -1901,7 +1901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1918,7 +1918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1935,7 +1935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity value (without processing).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1946,7 +1946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3192"
+NAME="AEN3203"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3202"
+NAME="AEN3213"
 ></A
 ><P
 ></P
@@ -2018,7 +2018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2035,7 +2035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the element</TD
 ></TR
 ><TR
 ><TD
@@ -2069,7 +2069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute type </TD
 ></TR
 ><TR
 ><TD
@@ -2086,7 +2086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of default value</TD
 ></TR
 ><TR
 ><TD
@@ -2103,7 +2103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the attribute default value</TD
 ></TR
 ><TR
 ><TD
@@ -2120,7 +2120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree of enumerated value set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2131,7 +2131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3235"
+NAME="AEN3246"
 ></A
 ><H3
 ><A
@@ -2167,7 +2167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3243"
+NAME="AEN3254"
 ></A
 ><P
 ></P
@@ -2194,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2211,7 +2211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name </TD
 ></TR
 ><TR
 ><TD
@@ -2228,7 +2228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element type </TD
 ></TR
 ><TR
 ><TD
@@ -2245,7 +2245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the element value tree</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2256,7 +2256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3264"
+NAME="AEN3275"
 ></A
 ><H3
 ><A
@@ -2295,7 +2295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3273"
+NAME="AEN3284"
 ></A
 ><P
 ></P
@@ -2322,7 +2322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2339,7 +2339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the notation</TD
 ></TR
 ><TR
 ><TD
@@ -2356,7 +2356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2373,7 +2373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2384,7 +2384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3294"
+NAME="AEN3305"
 ></A
 ><H3
 ><A
@@ -2427,7 +2427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3304"
+NAME="AEN3315"
 ></A
 ><P
 ></P
@@ -2454,7 +2454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2471,7 +2471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2488,7 +2488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2505,7 +2505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2522,7 +2522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the name of the notation</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2533,7 +2533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3329"
+NAME="AEN3340"
 ></A
 ><H3
 ><A
@@ -2560,7 +2560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3335"
+NAME="AEN3346"
 ></A
 ><P
 ></P
@@ -2587,7 +2587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2598,7 +2598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3344"
+NAME="AEN3355"
 ></A
 ><H3
 ><A
@@ -2625,7 +2625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3350"
+NAME="AEN3361"
 ></A
 ><P
 ></P
@@ -2652,7 +2652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2663,7 +2663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3359"
+NAME="AEN3370"
 ></A
 ><H3
 ><A
@@ -2701,7 +2701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3367"
+NAME="AEN3378"
 ></A
 ><P
 ></P
@@ -2728,7 +2728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2745,7 +2745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -2762,7 +2762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2773,7 +2773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3384"
+NAME="AEN3395"
 ></A
 ><H3
 ><A
@@ -2808,7 +2808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3392"
+NAME="AEN3403"
 ></A
 ><P
 ></P
@@ -2835,7 +2835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2852,7 +2852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -2869,7 +2869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An array of name/value attributes pairs, NULL terminated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2880,7 +2880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3409"
+NAME="AEN3420"
 ></A
 ><H3
 ><A
@@ -2911,7 +2911,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3416"
+NAME="AEN3427"
 ></A
 ><P
 ></P
@@ -2938,7 +2938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2955,7 +2955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2966,7 +2966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3429"
+NAME="AEN3440"
 ></A
 ><H3
 ><A
@@ -2997,7 +2997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3436"
+NAME="AEN3447"
 ></A
 ><P
 ></P
@@ -3024,7 +3024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3041,7 +3041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The entity name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3052,7 +3052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3449"
+NAME="AEN3460"
 ></A
 ><H3
 ><A
@@ -3085,7 +3085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3456"
+NAME="AEN3467"
 ></A
 ><P
 ></P
@@ -3112,7 +3112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3129,7 +3129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3146,7 +3146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3157,7 +3157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3473"
+NAME="AEN3484"
 ></A
 ><H3
 ><A
@@ -3190,7 +3190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3480"
+NAME="AEN3491"
 ></A
 ><P
 ></P
@@ -3217,7 +3217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3234,7 +3234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3251,7 +3251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3262,7 +3262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3497"
+NAME="AEN3508"
 ></A
 ><H3
 ><A
@@ -3297,7 +3297,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3505"
+NAME="AEN3516"
 ></A
 ><P
 ></P
@@ -3324,7 +3324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3341,7 +3341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the target name</TD
 ></TR
 ><TR
 ><TD
@@ -3358,7 +3358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the PI data's</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3369,7 +3369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3522"
+NAME="AEN3533"
 ></A
 ><H3
 ><A
@@ -3404,7 +3404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3530"
+NAME="AEN3541"
 ></A
 ><P
 ></P
@@ -3431,7 +3431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3448,7 +3448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace associated URN</TD
 ></TR
 ><TR
 ><TD
@@ -3465,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace prefix</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3476,7 +3476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3547"
+NAME="AEN3558"
 ></A
 ><H3
 ><A
@@ -3507,7 +3507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3554"
+NAME="AEN3565"
 ></A
 ><P
 ></P
@@ -3534,7 +3534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3551,7 +3551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3562,7 +3562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3567"
+NAME="AEN3578"
 ></A
 ><H3
 ><A
@@ -3592,7 +3592,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3574"
+NAME="AEN3585"
 ></A
 ><P
 ></P
@@ -3619,7 +3619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3634,7 +3634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNsPtr or NULL if none</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3645,7 +3645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3587"
+NAME="AEN3598"
 ></A
 ><H3
 ><A
@@ -3677,7 +3677,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3594"
+NAME="AEN3605"
 ></A
 ><P
 ></P
@@ -3704,7 +3704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3721,7 +3721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace to check against</TD
 ></TR
 ><TR
 ><TD
@@ -3736,7 +3736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3747,7 +3747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3611"
+NAME="AEN3622"
 ></A
 ><H3
 ><A
@@ -3782,7 +3782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3619"
+NAME="AEN3630"
 ></A
 ><P
 ></P
@@ -3809,7 +3809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3826,7 +3826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace associated URN</TD
 ></TR
 ><TR
 ><TD
@@ -3843,7 +3843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace prefix</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3854,7 +3854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3636"
+NAME="AEN3647"
 ></A
 ><H3
 ><A
@@ -3885,7 +3885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3643"
+NAME="AEN3654"
 ></A
 ><P
 ></P
@@ -3912,7 +3912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3929,7 +3929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3940,7 +3940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3656"
+NAME="AEN3667"
 ></A
 ><H3
 ><A
@@ -3972,7 +3972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3663"
+NAME="AEN3674"
 ></A
 ><P
 ></P
@@ -3999,7 +3999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -4016,7 +4016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The pcdata content</TD
 ></TR
 ><TR
 ><TD
@@ -4033,7 +4033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the block length</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4044,7 +4044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3680"
+NAME="AEN3691"
 ></A
 ><H3
 ><A
@@ -4072,7 +4072,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3686"
+NAME="AEN3697"
 ></A
 ><H3
 ><A
@@ -4100,7 +4100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3692"
+NAME="AEN3703"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index d34312d..d0b83d5 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3703"
+NAME="AEN3714"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3706"
+NAME="AEN3717"
 ></A
 ><H2
 >Synopsis</H2
@@ -1811,7 +1811,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4161"
+NAME="AEN4172"
 ></A
 ><H2
 >Description</H2
@@ -1821,14 +1821,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4164"
+NAME="AEN4175"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4166"
+NAME="AEN4177"
 ></A
 ><H3
 ><A
@@ -1854,7 +1854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4171"
+NAME="AEN4182"
 ></A
 ><H3
 ><A
@@ -1904,13 +1904,26 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4176"
+NAME="AEN4187"
 ></A
 ><H3
 ><A
 NAME="XMLCHAR"
 ></A
 >xmlChar</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef unsigned char xmlChar;</PRE
+></TD
+></TR
+></TABLE
 ><P
 >This is a basic byte in an UTF-8 encoded string.
 It's unsigned allowing to pinpoint case where char * are assigned
@@ -1921,7 +1934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4181"
+NAME="AEN4193"
 ></A
 ><H3
 ><A
@@ -1937,7 +1950,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     BAD_CAST</PRE
+>#define BAD_CAST (xmlChar *)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1949,7 +1962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4187"
+NAME="AEN4199"
 ></A
 ><H3
 ><A
@@ -1981,20 +1994,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4193"
+NAME="AEN4205"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONPTR"
 ></A
 >xmlNotationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNotation *xmlNotationPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4197"
+NAME="AEN4210"
 ></A
 ><H3
 ><A
@@ -2033,7 +2059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4203"
+NAME="AEN4216"
 ></A
 ><H3
 ><A
@@ -2066,7 +2092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4209"
+NAME="AEN4222"
 ></A
 ><H3
 ><A
@@ -2097,20 +2123,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4215"
+NAME="AEN4228"
 ></A
 ><H3
 ><A
 NAME="XMLENUMERATIONPTR"
 ></A
 >xmlEnumerationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEnumeration *xmlEnumerationPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4219"
+NAME="AEN4233"
 ></A
 ><H3
 ><A
@@ -2156,20 +2195,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4225"
+NAME="AEN4239"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTEPTR"
 ></A
 >xmlAttributePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttribute *xmlAttributePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4229"
+NAME="AEN4244"
 ></A
 ><H3
 ><A
@@ -2202,7 +2254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4235"
+NAME="AEN4250"
 ></A
 ><H3
 ><A
@@ -2235,7 +2287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4241"
+NAME="AEN4256"
 ></A
 ><H3
 ><A
@@ -2271,20 +2323,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4247"
+NAME="AEN4262"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTCONTENTPTR"
 ></A
 >xmlElementContentPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementContent *xmlElementContentPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4251"
+NAME="AEN4267"
 ></A
 ><H3
 ><A
@@ -2318,7 +2383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4257"
+NAME="AEN4273"
 ></A
 ><H3
 ><A
@@ -2361,20 +2426,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4263"
+NAME="AEN4279"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTPTR"
 ></A
 >xmlElementPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElement *xmlElementPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4267"
+NAME="AEN4284"
 ></A
 ><H3
 ><A
@@ -2390,7 +2468,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_LOCAL_NAMESPACE</PRE
+>#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2400,20 +2478,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4272"
+NAME="AEN4289"
 ></A
 ><H3
 ><A
 NAME="XMLNSTYPE"
 ></A
 >xmlNsType</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementType xmlNsType;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4276"
+NAME="AEN4294"
 ></A
 ><H3
 ><A
@@ -2451,20 +2542,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4283"
+NAME="AEN4301"
 ></A
 ><H3
 ><A
 NAME="XMLNSPTR"
 ></A
 >xmlNsPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNs *xmlNsPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4287"
+NAME="AEN4306"
 ></A
 ><H3
 ><A
@@ -2512,20 +2616,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4293"
+NAME="AEN4312"
 ></A
 ><H3
 ><A
 NAME="XMLDTDPTR"
 ></A
 >xmlDtdPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDtd *xmlDtdPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4297"
+NAME="AEN4317"
 ></A
 ><H3
 ><A
@@ -2565,20 +2682,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4303"
+NAME="AEN4323"
 ></A
 ><H3
 ><A
 NAME="XMLATTRPTR"
 ></A
 >xmlAttrPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttr *xmlAttrPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4307"
+NAME="AEN4328"
 ></A
 ><H3
 ><A
@@ -2610,20 +2740,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4313"
+NAME="AEN4334"
 ></A
 ><H3
 ><A
 NAME="XMLIDPTR"
 ></A
 >xmlIDPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlID *xmlIDPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4317"
+NAME="AEN4339"
 ></A
 ><H3
 ><A
@@ -2655,20 +2798,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4323"
+NAME="AEN4345"
 ></A
 ><H3
 ><A
 NAME="XMLREFPTR"
 ></A
 >xmlRefPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRef *xmlRefPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4327"
+NAME="AEN4350"
 ></A
 ><H3
 ><A
@@ -2700,7 +2856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4333"
+NAME="AEN4356"
 ></A
 ><H3
 ><A
@@ -2733,20 +2889,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4339"
+NAME="AEN4362"
 ></A
 ><H3
 ><A
 NAME="XMLBUFFERPTR"
 ></A
 >xmlBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlBuffer *xmlBufferPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4343"
+NAME="AEN4367"
 ></A
 ><H3
 ><A
@@ -2794,20 +2963,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4349"
+NAME="AEN4373"
 ></A
 ><H3
 ><A
 NAME="XMLNODEPTR"
 ></A
 >xmlNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNode *xmlNodePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4353"
+NAME="AEN4378"
 ></A
 ><H3
 ><A
@@ -2859,20 +3041,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4359"
+NAME="AEN4384"
 ></A
 ><H3
 ><A
 NAME="XMLDOCPTR"
 ></A
 >xmlDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDoc *xmlDocPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4363"
+NAME="AEN4389"
 ></A
 ><H3
 ><A
@@ -2888,7 +3083,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlChildrenNode</PRE
+>#define xmlChildrenNode children</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2900,7 +3095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4369"
+NAME="AEN4395"
 ></A
 ><H3
 ><A
@@ -2916,7 +3111,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlRootNode</PRE
+>#define xmlRootNode children</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2928,7 +3123,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4375"
+NAME="AEN4401"
 ></A
 ><H3
 ><A
@@ -2961,7 +3156,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4382"
+NAME="AEN4408"
 ></A
 ><P
 ></P
@@ -2988,7 +3183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  allocation method to use</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2999,7 +3194,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4391"
+NAME="AEN4417"
 ></A
 ><H3
 ><A
@@ -3033,7 +3228,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4398"
+NAME="AEN4424"
 ></A
 ><P
 ></P
@@ -3058,7 +3253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current allocation scheme</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3069,7 +3264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4407"
+NAME="AEN4433"
 ></A
 ><H3
 ><A
@@ -3099,7 +3294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4414"
+NAME="AEN4440"
 ></A
 ><P
 ></P
@@ -3124,7 +3319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3135,7 +3330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4423"
+NAME="AEN4449"
 ></A
 ><H3
 ><A
@@ -3168,7 +3363,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4431"
+NAME="AEN4457"
 ></A
 ><P
 ></P
@@ -3195,7 +3390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> initial size of buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3210,7 +3405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3221,7 +3416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4444"
+NAME="AEN4470"
 ></A
 ><H3
 ><A
@@ -3257,7 +3452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4452"
+NAME="AEN4478"
 ></A
 ><P
 ></P
@@ -3284,7 +3479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to resize</TD
 ></TR
 ><TR
 ><TD
@@ -3301,7 +3496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the desired size</TD
 ></TR
 ><TR
 ><TD
@@ -3316,7 +3511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of problems, 1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3327,7 +3522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4469"
+NAME="AEN4495"
 ></A
 ><H3
 ><A
@@ -3357,7 +3552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4476"
+NAME="AEN4502"
 ></A
 ><P
 ></P
@@ -3384,7 +3579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3395,7 +3590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4485"
+NAME="AEN4511"
 ></A
 ><H3
 ><A
@@ -3429,7 +3624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4493"
+NAME="AEN4519"
 ></A
 ><P
 ></P
@@ -3456,7 +3651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file output</TD
 ></TR
 ><TR
 ><TD
@@ -3473,7 +3668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3488,7 +3683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3499,7 +3694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4510"
+NAME="AEN4536"
 ></A
 ><H3
 ><A
@@ -3535,7 +3730,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4518"
+NAME="AEN4544"
 ></A
 ><P
 ></P
@@ -3562,7 +3757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3579,7 +3774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3596,7 +3791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3607,7 +3802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4535"
+NAME="AEN4561"
 ></A
 ><H3
 ><A
@@ -3648,7 +3843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4544"
+NAME="AEN4570"
 ></A
 ><P
 ></P
@@ -3675,7 +3870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3692,7 +3887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3709,7 +3904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3720,7 +3915,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4561"
+NAME="AEN4587"
 ></A
 ><H3
 ><A
@@ -3754,7 +3949,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4569"
+NAME="AEN4595"
 ></A
 ><P
 ></P
@@ -3781,7 +3976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3798,7 +3993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3809,7 +4004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4582"
+NAME="AEN4608"
 ></A
 ><H3
 ><A
@@ -3840,7 +4035,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4589"
+NAME="AEN4615"
 ></A
 ><P
 ></P
@@ -3867,7 +4062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3884,7 +4079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the C char string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3895,7 +4090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4602"
+NAME="AEN4628"
 ></A
 ><H3
 ><A
@@ -3926,7 +4121,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4609"
+NAME="AEN4635"
 ></A
 ><P
 ></P
@@ -3953,7 +4148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3970,7 +4165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to remove</TD
 ></TR
 ><TR
 ><TD
@@ -3985,7 +4180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar removed, or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3996,7 +4191,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4626"
+NAME="AEN4652"
 ></A
 ><H3
 ><A
@@ -4027,7 +4222,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4633"
+NAME="AEN4659"
 ></A
 ><P
 ></P
@@ -4054,7 +4249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4071,7 +4266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the minimum free size to allocate</TD
 ></TR
 ><TR
 ><TD
@@ -4086,7 +4281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new available space or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4097,7 +4292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4650"
+NAME="AEN4676"
 ></A
 ><H3
 ><A
@@ -4127,7 +4322,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4657"
+NAME="AEN4683"
 ></A
 ><P
 ></P
@@ -4154,7 +4349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4165,7 +4360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4666"
+NAME="AEN4692"
 ></A
 ><H3
 ><A
@@ -4198,7 +4393,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4674"
+NAME="AEN4700"
 ></A
 ><P
 ></P
@@ -4225,7 +4420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4240,7 +4435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the internal content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4251,7 +4446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4687"
+NAME="AEN4713"
 ></A
 ><H3
 ><A
@@ -4279,7 +4474,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4693"
+NAME="AEN4719"
 ></A
 ><P
 ></P
@@ -4332,7 +4527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4706"
+NAME="AEN4732"
 ></A
 ><H3
 ><A
@@ -4366,7 +4561,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4714"
+NAME="AEN4740"
 ></A
 ><P
 ></P
@@ -4393,7 +4588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ><TR
 ><TD
@@ -4410,7 +4605,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  allocation scheme to use</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4421,7 +4616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4727"
+NAME="AEN4753"
 ></A
 ><H3
 ><A
@@ -4451,7 +4646,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4734"
+NAME="AEN4760"
 ></A
 ><P
 ></P
@@ -4478,7 +4673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer </TD
 ></TR
 ><TR
 ><TD
@@ -4493,7 +4688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the length of data in the internal content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4504,7 +4699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4747"
+NAME="AEN4773"
 ></A
 ><H3
 ><A
@@ -4549,7 +4744,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4758"
+NAME="AEN4784"
 ></A
 ><P
 ></P
@@ -4576,7 +4771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4593,7 +4788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4610,7 +4805,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external (PUBLIC) ID</TD
 ></TR
 ><TR
 ><TD
@@ -4627,7 +4822,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4642,7 +4837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4653,7 +4848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4783"
+NAME="AEN4809"
 ></A
 ><H3
 ><A
@@ -4702,7 +4897,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4795"
+NAME="AEN4821"
 ></A
 ><P
 ></P
@@ -4729,7 +4924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4746,7 +4941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4763,7 +4958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -4780,7 +4975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4795,7 +4990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4806,7 +5001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4820"
+NAME="AEN4846"
 ></A
 ><H3
 ><A
@@ -4839,7 +5034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4828"
+NAME="AEN4854"
 ></A
 ><P
 ></P
@@ -4866,7 +5061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4881,7 +5076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the DTD structure or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4892,7 +5087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4841"
+NAME="AEN4867"
 ></A
 ><H3
 ><A
@@ -4922,7 +5117,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4848"
+NAME="AEN4874"
 ></A
 ><P
 ></P
@@ -4949,7 +5144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD structure to free up</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4960,7 +5155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4857"
+NAME="AEN4883"
 ></A
 ><H3
 ><A
@@ -5003,7 +5198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4867"
+NAME="AEN4893"
 ></A
 ><P
 ></P
@@ -5030,7 +5225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5047,7 +5242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -5064,7 +5259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5079,7 +5274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL this functionnality had been removed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5090,7 +5285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4888"
+NAME="AEN4914"
 ></A
 ><H3
 ><A
@@ -5135,7 +5330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4898"
+NAME="AEN4924"
 ></A
 ><P
 ></P
@@ -5162,7 +5357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5179,7 +5374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -5196,7 +5391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5211,7 +5406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>returns a new namespace pointer or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5222,7 +5417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4919"
+NAME="AEN4945"
 ></A
 ><H3
 ><A
@@ -5252,7 +5447,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4926"
+NAME="AEN4952"
 ></A
 ><P
 ></P
@@ -5279,7 +5474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5290,7 +5485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4935"
+NAME="AEN4961"
 ></A
 ><H3
 ><A
@@ -5320,7 +5515,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4942"
+NAME="AEN4968"
 ></A
 ><P
 ></P
@@ -5347,7 +5542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5358,7 +5553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4951"
+NAME="AEN4977"
 ></A
 ><H3
 ><A
@@ -5391,7 +5586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4959"
+NAME="AEN4985"
 ></A
 ><P
 ></P
@@ -5418,7 +5613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  xmlChar string giving the version of XML "1.0"</TD
 ></TR
 ><TR
 ><TD
@@ -5433,7 +5628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5444,7 +5639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4972"
+NAME="AEN4998"
 ></A
 ><H3
 ><A
@@ -5474,7 +5669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4979"
+NAME="AEN5005"
 ></A
 ><P
 ></P
@@ -5501,7 +5696,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document
+@:  </TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5512,7 +5708,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4988"
+NAME="AEN5014"
 ></A
 ><H3
 ><A
@@ -5553,7 +5749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4998"
+NAME="AEN5024"
 ></A
 ><P
 ></P
@@ -5580,7 +5776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5597,7 +5793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5614,7 +5810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5629,7 +5825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5640,7 +5836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5019"
+NAME="AEN5045"
 ></A
 ><H3
 ><A
@@ -5681,7 +5877,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5029"
+NAME="AEN5055"
 ></A
 ><P
 ></P
@@ -5708,7 +5904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5725,7 +5921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5742,7 +5938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5757,7 +5953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5768,7 +5964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5050"
+NAME="AEN5076"
 ></A
 ><H3
 ><A
@@ -5813,7 +6009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5061"
+NAME="AEN5087"
 ></A
 ><P
 ></P
@@ -5840,7 +6036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5857,7 +6053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5874,7 +6070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5891,7 +6087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5906,7 +6102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5917,7 +6113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5086"
+NAME="AEN5112"
 ></A
 ><H3
 ><A
@@ -5947,7 +6143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5093"
+NAME="AEN5119"
 ></A
 ><P
 ></P
@@ -5974,7 +6170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first property in the list</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5985,7 +6181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5102"
+NAME="AEN5128"
 ></A
 ><H3
 ><A
@@ -6015,7 +6211,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5109"
+NAME="AEN5135"
 ></A
 ><P
 ></P
@@ -6042,7 +6238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6053,7 +6249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5118"
+NAME="AEN5144"
 ></A
 ><H3
 ><A
@@ -6090,7 +6286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5127"
+NAME="AEN5153"
 ></A
 ><P
 ></P
@@ -6117,7 +6313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attribute will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -6134,7 +6330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6149,7 +6345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6160,7 +6356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5144"
+NAME="AEN5170"
 ></A
 ><H3
 ><A
@@ -6197,7 +6393,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5153"
+NAME="AEN5179"
 ></A
 ><P
 ></P
@@ -6224,7 +6420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attributes will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -6241,7 +6437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6256,7 +6452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6267,7 +6463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5170"
+NAME="AEN5196"
 ></A
 ><H3
 ><A
@@ -6300,7 +6496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5178"
+NAME="AEN5204"
 ></A
 ><P
 ></P
@@ -6327,7 +6523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the dtd</TD
 ></TR
 ><TR
 ><TD
@@ -6342,7 +6538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDtdPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6353,7 +6549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5191"
+NAME="AEN5217"
 ></A
 ><H3
 ><A
@@ -6388,7 +6584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5199"
+NAME="AEN5225"
 ></A
 ><P
 ></P
@@ -6415,7 +6611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6432,7 +6628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -6447,7 +6643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDocPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6458,7 +6654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5216"
+NAME="AEN5242"
 ></A
 ><H3
 ><A
@@ -6529,7 +6725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5232"
+NAME="AEN5258"
 ></A
 ><P
 ></P
@@ -6556,7 +6752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6573,7 +6769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6590,7 +6786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6607,7 +6803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6622,7 +6818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6633,7 +6829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5257"
+NAME="AEN5283"
 ></A
 ><H3
 ><A
@@ -6689,7 +6885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5270"
+NAME="AEN5296"
 ></A
 ><P
 ></P
@@ -6716,7 +6912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6733,7 +6929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6750,7 +6946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6767,7 +6963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6782,7 +6978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6793,7 +6989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5295"
+NAME="AEN5321"
 ></A
 ><H3
 ><A
@@ -6835,7 +7031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5305"
+NAME="AEN5331"
 ></A
 ><P
 ></P
@@ -6862,7 +7058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6879,7 +7075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6894,7 +7090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6905,7 +7101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5322"
+NAME="AEN5348"
 ></A
 ><H3
 ><A
@@ -6982,7 +7178,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5339"
+NAME="AEN5365"
 ></A
 ><P
 ></P
@@ -7009,7 +7205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -7026,7 +7222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -7043,7 +7239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -7060,7 +7256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -7075,7 +7271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7086,7 +7282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5364"
+NAME="AEN5390"
 ></A
 ><H3
 ><A
@@ -7148,7 +7344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5378"
+NAME="AEN5404"
 ></A
 ><P
 ></P
@@ -7175,7 +7371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -7192,7 +7388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -7209,7 +7405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -7226,7 +7422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -7241,7 +7437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7252,7 +7448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5403"
+NAME="AEN5429"
 ></A
 ><H3
 ><A
@@ -7289,7 +7485,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5412"
+NAME="AEN5438"
 ></A
 ><P
 ></P
@@ -7316,7 +7512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7333,7 +7529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7348,7 +7544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7359,7 +7555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5429"
+NAME="AEN5455"
 ></A
 ><H3
 ><A
@@ -7392,7 +7588,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5437"
+NAME="AEN5463"
 ></A
 ><P
 ></P
@@ -7419,7 +7615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7434,7 +7630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7445,7 +7641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5450"
+NAME="AEN5476"
 ></A
 ><H3
 ><A
@@ -7482,7 +7678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5459"
+NAME="AEN5485"
 ></A
 ><P
 ></P
@@ -7509,7 +7705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the processing instruction name</TD
 ></TR
 ><TR
 ><TD
@@ -7526,7 +7722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the PI content</TD
 ></TR
 ><TR
 ><TD
@@ -7541,7 +7737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7552,7 +7748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5476"
+NAME="AEN5502"
 ></A
 ><H3
 ><A
@@ -7591,7 +7787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5485"
+NAME="AEN5511"
 ></A
 ><P
 ></P
@@ -7618,7 +7814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7635,7 +7831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7652,7 +7848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7667,7 +7863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7678,7 +7874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5506"
+NAME="AEN5532"
 ></A
 ><H3
 ><A
@@ -7712,7 +7908,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5514"
+NAME="AEN5540"
 ></A
 ><P
 ></P
@@ -7739,7 +7935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7756,7 +7952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7771,7 +7967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7782,7 +7978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5531"
+NAME="AEN5557"
 ></A
 ><H3
 ><A
@@ -7819,7 +8015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5540"
+NAME="AEN5566"
 ></A
 ><P
 ></P
@@ -7846,7 +8042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -7863,7 +8059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7878,7 +8074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7889,7 +8085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5557"
+NAME="AEN5583"
 ></A
 ><H3
 ><A
@@ -7922,7 +8118,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5565"
+NAME="AEN5591"
 ></A
 ><P
 ></P
@@ -7949,7 +8145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7964,7 +8160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7975,7 +8171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5578"
+NAME="AEN5604"
 ></A
 ><H3
 ><A
@@ -8013,7 +8209,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5587"
+NAME="AEN5613"
 ></A
 ><P
 ></P
@@ -8040,7 +8236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -8057,7 +8253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the CData block content content</TD
 ></TR
 ><TR
 ><TD
@@ -8074,7 +8270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the block</TD
 ></TR
 ><TR
 ><TD
@@ -8089,7 +8285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8100,7 +8296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5608"
+NAME="AEN5634"
 ></A
 ><H3
 ><A
@@ -8137,7 +8333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5617"
+NAME="AEN5643"
 ></A
 ><P
 ></P
@@ -8164,7 +8360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -8181,7 +8377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char ref string, starting with # or "&amp;# ... ;"</TD
 ></TR
 ><TR
 ><TD
@@ -8196,7 +8392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8207,7 +8403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5634"
+NAME="AEN5660"
 ></A
 ><H3
 ><A
@@ -8244,7 +8440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5643"
+NAME="AEN5669"
 ></A
 ><P
 ></P
@@ -8271,7 +8467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -8288,7 +8484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the reference name, or the reference string with &amp; and ;</TD
 ></TR
 ><TR
 ><TD
@@ -8303,7 +8499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8314,7 +8510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5660"
+NAME="AEN5686"
 ></A
 ><H3
 ><A
@@ -8348,7 +8544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5668"
+NAME="AEN5694"
 ></A
 ><P
 ></P
@@ -8375,7 +8571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8392,7 +8588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -8407,7 +8603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8418,7 +8614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5685"
+NAME="AEN5711"
 ></A
 ><H3
 ><A
@@ -8456,7 +8652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5694"
+NAME="AEN5720"
 ></A
 ><P
 ></P
@@ -8483,7 +8679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8517,7 +8713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -8532,7 +8728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8543,7 +8739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5715"
+NAME="AEN5741"
 ></A
 ><H3
 ><A
@@ -8576,7 +8772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5723"
+NAME="AEN5749"
 ></A
 ><P
 ></P
@@ -8603,7 +8799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list.</TD
 ></TR
 ><TR
 ><TD
@@ -8618,7 +8814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8629,7 +8825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5736"
+NAME="AEN5762"
 ></A
 ><H3
 ><A
@@ -8662,7 +8858,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5744"
+NAME="AEN5770"
 ></A
 ><P
 ></P
@@ -8689,7 +8885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document owning the fragment</TD
 ></TR
 ><TR
 ><TD
@@ -8704,7 +8900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8715,7 +8911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5757"
+NAME="AEN5783"
 ></A
 ><H3
 ><A
@@ -8749,7 +8945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5765"
+NAME="AEN5791"
 ></A
 ><P
 ></P
@@ -8776,7 +8972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -8791,7 +8987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNodePtr for the root or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8802,7 +8998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5778"
+NAME="AEN5804"
 ></A
 ><H3
 ><A
@@ -8835,7 +9031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5786"
+NAME="AEN5812"
 ></A
 ><P
 ></P
@@ -8862,7 +9058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -8877,7 +9073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL if none.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8888,7 +9084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5799"
+NAME="AEN5825"
 ></A
 ><H3
 ><A
@@ -8918,7 +9114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5806"
+NAME="AEN5832"
 ></A
 ><P
 ></P
@@ -8945,7 +9141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8960,7 +9156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8971,7 +9167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5819"
+NAME="AEN5845"
 ></A
 ><H3
 ><A
@@ -9002,7 +9198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5826"
+NAME="AEN5852"
 ></A
 ><P
 ></P
@@ -9029,7 +9225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -9044,7 +9240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9055,7 +9251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5839"
+NAME="AEN5865"
 ></A
 ><H3
 ><A
@@ -9093,7 +9289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5848"
+NAME="AEN5874"
 ></A
 ><P
 ></P
@@ -9120,7 +9316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9137,7 +9333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new document root element</TD
 ></TR
 ><TR
 ><TD
@@ -9152,7 +9348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old root element if any was found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9163,7 +9359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5865"
+NAME="AEN5891"
 ></A
 ><H3
 ><A
@@ -9197,7 +9393,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5873"
+NAME="AEN5899"
 ></A
 ><P
 ></P
@@ -9224,7 +9420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -9241,7 +9437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new tag name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9252,7 +9448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5886"
+NAME="AEN5912"
 ></A
 ><H3
 ><A
@@ -9300,7 +9496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5897"
+NAME="AEN5923"
 ></A
 ><P
 ></P
@@ -9327,7 +9523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -9344,7 +9540,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9359,7 +9555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the child or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9370,7 +9566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5914"
+NAME="AEN5940"
 ></A
 ><H3
 ><A
@@ -9413,7 +9609,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5924"
+NAME="AEN5950"
 ></A
 ><P
 ></P
@@ -9440,7 +9636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -9457,7 +9653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ><TR
 ><TD
@@ -9472,7 +9668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9483,7 +9679,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5941"
+NAME="AEN5967"
 ></A
 ><H3
 ><A
@@ -9522,7 +9718,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5950"
+NAME="AEN5976"
 ></A
 ><P
 ></P
@@ -9549,7 +9745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the old node</TD
 ></TR
 ><TR
 ><TD
@@ -9566,7 +9762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -9581,7 +9777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9592,7 +9788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5967"
+NAME="AEN5993"
 ></A
 ><H3
 ><A
@@ -9647,7 +9843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5979"
+NAME="AEN6005"
 ></A
 ><P
 ></P
@@ -9674,7 +9870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9691,7 +9887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9706,7 +9902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9717,7 +9913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5996"
+NAME="AEN6022"
 ></A
 ><H3
 ><A
@@ -9772,7 +9968,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6008"
+NAME="AEN6034"
 ></A
 ><P
 ></P
@@ -9799,7 +9995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9816,7 +10012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9831,7 +10027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9842,7 +10038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6025"
+NAME="AEN6051"
 ></A
 ><H3
 ><A
@@ -9897,7 +10093,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6037"
+NAME="AEN6063"
 ></A
 ><P
 ></P
@@ -9924,7 +10120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9941,7 +10137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9956,7 +10152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9967,7 +10163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6054"
+NAME="AEN6080"
 ></A
 ><H3
 ><A
@@ -9997,7 +10193,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6061"
+NAME="AEN6087"
 ></A
 ><P
 ></P
@@ -10024,7 +10220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10035,7 +10231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6070"
+NAME="AEN6096"
 ></A
 ><H3
 ><A
@@ -10072,7 +10268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6079"
+NAME="AEN6105"
 ></A
 ><P
 ></P
@@ -10099,7 +10295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first text node</TD
 ></TR
 ><TR
 ><TD
@@ -10116,7 +10312,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second text node being merged</TD
 ></TR
 ><TR
 ><TD
@@ -10131,7 +10327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the first text node augmented</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10142,7 +10338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6096"
+NAME="AEN6122"
 ></A
 ><H3
 ><A
@@ -10177,7 +10373,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6104"
+NAME="AEN6130"
 ></A
 ><P
 ></P
@@ -10204,7 +10400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10221,7 +10417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the content</TD
 ></TR
 ><TR
 ><TD
@@ -10238,7 +10434,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+> lenght</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10249,7 +10450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6121"
+NAME="AEN6148"
 ></A
 ><H3
 ><A
@@ -10280,7 +10481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6128"
+NAME="AEN6155"
 ></A
 ><P
 ></P
@@ -10307,7 +10508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10318,7 +10519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6137"
+NAME="AEN6164"
 ></A
 ><H3
 ><A
@@ -10352,7 +10553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6145"
+NAME="AEN6172"
 ></A
 ><P
 ></P
@@ -10379,7 +10580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10390,7 +10591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6154"
+NAME="AEN6181"
 ></A
 ><H3
 ><A
@@ -10424,7 +10625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6162"
+NAME="AEN6189"
 ></A
 ><P
 ></P
@@ -10451,7 +10652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the top element</TD
 ></TR
 ><TR
 ><TD
@@ -10468,7 +10669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10479,7 +10680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6175"
+NAME="AEN6202"
 ></A
 ><H3
 ><A
@@ -10513,7 +10714,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6183"
+NAME="AEN6210"
 ></A
 ><P
 ></P
@@ -10557,7 +10758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10568,7 +10769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6196"
+NAME="AEN6223"
 ></A
 ><H3
 ><A
@@ -10620,7 +10821,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6207"
+NAME="AEN6234"
 ></A
 ><P
 ></P
@@ -10647,7 +10848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10664,7 +10865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10681,7 +10882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -10696,7 +10897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10707,7 +10908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6228"
+NAME="AEN6255"
 ></A
 ><H3
 ><A
@@ -10749,7 +10950,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6238"
+NAME="AEN6265"
 ></A
 ><P
 ></P
@@ -10776,7 +10977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10793,7 +10994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10810,7 +11011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace value</TD
 ></TR
 ><TR
 ><TD
@@ -10825,7 +11026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10836,7 +11037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6259"
+NAME="AEN6286"
 ></A
 ><H3
 ><A
@@ -10873,7 +11074,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6268"
+NAME="AEN6295"
 ></A
 ><P
 ></P
@@ -10900,7 +11101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10917,7 +11118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10932,7 +11133,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an NULL terminated array of all the xmlNsPtr found
+that need to be freed by the caller or NULL if no
+namespace if defined</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10943,7 +11146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6285"
+NAME="AEN6312"
 ></A
 ><H3
 ><A
@@ -10977,7 +11180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6293"
+NAME="AEN6320"
 ></A
 ><P
 ></P
@@ -11004,7 +11207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node in the document</TD
 ></TR
 ><TR
 ><TD
@@ -11021,7 +11224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11032,7 +11235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6306"
+NAME="AEN6333"
 ></A
 ><H3
 ><A
@@ -11065,7 +11268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6314"
+NAME="AEN6341"
 ></A
 ><P
 ></P
@@ -11092,7 +11295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11107,7 +11310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11118,7 +11321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6327"
+NAME="AEN6354"
 ></A
 ><H3
 ><A
@@ -11151,7 +11354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6335"
+NAME="AEN6362"
 ></A
 ><P
 ></P
@@ -11178,7 +11381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11193,7 +11396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11204,7 +11407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6348"
+NAME="AEN6375"
 ></A
 ><H3
 ><A
@@ -11245,7 +11448,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6358"
+NAME="AEN6385"
 ></A
 ><P
 ></P
@@ -11272,7 +11475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11289,7 +11492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11306,7 +11509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -11321,7 +11524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute pointer.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11332,7 +11535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6379"
+NAME="AEN6406"
 ></A
 ><H3
 ><A
@@ -11375,7 +11578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6389"
+NAME="AEN6416"
 ></A
 ><P
 ></P
@@ -11402,7 +11605,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11419,7 +11622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11434,7 +11637,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11445,7 +11649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6406"
+NAME="AEN6433"
 ></A
 ><H3
 ><A
@@ -11487,7 +11691,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6416"
+NAME="AEN6443"
 ></A
 ><P
 ></P
@@ -11514,7 +11718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11531,7 +11735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11546,7 +11750,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute or the attribute declaration or NULL if 
+neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11557,7 +11762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6433"
+NAME="AEN6460"
 ></A
 ><H3
 ><A
@@ -11605,7 +11810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6444"
+NAME="AEN6471"
 ></A
 ><P
 ></P
@@ -11632,7 +11837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11649,7 +11854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11666,7 +11871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI of the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11681,7 +11886,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute or the attribute declaration or NULL
+if neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11692,7 +11898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6465"
+NAME="AEN6492"
 ></A
 ><H3
 ><A
@@ -11738,7 +11944,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6476"
+NAME="AEN6503"
 ></A
 ><P
 ></P
@@ -11765,7 +11971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11782,7 +11988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace definition</TD
 ></TR
 ><TR
 ><TD
@@ -11799,7 +12005,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11816,7 +12022,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -11831,7 +12037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute pointer.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11842,7 +12048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6501"
+NAME="AEN6528"
 ></A
 ><H3
 ><A
@@ -11890,7 +12096,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6512"
+NAME="AEN6539"
 ></A
 ><P
 ></P
@@ -11917,7 +12123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11934,7 +12140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11951,7 +12157,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI of the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11966,7 +12172,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11977,7 +12184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6533"
+NAME="AEN6560"
 ></A
 ><H3
 ><A
@@ -12015,7 +12222,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6542"
+NAME="AEN6569"
 ></A
 ><P
 ></P
@@ -12042,7 +12249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12059,7 +12266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -12074,7 +12281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12085,7 +12292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6559"
+NAME="AEN6586"
 ></A
 ><H3
 ><A
@@ -12124,7 +12331,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6568"
+NAME="AEN6595"
 ></A
 ><P
 ></P
@@ -12151,7 +12358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12168,7 +12375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the text</TD
 ></TR
 ><TR
 ><TD
@@ -12185,7 +12392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the string value</TD
 ></TR
 ><TR
 ><TD
@@ -12200,7 +12407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12211,7 +12418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6589"
+NAME="AEN6616"
 ></A
 ><H3
 ><A
@@ -12250,7 +12457,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6598"
+NAME="AEN6625"
 ></A
 ><P
 ></P
@@ -12277,7 +12484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12294,7 +12501,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -12311,7 +12518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -12326,7 +12533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12337,7 +12544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6619"
+NAME="AEN6646"
 ></A
 ><H3
 ><A
@@ -12380,7 +12587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6629"
+NAME="AEN6656"
 ></A
 ><P
 ></P
@@ -12407,7 +12614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12424,7 +12631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -12441,7 +12648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -12456,7 +12663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12467,7 +12674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6650"
+NAME="AEN6677"
 ></A
 ><H3
 ><A
@@ -12501,7 +12708,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6658"
+NAME="AEN6685"
 ></A
 ><P
 ></P
@@ -12528,7 +12735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12545,7 +12752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12556,7 +12763,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6671"
+NAME="AEN6698"
 ></A
 ><H3
 ><A
@@ -12591,7 +12798,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6679"
+NAME="AEN6706"
 ></A
 ><P
 ></P
@@ -12618,7 +12825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12635,7 +12842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ><TR
 ><TD
@@ -12652,7 +12859,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12663,7 +12875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6696"
+NAME="AEN6724"
 ></A
 ><H3
 ><A
@@ -12697,7 +12909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6704"
+NAME="AEN6732"
 ></A
 ><P
 ></P
@@ -12724,7 +12936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12741,7 +12953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12752,7 +12964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6717"
+NAME="AEN6745"
 ></A
 ><H3
 ><A
@@ -12787,7 +12999,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6725"
+NAME="AEN6753"
 ></A
 ><P
 ></P
@@ -12814,7 +13026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12831,7 +13043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ><TR
 ><TD
@@ -12848,7 +13060,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12859,7 +13076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6742"
+NAME="AEN6771"
 ></A
 ><H3
 ><A
@@ -12895,7 +13112,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6750"
+NAME="AEN6779"
 ></A
 ><P
 ></P
@@ -12922,7 +13139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being read</TD
 ></TR
 ><TR
 ><TD
@@ -12937,7 +13154,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL if no content is available.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12948,7 +13166,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6763"
+NAME="AEN6792"
 ></A
 ><H3
 ><A
@@ -12982,7 +13200,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6771"
+NAME="AEN6800"
 ></A
 ><P
 ></P
@@ -13009,7 +13227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -13024,7 +13242,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the lang value, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13035,7 +13254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6784"
+NAME="AEN6813"
 ></A
 ><H3
 ><A
@@ -13070,7 +13289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6792"
+NAME="AEN6821"
 ></A
 ><P
 ></P
@@ -13097,7 +13316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13114,7 +13333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the langage description</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13125,7 +13344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6805"
+NAME="AEN6834"
 ></A
 ><H3
 ><A
@@ -13157,7 +13376,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6812"
+NAME="AEN6841"
 ></A
 ><P
 ></P
@@ -13184,7 +13403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -13199,7 +13418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13210,7 +13429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6825"
+NAME="AEN6854"
 ></A
 ><H3
 ><A
@@ -13245,7 +13464,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6833"
+NAME="AEN6862"
 ></A
 ><P
 ></P
@@ -13272,7 +13491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13300,7 +13519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6846"
+NAME="AEN6875"
 ></A
 ><H3
 ><A
@@ -13347,7 +13566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6856"
+NAME="AEN6885"
 ></A
 ><P
 ></P
@@ -13374,7 +13593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the node pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -13391,7 +13610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -13406,7 +13625,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the base URL, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13417,7 +13637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6873"
+NAME="AEN6902"
 ></A
 ><H3
 ><A
@@ -13452,7 +13672,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6881"
+NAME="AEN6910"
 ></A
 ><P
 ></P
@@ -13479,7 +13699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13496,7 +13716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new base URI</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13507,7 +13727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6894"
+NAME="AEN6923"
 ></A
 ><H3
 ><A
@@ -13538,7 +13758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6901"
+NAME="AEN6930"
 ></A
 ><P
 ></P
@@ -13580,7 +13800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success and -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13591,7 +13811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6914"
+NAME="AEN6943"
 ></A
 ><H3
 ><A
@@ -13619,7 +13839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6920"
+NAME="AEN6949"
 ></A
 ><P
 ></P
@@ -13672,7 +13892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6933"
+NAME="AEN6962"
 ></A
 ><H3
 ><A
@@ -13706,7 +13926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6941"
+NAME="AEN6970"
 ></A
 ><P
 ></P
@@ -13733,7 +13953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -13750,7 +13970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -13765,7 +13985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if successful, -1 if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13776,7 +13996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6958"
+NAME="AEN6987"
 ></A
 ><H3
 ><A
@@ -13814,7 +14034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6967"
+NAME="AEN6996"
 ></A
 ><P
 ></P
@@ -13841,7 +14061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -13858,7 +14078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace definition</TD
 ></TR
 ><TR
 ><TD
@@ -13875,7 +14095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -13890,7 +14110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if successful, -1 if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13901,7 +14121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6988"
+NAME="AEN7017"
 ></A
 ><H3
 ><A
@@ -13933,7 +14153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6995"
+NAME="AEN7024"
 ></A
 ><P
 ></P
@@ -13988,7 +14208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7008"
+NAME="AEN7037"
 ></A
 ><H3
 ><A
@@ -14023,7 +14243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7016"
+NAME="AEN7045"
 ></A
 ><P
 ></P
@@ -14050,7 +14270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer</TD
 ></TR
 ><TR
 ><TD
@@ -14067,7 +14287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14078,7 +14298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7029"
+NAME="AEN7058"
 ></A
 ><H3
 ><A
@@ -14110,7 +14330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7036"
+NAME="AEN7065"
 ></A
 ><P
 ></P
@@ -14137,7 +14357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -14154,7 +14374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14165,7 +14385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7049"
+NAME="AEN7078"
 ></A
 ><H3
 ><A
@@ -14201,7 +14421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7057"
+NAME="AEN7086"
 ></A
 ><P
 ></P
@@ -14228,7 +14448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -14245,7 +14465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14256,7 +14476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7070"
+NAME="AEN7099"
 ></A
 ><H3
 ><A
@@ -14301,7 +14521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7079"
+NAME="AEN7108"
 ></A
 ><P
 ></P
@@ -14328,7 +14548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14345,7 +14565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node defining the subtree to reconciliate</TD
 ></TR
 ><TR
 ><TD
@@ -14360,7 +14580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of namespace declarations created or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14371,7 +14591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7096"
+NAME="AEN7125"
 ></A
 ><H3
 ><A
@@ -14408,131 +14628,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7104"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->mem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7125"
-></A
-><H3
-><A
-NAME="XMLDOCDUMPMEMORY"
-></A
->xmlDocDumpMemory ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDocDumpMemory                (<A
-HREF="libxml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> cur,
-                                             <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> **mem,
-                                             int *size);</PRE
-></TD
-></TR
-></TABLE
-><P
->Dump an XML document in memory and return the xmlChar * and it's size.
-It's up to the caller to free the memory.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN7133"
 ></A
 ><P
@@ -14560,7 +14655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14577,7 +14672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -14594,7 +14689,24 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory lenght</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>format</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  should formatting spaces been added</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14605,7 +14717,115 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7150"
+NAME="AEN7154"
+></A
+><H3
+><A
+NAME="XMLDOCDUMPMEMORY"
+></A
+>xmlDocDumpMemory ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlDocDumpMemory                (<A
+HREF="libxml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> cur,
+                                             <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> **mem,
+                                             int *size);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Dump an XML document in memory and return the xmlChar * and it's size.
+It's up to the caller to free the memory.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN7162"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the document</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>mem</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  OUT: the memory pointer</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  OUT: the memory lenght</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN7179"
 ></A
 ><H3
 ><A
@@ -14643,7 +14863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7158"
+NAME="AEN7187"
 ></A
 ><P
 ></P
@@ -14670,7 +14890,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Document to generate XML text from</TD
 ></TR
 ><TR
 ><TD
@@ -14687,7 +14907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Memory pointer for allocated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14704,7 +14924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Length of the generated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14721,7 +14941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Character encoding to use when generating XML text</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14732,7 +14952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7179"
+NAME="AEN7208"
 ></A
 ><H3
 ><A
@@ -14767,7 +14987,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7186"
+NAME="AEN7215"
 ></A
 ><P
 ></P
@@ -14873,7 +15093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7211"
+NAME="AEN7240"
 ></A
 ><H3
 ><A
@@ -14907,7 +15127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7219"
+NAME="AEN7248"
 ></A
 ><P
 ></P
@@ -14934,7 +15154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE*</TD
 ></TR
 ><TR
 ><TD
@@ -14951,7 +15171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14966,7 +15186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14977,7 +15197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7236"
+NAME="AEN7265"
 ></A
 ><H3
 ><A
@@ -15015,7 +15235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7245"
+NAME="AEN7274"
 ></A
 ><P
 ></P
@@ -15042,7 +15262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE * for the output</TD
 ></TR
 ><TR
 ><TD
@@ -15059,7 +15279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15076,7 +15296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15087,7 +15307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7262"
+NAME="AEN7291"
 ></A
 ><H3
 ><A
@@ -15125,7 +15345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7270"
+NAME="AEN7299"
 ></A
 ><P
 ></P
@@ -15152,7 +15372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15169,7 +15389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15184,7 +15404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15195,7 +15415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7287"
+NAME="AEN7316"
 ></A
 ><H3
 ><A
@@ -15234,7 +15454,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7295"
+NAME="AEN7324"
 ></A
 ><P
 ></P
@@ -15261,7 +15481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15278,7 +15498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15295,7 +15515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -15310,7 +15530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15321,7 +15541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7316"
+NAME="AEN7345"
 ></A
 ><H3
 ><A
@@ -15361,7 +15581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7325"
+NAME="AEN7354"
 ></A
 ><P
 ></P
@@ -15388,7 +15608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -15405,7 +15625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15422,7 +15642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -15439,7 +15659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -15456,7 +15676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15467,7 +15687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7350"
+NAME="AEN7379"
 ></A
 ><H3
 ><A
@@ -15499,7 +15719,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7357"
+NAME="AEN7386"
 ></A
 ><P
 ></P
@@ -15526,7 +15746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15543,7 +15763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15560,7 +15780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of an encoding (or NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -15575,7 +15795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15586,7 +15806,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7378"
+NAME="AEN7407"
 ></A
 ><H3
 ><A
@@ -15616,7 +15836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7385"
+NAME="AEN7414"
 ></A
 ><P
 ></P
@@ -15643,7 +15863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15658,7 +15878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15669,7 +15889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7398"
+NAME="AEN7427"
 ></A
 ><H3
 ><A
@@ -15701,7 +15921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7405"
+NAME="AEN7434"
 ></A
 ><P
 ></P
@@ -15728,7 +15948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15745,7 +15965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15756,7 +15976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7418"
+NAME="AEN7447"
 ></A
 ><H3
 ><A
@@ -15783,7 +16003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7424"
+NAME="AEN7453"
 ></A
 ><P
 ></P
@@ -15808,7 +16028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15819,7 +16039,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7433"
+NAME="AEN7462"
 ></A
 ><H3
 ><A
@@ -15847,7 +16067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7439"
+NAME="AEN7468"
 ></A
 ><P
 ></P
@@ -15874,7 +16094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index a583e51..702fe90 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9701"
+NAME="AEN9740"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9704"
+NAME="AEN9743"
 ></A
 ><H2
 >Synopsis</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9736"
+NAME="AEN9775"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9739"
+NAME="AEN9778"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9741"
+NAME="AEN9780"
 ></A
 ><H3
 ><A
@@ -324,7 +324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9747"
+NAME="AEN9786"
 ></A
 ><H3
 ><A
@@ -337,7 +337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9751"
+NAME="AEN9790"
 ></A
 ><H3
 ><A
@@ -367,7 +367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9758"
+NAME="AEN9797"
 ></A
 ><P
 ></P
@@ -403,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9767"
+NAME="AEN9806"
 ></A
 ><H3
 ><A
@@ -445,7 +445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9777"
+NAME="AEN9816"
 ></A
 ><P
 ></P
@@ -515,7 +515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9794"
+NAME="AEN9833"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9802"
+NAME="AEN9841"
 ></A
 ><P
 ></P
@@ -600,7 +600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9815"
+NAME="AEN9854"
 ></A
 ><H3
 ><A
@@ -639,7 +639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9824"
+NAME="AEN9863"
 ></A
 ><P
 ></P
@@ -709,7 +709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9841"
+NAME="AEN9880"
 ></A
 ><H3
 ><A
@@ -742,7 +742,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9849"
+NAME="AEN9888"
 ></A
 ><P
 ></P
@@ -795,7 +795,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9862"
+NAME="AEN9901"
 ></A
 ><H3
 ><A
@@ -834,7 +834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9871"
+NAME="AEN9910"
 ></A
 ><P
 ></P
@@ -889,7 +889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9884"
+NAME="AEN9923"
 ></A
 ><H3
 ><A
@@ -927,7 +927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9893"
+NAME="AEN9932"
 ></A
 ><P
 ></P
@@ -997,7 +997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9910"
+NAME="AEN9949"
 ></A
 ><H3
 ><A
@@ -1030,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9917"
+NAME="AEN9956"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9938"
+NAME="AEN9977"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9945"
+NAME="AEN9984"
 ></A
 ><P
 ></P
@@ -1200,7 +1200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9958"
+NAME="AEN9997"
 ></A
 ><H3
 ><A
@@ -1235,7 +1235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9966"
+NAME="AEN10005"
 ></A
 ><P
 ></P
@@ -1288,7 +1288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9979"
+NAME="AEN10018"
 ></A
 ><H3
 ><A
@@ -1318,7 +1318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9986"
+NAME="AEN10025"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index f76fb42..90cb20a 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7923"
+NAME="AEN7954"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7926"
+NAME="AEN7957"
 ></A
 ><H2
 >Synopsis</H2
@@ -941,7 +941,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8143"
+NAME="AEN8174"
 ></A
 ><H2
 >Description</H2
@@ -951,14 +951,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8146"
+NAME="AEN8177"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8148"
+NAME="AEN8179"
 ></A
 ><H3
 ><A
@@ -984,20 +984,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8153"
+NAME="AEN8184"
 ></A
 ><H3
 ><A
 NAME="XMLVALIDSTATEPTR"
 ></A
 >xmlValidStatePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlValidState *xmlValidStatePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8157"
+NAME="AEN8189"
 ></A
 ><H3
 ><A
@@ -1024,7 +1037,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8162"
+NAME="AEN8194"
 ></A
 ><P
 ></P
@@ -1096,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8179"
+NAME="AEN8211"
 ></A
 ><H3
 ><A
@@ -1123,7 +1136,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8184"
+NAME="AEN8216"
 ></A
 ><P
 ></P
@@ -1195,7 +1208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8201"
+NAME="AEN8233"
 ></A
 ><H3
 ><A
@@ -1241,85 +1254,163 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8206"
+NAME="AEN8238"
 ></A
 ><H3
 ><A
 NAME="XMLVALIDCTXTPTR"
 ></A
 >xmlValidCtxtPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlValidCtxt *xmlValidCtxtPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8210"
+NAME="AEN8243"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONTABLEPTR"
 ></A
 >xmlNotationTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNotationTable *xmlNotationTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8214"
+NAME="AEN8248"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTTABLEPTR"
 ></A
 >xmlElementTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementTable *xmlElementTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8218"
+NAME="AEN8253"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTETABLEPTR"
 ></A
 >xmlAttributeTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttributeTable *xmlAttributeTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8222"
+NAME="AEN8258"
 ></A
 ><H3
 ><A
 NAME="XMLIDTABLEPTR"
 ></A
 >xmlIDTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlIDTable *xmlIDTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8226"
+NAME="AEN8263"
 ></A
 ><H3
 ><A
 NAME="XMLREFTABLEPTR"
 ></A
 >xmlRefTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRefTable *xmlRefTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8230"
+NAME="AEN8268"
 ></A
 ><H3
 ><A
@@ -1362,7 +1453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8242"
+NAME="AEN8280"
 ></A
 ><P
 ></P
@@ -1389,7 +1480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1406,7 +1497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** </TD
 ></TR
 ><TR
 ><TD
@@ -1421,7 +1512,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not a QName, otherwise the local part, and prefix
+is updated to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1432,7 +1524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8259"
+NAME="AEN8297"
 ></A
 ><H3
 ><A
@@ -1481,7 +1573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8271"
+NAME="AEN8309"
 ></A
 ><P
 ></P
@@ -1508,7 +1600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -1525,7 +1617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -1542,7 +1634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1559,7 +1651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the public identifier or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1576,7 +1668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system identifier or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1591,7 +1683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1602,7 +1694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8300"
+NAME="AEN8338"
 ></A
 ><H3
 ><A
@@ -1635,7 +1727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8308"
+NAME="AEN8346"
 ></A
 ><P
 ></P
@@ -1662,7 +1754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation table</TD
 ></TR
 ><TR
 ><TD
@@ -1677,7 +1769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlNotationTablePtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1688,7 +1780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8321"
+NAME="AEN8359"
 ></A
 ><H3
 ><A
@@ -1718,7 +1810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8328"
+NAME="AEN8366"
 ></A
 ><P
 ></P
@@ -1745,7 +1837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An notation table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1756,7 +1848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8337"
+NAME="AEN8375"
 ></A
 ><H3
 ><A
@@ -1790,7 +1882,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8345"
+NAME="AEN8383"
 ></A
 ><P
 ></P
@@ -1817,7 +1909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -1834,7 +1926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation declaration</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1845,7 +1937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8358"
+NAME="AEN8396"
 ></A
 ><H3
 ><A
@@ -1879,7 +1971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8366"
+NAME="AEN8404"
 ></A
 ><P
 ></P
@@ -1906,7 +1998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -1923,7 +2015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1934,7 +2026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8379"
+NAME="AEN8417"
 ></A
 ><H3
 ><A
@@ -1971,7 +2063,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8388"
+NAME="AEN8426"
 ></A
 ><P
 ></P
@@ -1998,7 +2090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the subelement name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2015,7 +2107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of element content decl</TD
 ></TR
 ><TR
 ><TD
@@ -2030,7 +2122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new element content structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2041,7 +2133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8405"
+NAME="AEN8443"
 ></A
 ><H3
 ><A
@@ -2074,7 +2166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8413"
+NAME="AEN8451"
 ></A
 ><P
 ></P
@@ -2101,7 +2193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element content pointer.</TD
 ></TR
 ><TR
 ><TD
@@ -2116,7 +2208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlElementContentPtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2127,7 +2219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8426"
+NAME="AEN8464"
 ></A
 ><H3
 ><A
@@ -2157,7 +2249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8433"
+NAME="AEN8471"
 ></A
 ><P
 ></P
@@ -2184,7 +2276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element content tree to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2195,7 +2287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8442"
+NAME="AEN8480"
 ></A
 ><H3
 ><A
@@ -2228,7 +2320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8449"
+NAME="AEN8487"
 ></A
 ><P
 ></P
@@ -2255,7 +2347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output buffer</TD
 ></TR
 ><TR
 ><TD
@@ -2272,7 +2364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ><TR
 ><TD
@@ -2289,7 +2381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> 1 if one must print the englobing parenthesis, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2300,7 +2392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8466"
+NAME="AEN8504"
 ></A
 ><H3
 ><A
@@ -2349,7 +2441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8478"
+NAME="AEN8516"
 ></A
 ><P
 ></P
@@ -2376,7 +2468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -2393,7 +2485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -2410,7 +2502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -2427,7 +2519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element type</TD
 ></TR
 ><TR
 ><TD
@@ -2444,7 +2536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element content tree or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2459,7 +2551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2470,7 +2562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8507"
+NAME="AEN8545"
 ></A
 ><H3
 ><A
@@ -2503,7 +2595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8515"
+NAME="AEN8553"
 ></A
 ><P
 ></P
@@ -2530,7 +2622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ><TR
 ><TD
@@ -2545,7 +2637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlElementTablePtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2556,7 +2648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8528"
+NAME="AEN8566"
 ></A
 ><H3
 ><A
@@ -2586,7 +2678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8535"
+NAME="AEN8573"
 ></A
 ><P
 ></P
@@ -2613,7 +2705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2624,7 +2716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8544"
+NAME="AEN8582"
 ></A
 ><H3
 ><A
@@ -2658,7 +2750,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8552"
+NAME="AEN8590"
 ></A
 ><P
 ></P
@@ -2685,7 +2777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -2702,7 +2794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2713,7 +2805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8565"
+NAME="AEN8603"
 ></A
 ><H3
 ><A
@@ -2748,7 +2840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8573"
+NAME="AEN8611"
 ></A
 ><P
 ></P
@@ -2775,7 +2867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -2792,7 +2884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2803,7 +2895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8586"
+NAME="AEN8624"
 ></A
 ><H3
 ><A
@@ -2836,7 +2928,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8594"
+NAME="AEN8632"
 ></A
 ><P
 ></P
@@ -2863,7 +2955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2878,7 +2970,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2889,7 +2982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8607"
+NAME="AEN8645"
 ></A
 ><H3
 ><A
@@ -2919,7 +3012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8614"
+NAME="AEN8652"
 ></A
 ><P
 ></P
@@ -2946,7 +3039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree to free.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2957,7 +3050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8623"
+NAME="AEN8661"
 ></A
 ><H3
 ><A
@@ -2990,7 +3083,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8631"
+NAME="AEN8669"
 ></A
 ><P
 ></P
@@ -3017,7 +3110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree to copy.</TD
 ></TR
 ><TR
 ><TD
@@ -3032,7 +3125,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3043,7 +3137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8644"
+NAME="AEN8682"
 ></A
 ><H3
 ><A
@@ -3114,7 +3208,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8661"
+NAME="AEN8699"
 ></A
 ><P
 ></P
@@ -3141,7 +3235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -3158,7 +3252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -3175,7 +3269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -3192,7 +3286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -3209,7 +3303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -3226,7 +3320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute type</TD
 ></TR
 ><TR
 ><TD
@@ -3243,7 +3337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute default type</TD
 ></TR
 ><TR
 ><TD
@@ -3260,7 +3354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute default value</TD
 ></TR
 ><TR
 ><TD
@@ -3277,7 +3371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if it's an enumeration, the associated list</TD
 ></TR
 ><TR
 ><TD
@@ -3292,7 +3386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not new, othervise the attribute decl</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3303,7 +3397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8706"
+NAME="AEN8744"
 ></A
 ><H3
 ><A
@@ -3336,7 +3430,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8714"
+NAME="AEN8752"
 ></A
 ><P
 ></P
@@ -3363,7 +3457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ><TR
 ><TD
@@ -3378,7 +3472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlAttributeTablePtr or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3389,7 +3483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8727"
+NAME="AEN8765"
 ></A
 ><H3
 ><A
@@ -3419,7 +3513,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8734"
+NAME="AEN8772"
 ></A
 ><P
 ></P
@@ -3446,7 +3540,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3457,7 +3551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8743"
+NAME="AEN8781"
 ></A
 ><H3
 ><A
@@ -3491,7 +3585,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8751"
+NAME="AEN8789"
 ></A
 ><P
 ></P
@@ -3518,7 +3612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -3535,7 +3629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3546,7 +3640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8764"
+NAME="AEN8802"
 ></A
 ><H3
 ><A
@@ -3581,7 +3675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8772"
+NAME="AEN8810"
 ></A
 ><P
 ></P
@@ -3608,7 +3702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -3625,7 +3719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute declaration</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3636,7 +3730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8785"
+NAME="AEN8823"
 ></A
 ><H3
 ><A
@@ -3681,7 +3775,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8796"
+NAME="AEN8834"
 ></A
 ><P
 ></P
@@ -3708,7 +3802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -3725,7 +3819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -3742,7 +3836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value name</TD
 ></TR
 ><TR
 ><TD
@@ -3759,7 +3853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute holding the ID</TD
 ></TR
 ><TR
 ><TD
@@ -3774,7 +3868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new xmlIDPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3785,7 +3879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8821"
+NAME="AEN8859"
 ></A
 ><H3
 ><A
@@ -3816,7 +3910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8828"
+NAME="AEN8866"
 ></A
 ><P
 ></P
@@ -3869,7 +3963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8841"
+NAME="AEN8879"
 ></A
 ><H3
 ><A
@@ -3899,7 +3993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8848"
+NAME="AEN8886"
 ></A
 ><P
 ></P
@@ -3926,7 +4020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An id table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3937,7 +4031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8857"
+NAME="AEN8895"
 ></A
 ><H3
 ><A
@@ -3974,7 +4068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8866"
+NAME="AEN8904"
 ></A
 ><P
 ></P
@@ -4001,7 +4095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -4018,7 +4112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ID value</TD
 ></TR
 ><TR
 ><TD
@@ -4033,7 +4127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4044,7 +4138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8883"
+NAME="AEN8921"
 ></A
 ><H3
 ><A
@@ -4084,7 +4178,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8892"
+NAME="AEN8930"
 ></A
 ><P
 ></P
@@ -4111,7 +4205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4128,7 +4222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4145,7 +4239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4160,7 +4254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or 1 depending on the lookup result</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4171,7 +4265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8913"
+NAME="AEN8951"
 ></A
 ><H3
 ><A
@@ -4205,7 +4299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8921"
+NAME="AEN8959"
 ></A
 ><P
 ></P
@@ -4232,7 +4326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4249,7 +4343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4264,7 +4358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if the lookup failed and 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4275,7 +4369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8938"
+NAME="AEN8976"
 ></A
 ><H3
 ><A
@@ -4320,7 +4414,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8949"
+NAME="AEN8987"
 ></A
 ><P
 ></P
@@ -4347,7 +4441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -4364,7 +4458,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -4381,7 +4475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value name</TD
 ></TR
 ><TR
 ><TD
@@ -4398,7 +4492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute holding the Ref</TD
 ></TR
 ><TR
 ><TD
@@ -4413,7 +4507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new xmlRefPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4424,7 +4518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8974"
+NAME="AEN9012"
 ></A
 ><H3
 ><A
@@ -4455,7 +4549,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8981"
+NAME="AEN9019"
 ></A
 ><P
 ></P
@@ -4508,7 +4602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8994"
+NAME="AEN9032"
 ></A
 ><H3
 ><A
@@ -4538,7 +4632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9001"
+NAME="AEN9039"
 ></A
 ><P
 ></P
@@ -4565,7 +4659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An ref table</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4576,7 +4670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9010"
+NAME="AEN9048"
 ></A
 ><H3
 ><A
@@ -4616,7 +4710,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9019"
+NAME="AEN9057"
 ></A
 ><P
 ></P
@@ -4643,7 +4737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4660,7 +4754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4677,7 +4771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4692,7 +4786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or 1 depending on the lookup result</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4703,7 +4797,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9040"
+NAME="AEN9078"
 ></A
 ><H3
 ><A
@@ -4737,7 +4831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9048"
+NAME="AEN9086"
 ></A
 ><P
 ></P
@@ -4764,7 +4858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4781,7 +4875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4796,7 +4890,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if the lookup failed and 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4807,7 +4901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9065"
+NAME="AEN9103"
 ></A
 ><H3
 ><A
@@ -4844,7 +4938,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9074"
+NAME="AEN9112"
 ></A
 ><P
 ></P
@@ -4871,7 +4965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -4888,7 +4982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ID value</TD
 ></TR
 ><TR
 ><TD
@@ -4903,7 +4997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not found, otherwise node set for the ID.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4914,7 +5008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9091"
+NAME="AEN9129"
 ></A
 ><H3
 ><A
@@ -4952,7 +5046,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9099"
+NAME="AEN9137"
 ></A
 ><P
 ></P
@@ -4979,7 +5073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -4996,7 +5090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5011,7 +5105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5022,7 +5116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9116"
+NAME="AEN9154"
 ></A
 ><H3
 ><A
@@ -5065,7 +5159,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9125"
+NAME="AEN9163"
 ></A
 ><P
 ></P
@@ -5092,7 +5186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5109,7 +5203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5126,7 +5220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element definition</TD
 ></TR
 ><TR
 ><TD
@@ -5141,7 +5235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5152,7 +5246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9146"
+NAME="AEN9184"
 ></A
 ><H3
 ><A
@@ -5212,7 +5306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9161"
+NAME="AEN9199"
 ></A
 ><P
 ></P
@@ -5239,7 +5333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5256,7 +5350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent</TD
 ></TR
 ><TR
 ><TD
@@ -5273,7 +5367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -5290,7 +5384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -5305,7 +5399,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new normalized string if normalization is needed, NULL otherwise
+the caller must free the returned value.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5316,7 +5411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9186"
+NAME="AEN9224"
 ></A
 ><H3
 ><A
@@ -5361,7 +5456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9196"
+NAME="AEN9234"
 ></A
 ><P
 ></P
@@ -5388,7 +5483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5405,7 +5500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5422,7 +5517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute definition</TD
 ></TR
 ><TR
 ><TD
@@ -5437,7 +5532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5448,7 +5543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9217"
+NAME="AEN9255"
 ></A
 ><H3
 ><A
@@ -5497,7 +5592,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9229"
+NAME="AEN9267"
 ></A
 ><P
 ></P
@@ -5524,7 +5619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute type</TD
 ></TR
 ><TR
 ><TD
@@ -5541,7 +5636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -5556,7 +5651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5567,7 +5662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9246"
+NAME="AEN9284"
 ></A
 ><H3
 ><A
@@ -5609,7 +5704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9255"
+NAME="AEN9293"
 ></A
 ><P
 ></P
@@ -5636,7 +5731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5653,7 +5748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5670,7 +5765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a notation definition</TD
 ></TR
 ><TR
 ><TD
@@ -5685,7 +5780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5696,7 +5791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9276"
+NAME="AEN9314"
 ></A
 ><H3
 ><A
@@ -5736,7 +5831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9286"
+NAME="AEN9324"
 ></A
 ><P
 ></P
@@ -5763,7 +5858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5780,7 +5875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5797,7 +5892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a dtd instance</TD
 ></TR
 ><TR
 ><TD
@@ -5812,7 +5907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5823,7 +5918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9307"
+NAME="AEN9345"
 ></A
 ><H3
 ><A
@@ -5864,7 +5959,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9316"
+NAME="AEN9354"
 ></A
 ><P
 ></P
@@ -5891,7 +5986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5908,7 +6003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5923,7 +6018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5934,7 +6029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9333"
+NAME="AEN9371"
 ></A
 ><H3
 ><A
@@ -5972,7 +6067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9342"
+NAME="AEN9380"
 ></A
 ><P
 ></P
@@ -5999,7 +6094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6016,7 +6111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6031,7 +6126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6042,7 +6137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9359"
+NAME="AEN9397"
 ></A
 ><H3
 ><A
@@ -6080,7 +6175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9368"
+NAME="AEN9406"
 ></A
 ><P
 ></P
@@ -6107,7 +6202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6124,7 +6219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6141,7 +6236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -6156,7 +6251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6167,7 +6262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9389"
+NAME="AEN9427"
 ></A
 ><H3
 ><A
@@ -6215,7 +6310,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9400"
+NAME="AEN9438"
 ></A
 ><P
 ></P
@@ -6242,7 +6337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6259,7 +6354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6276,7 +6371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -6291,7 +6386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6302,7 +6397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9421"
+NAME="AEN9459"
 ></A
 ><H3
 ><A
@@ -6360,7 +6455,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9433"
+NAME="AEN9471"
 ></A
 ><P
 ></P
@@ -6387,7 +6482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6404,7 +6499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6421,7 +6516,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -6438,7 +6533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute instance</TD
 ></TR
 ><TR
 ><TD
@@ -6455,7 +6550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value (without entities processing)</TD
 ></TR
 ><TR
 ><TD
@@ -6470,7 +6565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6481,7 +6576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9462"
+NAME="AEN9500"
 ></A
 ><H3
 ><A
@@ -6518,7 +6613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9471"
+NAME="AEN9509"
 ></A
 ><P
 ></P
@@ -6545,7 +6640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6562,7 +6657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6577,7 +6672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6588,7 +6683,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9488"
+NAME="AEN9526"
 ></A
 ><H3
 ><A
@@ -6627,7 +6722,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9497"
+NAME="AEN9535"
 ></A
 ><P
 ></P
@@ -6654,7 +6749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6671,7 +6766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6688,7 +6783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the notation name to check</TD
 ></TR
 ><TR
 ><TD
@@ -6703,7 +6798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6714,7 +6809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9518"
+NAME="AEN9556"
 ></A
 ><H3
 ><A
@@ -6749,7 +6844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9526"
+NAME="AEN9564"
 ></A
 ><P
 ></P
@@ -6776,7 +6871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6793,7 +6888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -6808,7 +6903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if no, 1 if yes, and -1 if no element description is available</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6819,7 +6914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9543"
+NAME="AEN9581"
 ></A
 ><H3
 ><A
@@ -6861,7 +6956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9553"
+NAME="AEN9591"
 ></A
 ><P
 ></P
@@ -6888,7 +6983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -6905,7 +7000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -6922,7 +7017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -6937,7 +7032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlAttributePtr if found or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6948,7 +7043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9574"
+NAME="AEN9612"
 ></A
 ><H3
 ><A
@@ -6985,7 +7080,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9583"
+NAME="AEN9621"
 ></A
 ><P
 ></P
@@ -7012,7 +7107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -7029,7 +7124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the notation name</TD
 ></TR
 ><TR
 ><TD
@@ -7044,7 +7139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNotationPtr if found or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7055,7 +7150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9600"
+NAME="AEN9638"
 ></A
 ><H3
 ><A
@@ -7092,7 +7187,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9609"
+NAME="AEN9647"
 ></A
 ><P
 ></P
@@ -7119,7 +7214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -7136,7 +7231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -7151,7 +7246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlElementPtr if found or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7162,7 +7257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9626"
+NAME="AEN9664"
 ></A
 ><H3
 ><A
@@ -7222,7 +7317,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9638"
+NAME="AEN9676"
 ></A
 ><P
 ></P
@@ -7249,7 +7344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element to insert after</TD
 ></TR
 ><TR
 ><TD
@@ -7266,7 +7361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element to insert next</TD
 ></TR
 ><TR
 ><TD
@@ -7283,7 +7378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an array to store the list of child names</TD
 ></TR
 ><TR
 ><TD
@@ -7300,7 +7395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7315,7 +7410,14 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of element in the list, or -1 in case of error. If
+the function returns the value <TT
+CLASS="PARAMETER"
+><I
+>max</I
+></TT
+> the caller is invited to grow the
+receiving array and retry.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7326,7 +7428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9663"
+NAME="AEN9702"
 ></A
 ><H3
 ><A
@@ -7362,7 +7464,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9671"
+NAME="AEN9710"
 ></A
 ><P
 ></P
@@ -7389,7 +7491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element content tree</TD
 ></TR
 ><TR
 ><TD
@@ -7406,7 +7508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an array to store the list of child names</TD
 ></TR
 ><TR
 ><TD
@@ -7423,7 +7525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the number of element in the list</TD
 ></TR
 ><TR
 ><TD
@@ -7440,7 +7542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7455,7 +7557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of element in the list, or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 2733cbf..762ed4c 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15511"
+NAME="AEN15597"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15514"
+NAME="AEN15600"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15519"
+NAME="AEN15605"
 ></A
 ><H2
 >Description</H2
@@ -169,14 +169,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15522"
+NAME="AEN15608"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15524"
+NAME="AEN15610"
 ></A
 ><H3
 ><A
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15532"
+NAME="AEN15618"
 ></A
 ><P
 ></P
@@ -238,7 +238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an XML document</TD
 ></TR
 ><TR
 ><TD
@@ -253,7 +253,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if no substition were done, -1 if some processing failed
+or the number of substitutions done.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index cf4d8ce..d43cd80 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10000"
+NAME="AEN10039"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10003"
+NAME="AEN10042"
 ></A
 ><H2
 >Synopsis</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10018"
+NAME="AEN10057"
 ></A
 ><H2
 >Description</H2
@@ -218,14 +218,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10021"
+NAME="AEN10060"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10023"
+NAME="AEN10062"
 ></A
 ><H3
 ><A
@@ -378,7 +378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10028"
+NAME="AEN10067"
 ></A
 ><H3
 ><A
@@ -405,7 +405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10033"
+NAME="AEN10072"
 ></A
 ><P
 ></P
@@ -477,7 +477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10050"
+NAME="AEN10089"
 ></A
 ><H3
 ><A
@@ -539,7 +539,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10062"
+NAME="AEN10101"
 ></A
 ><P
 ></P
@@ -566,7 +566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new error handling context</TD
 ></TR
 ><TR
 ><TD
@@ -583,7 +583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new handler function</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -594,7 +594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10075"
+NAME="AEN10114"
 ></A
 ><H3
 ><A
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10081"
+NAME="AEN10120"
 ></A
 ><P
 ></P
@@ -651,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -668,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -685,7 +685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -696,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10098"
+NAME="AEN10137"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10104"
+NAME="AEN10143"
 ></A
 ><P
 ></P
@@ -753,7 +753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -770,7 +770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -787,7 +787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -798,7 +798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10121"
+NAME="AEN10160"
 ></A
 ><H3
 ><A
@@ -828,7 +828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10127"
+NAME="AEN10166"
 ></A
 ><P
 ></P
@@ -855,7 +855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -872,7 +872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -900,7 +900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10144"
+NAME="AEN10183"
 ></A
 ><H3
 ><A
@@ -930,7 +930,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10150"
+NAME="AEN10189"
 ></A
 ><P
 ></P
@@ -957,7 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -974,7 +974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the message to display/transmit</TD
 ></TR
 ><TR
 ><TD
@@ -991,7 +991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra parameters for the message display</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1002,7 +1002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10167"
+NAME="AEN10206"
 ></A
 ><H3
 ><A
@@ -1032,7 +1032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10174"
+NAME="AEN10213"
 ></A
 ><P
 ></P
@@ -1059,7 +1059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlParserInputPtr input</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1070,7 +1070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10183"
+NAME="AEN10222"
 ></A
 ><H3
 ><A
@@ -1100,7 +1100,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10190"
+NAME="AEN10229"
 ></A
 ><P
 ></P
@@ -1127,7 +1127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlParserInputPtr input</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index 477851e..ee939cb 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16389"
+NAME="AEN16476"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16392"
+NAME="AEN16479"
 ></A
 ><H2
 >Synopsis</H2
@@ -537,7 +537,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16491"
+NAME="AEN16578"
 ></A
 ><H2
 >Description</H2
@@ -547,14 +547,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16494"
+NAME="AEN16581"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16496"
+NAME="AEN16583"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16501"
+NAME="AEN16588"
 ></A
 ><P
 ></P
@@ -632,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16514"
+NAME="AEN16601"
 ></A
 ><H3
 ><A
@@ -657,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16519"
+NAME="AEN16606"
 ></A
 ><P
 ></P
@@ -695,7 +695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16528"
+NAME="AEN16615"
 ></A
 ><H3
 ><A
@@ -722,7 +722,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16533"
+NAME="AEN16620"
 ></A
 ><P
 ></P
@@ -809,7 +809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16554"
+NAME="AEN16641"
 ></A
 ><H3
 ><A
@@ -834,7 +834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16559"
+NAME="AEN16646"
 ></A
 ><P
 ></P
@@ -872,7 +872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16568"
+NAME="AEN16655"
 ></A
 ><H3
 ><A
@@ -907,20 +907,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16573"
+NAME="AEN16660"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTBUFFERPTR"
 ></A
 >xmlParserInputBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInputBuffer *xmlParserInputBufferPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16577"
+NAME="AEN16665"
 ></A
 ><H3
 ><A
@@ -945,7 +958,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16582"
+NAME="AEN16670"
 ></A
 ><P
 ></P
@@ -998,7 +1011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16595"
+NAME="AEN16683"
 ></A
 ><H3
 ><A
@@ -1023,7 +1036,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16600"
+NAME="AEN16688"
 ></A
 ><P
 ></P
@@ -1061,7 +1074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16609"
+NAME="AEN16697"
 ></A
 ><H3
 ><A
@@ -1088,7 +1101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16614"
+NAME="AEN16702"
 ></A
 ><P
 ></P
@@ -1175,7 +1188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16635"
+NAME="AEN16723"
 ></A
 ><H3
 ><A
@@ -1200,7 +1213,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16640"
+NAME="AEN16728"
 ></A
 ><P
 ></P
@@ -1238,7 +1251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16649"
+NAME="AEN16737"
 ></A
 ><H3
 ><A
@@ -1274,20 +1287,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16654"
+NAME="AEN16742"
 ></A
 ><H3
 ><A
 NAME="XMLOUTPUTBUFFERPTR"
 ></A
 >xmlOutputBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlOutputBuffer *xmlOutputBufferPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16658"
+NAME="AEN16747"
 ></A
 ><H3
 ><A
@@ -1316,7 +1342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16664"
+NAME="AEN16753"
 ></A
 ><H3
 ><A
@@ -1350,7 +1376,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16672"
+NAME="AEN16761"
 ></A
 ><P
 ></P
@@ -1377,7 +1403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1392,7 +1418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1403,7 +1429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16685"
+NAME="AEN16774"
 ></A
 ><H3
 ><A
@@ -1436,7 +1462,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16692"
+NAME="AEN16781"
 ></A
 ><P
 ></P
@@ -1506,7 +1532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16709"
+NAME="AEN16798"
 ></A
 ><H3
 ><A
@@ -1545,7 +1571,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16717"
+NAME="AEN16806"
 ></A
 ><P
 ></P
@@ -1572,7 +1598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -1589,7 +1615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1604,7 +1630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1615,7 +1641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16734"
+NAME="AEN16823"
 ></A
 ><H3
 ><A
@@ -1654,7 +1680,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16743"
+NAME="AEN16832"
 ></A
 ><P
 ></P
@@ -1681,7 +1707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -1698,7 +1724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1713,7 +1739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1724,7 +1750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16760"
+NAME="AEN16849"
 ></A
 ><H3
 ><A
@@ -1760,7 +1786,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16768"
+NAME="AEN16857"
 ></A
 ><P
 ></P
@@ -1787,7 +1813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -1804,7 +1830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1819,7 +1845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1830,7 +1856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16785"
+NAME="AEN16874"
 ></A
 ><H3
 ><A
@@ -1867,7 +1893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16793"
+NAME="AEN16882"
 ></A
 ><P
 ></P
@@ -1894,7 +1920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the memory input</TD
 ></TR
 ><TR
 ><TD
@@ -1911,7 +1937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the memory block</TD
 ></TR
 ><TR
 ><TD
@@ -1928,7 +1954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1943,7 +1969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1954,7 +1980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16814"
+NAME="AEN16903"
 ></A
 ><H3
 ><A
@@ -1998,7 +2024,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16824"
+NAME="AEN16913"
 ></A
 ><P
 ></P
@@ -2025,7 +2051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O read function</TD
 ></TR
 ><TR
 ><TD
@@ -2042,7 +2068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -2059,7 +2085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -2076,7 +2102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -2091,7 +2117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2102,7 +2128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16849"
+NAME="AEN16938"
 ></A
 ><H3
 ><A
@@ -2135,7 +2161,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16856"
+NAME="AEN16945"
 ></A
 ><P
 ></P
@@ -2162,7 +2188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2179,7 +2205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -2194,7 +2220,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2205,7 +2232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16873"
+NAME="AEN16962"
 ></A
 ><H3
 ><A
@@ -2241,7 +2268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16881"
+NAME="AEN16970"
 ></A
 ><P
 ></P
@@ -2268,7 +2295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2285,7 +2312,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -2300,7 +2327,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2311,7 +2339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16898"
+NAME="AEN16987"
 ></A
 ><H3
 ><A
@@ -2345,7 +2373,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16905"
+NAME="AEN16994"
 ></A
 ><P
 ></P
@@ -2372,7 +2400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2389,7 +2417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -2406,7 +2434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -2421,7 +2449,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2432,7 +2461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16926"
+NAME="AEN17015"
 ></A
 ><H3
 ><A
@@ -2462,7 +2491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16933"
+NAME="AEN17022"
 ></A
 ><P
 ></P
@@ -2489,7 +2518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2500,7 +2529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16942"
+NAME="AEN17031"
 ></A
 ><H3
 ><A
@@ -2525,7 +2554,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16947"
+NAME="AEN17036"
 ></A
 ><P
 ></P
@@ -2578,7 +2607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16960"
+NAME="AEN17049"
 ></A
 ><H3
 ><A
@@ -2620,7 +2649,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16970"
+NAME="AEN17059"
 ></A
 ><P
 ></P
@@ -2647,7 +2676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2664,7 +2693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2681,7 +2710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputReadCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2698,7 +2727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2713,7 +2742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2724,7 +2753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16995"
+NAME="AEN17084"
 ></A
 ><H3
 ><A
@@ -2753,7 +2782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17001"
+NAME="AEN17090"
 ></A
 ><H3
 ><A
@@ -2786,7 +2815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17009"
+NAME="AEN17098"
 ></A
 ><P
 ></P
@@ -2813,7 +2842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2828,7 +2857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2839,7 +2868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17022"
+NAME="AEN17111"
 ></A
 ><H3
 ><A
@@ -2880,7 +2909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17030"
+NAME="AEN17119"
 ></A
 ><P
 ></P
@@ -2907,7 +2936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -2924,7 +2953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2941,7 +2970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ration (0 none, 9 max).</TD
 ></TR
 ><TR
 ><TD
@@ -2956,7 +2985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2967,7 +2996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17051"
+NAME="AEN17140"
 ></A
 ><H3
 ><A
@@ -3006,7 +3035,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17060"
+NAME="AEN17149"
 ></A
 ><P
 ></P
@@ -3033,7 +3062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -3050,7 +3079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -3065,7 +3094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3076,7 +3105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17077"
+NAME="AEN17166"
 ></A
 ><H3
 ><A
@@ -3111,7 +3140,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17085"
+NAME="AEN17174"
 ></A
 ><P
 ></P
@@ -3138,7 +3167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -3155,7 +3184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -3170,7 +3199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3181,7 +3210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17102"
+NAME="AEN17191"
 ></A
 ><H3
 ><A
@@ -3224,7 +3253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17112"
+NAME="AEN17201"
 ></A
 ><P
 ></P
@@ -3251,7 +3280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O write function</TD
 ></TR
 ><TR
 ><TD
@@ -3268,7 +3297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -3285,7 +3314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -3317,7 +3346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3328,7 +3357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17137"
+NAME="AEN17226"
 ></A
 ><H3
 ><A
@@ -3363,7 +3392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17144"
+NAME="AEN17233"
 ></A
 ><P
 ></P
@@ -3390,7 +3419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3407,7 +3436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -3424,7 +3453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -3439,7 +3468,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3450,7 +3480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17165"
+NAME="AEN17254"
 ></A
 ><H3
 ><A
@@ -3484,7 +3514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17172"
+NAME="AEN17261"
 ></A
 ><P
 ></P
@@ -3511,7 +3541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3528,7 +3558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a zero terminated C string</TD
 ></TR
 ><TR
 ><TD
@@ -3543,7 +3573,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3554,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17189"
+NAME="AEN17278"
 ></A
 ><H3
 ><A
@@ -3584,7 +3615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17196"
+NAME="AEN17285"
 ></A
 ><P
 ></P
@@ -3611,7 +3642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3626,7 +3657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3637,7 +3668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17209"
+NAME="AEN17298"
 ></A
 ><H3
 ><A
@@ -3668,7 +3699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17216"
+NAME="AEN17305"
 ></A
 ><P
 ></P
@@ -3695,7 +3726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3710,7 +3741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3721,7 +3752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17229"
+NAME="AEN17318"
 ></A
 ><H3
 ><A
@@ -3763,7 +3794,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17239"
+NAME="AEN17328"
 ></A
 ><P
 ></P
@@ -3790,7 +3821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3807,7 +3838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3824,7 +3855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputWriteCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3841,7 +3872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3856,7 +3887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3867,7 +3898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17264"
+NAME="AEN17353"
 ></A
 ><H3
 ><A
@@ -3902,7 +3933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17272"
+NAME="AEN17361"
 ></A
 ><P
 ></P
@@ -3929,7 +3960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output I/O buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3946,7 +3977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -3963,7 +3994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding if any assuming the i/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -3978,7 +4009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3989,7 +4020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17293"
+NAME="AEN17382"
 ></A
 ><H3
 ><A
@@ -4025,7 +4056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17301"
+NAME="AEN17390"
 ></A
 ><P
 ></P
@@ -4052,7 +4083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output I/O buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4069,7 +4100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4086,7 +4117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding if any assuming the i/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -4103,7 +4134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -4118,7 +4149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4129,7 +4160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17326"
+NAME="AEN17415"
 ></A
 ><H3
 ><A
@@ -4170,7 +4201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17335"
+NAME="AEN17424"
 ></A
 ><P
 ></P
@@ -4197,7 +4228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -4214,7 +4245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4231,7 +4262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -4248,7 +4279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -4265,7 +4296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ><TR
 ><TD
@@ -4282,7 +4313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4293,7 +4324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17364"
+NAME="AEN17453"
 ></A
 ><H3
 ><A
@@ -4328,7 +4359,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17372"
+NAME="AEN17461"
 ></A
 ><P
 ></P
@@ -4355,7 +4386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -4372,7 +4403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4389,7 +4420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding string</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 4f6ad74..dc4d74e 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21815"
+NAME="AEN21937"
 ></A
 ><H2
 >Name</H2
@@ -118,7 +118,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21818"
+NAME="AEN21940"
 ></A
 ><H2
 >Synopsis</H2
@@ -261,7 +261,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21850"
+NAME="AEN21972"
 ></A
 ><H2
 >Description</H2
@@ -271,14 +271,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21853"
+NAME="AEN21975"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21855"
+NAME="AEN21977"
 ></A
 ><H3
 ><A
@@ -294,7 +294,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     DEBUG_MEMORY</PRE
+>#define DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -309,7 +309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21861"
+NAME="AEN21983"
 ></A
 ><H3
 ><A
@@ -325,7 +325,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     MEM_LIST</PRE
+>#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
 ></TD
 ></TR
 ></TABLE
@@ -335,7 +335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21866"
+NAME="AEN21988"
 ></A
 ><H3
 ><A
@@ -360,7 +360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21871"
+NAME="AEN21993"
 ></A
 ><P
 ></P
@@ -398,7 +398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21880"
+NAME="AEN22002"
 ></A
 ><H3
 ><A
@@ -423,7 +423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21885"
+NAME="AEN22007"
 ></A
 ><P
 ></P
@@ -461,7 +461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21894"
+NAME="AEN22016"
 ></A
 ><H3
 ><A
@@ -487,7 +487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21899"
+NAME="AEN22021"
 ></A
 ><P
 ></P
@@ -542,7 +542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21912"
+NAME="AEN22034"
 ></A
 ><H3
 ><A
@@ -567,7 +567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21917"
+NAME="AEN22039"
 ></A
 ><P
 ></P
@@ -620,7 +620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21930"
+NAME="AEN22052"
 ></A
 ><H3
 ><A
@@ -666,7 +666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21941"
+NAME="AEN22063"
 ></A
 ><P
 ></P
@@ -693,7 +693,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -710,7 +713,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -727,7 +733,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -744,7 +753,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -759,7 +771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -770,7 +782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21966"
+NAME="AEN22092"
 ></A
 ><H3
 ><A
@@ -812,7 +824,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21976"
+NAME="AEN22102"
 ></A
 ><P
 ></P
@@ -839,7 +851,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -856,7 +871,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -873,7 +891,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -890,7 +911,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -905,7 +929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -916,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22001"
+NAME="AEN22131"
 ></A
 ><H3
 ><A
@@ -943,7 +967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22007"
+NAME="AEN22137"
 ></A
 ><P
 ></P
@@ -968,7 +992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -979,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22016"
+NAME="AEN22146"
 ></A
 ><H3
 ><A
@@ -1006,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22022"
+NAME="AEN22152"
 ></A
 ><P
 ></P
@@ -1031,7 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int representing the amount of memory allocated.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1042,7 +1066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22031"
+NAME="AEN22161"
 ></A
 ><H3
 ><A
@@ -1072,7 +1096,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22038"
+NAME="AEN22168"
 ></A
 ><P
 ></P
@@ -1099,7 +1123,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE descriptor used as the output file, if NULL, the result is
+written to the file .memorylist</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1110,7 +1135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22047"
+NAME="AEN22177"
 ></A
 ><H3
 ><A
@@ -1147,7 +1172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22055"
+NAME="AEN22185"
 ></A
 ><P
 ></P
@@ -1174,7 +1199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE descriptor used as the output file</TD
 ></TR
 ><TR
 ><TD
@@ -1191,7 +1216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of entries to dump</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1202,7 +1227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22068"
+NAME="AEN22198"
 ></A
 ><H3
 ><A
@@ -1230,7 +1255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22074"
+NAME="AEN22204"
 ></A
 ><H3
 ><A
@@ -1246,7 +1271,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlMalloc(x)</PRE
+>#define xmlMalloc(x) xmlMallocLoc((x), __FILE__, __LINE__)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1255,7 +1280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22079"
+NAME="AEN22209"
 ></A
 ><P
 ></P
@@ -1293,7 +1318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22088"
+NAME="AEN22218"
 ></A
 ><H3
 ><A
@@ -1309,7 +1334,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlRealloc(p, x)</PRE
+>#define xmlRealloc(p, x) xmlReallocLoc((p), (x), __FILE__, __LINE__)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1318,7 +1343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22093"
+NAME="AEN22223"
 ></A
 ><P
 ></P
@@ -1373,7 +1398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22106"
+NAME="AEN22236"
 ></A
 ><H3
 ><A
@@ -1389,7 +1414,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlMemStrdup(x)</PRE
+>#define xmlMemStrdup(x) xmlMemStrdupLoc((x), __FILE__, __LINE__)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1398,7 +1423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22111"
+NAME="AEN22241"
 ></A
 ><P
 ></P
@@ -1436,7 +1461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22120"
+NAME="AEN22250"
 ></A
 ><H3
 ><A
@@ -1468,7 +1493,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22127"
+NAME="AEN22257"
 ></A
 ><P
 ></P
@@ -1495,7 +1520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an int specifying the size in byte to allocate.</TD
 ></TR
 ><TR
 ><TD
@@ -1512,7 +1537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1529,7 +1554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1540,7 +1565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22144"
+NAME="AEN22274"
 ></A
 ><H3
 ><A
@@ -1573,7 +1598,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22151"
+NAME="AEN22281"
 ></A
 ><P
 ></P
@@ -1600,7 +1625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial memory block pointer</TD
 ></TR
 ><TR
 ><TD
@@ -1617,7 +1642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an int specifying the size in byte to allocate.</TD
 ></TR
 ><TR
 ><TD
@@ -1634,7 +1659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1651,7 +1676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1662,7 +1687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22172"
+NAME="AEN22302"
 ></A
 ><H3
 ><A
@@ -1694,7 +1719,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22179"
+NAME="AEN22309"
 ></A
 ><P
 ></P
@@ -1738,7 +1763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1755,7 +1780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ><TR
 ><TD
@@ -1770,7 +1795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new string or NULL if allocation error occured.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index f94ec49..11ee271 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11247"
+NAME="AEN11305"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11250"
+NAME="AEN11308"
 ></A
 ><H2
 >Synopsis</H2
@@ -590,7 +590,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11376"
+NAME="AEN11434"
 ></A
 ><H2
 >Description</H2
@@ -600,14 +600,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11379"
+NAME="AEN11437"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11381"
+NAME="AEN11439"
 ></A
 ><H3
 ><A
@@ -688,20 +688,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11387"
+NAME="AEN11445"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHCONTEXTPTR"
 ></A
 >xmlXPathContextPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathContext *xmlXPathContextPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11391"
+NAME="AEN11450"
 ></A
 ><H3
 ><A
@@ -731,6 +744,7 @@
 
     xmlXPathCompExprPtr comp;		/* the precompiled expression */
     int xptr;				/* it this an XPointer expression */
+    xmlNodePtr         ancestor;	/* used for walking preceding axis */
 };</PRE
 ></TD
 ></TR
@@ -744,20 +758,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11397"
+NAME="AEN11456"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHPARSERCONTEXTPTR"
 ></A
 >xmlXPathParserContextPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathParserContext *xmlXPathParserContextPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11401"
+NAME="AEN11461"
 ></A
 ><H3
 ><A
@@ -813,7 +840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11408"
+NAME="AEN11468"
 ></A
 ><H3
 ><A
@@ -843,20 +870,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11413"
+NAME="AEN11473"
 ></A
 ><H3
 ><A
 NAME="XMLNODESETPTR"
 ></A
 >xmlNodeSetPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNodeSet *xmlNodeSetPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11417"
+NAME="AEN11478"
 ></A
 ><H3
 ><A
@@ -893,7 +933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11422"
+NAME="AEN11483"
 ></A
 ><H3
 ><A
@@ -929,7 +969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11427"
+NAME="AEN11488"
 ></A
 ><H3
 ><A
@@ -957,7 +997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11433"
+NAME="AEN11494"
 ></A
 ><P
 ></P
@@ -993,7 +1033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11442"
+NAME="AEN11503"
 ></A
 ><H3
 ><A
@@ -1022,7 +1062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11448"
+NAME="AEN11509"
 ></A
 ><P
 ></P
@@ -1092,7 +1132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11465"
+NAME="AEN11526"
 ></A
 ><H3
 ><A
@@ -1121,20 +1161,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11470"
+NAME="AEN11531"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHTYPEPTR"
 ></A
 >xmlXPathTypePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathType *xmlXPathTypePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11474"
+NAME="AEN11536"
 ></A
 ><H3
 ><A
@@ -1163,20 +1216,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11479"
+NAME="AEN11541"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHVARIABLEPTR"
 ></A
 >xmlXPathVariablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathVariable *xmlXPathVariablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11483"
+NAME="AEN11546"
 ></A
 ><H3
 ><A
@@ -1205,7 +1271,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11489"
+NAME="AEN11552"
 ></A
 ><P
 ></P
@@ -1260,7 +1326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11502"
+NAME="AEN11565"
 ></A
 ><H3
 ><A
@@ -1289,20 +1355,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11507"
+NAME="AEN11570"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHFUNCPTR"
 ></A
 >xmlXPathFuncPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathFunct *xmlXPathFuncPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11511"
+NAME="AEN11575"
 ></A
 ><H3
 ><A
@@ -1337,7 +1416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11519"
+NAME="AEN11583"
 ></A
 ><P
 ></P
@@ -1407,7 +1486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11536"
+NAME="AEN11600"
 ></A
 ><H3
 ><A
@@ -1436,20 +1515,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11541"
+NAME="AEN11605"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHAXISPTR"
 ></A
 >xmlXPathAxisPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathAxis *xmlXPathAxisPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11545"
+NAME="AEN11610"
 ></A
 ><H3
 ><A
@@ -1481,20 +1573,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11552"
+NAME="AEN11617"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHCOMPEXPRPTR"
 ></A
 >xmlXPathCompExprPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlXPathCompExpr *xmlXPathCompExprPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11556"
+NAME="AEN11622"
 ></A
 ><H3
 ><A
@@ -1527,7 +1632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11563"
+NAME="AEN11629"
 ></A
 ><P
 ></P
@@ -1582,7 +1687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11576"
+NAME="AEN11642"
 ></A
 ><H3
 ><A
@@ -1598,7 +1703,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlXPathNodeSetGetLength(ns)</PRE
+>#define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)-&gt;nodeNr : 0)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1607,7 +1712,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11581"
+NAME="AEN11647"
 ></A
 ><P
 ></P
@@ -1645,7 +1750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11590"
+NAME="AEN11656"
 ></A
 ><H3
 ><A
@@ -1670,7 +1775,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11595"
+NAME="AEN11661"
 ></A
 ><P
 ></P
@@ -1725,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11608"
+NAME="AEN11674"
 ></A
 ><H3
 ><A
@@ -1755,7 +1860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11615"
+NAME="AEN11681"
 ></A
 ><P
 ></P
@@ -1782,7 +1887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the object to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1793,7 +1898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11624"
+NAME="AEN11690"
 ></A
 ><H3
 ><A
@@ -1831,7 +1936,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11633"
+NAME="AEN11699"
 ></A
 ><P
 ></P
@@ -1858,7 +1963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an initial xmlNodePtr, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1873,7 +1978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1884,7 +1989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11646"
+NAME="AEN11712"
 ></A
 ><H3
 ><A
@@ -1923,7 +2028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11655"
+NAME="AEN11721"
 ></A
 ><P
 ></P
@@ -1950,7 +2055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an existing NodeSetList object</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1961,7 +2066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11664"
+NAME="AEN11730"
 ></A
 ><H3
 ><A
@@ -1991,7 +2096,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11671"
+NAME="AEN11737"
 ></A
 ><P
 ></P
@@ -2018,7 +2123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlNodeSetPtr to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2029,7 +2134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11680"
+NAME="AEN11746"
 ></A
 ><H3
 ><A
@@ -2062,7 +2167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11688"
+NAME="AEN11754"
 ></A
 ><P
 ></P
@@ -2089,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the original object</TD
 ></TR
 ><TR
 ><TD
@@ -2104,7 +2209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2115,7 +2220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11701"
+NAME="AEN11767"
 ></A
 ><H3
 ><A
@@ -2149,7 +2254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11709"
+NAME="AEN11775"
 ></A
 ><P
 ></P
@@ -2176,7 +2281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node</TD
 ></TR
 ><TR
 ><TD
@@ -2193,7 +2298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second node</TD
 ></TR
 ><TR
 ><TD
@@ -2208,7 +2313,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-2 in case of error 1 if first point &lt; second point, 0 if
+that's the same node, -1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2219,7 +2325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11726"
+NAME="AEN11792"
 ></A
 ><H3
 ><A
@@ -2249,7 +2355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11733"
+NAME="AEN11799"
 ></A
 ><P
 ></P
@@ -2276,7 +2382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a number</TD
 ></TR
 ><TR
 ><TD
@@ -2291,7 +2397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the boolean value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2302,7 +2408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11746"
+NAME="AEN11812"
 ></A
 ><H3
 ><A
@@ -2332,7 +2438,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11753"
+NAME="AEN11819"
 ></A
 ><P
 ></P
@@ -2359,7 +2465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string</TD
 ></TR
 ><TR
 ><TD
@@ -2374,7 +2480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the boolean value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2385,7 +2491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11766"
+NAME="AEN11832"
 ></A
 ><H3
 ><A
@@ -2415,7 +2521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11773"
+NAME="AEN11839"
 ></A
 ><P
 ></P
@@ -2442,7 +2548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ><TR
 ><TD
@@ -2457,7 +2563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the boolean value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2468,7 +2574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11786"
+NAME="AEN11852"
 ></A
 ><H3
 ><A
@@ -2496,7 +2602,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11792"
+NAME="AEN11858"
 ></A
 ><P
 ></P
@@ -2549,7 +2655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11805"
+NAME="AEN11871"
 ></A
 ><H3
 ><A
@@ -2579,7 +2685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11812"
+NAME="AEN11878"
 ></A
 ><P
 ></P
@@ -2606,7 +2712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a boolean</TD
 ></TR
 ><TR
 ><TD
@@ -2621,7 +2727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2632,7 +2738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11825"
+NAME="AEN11891"
 ></A
 ><H3
 ><A
@@ -2665,7 +2771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11833"
+NAME="AEN11899"
 ></A
 ><P
 ></P
@@ -2692,7 +2798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string</TD
 ></TR
 ><TR
 ><TD
@@ -2707,7 +2813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2718,7 +2824,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11846"
+NAME="AEN11912"
 ></A
 ><H3
 ><A
@@ -2751,7 +2857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11854"
+NAME="AEN11920"
 ></A
 ><P
 ></P
@@ -2778,7 +2884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node</TD
 ></TR
 ><TR
 ><TD
@@ -2793,7 +2899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2804,7 +2910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11867"
+NAME="AEN11933"
 ></A
 ><H3
 ><A
@@ -2837,7 +2943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11875"
+NAME="AEN11941"
 ></A
 ><P
 ></P
@@ -2864,7 +2970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ><TR
 ><TD
@@ -2879,7 +2985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2890,7 +2996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11888"
+NAME="AEN11954"
 ></A
 ><H3
 ><A
@@ -2923,7 +3029,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11896"
+NAME="AEN11962"
 ></A
 ><P
 ></P
@@ -2950,7 +3056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath object</TD
 ></TR
 ><TR
 ><TD
@@ -2965,7 +3071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number value</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2976,7 +3082,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11909"
+NAME="AEN11975"
 ></A
 ><H3
 ><A
@@ -3006,7 +3112,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11916"
+NAME="AEN11982"
 ></A
 ><P
 ></P
@@ -3033,7 +3139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a boolean</TD
 ></TR
 ><TR
 ><TD
@@ -3048,7 +3154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a newly allocated string.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3059,7 +3165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11929"
+NAME="AEN11995"
 ></A
 ><H3
 ><A
@@ -3092,7 +3198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11937"
+NAME="AEN12003"
 ></A
 ><P
 ></P
@@ -3119,7 +3225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a number</TD
 ></TR
 ><TR
 ><TD
@@ -3134,7 +3240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a newly allocated string.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3145,7 +3251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11950"
+NAME="AEN12016"
 ></A
 ><H3
 ><A
@@ -3178,7 +3284,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11958"
+NAME="AEN12024"
 ></A
 ><P
 ></P
@@ -3205,7 +3311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node</TD
 ></TR
 ><TR
 ><TD
@@ -3220,7 +3326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a newly allocated string.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3231,7 +3337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11971"
+NAME="AEN12037"
 ></A
 ><H3
 ><A
@@ -3264,7 +3370,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11979"
+NAME="AEN12045"
 ></A
 ><P
 ></P
@@ -3291,7 +3397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ><TR
 ><TD
@@ -3306,7 +3412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a newly allocated string.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3317,7 +3423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11992"
+NAME="AEN12058"
 ></A
 ><H3
 ><A
@@ -3353,273 +3459,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12001"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12014"
-></A
-><H3
-><A
-NAME="XMLXPATHCONVERTBOOLEAN"
-></A
->xmlXPathConvertBoolean ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathConvertBoolean    (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts an existing object to its <GTKDOCLINK
-HREF="BOOLEAN"
->boolean</GTKDOCLINK
->() equivalent</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12023"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12036"
-></A
-><H3
-><A
-NAME="XMLXPATHCONVERTNUMBER"
-></A
->xmlXPathConvertNumber ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathConvertNumber     (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts an existing object to its <GTKDOCLINK
-HREF="NUMBER"
->number</GTKDOCLINK
->() equivalent</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12045"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12058"
-></A
-><H3
-><A
-NAME="XMLXPATHCONVERTSTRING"
-></A
->xmlXPathConvertString ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathConvertString     (<A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Converts an existing object to its <GTKDOCLINK
-HREF="STRING"
->string</GTKDOCLINK
->() equivalent</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN12067"
 ></A
 ><P
@@ -3647,7 +3486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath object</TD
 ></TR
 ><TR
 ><TD
@@ -3662,7 +3501,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the string value of the object, NULL in case of error.
+A new string is allocated only if needed (val isn't a
+string object).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3677,6 +3518,291 @@
 ></A
 ><H3
 ><A
+NAME="XMLXPATHCONVERTBOOLEAN"
+></A
+>xmlXPathConvertBoolean ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathConvertBoolean    (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts an existing object to its <GTKDOCLINK
+HREF="BOOLEAN"
+>boolean</GTKDOCLINK
+>() equivalent</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12089"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XPath object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new object, the old one is freed (or the operation
+is done directly on <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>)</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12103"
+></A
+><H3
+><A
+NAME="XMLXPATHCONVERTNUMBER"
+></A
+>xmlXPathConvertNumber ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathConvertNumber     (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts an existing object to its <GTKDOCLINK
+HREF="NUMBER"
+>number</GTKDOCLINK
+>() equivalent</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12112"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XPath object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new object, the old one is freed (or the operation
+is done directly on <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>)</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12126"
+></A
+><H3
+><A
+NAME="XMLXPATHCONVERTSTRING"
+></A
+>xmlXPathConvertString ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathConvertString     (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Converts an existing object to its <GTKDOCLINK
+HREF="STRING"
+>string</GTKDOCLINK
+>() equivalent</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12135"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an XPath object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new object, the old one is freed (or the operation
+is done directly on <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>)</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12149"
+></A
+><H3
+><A
 NAME="XMLXPATHINIT"
 ></A
 >xmlXPathInit ()</H3
@@ -3701,7 +3827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12086"
+NAME="AEN12155"
 ></A
 ><H3
 ><A
@@ -3734,7 +3860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12094"
+NAME="AEN12163"
 ></A
 ><P
 ></P
@@ -3761,7 +3887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML document</TD
 ></TR
 ><TR
 ><TD
@@ -3776,7 +3902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathContext just allocated.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3787,7 +3913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12107"
+NAME="AEN12176"
 ></A
 ><H3
 ><A
@@ -3817,7 +3943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12114"
+NAME="AEN12183"
 ></A
 ><P
 ></P
@@ -3844,7 +3970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the context to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3855,7 +3981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12123"
+NAME="AEN12192"
 ></A
 ><H3
 ><A
@@ -3892,7 +4018,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12132"
+NAME="AEN12201"
 ></A
 ><P
 ></P
@@ -3919,7 +4045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -3951,7 +4077,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3962,7 +4089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12149"
+NAME="AEN12218"
 ></A
 ><H3
 ><A
@@ -3997,7 +4124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12157"
+NAME="AEN12226"
 ></A
 ><P
 ></P
@@ -4067,7 +4194,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12174"
+NAME="AEN12243"
 ></A
 ><H3
 ><A
@@ -4104,7 +4231,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12183"
+NAME="AEN12252"
 ></A
 ><P
 ></P
@@ -4131,7 +4258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -4148,7 +4275,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -4163,7 +4290,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4174,7 +4302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12200"
+NAME="AEN12269"
 ></A
 ><H3
 ><A
@@ -4217,7 +4345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12209"
+NAME="AEN12278"
 ></A
 ><P
 ></P
@@ -4244,7 +4372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -4261,7 +4389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Predicate Expression evaluation result</TD
 ></TR
 ><TR
 ><TD
@@ -4287,7 +4415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12226"
+NAME="AEN12295"
 ></A
 ><H3
 ><A
@@ -4320,7 +4448,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12234"
+NAME="AEN12303"
 ></A
 ><P
 ></P
@@ -4347,7 +4475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -4362,7 +4490,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4373,7 +4502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12247"
+NAME="AEN12316"
 ></A
 ><H3
 ><A
@@ -4410,7 +4539,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12256"
+NAME="AEN12325"
 ></A
 ><P
 ></P
@@ -4437,7 +4566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compiled XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -4454,7 +4583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -4469,7 +4598,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4480,7 +4610,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12273"
+NAME="AEN12342"
 ></A
 ><H3
 ><A
@@ -4515,7 +4645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12281"
+NAME="AEN12350"
 ></A
 ><P
 ></P
@@ -4542,7 +4672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPATH comp</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 60324d0..be5d788 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12295"
+NAME="AEN12364"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12298"
+NAME="AEN12367"
 ></A
 ><H2
 >Synopsis</H2
@@ -166,6 +166,10 @@
 >CHECK_TYPE</A
 >                      (typeval)
 #define     <A
+HREF="libxml-xpathinternals.html#CHECK-TYPE0-CAPS"
+>CHECK_TYPE0</A
+>                     (typeval)
+#define     <A
 HREF="libxml-xpathinternals.html#CHECK-ARITY-CAPS"
 >CHECK_ARITY</A
 >                     (x)
@@ -1189,7 +1193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12584"
+NAME="AEN12654"
 ></A
 ><H2
 >Description</H2
@@ -1199,14 +1203,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12587"
+NAME="AEN12657"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12589"
+NAME="AEN12659"
 ></A
 ><H3
 ><A
@@ -1234,7 +1238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12595"
+NAME="AEN12665"
 ></A
 ><H3
 ><A
@@ -1262,7 +1266,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12601"
+NAME="AEN12671"
 ></A
 ><H3
 ><A
@@ -1289,7 +1293,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12607"
+NAME="AEN12677"
 ></A
 ><P
 ></P
@@ -1316,7 +1320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the error code</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1327,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12616"
+NAME="AEN12686"
 ></A
 ><H3
 ><A
@@ -1354,7 +1358,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12622"
+NAME="AEN12692"
 ></A
 ><P
 ></P
@@ -1381,7 +1385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the error code</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1392,7 +1396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12631"
+NAME="AEN12701"
 ></A
 ><H3
 ><A
@@ -1420,7 +1424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12637"
+NAME="AEN12707"
 ></A
 ><P
 ></P
@@ -1447,7 +1451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath type</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1458,7 +1462,73 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12646"
+NAME="AEN12716"
+></A
+><H3
+><A
+NAME="CHECK-TYPE0-CAPS"
+></A
+>CHECK_TYPE0()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     CHECK_TYPE0(typeval)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Macro to check that the value on top of the XPath stack is of a given
+type. return(0) in case of failure</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN12722"
+></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
+>typeval</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath type</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN12731"
 ></A
 ><H3
 ><A
@@ -1485,7 +1555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12652"
+NAME="AEN12737"
 ></A
 ><P
 ></P
@@ -1512,7 +1582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of expected args</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1523,7 +1593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12661"
+NAME="AEN12746"
 ></A
 ><H3
 ><A
@@ -1551,7 +1621,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12667"
+NAME="AEN12752"
 ></A
 ><H3
 ><A
@@ -1579,7 +1649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12673"
+NAME="AEN12758"
 ></A
 ><H3
 ><A
@@ -1607,7 +1677,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12679"
+NAME="AEN12764"
 ></A
 ><H3
 ><A
@@ -1635,7 +1705,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12685"
+NAME="AEN12770"
 ></A
 ><P
 ></P
@@ -1671,7 +1741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12694"
+NAME="AEN12779"
 ></A
 ><H3
 ><A
@@ -1706,7 +1776,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12702"
+NAME="AEN12787"
 ></A
 ><P
 ></P
@@ -1733,7 +1803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -1750,7 +1820,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lookup function</TD
 ></TR
 ><TR
 ><TD
@@ -1778,7 +1848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12719"
+NAME="AEN12804"
 ></A
 ><H3
 ><A
@@ -1809,7 +1879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12725"
+NAME="AEN12810"
 ></A
 ><P
 ></P
@@ -1898,7 +1968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12746"
+NAME="AEN12831"
 ></A
 ><H3
 ><A
@@ -1933,7 +2003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12754"
+NAME="AEN12839"
 ></A
 ><P
 ></P
@@ -1960,7 +2030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE * to dump the output</TD
 ></TR
 ><TR
 ><TD
@@ -1977,7 +2047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the object to inspect</TD
 ></TR
 ><TR
 ><TD
@@ -1994,7 +2064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indentation level</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2005,7 +2075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12771"
+NAME="AEN12856"
 ></A
 ><H3
 ><A
@@ -2038,7 +2108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12778"
+NAME="AEN12863"
 ></A
 ><P
 ></P
@@ -2110,7 +2180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12795"
+NAME="AEN12880"
 ></A
 ><H3
 ><A
@@ -2154,7 +2224,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12805"
+NAME="AEN12890"
 ></A
 ><P
 ></P
@@ -2181,7 +2251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2198,7 +2268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -2215,7 +2285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace name</TD
 ></TR
 ><TR
 ><TD
@@ -2230,7 +2300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2241,7 +2311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12826"
+NAME="AEN12911"
 ></A
 ><H3
 ><A
@@ -2279,7 +2349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12835"
+NAME="AEN12920"
 ></A
 ><P
 ></P
@@ -2306,7 +2376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2338,7 +2408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the value or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2349,7 +2419,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12852"
+NAME="AEN12937"
 ></A
 ><H3
 ><A
@@ -2377,7 +2447,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12858"
+NAME="AEN12943"
 ></A
 ><P
 ></P
@@ -2415,7 +2485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12867"
+NAME="AEN12952"
 ></A
 ><H3
 ><A
@@ -2458,7 +2528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12877"
+NAME="AEN12962"
 ></A
 ><P
 ></P
@@ -2485,7 +2555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2502,7 +2572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function name</TD
 ></TR
 ><TR
 ><TD
@@ -2519,7 +2589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function implementation or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2534,7 +2604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2545,7 +2615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12898"
+NAME="AEN12983"
 ></A
 ><H3
 ><A
@@ -2592,7 +2662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12909"
+NAME="AEN12994"
 ></A
 ><P
 ></P
@@ -2619,7 +2689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2636,7 +2706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function name</TD
 ></TR
 ><TR
 ><TD
@@ -2653,7 +2723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function namespace URI</TD
 ></TR
 ><TR
 ><TD
@@ -2670,7 +2740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function implementation or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2685,7 +2755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2696,7 +2766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12934"
+NAME="AEN13019"
 ></A
 ><H3
 ><A
@@ -2740,7 +2810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12944"
+NAME="AEN13029"
 ></A
 ><P
 ></P
@@ -2767,7 +2837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2784,7 +2854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable name</TD
 ></TR
 ><TR
 ><TD
@@ -2801,7 +2871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable value or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2816,7 +2886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2827,7 +2897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12965"
+NAME="AEN13050"
 ></A
 ><H3
 ><A
@@ -2875,7 +2945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12976"
+NAME="AEN13061"
 ></A
 ><P
 ></P
@@ -2902,7 +2972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2919,7 +2989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable name</TD
 ></TR
 ><TR
 ><TD
@@ -2936,7 +3006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable namespace URI</TD
 ></TR
 ><TR
 ><TD
@@ -2953,7 +3023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable value or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2968,7 +3038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2979,7 +3049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13001"
+NAME="AEN13086"
 ></A
 ><H3
 ><A
@@ -3017,7 +3087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13010"
+NAME="AEN13095"
 ></A
 ><P
 ></P
@@ -3044,7 +3114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3061,7 +3131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function name</TD
 ></TR
 ><TR
 ><TD
@@ -3076,7 +3146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathFunction or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3087,7 +3157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13027"
+NAME="AEN13112"
 ></A
 ><H3
 ><A
@@ -3129,7 +3199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13037"
+NAME="AEN13122"
 ></A
 ><P
 ></P
@@ -3156,7 +3226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3173,7 +3243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function name</TD
 ></TR
 ><TR
 ><TD
@@ -3190,7 +3260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the function namespace URI</TD
 ></TR
 ><TR
 ><TD
@@ -3205,7 +3275,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathFunction or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3216,7 +3286,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13058"
+NAME="AEN13143"
 ></A
 ><H3
 ><A
@@ -3246,7 +3316,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13065"
+NAME="AEN13150"
 ></A
 ><P
 ></P
@@ -3273,7 +3343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3284,7 +3354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13074"
+NAME="AEN13159"
 ></A
 ><H3
 ><A
@@ -3322,7 +3392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13083"
+NAME="AEN13168"
 ></A
 ><P
 ></P
@@ -3349,7 +3419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3366,7 +3436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable name</TD
 ></TR
 ><TR
 ><TD
@@ -3381,7 +3451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a copy of the value or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3392,7 +3462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13100"
+NAME="AEN13185"
 ></A
 ><H3
 ><A
@@ -3434,7 +3504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13110"
+NAME="AEN13195"
 ></A
 ><P
 ></P
@@ -3461,7 +3531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3478,7 +3548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable name</TD
 ></TR
 ><TR
 ><TD
@@ -3495,7 +3565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the variable namespace URI</TD
 ></TR
 ><TR
 ><TD
@@ -3510,7 +3580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the a copy of the value or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3521,7 +3591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13131"
+NAME="AEN13216"
 ></A
 ><H3
 ><A
@@ -3552,7 +3622,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13138"
+NAME="AEN13223"
 ></A
 ><P
 ></P
@@ -3579,7 +3649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3590,7 +3660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13147"
+NAME="AEN13232"
 ></A
 ><H3
 ><A
@@ -3628,7 +3698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13156"
+NAME="AEN13241"
 ></A
 ><P
 ></P
@@ -3655,7 +3725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -3672,7 +3742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -3687,7 +3757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathParserContext just allocated.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3698,7 +3768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13173"
+NAME="AEN13258"
 ></A
 ><H3
 ><A
@@ -3728,7 +3798,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13180"
+NAME="AEN13265"
 ></A
 ><P
 ></P
@@ -3755,7 +3825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the context to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3766,7 +3836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13189"
+NAME="AEN13274"
 ></A
 ><H3
 ><A
@@ -3797,7 +3867,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13196"
+NAME="AEN13281"
 ></A
 ><P
 ></P
@@ -3850,7 +3920,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13209"
+NAME="AEN13294"
 ></A
 ><H3
 ><A
@@ -3882,7 +3952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13216"
+NAME="AEN13301"
 ></A
 ><P
 ></P
@@ -3952,7 +4022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13233"
+NAME="AEN13318"
 ></A
 ><H3
 ><A
@@ -3990,359 +4060,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13242"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13255"
-></A
-><H3
-><A
-NAME="XMLXPATHNEWCSTRING"
-></A
->xmlXPathNewCString ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathNewCString        (const char *val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlXPathObjectPtr of type string and of value <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-></P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN13263"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13276"
-></A
-><H3
-><A
-NAME="XMLXPATHWRAPSTRING"
-></A
->xmlXPathWrapString ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathWrapString        (<A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Wraps the <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-> string into an XPath object.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN13285"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13298"
-></A
-><H3
-><A
-NAME="XMLXPATHWRAPCSTRING"
-></A
->xmlXPathWrapCString ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathWrapCString       (char *val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Wraps a string into an XPath object.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN13305"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13318"
-></A
-><H3
-><A
-NAME="XMLXPATHNEWFLOAT"
-></A
->xmlXPathNewFloat ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> xmlXPathNewFloat          (<GTKDOCLINK
-HREF="DOUBLE"
->double</GTKDOCLINK
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlXPathObjectPtr of type double and of value <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-></P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN13327"
 ></A
 ><P
@@ -4370,7 +4087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * value</TD
 ></TR
 ><TR
 ><TD
@@ -4385,7 +4102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4400,9 +4117,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEWBOOLEAN"
+NAME="XMLXPATHNEWCSTRING"
 ></A
->xmlXPathNewBoolean ()</H3
+>xmlXPathNewCString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4415,12 +4132,12 @@
 ><A
 HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
-> xmlXPathNewBoolean        (int val);</PRE
+> xmlXPathNewCString        (const char *val);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Create a new xmlXPathObjectPtr of type boolean and of value <TT
+>Create a new xmlXPathObjectPtr of type string and of value <TT
 CLASS="PARAMETER"
 ><I
 >val</I
@@ -4458,7 +4175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char * value</TD
 ></TR
 ><TR
 ><TD
@@ -4473,7 +4190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4488,6 +4205,359 @@
 ></A
 ><H3
 ><A
+NAME="XMLXPATHWRAPSTRING"
+></A
+>xmlXPathWrapString ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathWrapString        (<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Wraps the <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+> string into an XPath object.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13370"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the xmlChar * value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13383"
+></A
+><H3
+><A
+NAME="XMLXPATHWRAPCSTRING"
+></A
+>xmlXPathWrapCString ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathWrapCString       (char *val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Wraps a string into an XPath object.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13390"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the char * value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13403"
+></A
+><H3
+><A
+NAME="XMLXPATHNEWFLOAT"
+></A
+>xmlXPathNewFloat ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathNewFloat          (<GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type double and of value <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13412"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the double value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13425"
+></A
+><H3
+><A
+NAME="XMLXPATHNEWBOOLEAN"
+></A
+>xmlXPathNewBoolean ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathNewBoolean        (int val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathObjectPtr of type boolean and of value <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13433"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the boolean value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13446"
+></A
+><H3
+><A
 NAME="XMLXPATHNEWNODESET"
 ></A
 >xmlXPathNewNodeSet ()</H3
@@ -4523,7 +4593,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13370"
+NAME="AEN13455"
 ></A
 ><P
 ></P
@@ -4550,7 +4620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the NodePtr value</TD
 ></TR
 ><TR
 ><TD
@@ -4565,7 +4635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4576,7 +4646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13383"
+NAME="AEN13468"
 ></A
 ><H3
 ><A
@@ -4615,7 +4685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13392"
+NAME="AEN13477"
 ></A
 ><P
 ></P
@@ -4642,7 +4712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the NodePtr value</TD
 ></TR
 ><TR
 ><TD
@@ -4657,7 +4727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4668,7 +4738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13405"
+NAME="AEN13490"
 ></A
 ><H3
 ><A
@@ -4702,7 +4772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13413"
+NAME="AEN13498"
 ></A
 ><P
 ></P
@@ -4729,7 +4799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial node set</TD
 ></TR
 ><TR
 ><TD
@@ -4746,7 +4816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a new xmlNodePtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4757,7 +4827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13426"
+NAME="AEN13511"
 ></A
 ><H3
 ><A
@@ -4792,7 +4862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13434"
+NAME="AEN13519"
 ></A
 ><P
 ></P
@@ -4819,7 +4889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial node set</TD
 ></TR
 ><TR
 ><TD
@@ -4836,7 +4906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a new xmlNodePtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4847,7 +4917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13447"
+NAME="AEN13532"
 ></A
 ><H3
 ><A
@@ -4877,7 +4947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13454"
+NAME="AEN13539"
 ></A
 ><P
 ></P
@@ -4904,7 +4974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4915,7 +4985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13463"
+NAME="AEN13548"
 ></A
 ><H3
 ><A
@@ -4960,7 +5030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13471"
+NAME="AEN13556"
 ></A
 ><P
 ></P
@@ -4987,7 +5057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5004,7 +5074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5015,7 +5085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13484"
+NAME="AEN13569"
 ></A
 ><H3
 ><A
@@ -5045,7 +5115,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13491"
+NAME="AEN13576"
 ></A
 ><P
 ></P
@@ -5072,7 +5142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5083,7 +5153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13500"
+NAME="AEN13585"
 ></A
 ><H3
 ><A
@@ -5114,7 +5184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13507"
+NAME="AEN13592"
 ></A
 ><P
 ></P
@@ -5141,7 +5211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5152,7 +5222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13516"
+NAME="AEN13601"
 ></A
 ><H3
 ><A
@@ -5190,7 +5260,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13526"
+NAME="AEN13611"
 ></A
 ><P
 ></P
@@ -5217,7 +5287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5232,7 +5302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5243,7 +5313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13539"
+NAME="AEN13624"
 ></A
 ><H3
 ><A
@@ -5281,7 +5351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13549"
+NAME="AEN13634"
 ></A
 ><P
 ></P
@@ -5308,7 +5378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5323,7 +5393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5334,7 +5404,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13562"
+NAME="AEN13647"
 ></A
 ><H3
 ><A
@@ -5375,7 +5445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13572"
+NAME="AEN13657"
 ></A
 ><P
 ></P
@@ -5402,7 +5472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to scan</TD
 ></TR
 ><TR
 ><TD
@@ -5417,7 +5487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the double value.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5428,7 +5498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13585"
+NAME="AEN13670"
 ></A
 ><H3
 ><A
@@ -5471,7 +5541,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13594"
+NAME="AEN13679"
 ></A
 ><P
 ></P
@@ -5498,7 +5568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5515,7 +5585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Predicate Expression evaluation result</TD
 ></TR
 ><TR
 ><TD
@@ -5541,7 +5611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13611"
+NAME="AEN13696"
 ></A
 ><H3
 ><A
@@ -5569,7 +5639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13617"
+NAME="AEN13702"
 ></A
 ><H3
 ><A
@@ -5632,7 +5702,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13626"
+NAME="AEN13711"
 ></A
 ><P
 ></P
@@ -5659,7 +5729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5676,7 +5746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5687,7 +5757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13639"
+NAME="AEN13724"
 ></A
 ><H3
 ><A
@@ -5717,7 +5787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13646"
+NAME="AEN13731"
 ></A
 ><P
 ></P
@@ -5744,7 +5814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5755,7 +5825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13655"
+NAME="AEN13740"
 ></A
 ><H3
 ><A
@@ -5793,7 +5863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13664"
+NAME="AEN13749"
 ></A
 ><P
 ></P
@@ -5846,7 +5916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13677"
+NAME="AEN13762"
 ></A
 ><H3
 ><A
@@ -5904,7 +5974,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13690"
+NAME="AEN13775"
 ></A
 ><P
 ></P
@@ -5931,7 +6001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first NodeSet or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -5948,7 +6018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second NodeSet</TD
 ></TR
 ><TR
 ><TD
@@ -5963,7 +6033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>val1 once extended or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5974,7 +6044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13707"
+NAME="AEN13792"
 ></A
 ><H3
 ><A
@@ -6008,7 +6078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13715"
+NAME="AEN13800"
 ></A
 ><P
 ></P
@@ -6035,7 +6105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial node set</TD
 ></TR
 ><TR
 ><TD
@@ -6052,7 +6122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlNodePtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6063,7 +6133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13728"
+NAME="AEN13813"
 ></A
 ><H3
 ><A
@@ -6094,7 +6164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13735"
+NAME="AEN13820"
 ></A
 ><P
 ></P
@@ -6121,7 +6191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial node set</TD
 ></TR
 ><TR
 ><TD
@@ -6138,7 +6208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the index to remove</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6149,7 +6219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13748"
+NAME="AEN13833"
 ></A
 ><H3
 ><A
@@ -6179,7 +6249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13755"
+NAME="AEN13840"
 ></A
 ><P
 ></P
@@ -6217,7 +6287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13764"
+NAME="AEN13849"
 ></A
 ><H3
 ><A
@@ -6256,7 +6326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13773"
+NAME="AEN13858"
 ></A
 ><P
 ></P
@@ -6283,7 +6353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an existing NodeSet</TD
 ></TR
 ><TR
 ><TD
@@ -6298,7 +6368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6309,7 +6379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13786"
+NAME="AEN13871"
 ></A
 ><H3
 ><A
@@ -6347,7 +6417,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13795"
+NAME="AEN13880"
 ></A
 ><P
 ></P
@@ -6374,7 +6444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the NodePtr value</TD
 ></TR
 ><TR
 ><TD
@@ -6389,7 +6459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6400,7 +6470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13808"
+NAME="AEN13893"
 ></A
 ><H3
 ><A
@@ -6439,7 +6509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13817"
+NAME="AEN13902"
 ></A
 ><P
 ></P
@@ -6477,7 +6547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13826"
+NAME="AEN13911"
 ></A
 ><H3
 ><A
@@ -6507,7 +6577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13833"
+NAME="AEN13918"
 ></A
 ><P
 ></P
@@ -6545,7 +6615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13842"
+NAME="AEN13927"
 ></A
 ><H3
 ><A
@@ -6578,7 +6648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13850"
+NAME="AEN13935"
 ></A
 ><P
 ></P
@@ -6631,7 +6701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13863"
+NAME="AEN13948"
 ></A
 ><H3
 ><A
@@ -6661,7 +6731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13870"
+NAME="AEN13955"
 ></A
 ><P
 ></P
@@ -6699,7 +6769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13879"
+NAME="AEN13964"
 ></A
 ><H3
 ><A
@@ -6739,7 +6809,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13888"
+NAME="AEN13973"
 ></A
 ><P
 ></P
@@ -6766,7 +6836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6781,7 +6851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or 1 depending on the results of the test.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6792,7 +6862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13901"
+NAME="AEN13986"
 ></A
 ><H3
 ><A
@@ -6878,7 +6948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13917"
+NAME="AEN14002"
 ></A
 ><P
 ></P
@@ -6905,7 +6975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6922,7 +6992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  less than (1) or greater than (0)</TD
 ></TR
 ><TR
 ><TD
@@ -6939,7 +7009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  is the comparison strict</TD
 ></TR
 ><TR
 ><TD
@@ -6954,7 +7024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if the comparaison succeeded, 0 if it failed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6965,7 +7035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13938"
+NAME="AEN14023"
 ></A
 ><H3
 ><A
@@ -6997,7 +7067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13945"
+NAME="AEN14030"
 ></A
 ><P
 ></P
@@ -7024,7 +7094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7035,7 +7105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13954"
+NAME="AEN14039"
 ></A
 ><H3
 ><A
@@ -7067,7 +7137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13961"
+NAME="AEN14046"
 ></A
 ><P
 ></P
@@ -7094,7 +7164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7105,7 +7175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13970"
+NAME="AEN14055"
 ></A
 ><H3
 ><A
@@ -7137,7 +7207,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13977"
+NAME="AEN14062"
 ></A
 ><P
 ></P
@@ -7164,7 +7234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7175,7 +7245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13986"
+NAME="AEN14071"
 ></A
 ><H3
 ><A
@@ -7207,7 +7277,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13993"
+NAME="AEN14078"
 ></A
 ><P
 ></P
@@ -7234,7 +7304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7245,7 +7315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14002"
+NAME="AEN14087"
 ></A
 ><H3
 ><A
@@ -7287,7 +7357,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14011"
+NAME="AEN14096"
 ></A
 ><P
 ></P
@@ -7314,7 +7384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7325,7 +7395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14020"
+NAME="AEN14105"
 ></A
 ><H3
 ><A
@@ -7367,7 +7437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14029"
+NAME="AEN14114"
 ></A
 ><P
 ></P
@@ -7394,7 +7464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7405,7 +7475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14038"
+NAME="AEN14123"
 ></A
 ><H3
 ><A
@@ -7440,7 +7510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14046"
+NAME="AEN14131"
 ></A
 ><P
 ></P
@@ -7467,7 +7537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a name string</TD
 ></TR
 ><TR
 ><TD
@@ -7482,7 +7552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7493,7 +7563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14059"
+NAME="AEN14144"
 ></A
 ><H3
 ><A
@@ -7531,7 +7601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14068"
+NAME="AEN14153"
 ></A
 ><P
 ></P
@@ -7558,7 +7628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7575,7 +7645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -7590,7 +7660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7601,7 +7671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14085"
+NAME="AEN14170"
 ></A
 ><H3
 ><A
@@ -7639,7 +7709,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14094"
+NAME="AEN14179"
 ></A
 ><P
 ></P
@@ -7666,7 +7736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7683,7 +7753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -7698,7 +7768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7709,7 +7779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14111"
+NAME="AEN14196"
 ></A
 ><H3
 ><A
@@ -7748,7 +7818,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14120"
+NAME="AEN14205"
 ></A
 ><P
 ></P
@@ -7775,7 +7845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7792,7 +7862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -7807,7 +7877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7818,7 +7888,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14137"
+NAME="AEN14222"
 ></A
 ><H3
 ><A
@@ -7859,7 +7929,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14146"
+NAME="AEN14231"
 ></A
 ><P
 ></P
@@ -7886,7 +7956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7903,7 +7973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -7918,7 +7988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7929,7 +7999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14163"
+NAME="AEN14248"
 ></A
 ><H3
 ><A
@@ -7967,7 +8037,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14172"
+NAME="AEN14257"
 ></A
 ><P
 ></P
@@ -7994,7 +8064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8011,7 +8081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8026,7 +8096,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8037,7 +8107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14189"
+NAME="AEN14274"
 ></A
 ><H3
 ><A
@@ -8078,7 +8148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14198"
+NAME="AEN14283"
 ></A
 ><P
 ></P
@@ -8105,7 +8175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8122,7 +8192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8137,7 +8207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8148,7 +8218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14215"
+NAME="AEN14300"
 ></A
 ><H3
 ><A
@@ -8187,7 +8257,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14224"
+NAME="AEN14309"
 ></A
 ><P
 ></P
@@ -8214,7 +8284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8231,7 +8301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8246,7 +8316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8257,7 +8327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14241"
+NAME="AEN14326"
 ></A
 ><H3
 ><A
@@ -8298,7 +8368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14250"
+NAME="AEN14335"
 ></A
 ><P
 ></P
@@ -8325,7 +8395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8342,7 +8412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8357,7 +8427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8368,7 +8438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14267"
+NAME="AEN14352"
 ></A
 ><H3
 ><A
@@ -8408,7 +8478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14276"
+NAME="AEN14361"
 ></A
 ><P
 ></P
@@ -8435,7 +8505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8452,7 +8522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current attribute in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8467,7 +8537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8478,7 +8548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14293"
+NAME="AEN14378"
 ></A
 ><H3
 ><A
@@ -8516,7 +8586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14302"
+NAME="AEN14387"
 ></A
 ><P
 ></P
@@ -8543,7 +8613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8560,7 +8630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current attribute in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8575,7 +8645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8586,7 +8656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14319"
+NAME="AEN14404"
 ></A
 ><H3
 ><A
@@ -8627,7 +8697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14328"
+NAME="AEN14413"
 ></A
 ><P
 ></P
@@ -8654,7 +8724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8671,7 +8741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8686,7 +8756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8697,7 +8767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14345"
+NAME="AEN14430"
 ></A
 ><H3
 ><A
@@ -8739,7 +8809,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14354"
+NAME="AEN14439"
 ></A
 ><P
 ></P
@@ -8766,7 +8836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8783,7 +8853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8798,7 +8868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8809,7 +8879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14371"
+NAME="AEN14456"
 ></A
 ><H3
 ><A
@@ -8849,7 +8919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14380"
+NAME="AEN14465"
 ></A
 ><P
 ></P
@@ -8876,7 +8946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8893,7 +8963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -8908,7 +8978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the next element following that axis</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8919,7 +8989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14397"
+NAME="AEN14482"
 ></A
 ><H3
 ><A
@@ -8958,7 +9028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14406"
+NAME="AEN14491"
 ></A
 ><P
 ></P
@@ -8985,7 +9055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9002,7 +9072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9013,7 +9083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14419"
+NAME="AEN14504"
 ></A
 ><H3
 ><A
@@ -9057,7 +9127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14429"
+NAME="AEN14514"
 ></A
 ><P
 ></P
@@ -9084,7 +9154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9101,7 +9171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9112,7 +9182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14442"
+NAME="AEN14527"
 ></A
 ><H3
 ><A
@@ -9147,7 +9217,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14450"
+NAME="AEN14535"
 ></A
 ><P
 ></P
@@ -9174,7 +9244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9191,7 +9261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9202,7 +9272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14463"
+NAME="AEN14548"
 ></A
 ><H3
 ><A
@@ -9242,7 +9312,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14471"
+NAME="AEN14556"
 ></A
 ><P
 ></P
@@ -9269,7 +9339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9286,7 +9356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9297,7 +9367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14484"
+NAME="AEN14569"
 ></A
 ><H3
 ><A
@@ -9338,7 +9408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14492"
+NAME="AEN14577"
 ></A
 ><P
 ></P
@@ -9365,7 +9435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9382,7 +9452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9393,7 +9463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14505"
+NAME="AEN14590"
 ></A
 ><H3
 ><A
@@ -9432,7 +9502,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14513"
+NAME="AEN14598"
 ></A
 ><P
 ></P
@@ -9459,7 +9529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9476,7 +9546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9487,7 +9557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14526"
+NAME="AEN14611"
 ></A
 ><H3
 ><A
@@ -9523,7 +9593,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14534"
+NAME="AEN14619"
 ></A
 ><P
 ></P
@@ -9550,7 +9620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9567,7 +9637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9578,7 +9648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14547"
+NAME="AEN14632"
 ></A
 ><H3
 ><A
@@ -9615,7 +9685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14555"
+NAME="AEN14640"
 ></A
 ><P
 ></P
@@ -9642,7 +9712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9659,7 +9729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9670,7 +9740,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14568"
+NAME="AEN14653"
 ></A
 ><H3
 ><A
@@ -9707,7 +9777,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14576"
+NAME="AEN14661"
 ></A
 ><P
 ></P
@@ -9734,7 +9804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9751,7 +9821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9762,7 +9832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14589"
+NAME="AEN14674"
 ></A
 ><H3
 ><A
@@ -9817,7 +9887,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14597"
+NAME="AEN14682"
 ></A
 ><P
 ></P
@@ -9844,7 +9914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9861,7 +9931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9872,7 +9942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14610"
+NAME="AEN14695"
 ></A
 ><H3
 ><A
@@ -9912,7 +9982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14618"
+NAME="AEN14703"
 ></A
 ><P
 ></P
@@ -9939,7 +10009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9956,7 +10026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9967,7 +10037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14631"
+NAME="AEN14716"
 ></A
 ><H3
 ><A
@@ -10008,7 +10078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14639"
+NAME="AEN14724"
 ></A
 ><P
 ></P
@@ -10035,7 +10105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10052,7 +10122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10063,7 +10133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14652"
+NAME="AEN14737"
 ></A
 ><H3
 ><A
@@ -10104,7 +10174,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14660"
+NAME="AEN14745"
 ></A
 ><P
 ></P
@@ -10131,7 +10201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10148,7 +10218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10159,7 +10229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14673"
+NAME="AEN14758"
 ></A
 ><H3
 ><A
@@ -10203,7 +10273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14681"
+NAME="AEN14766"
 ></A
 ><P
 ></P
@@ -10230,7 +10300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10247,7 +10317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10258,7 +10328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14694"
+NAME="AEN14779"
 ></A
 ><H3
 ><A
@@ -10295,7 +10365,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14702"
+NAME="AEN14787"
 ></A
 ><P
 ></P
@@ -10322,7 +10392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10339,7 +10409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10350,7 +10420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14715"
+NAME="AEN14800"
 ></A
 ><H3
 ><A
@@ -10388,7 +10458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14724"
+NAME="AEN14809"
 ></A
 ><P
 ></P
@@ -10415,7 +10485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10432,7 +10502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10443,7 +10513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14737"
+NAME="AEN14822"
 ></A
 ><H3
 ><A
@@ -10481,7 +10551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14746"
+NAME="AEN14831"
 ></A
 ><P
 ></P
@@ -10508,7 +10578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10525,7 +10595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10536,7 +10606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14759"
+NAME="AEN14844"
 ></A
 ><H3
 ><A
@@ -10579,7 +10649,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14767"
+NAME="AEN14852"
 ></A
 ><P
 ></P
@@ -10606,7 +10676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10623,7 +10693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10634,7 +10704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14780"
+NAME="AEN14865"
 ></A
 ><H3
 ><A
@@ -10669,7 +10739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14788"
+NAME="AEN14873"
 ></A
 ><P
 ></P
@@ -10696,7 +10766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10713,7 +10783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10724,7 +10794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14801"
+NAME="AEN14886"
 ></A
 ><H3
 ><A
@@ -10761,7 +10831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14809"
+NAME="AEN14894"
 ></A
 ><P
 ></P
@@ -10788,7 +10858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10805,7 +10875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10816,7 +10886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14822"
+NAME="AEN14907"
 ></A
 ><H3
 ><A
@@ -10853,7 +10923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14830"
+NAME="AEN14915"
 ></A
 ><P
 ></P
@@ -10880,7 +10950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10897,7 +10967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10908,7 +10978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14843"
+NAME="AEN14928"
 ></A
 ><H3
 ><A
@@ -10945,7 +11015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14851"
+NAME="AEN14936"
 ></A
 ><P
 ></P
@@ -10972,7 +11042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10989,7 +11059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11000,7 +11070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14864"
+NAME="AEN14949"
 ></A
 ><H3
 ><A
@@ -11038,7 +11108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14872"
+NAME="AEN14957"
 ></A
 ><P
 ></P
@@ -11065,7 +11135,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11082,7 +11152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11093,7 +11163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14885"
+NAME="AEN14970"
 ></A
 ><H3
 ><A
@@ -11133,7 +11203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14893"
+NAME="AEN14978"
 ></A
 ><P
 ></P
@@ -11160,7 +11230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -11177,7 +11247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of arguments</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index 5d5d6f7..a67aea0 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14911"
+NAME="AEN14996"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14914"
+NAME="AEN14999"
 ></A
 ><H2
 >Synopsis</H2
@@ -410,7 +410,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14989"
+NAME="AEN15074"
 ></A
 ><H2
 >Description</H2
@@ -420,14 +420,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14992"
+NAME="AEN15077"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14994"
+NAME="AEN15079"
 ></A
 ><H3
 ><A
@@ -457,20 +457,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14999"
+NAME="AEN15084"
 ></A
 ><H3
 ><A
 NAME="XMLLOCATIONSETPTR"
 ></A
 >xmlLocationSetPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlLocationSet *xmlLocationSetPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15003"
+NAME="AEN15089"
 ></A
 ><H3
 ><A
@@ -508,7 +521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15012"
+NAME="AEN15098"
 ></A
 ><P
 ></P
@@ -535,7 +548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an initial xmlXPathObjectPtr, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -550,7 +563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -561,7 +574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15025"
+NAME="AEN15111"
 ></A
 ><H3
 ><A
@@ -591,7 +604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15032"
+NAME="AEN15118"
 ></A
 ><P
 ></P
@@ -618,7 +631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlLocationSetPtr to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -629,7 +642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15041"
+NAME="AEN15127"
 ></A
 ><H3
 ><A
@@ -676,7 +689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15052"
+NAME="AEN15138"
 ></A
 ><P
 ></P
@@ -703,7 +716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first LocationSet</TD
 ></TR
 ><TR
 ><TD
@@ -720,7 +733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second LocationSet</TD
 ></TR
 ><TR
 ><TD
@@ -735,7 +748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>val1 once extended or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -746,7 +759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15069"
+NAME="AEN15155"
 ></A
 ><H3
 ><A
@@ -785,7 +798,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15078"
+NAME="AEN15164"
 ></A
 ><P
 ></P
@@ -812,7 +825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting node</TD
 ></TR
 ><TR
 ><TD
@@ -829,7 +842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the start index</TD
 ></TR
 ><TR
 ><TD
@@ -846,7 +859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending point</TD
 ></TR
 ><TR
 ><TD
@@ -863,7 +876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending index</TD
 ></TR
 ><TR
 ><TD
@@ -878,7 +891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -889,7 +902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15103"
+NAME="AEN15189"
 ></A
 ><H3
 ><A
@@ -926,7 +939,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15112"
+NAME="AEN15198"
 ></A
 ><P
 ></P
@@ -953,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting point</TD
 ></TR
 ><TR
 ><TD
@@ -970,7 +983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending point</TD
 ></TR
 ><TR
 ><TD
@@ -985,7 +998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -996,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15129"
+NAME="AEN15215"
 ></A
 ><H3
 ><A
@@ -1033,7 +1046,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15138"
+NAME="AEN15224"
 ></A
 ><P
 ></P
@@ -1060,7 +1073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting node</TD
 ></TR
 ><TR
 ><TD
@@ -1077,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending point</TD
 ></TR
 ><TR
 ><TD
@@ -1092,7 +1105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1103,7 +1116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15155"
+NAME="AEN15241"
 ></A
 ><H3
 ><A
@@ -1140,7 +1153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15164"
+NAME="AEN15250"
 ></A
 ><P
 ></P
@@ -1167,7 +1180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting point</TD
 ></TR
 ><TR
 ><TD
@@ -1184,7 +1197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending node</TD
 ></TR
 ><TR
 ><TD
@@ -1199,7 +1212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1210,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15181"
+NAME="AEN15267"
 ></A
 ><H3
 ><A
@@ -1247,7 +1260,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15190"
+NAME="AEN15276"
 ></A
 ><P
 ></P
@@ -1274,7 +1287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting node</TD
 ></TR
 ><TR
 ><TD
@@ -1291,7 +1304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending node</TD
 ></TR
 ><TR
 ><TD
@@ -1306,7 +1319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1317,7 +1330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15207"
+NAME="AEN15293"
 ></A
 ><H3
 ><A
@@ -1366,7 +1379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15218"
+NAME="AEN15304"
 ></A
 ><P
 ></P
@@ -1393,7 +1406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the start NodePtr value</TD
 ></TR
 ><TR
 ><TD
@@ -1410,7 +1423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the end NodePtr value or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1425,7 +1438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1436,7 +1449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15235"
+NAME="AEN15321"
 ></A
 ><H3
 ><A
@@ -1476,7 +1489,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15244"
+NAME="AEN15330"
 ></A
 ><P
 ></P
@@ -1503,7 +1516,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node set</TD
 ></TR
 ><TR
 ><TD
@@ -1518,7 +1531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1529,7 +1542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15257"
+NAME="AEN15343"
 ></A
 ><H3
 ><A
@@ -1566,7 +1579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15266"
+NAME="AEN15352"
 ></A
 ><P
 ></P
@@ -1593,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting node</TD
 ></TR
 ><TR
 ><TD
@@ -1610,7 +1623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ending object</TD
 ></TR
 ><TR
 ><TD
@@ -1625,7 +1638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1636,7 +1649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15283"
+NAME="AEN15369"
 ></A
 ><H3
 ><A
@@ -1669,7 +1682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15291"
+NAME="AEN15377"
 ></A
 ><P
 ></P
@@ -1696,7 +1709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the starting and ending node</TD
 ></TR
 ><TR
 ><TD
@@ -1711,7 +1724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1722,7 +1735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15304"
+NAME="AEN15390"
 ></A
 ><H3
 ><A
@@ -1762,7 +1775,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15313"
+NAME="AEN15399"
 ></A
 ><P
 ></P
@@ -1789,7 +1802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial range set</TD
 ></TR
 ><TR
 ><TD
@@ -1806,7 +1819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a new xmlXPathObjectPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1817,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15326"
+NAME="AEN15412"
 ></A
 ><H3
 ><A
@@ -1855,7 +1868,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15335"
+NAME="AEN15421"
 ></A
 ><P
 ></P
@@ -1882,7 +1895,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the LocationSet value</TD
 ></TR
 ><TR
 ><TD
@@ -1897,7 +1910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1908,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15348"
+NAME="AEN15434"
 ></A
 ><H3
 ><A
@@ -1942,7 +1955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15356"
+NAME="AEN15442"
 ></A
 ><P
 ></P
@@ -1969,7 +1982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial range set</TD
 ></TR
 ><TR
 ><TD
@@ -1986,7 +1999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlXPathObjectPtr</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1997,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15369"
+NAME="AEN15455"
 ></A
 ><H3
 ><A
@@ -2028,7 +2041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15376"
+NAME="AEN15462"
 ></A
 ><P
 ></P
@@ -2055,7 +2068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial range set</TD
 ></TR
 ><TR
 ><TD
@@ -2072,7 +2085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the index to remove</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2083,7 +2096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15389"
+NAME="AEN15475"
 ></A
 ><H3
 ><A
@@ -2124,7 +2137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15399"
+NAME="AEN15485"
 ></A
 ><P
 ></P
@@ -2151,7 +2164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML document</TD
 ></TR
 ><TR
 ><TD
@@ -2168,7 +2181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node that directly contains the XPointer being evaluated or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2185,7 +2198,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element from which a user or program initiated traversal of
+the link, or NULL.</TD
 ></TR
 ><TR
 ><TD
@@ -2200,7 +2214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathContext just allocated.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2211,7 +2225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15420"
+NAME="AEN15506"
 ></A
 ><H3
 ><A
@@ -2248,7 +2262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15429"
+NAME="AEN15515"
 ></A
 ><P
 ></P
@@ -2275,7 +2289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPointer expression</TD
 ></TR
 ><TR
 ><TD
@@ -2292,7 +2306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPointer context</TD
 ></TR
 ><TR
 ><TD
@@ -2307,7 +2321,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2318,7 +2333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15446"
+NAME="AEN15532"
 ></A
 ><H3
 ><A
@@ -2352,7 +2367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15454"
+NAME="AEN15540"
 ></A
 ><P
 ></P
@@ -2379,7 +2394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPointer Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2396,7 +2411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of args</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2407,7 +2422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15467"
+NAME="AEN15553"
 ></A
 ><H3
 ><A
@@ -2441,7 +2456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15475"
+NAME="AEN15561"
 ></A
 ><P
 ></P
@@ -2468,7 +2483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPointer result from the evaluation.</TD
 ></TR
 ><TR
 ><TD
@@ -2483,7 +2498,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an xmlNodePtr list or NULL.
+the caller has to free the node tree.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2494,7 +2510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15488"
+NAME="AEN15574"
 ></A
 ><H3
 ><A
@@ -2531,7 +2547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15497"
+NAME="AEN15583"
 ></A
 ><P
 ></P
@@ -2558,7 +2574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPointer Parser context</TD
 ></TR
 ></TBODY
 ></TABLE