diff --git a/doc/FAQ.html b/doc/FAQ.html
index f6cf9ab..48217e6 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -267,7 +267,7 @@
   <li>etc ...</li>
 </ol>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
 <p>$Id$</p>
 </body>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7feec35..58d2a90 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,9 +17,6 @@
 # html_DATA = gnome-dev-info.html
 
 scan:
-	@(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
-	@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/include ; fi)
-	@(if [ -L $(DOC_SOURCE_DIR)/include/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/include/libxml ; fi)
 	gtkdoc-scan --module=libxml --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
 
 templates: scan
diff --git a/doc/encoding.html b/doc/encoding.html
index d79a0b8..24573e3 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -281,7 +281,7 @@
 libxml-2.0.0, but a lot of features and corrections are really available only
 starting 2.2.</p>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
 <p>$Id$</p>
 </body>
diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml
index 07123c2..a89de42 100644
--- a/doc/gnome-xml.sgml
+++ b/doc/gnome-xml.sgml
@@ -32,7 +32,7 @@
         <surname>Veillard</surname>
         <affiliation>
 	  <address>
-	    <email>Daniel.Veillard@w3.org</email>
+	    <email>daniel@veillard.com</email>
 	  </address>
         </affiliation>
       </author>
diff --git a/doc/html/book1.html b/doc/html/book1.html
index 998ee9c..17db177 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -54,7 +54,7 @@
 CLASS="ADDRESS"
 ><P
 CLASS="ADDRESS"
->	&nbsp;&nbsp;&nbsp;&nbsp;Daniel.Veillard@w3.org<br>
+>	&nbsp;&nbsp;&nbsp;&nbsp;daniel@veillard.com<br>
 	&nbsp;&nbsp;</P
 ></DIV
 ></DIV
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index d5bbcf1..80bba16 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -757,6 +757,7 @@
 <ANCHOR id ="XMLNODEDUMPOUTPUT" href="libxml/libxml-xmlio.html#XMLNODEDUMPOUTPUT">
 <ANCHOR id ="HTMLDOCCONTENTDUMPOUTPUT" href="libxml/libxml-xmlio.html#HTMLDOCCONTENTDUMPOUTPUT">
 <ANCHOR id ="LIBXML-CATALOG" href="libxml/libxml-catalog.html">
+<ANCHOR id ="XML-CATALOGS-NAMESPACE-CAPS" href="libxml/libxml-catalog.html#XML-CATALOGS-NAMESPACE-CAPS">
 <ANCHOR id ="XMLLOADCATALOG" href="libxml/libxml-catalog.html#XMLLOADCATALOG">
 <ANCHOR id ="XMLLOADCATALOGS" href="libxml/libxml-catalog.html#XMLLOADCATALOGS">
 <ANCHOR id ="XMLCATALOGCLEANUP" href="libxml/libxml-catalog.html#XMLCATALOGCLEANUP">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index b10cab7..57e010c 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17467"
+NAME="AEN17394"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17470"
+NAME="AEN17397"
 ></A
 ><H2
 >Synopsis</H2
@@ -145,6 +145,10 @@
 CLASS="SYNOPSIS"
 >&#13;
 
+#define     <A
+HREF="libxml-catalog.html#XML-CATALOGS-NAMESPACE-CAPS"
+>XML_CATALOGS_NAMESPACE</A
+>
 int         <A
 HREF="libxml-catalog.html#XMLLOADCATALOG"
 >xmlLoadCatalog</A
@@ -191,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17484"
+NAME="AEN17412"
 ></A
 ><H2
 >Description</H2
@@ -201,14 +205,42 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17487"
+NAME="AEN17415"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17489"
+NAME="AEN17417"
+></A
+><H3
+><A
+NAME="XML-CATALOGS-NAMESPACE-CAPS"
+></A
+>XML_CATALOGS_NAMESPACE</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XML_CATALOGS_NAMESPACE</PRE
+></TD
+></TR
+></TABLE
+><P
+>The namespace for the XML Catalogs elements</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN17423"
 ></A
 ><H3
 ><A
@@ -233,7 +265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17494"
+NAME="AEN17428"
 ></A
 ><P
 ></P
@@ -286,7 +318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17507"
+NAME="AEN17441"
 ></A
 ><H3
 ><A
@@ -311,7 +343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17512"
+NAME="AEN17446"
 ></A
 ><P
 ></P
@@ -349,7 +381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17521"
+NAME="AEN17455"
 ></A
 ><H3
 ><A
@@ -377,7 +409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17527"
+NAME="AEN17461"
 ></A
 ><H3
 ><A
@@ -407,7 +439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17534"
+NAME="AEN17468"
 ></A
 ><P
 ></P
@@ -434,7 +466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -445,7 +477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17543"
+NAME="AEN17477"
 ></A
 ><H3
 ><A
@@ -478,7 +510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17551"
+NAME="AEN17485"
 ></A
 ><P
 ></P
@@ -505,7 +537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -520,7 +552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resource name if found or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -531,7 +563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17564"
+NAME="AEN17498"
 ></A
 ><H3
 ><A
@@ -564,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17572"
+NAME="AEN17506"
 ></A
 ><P
 ></P
@@ -591,7 +623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -606,7 +638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index a20dabc..9cdf315 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21520"
+NAME="AEN21422"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21523"
+NAME="AEN21425"
 ></A
 ><H2
 >Synopsis</H2
@@ -322,7 +322,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21570"
+NAME="AEN21472"
 ></A
 ><H2
 >Description</H2
@@ -332,14 +332,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21573"
+NAME="AEN21475"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21575"
+NAME="AEN21477"
 ></A
 ><H3
 ><A
@@ -371,7 +371,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21582"
+NAME="AEN21484"
 ></A
 ><P
 ></P
@@ -426,7 +426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21595"
+NAME="AEN21497"
 ></A
 ><H3
 ><A
@@ -459,7 +459,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21602"
+NAME="AEN21504"
 ></A
 ><P
 ></P
@@ -531,7 +531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21619"
+NAME="AEN21521"
 ></A
 ><H3
 ><A
@@ -564,7 +564,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21626"
+NAME="AEN21528"
 ></A
 ><P
 ></P
@@ -636,7 +636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21643"
+NAME="AEN21545"
 ></A
 ><H3
 ><A
@@ -669,7 +669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21650"
+NAME="AEN21552"
 ></A
 ><P
 ></P
@@ -741,7 +741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21667"
+NAME="AEN21569"
 ></A
 ><H3
 ><A
@@ -774,7 +774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21674"
+NAME="AEN21576"
 ></A
 ><P
 ></P
@@ -846,7 +846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21691"
+NAME="AEN21593"
 ></A
 ><H3
 ><A
@@ -879,7 +879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21698"
+NAME="AEN21600"
 ></A
 ><P
 ></P
@@ -951,7 +951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21715"
+NAME="AEN21617"
 ></A
 ><H3
 ><A
@@ -983,7 +983,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21722"
+NAME="AEN21624"
 ></A
 ><P
 ></P
@@ -1038,7 +1038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21735"
+NAME="AEN21637"
 ></A
 ><H3
 ><A
@@ -1070,7 +1070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21742"
+NAME="AEN21644"
 ></A
 ><P
 ></P
@@ -1125,7 +1125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21755"
+NAME="AEN21657"
 ></A
 ><H3
 ><A
@@ -1157,7 +1157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21762"
+NAME="AEN21664"
 ></A
 ><P
 ></P
@@ -1212,7 +1212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21775"
+NAME="AEN21677"
 ></A
 ><H3
 ><A
@@ -1244,7 +1244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21782"
+NAME="AEN21684"
 ></A
 ><P
 ></P
@@ -1299,7 +1299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21795"
+NAME="AEN21697"
 ></A
 ><H3
 ><A
@@ -1331,7 +1331,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21802"
+NAME="AEN21704"
 ></A
 ><P
 ></P
@@ -1386,7 +1386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21815"
+NAME="AEN21717"
 ></A
 ><H3
 ><A
@@ -1413,7 +1413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21821"
+NAME="AEN21723"
 ></A
 ><P
 ></P
@@ -1440,7 +1440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string prompt</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1455,7 +1455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string which will be freed by the Shell</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1466,7 +1466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21834"
+NAME="AEN21736"
 ></A
 ><H3
 ><A
@@ -1503,33 +1503,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21840"
+NAME="AEN21742"
 ></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="AEN21845"
+NAME="AEN21746"
 ></A
 ><H3
 ><A
@@ -1568,7 +1555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21854"
+NAME="AEN21755"
 ></A
 ><P
 ></P
@@ -1595,7 +1582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1612,7 +1599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string argument</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1629,7 +1616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a first node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1646,7 +1633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a second node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1661,7 +1648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int, negative returns indicating errors</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1672,7 +1659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21879"
+NAME="AEN21780"
 ></A
 ><H3
 ><A
@@ -1713,7 +1700,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21888"
+NAME="AEN21789"
 ></A
 ><P
 ></P
@@ -1740,7 +1727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1757,7 +1744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1774,7 +1761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line reading function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1791,7 +1778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output FILE*</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index edf23d8..4e58be5 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17590"
+NAME="AEN17524"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17593"
+NAME="AEN17527"
 ></A
 ><H2
 >Synopsis</H2
@@ -294,7 +294,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17630"
+NAME="AEN17564"
 ></A
 ><H2
 >Description</H2
@@ -304,248 +304,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17633"
+NAME="AEN17567"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17635"
+NAME="AEN17569"
 ></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="AEN17640"
+NAME="AEN17573"
 ></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="AEN17645"
+NAME="AEN17577"
 ></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="AEN17650"
+NAME="AEN17581"
 ></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="AEN17655"
+NAME="AEN17585"
 ></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="AEN17660"
+NAME="AEN17589"
 ></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="AEN17665"
+NAME="AEN17593"
 ></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="AEN17670"
+NAME="AEN17597"
 ></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="AEN17675"
+NAME="AEN17601"
 ></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="AEN17680"
+NAME="AEN17605"
 ></A
 ><H3
 ><A
@@ -577,7 +460,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17686"
+NAME="AEN17611"
 ></A
 ><P
 ></P
@@ -604,7 +487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -621,12 +504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -643,7 +521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -660,12 +538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -682,7 +555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the quote character to escape (' or ") or zero.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -697,20 +570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -721,7 +581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17719"
+NAME="AEN17640"
 ></A
 ><H3
 ><A
@@ -762,7 +622,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17728"
+NAME="AEN17649"
 ></A
 ><P
 ></P
@@ -789,7 +649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -806,7 +666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the SGML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -823,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -840,7 +700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -855,7 +715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -866,7 +726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17753"
+NAME="AEN17674"
 ></A
 ><H3
 ><A
@@ -900,7 +760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17761"
+NAME="AEN17682"
 ></A
 ><P
 ></P
@@ -927,7 +787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -944,7 +804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the SGML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -959,7 +819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -970,7 +830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17778"
+NAME="AEN17699"
 ></A
 ><H3
 ><A
@@ -1009,7 +869,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17786"
+NAME="AEN17707"
 ></A
 ><P
 ></P
@@ -1036,7 +896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1053,7 +913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the SGML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1070,7 +930,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1087,7 +947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1102,7 +962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1113,7 +973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17811"
+NAME="AEN17732"
 ></A
 ><H3
 ><A
@@ -1146,7 +1006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17818"
+NAME="AEN17739"
 ></A
 ><P
 ></P
@@ -1173,7 +1033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1190,7 +1050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1205,7 +1065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1216,7 +1076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17835"
+NAME="AEN17756"
 ></A
 ><H3
 ><A
@@ -1247,7 +1107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17842"
+NAME="AEN17763"
 ></A
 ><P
 ></P
@@ -1274,7 +1134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an SGML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1285,7 +1145,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17851"
+NAME="AEN17772"
 ></A
 ><H3
 ><A
@@ -1339,7 +1199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17862"
+NAME="AEN17783"
 ></A
 ><P
 ></P
@@ -1366,7 +1226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1383,7 +1243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1400,7 +1260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1417,7 +1277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1434,7 +1294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1451,7 +1311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1466,7 +1326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1477,7 +1337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17895"
+NAME="AEN17816"
 ></A
 ><H3
 ><A
@@ -1510,7 +1370,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17902"
+NAME="AEN17823"
 ></A
 ><P
 ></P
@@ -1537,7 +1397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1554,7 +1414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1571,7 +1431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1588,7 +1448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1603,7 +1463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1614,7 +1474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17927"
+NAME="AEN17848"
 ></A
 ><H3
 ><A
@@ -1647,7 +1507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17934"
+NAME="AEN17855"
 ></A
 ><P
 ></P
@@ -1674,7 +1534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1691,7 +1551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SGML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1706,7 +1566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1717,7 +1577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17951"
+NAME="AEN17872"
 ></A
 ><H3
 ><A
@@ -1748,7 +1608,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17958"
+NAME="AEN17879"
 ></A
 ><P
 ></P
@@ -1775,7 +1635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an SGML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1790,8 +1650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 4d058ca..87fb099 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20802"
+NAME="AEN20723"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20805"
+NAME="AEN20726"
 ></A
 ><H2
 >Synopsis</H2
@@ -381,7 +381,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20865"
+NAME="AEN20786"
 ></A
 ><H2
 >Description</H2
@@ -391,14 +391,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20868"
+NAME="AEN20789"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20870"
+NAME="AEN20791"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20877"
+NAME="AEN20798"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20883"
+NAME="AEN20804"
 ></A
 ><P
 ></P
@@ -522,7 +522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of bytes to store the UTF-8 result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -539,12 +539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lenght of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -561,7 +556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of chars in the original encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -578,12 +573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lenght of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -598,21 +588,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -623,7 +599,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20912"
+NAME="AEN20829"
 ></A
 ><H3
 ><A
@@ -656,7 +632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20918"
+NAME="AEN20835"
 ></A
 ><P
 ></P
@@ -683,7 +659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -700,12 +676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lenght of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -722,7 +693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer ot an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -739,12 +710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lenght of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -759,21 +725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -784,7 +736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20947"
+NAME="AEN20860"
 ></A
 ><H3
 ><A
@@ -818,33 +770,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20952"
+NAME="AEN20865"
 ></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="AEN20957"
+NAME="AEN20869"
 ></A
 ><H3
 ><A
@@ -875,7 +814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20963"
+NAME="AEN20875"
 ></A
 ><H3
 ><A
@@ -904,7 +843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20969"
+NAME="AEN20881"
 ></A
 ><H3
 ><A
@@ -934,7 +873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20976"
+NAME="AEN20888"
 ></A
 ><P
 ></P
@@ -961,7 +900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingHandlerPtr handler block</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -972,7 +911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20985"
+NAME="AEN20897"
 ></A
 ><H3
 ><A
@@ -1006,7 +945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20993"
+NAME="AEN20905"
 ></A
 ><P
 ></P
@@ -1033,7 +972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string describing the char encoding.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1048,7 +987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the handler or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1059,7 +998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21006"
+NAME="AEN20918"
 ></A
 ><H3
 ><A
@@ -1088,7 +1027,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21012"
+NAME="AEN20924"
 ></A
 ><P
 ></P
@@ -1141,7 +1080,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21025"
+NAME="AEN20937"
 ></A
 ><H3
 ><A
@@ -1180,7 +1119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21033"
+NAME="AEN20945"
 ></A
 ><P
 ></P
@@ -1207,7 +1146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1224,7 +1163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1239,7 +1178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1250,7 +1189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21050"
+NAME="AEN20962"
 ></A
 ><H3
 ><A
@@ -1282,7 +1221,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21057"
+NAME="AEN20969"
 ></A
 ><P
 ></P
@@ -1309,7 +1248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1324,7 +1263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1335,7 +1274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21070"
+NAME="AEN20982"
 ></A
 ><H3
 ><A
@@ -1362,7 +1301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21076"
+NAME="AEN20988"
 ></A
 ><P
 ></P
@@ -1389,7 +1328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1404,7 +1343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found the original name otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1415,7 +1354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21089"
+NAME="AEN21001"
 ></A
 ><H3
 ><A
@@ -1443,7 +1382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21095"
+NAME="AEN21007"
 ></A
 ><H3
 ><A
@@ -1475,7 +1414,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21102"
+NAME="AEN21014"
 ></A
 ><P
 ></P
@@ -1502,7 +1441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1517,8 +1456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE
-if not recognized.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1529,7 +1467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21115"
+NAME="AEN21027"
 ></A
 ><H3
 ><A
@@ -1564,7 +1502,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21123"
+NAME="AEN21035"
 ></A
 ><P
 ></P
@@ -1591,7 +1529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1606,7 +1544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the canonical name for the given encoding</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1617,7 +1555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21136"
+NAME="AEN21048"
 ></A
 ><H3
 ><A
@@ -1649,7 +1587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21143"
+NAME="AEN21055"
 ></A
 ><P
 ></P
@@ -1676,8 +1614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the first bytes of the XML entity, must be at least
-4 bytes long.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1694,7 +1631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1709,7 +1646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1720,7 +1657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21160"
+NAME="AEN21072"
 ></A
 ><H3
 ><A
@@ -1768,7 +1705,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21170"
+NAME="AEN21082"
 ></A
 ><P
 ></P
@@ -1795,7 +1732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1812,7 +1749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1829,7 +1766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1844,10 +1781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1858,7 +1792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21191"
+NAME="AEN21103"
 ></A
 ><H3
 ><A
@@ -1896,7 +1830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21200"
+NAME="AEN21112"
 ></A
 ><P
 ></P
@@ -1923,7 +1857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1940,7 +1874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1957,7 +1891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1972,10 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1986,7 +1917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21221"
+NAME="AEN21133"
 ></A
 ><H3
 ><A
@@ -2025,7 +1956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21230"
+NAME="AEN21142"
 ></A
 ><P
 ></P
@@ -2052,7 +1983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2069,7 +2000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2086,7 +2017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2101,10 +2032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written if success, or 
--1 general error
--2 if the transcoding fails (for *in is not valid utf8 string or
-the result of transformation can't fit into the encoding we want), or</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2115,7 +2043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21251"
+NAME="AEN21163"
 ></A
 ><H3
 ><A
@@ -2145,7 +2073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21258"
+NAME="AEN21170"
 ></A
 ><P
 ></P
@@ -2172,7 +2100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2187,7 +2115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2198,7 +2126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21271"
+NAME="AEN21183"
 ></A
 ><H3
 ><A
@@ -2229,7 +2157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21277"
+NAME="AEN21189"
 ></A
 ><P
 ></P
@@ -2256,7 +2184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2273,12 +2201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2295,7 +2218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2312,12 +2235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2332,20 +2250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2356,7 +2261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21306"
+NAME="AEN21214"
 ></A
 ><H3
 ><A
@@ -2387,7 +2292,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21312"
+NAME="AEN21220"
 ></A
 ><P
 ></P
@@ -2414,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2431,12 +2336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2453,7 +2353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of ISO Latin 1 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2470,12 +2370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2490,20 +2385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2514,7 +2396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21341"
+NAME="AEN21245"
 ></A
 ><H3
 ><A
@@ -2556,7 +2438,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21349"
+NAME="AEN21253"
 ></A
 ><P
 ></P
@@ -2583,7 +2465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> Pointer to putative utf-8 encoded string.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2598,12 +2480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> true if <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is valid.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2614,7 +2491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21363"
+NAME="AEN21266"
 ></A
 ><H3
 ><A
@@ -2645,7 +2522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21370"
+NAME="AEN21273"
 ></A
 ><P
 ></P
@@ -2672,7 +2549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2689,7 +2566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of characters in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2704,8 +2581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the storage size of
-the first 'len' characters of ARRAY&#13;</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2716,7 +2592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21387"
+NAME="AEN21290"
 ></A
 ><H3
 ><A
@@ -2750,7 +2626,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21395"
+NAME="AEN21298"
 ></A
 ><P
 ></P
@@ -2777,7 +2653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2794,12 +2670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> (in chars)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2814,7 +2685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new UTF8 * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2825,7 +2696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21413"
+NAME="AEN21315"
 ></A
 ><H3
 ><A
@@ -2860,7 +2731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21421"
+NAME="AEN21323"
 ></A
 ><P
 ></P
@@ -2887,7 +2758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2904,7 +2775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the position of the desired UTF8 char (in chars)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2919,7 +2790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the UTF8 character or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2930,7 +2801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21438"
+NAME="AEN21340"
 ></A
 ><H3
 ><A
@@ -2964,7 +2835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21446"
+NAME="AEN21348"
 ></A
 ><P
 ></P
@@ -2991,7 +2862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3008,7 +2879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the UTF8 character to be found</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3023,8 +2894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the relative character position of the desired char
-or -1 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3035,7 +2905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21463"
+NAME="AEN21365"
 ></A
 ><H3
 ><A
@@ -3083,7 +2953,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21474"
+NAME="AEN21376"
 ></A
 ><P
 ></P
@@ -3110,7 +2980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3159,8 +3029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to a newly created string
-or NULL if any problem</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3171,7 +3040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21495"
+NAME="AEN21397"
 ></A
 ><H3
 ><A
@@ -3202,7 +3071,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21502"
+NAME="AEN21404"
 ></A
 ><P
 ></P
@@ -3229,7 +3098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3244,7 +3113,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of characters in the string or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 3af6ba0..09e42d3 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7482"
+NAME="AEN7453"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7485"
+NAME="AEN7456"
 ></A
 ><H2
 >Synopsis</H2
@@ -370,7 +370,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7548"
+NAME="AEN7519"
 ></A
 ><H2
 >Description</H2
@@ -380,14 +380,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7551"
+NAME="AEN7522"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7553"
+NAME="AEN7524"
 ></A
 ><H3
 ><A
@@ -420,7 +420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7558"
+NAME="AEN7529"
 ></A
 ><H3
 ><A
@@ -437,9 +437,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlEntity {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
@@ -468,59 +466,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7563"
+NAME="AEN7534"
 ></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="AEN7568"
+NAME="AEN7538"
 ></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="AEN7573"
+NAME="AEN7542"
 ></A
 ><H3
 ><A
@@ -548,7 +520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7579"
+NAME="AEN7548"
 ></A
 ><H3
 ><A
@@ -598,7 +570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7591"
+NAME="AEN7560"
 ></A
 ><P
 ></P
@@ -625,7 +597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -642,7 +614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -659,7 +631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -676,7 +648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -693,7 +665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -710,7 +682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -725,7 +697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -736,7 +708,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7624"
+NAME="AEN7593"
 ></A
 ><H3
 ><A
@@ -786,7 +758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7636"
+NAME="AEN7605"
 ></A
 ><P
 ></P
@@ -813,7 +785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -830,7 +802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -847,7 +819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -864,7 +836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -881,7 +853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -898,7 +870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -913,7 +885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -924,7 +896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7669"
+NAME="AEN7638"
 ></A
 ><H3
 ><A
@@ -957,7 +929,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7677"
+NAME="AEN7646"
 ></A
 ><P
 ></P
@@ -984,7 +956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -999,7 +971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1010,7 +982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7690"
+NAME="AEN7659"
 ></A
 ><H3
 ><A
@@ -1049,7 +1021,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7699"
+NAME="AEN7668"
 ></A
 ><P
 ></P
@@ -1076,7 +1048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1093,7 +1065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1108,7 +1080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1119,7 +1091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7716"
+NAME="AEN7685"
 ></A
 ><H3
 ><A
@@ -1157,7 +1129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7725"
+NAME="AEN7694"
 ></A
 ><P
 ></P
@@ -1184,7 +1156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1201,7 +1173,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1216,7 +1188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1227,7 +1199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7742"
+NAME="AEN7711"
 ></A
 ><H3
 ><A
@@ -1265,7 +1237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7751"
+NAME="AEN7720"
 ></A
 ><P
 ></P
@@ -1292,7 +1264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1309,7 +1281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1324,7 +1296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1335,7 +1307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7768"
+NAME="AEN7737"
 ></A
 ><H3
 ><A
@@ -1379,7 +1351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7779"
+NAME="AEN7748"
 ></A
 ><P
 ></P
@@ -1406,7 +1378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1423,7 +1395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1438,7 +1410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1449,7 +1421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7796"
+NAME="AEN7765"
 ></A
 ><H3
 ><A
@@ -1489,7 +1461,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7805"
+NAME="AEN7774"
 ></A
 ><P
 ></P
@@ -1516,7 +1488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1533,7 +1505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1548,7 +1520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1559,7 +1531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7822"
+NAME="AEN7791"
 ></A
 ><H3
 ><A
@@ -1597,7 +1569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7831"
+NAME="AEN7800"
 ></A
 ><P
 ></P
@@ -1624,7 +1596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1641,7 +1613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1656,7 +1628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1667,7 +1639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7848"
+NAME="AEN7817"
 ></A
 ><H3
 ><A
@@ -1697,7 +1669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7855"
+NAME="AEN7824"
 ></A
 ><P
 ></P
@@ -1722,7 +1694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntitiesTablePtr just created or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1733,7 +1705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7864"
+NAME="AEN7833"
 ></A
 ><H3
 ><A
@@ -1766,7 +1738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7872"
+NAME="AEN7841"
 ></A
 ><P
 ></P
@@ -1793,7 +1765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1808,7 +1780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlEntitiesTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1819,7 +1791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7885"
+NAME="AEN7854"
 ></A
 ><H3
 ><A
@@ -1849,7 +1821,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7892"
+NAME="AEN7861"
 ></A
 ><P
 ></P
@@ -1876,7 +1848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1887,7 +1859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7901"
+NAME="AEN7870"
 ></A
 ><H3
 ><A
@@ -1921,7 +1893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7909"
+NAME="AEN7878"
 ></A
 ><P
 ></P
@@ -1948,7 +1920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1965,7 +1937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1976,7 +1948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7922"
+NAME="AEN7891"
 ></A
 ><H3
 ><A
@@ -2010,7 +1982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7930"
+NAME="AEN7899"
 ></A
 ><P
 ></P
@@ -2037,7 +2009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2054,7 +2026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2065,7 +2037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7943"
+NAME="AEN7912"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index dec0feb..8bab177 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10243"
+NAME="AEN10204"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10246"
+NAME="AEN10207"
 ></A
 ><H2
 >Synopsis</H2
@@ -394,7 +394,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10310"
+NAME="AEN10271"
 ></A
 ><H2
 >Description</H2
@@ -404,248 +404,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10313"
+NAME="AEN10274"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10315"
+NAME="AEN10276"
 ></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="AEN10320"
+NAME="AEN10280"
 ></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="AEN10325"
+NAME="AEN10284"
 ></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="AEN10330"
+NAME="AEN10288"
 ></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="AEN10335"
+NAME="AEN10292"
 ></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="AEN10340"
+NAME="AEN10296"
 ></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="AEN10345"
+NAME="AEN10300"
 ></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="AEN10350"
+NAME="AEN10304"
 ></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="AEN10355"
+NAME="AEN10308"
 ></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="AEN10360"
+NAME="AEN10312"
 ></A
 ><H3
 ><A
@@ -681,33 +564,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10365"
+NAME="AEN10317"
 ></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="AEN10370"
+NAME="AEN10321"
 ></A
 ><H3
 ><A
@@ -737,33 +607,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10375"
+NAME="AEN10326"
 ></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="AEN10380"
+NAME="AEN10330"
 ></A
 ><H3
 ><A
@@ -796,7 +653,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10388"
+NAME="AEN10338"
 ></A
 ><P
 ></P
@@ -823,7 +680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name in lowercase</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -838,7 +695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the related htmlElemDescPtr or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -849,7 +706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10401"
+NAME="AEN10351"
 ></A
 ><H3
 ><A
@@ -884,7 +741,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10410"
+NAME="AEN10360"
 ></A
 ><P
 ></P
@@ -911,7 +768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -926,7 +783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -937,7 +794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10423"
+NAME="AEN10373"
 ></A
 ><H3
 ><A
@@ -969,7 +826,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10431"
+NAME="AEN10381"
 ></A
 ><P
 ></P
@@ -996,7 +853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity's unicode value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1011,7 +868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1022,7 +879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10444"
+NAME="AEN10394"
 ></A
 ><H3
 ><A
@@ -1058,7 +915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10452"
+NAME="AEN10402"
 ></A
 ><P
 ></P
@@ -1085,7 +942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1102,7 +959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1117,7 +974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclosed, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1128,7 +985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10469"
+NAME="AEN10419"
 ></A
 ><H3
 ><A
@@ -1169,7 +1026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10478"
+NAME="AEN10428"
 ></A
 ><P
 ></P
@@ -1196,7 +1053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1230,7 +1087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1245,7 +1102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclose, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1256,7 +1113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10499"
+NAME="AEN10449"
 ></A
 ><H3
 ><A
@@ -1295,7 +1152,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10509"
+NAME="AEN10459"
 ></A
 ><P
 ></P
@@ -1322,7 +1179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1339,7 +1196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  location to store the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1354,8 +1211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, or NULL otherwise,
-if non-NULL *str will have to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1366,7 +1222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10526"
+NAME="AEN10476"
 ></A
 ><H3
 ><A
@@ -1402,7 +1258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10535"
+NAME="AEN10485"
 ></A
 ><P
 ></P
@@ -1429,7 +1285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1444,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1455,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10548"
+NAME="AEN10498"
 ></A
 ><H3
 ><A
@@ -1489,7 +1345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10557"
+NAME="AEN10507"
 ></A
 ><P
 ></P
@@ -1516,7 +1372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1527,7 +1383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10566"
+NAME="AEN10516"
 ></A
 ><H3
 ><A
@@ -1568,7 +1424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10575"
+NAME="AEN10525"
 ></A
 ><P
 ></P
@@ -1595,7 +1451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1612,7 +1468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1629,7 +1485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1646,7 +1502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1661,7 +1517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1672,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10600"
+NAME="AEN10550"
 ></A
 ><H3
 ><A
@@ -1706,7 +1562,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10608"
+NAME="AEN10558"
 ></A
 ><P
 ></P
@@ -1733,7 +1589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1750,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1765,7 +1621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1776,7 +1632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10625"
+NAME="AEN10575"
 ></A
 ><H3
 ><A
@@ -1815,7 +1671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10633"
+NAME="AEN10583"
 ></A
 ><P
 ></P
@@ -1842,7 +1698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1859,7 +1715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1876,7 +1732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1893,7 +1749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1908,7 +1764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1919,7 +1775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10658"
+NAME="AEN10608"
 ></A
 ><H3
 ><A
@@ -1951,7 +1807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10665"
+NAME="AEN10615"
 ></A
 ><P
 ></P
@@ -1978,7 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1995,7 +1851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2010,7 +1866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2021,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10682"
+NAME="AEN10632"
 ></A
 ><H3
 ><A
@@ -2052,7 +1908,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10688"
+NAME="AEN10638"
 ></A
 ><P
 ></P
@@ -2079,7 +1935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2096,12 +1952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2118,7 +1969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2135,12 +1986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2155,20 +2001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2179,7 +2012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10717"
+NAME="AEN10663"
 ></A
 ><H3
 ><A
@@ -2211,7 +2044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10723"
+NAME="AEN10669"
 ></A
 ><P
 ></P
@@ -2238,7 +2071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2255,12 +2088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2277,7 +2105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2294,12 +2122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2316,7 +2139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the quote character to escape (' or ") or zero.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2331,20 +2154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2355,7 +2165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10756"
+NAME="AEN10698"
 ></A
 ><H3
 ><A
@@ -2385,7 +2195,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10763"
+NAME="AEN10705"
 ></A
 ><P
 ></P
@@ -2412,7 +2222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2427,7 +2237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 is the attribute is a script 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2438,7 +2248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10776"
+NAME="AEN10718"
 ></A
 ><H3
 ><A
@@ -2465,7 +2275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10782"
+NAME="AEN10724"
 ></A
 ><P
 ></P
@@ -2492,7 +2302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2507,7 +2317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no handling, 1 for auto insertion.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2518,7 +2328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10795"
+NAME="AEN10737"
 ></A
 ><H3
 ><A
@@ -2549,7 +2359,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10802"
+NAME="AEN10744"
 ></A
 ><P
 ></P
@@ -2576,7 +2386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2587,7 +2397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10811"
+NAME="AEN10753"
 ></A
 ><H3
 ><A
@@ -2641,7 +2451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10822"
+NAME="AEN10764"
 ></A
 ><P
 ></P
@@ -2668,7 +2478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2685,7 +2495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2702,7 +2512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2719,7 +2529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2736,7 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2753,7 +2563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2768,7 +2578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2779,7 +2589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10855"
+NAME="AEN10797"
 ></A
 ><H3
 ><A
@@ -2812,7 +2622,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10862"
+NAME="AEN10804"
 ></A
 ><P
 ></P
@@ -2839,7 +2649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2856,7 +2666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2873,7 +2683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2890,7 +2700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2905,7 +2715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index 9995c56..e4fb7a7 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10892"
+NAME="AEN10834"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10895"
+NAME="AEN10837"
 ></A
 ><H2
 >Synopsis</H2
@@ -318,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10941"
+NAME="AEN10883"
 ></A
 ><H2
 >Description</H2
@@ -328,14 +328,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10944"
+NAME="AEN10886"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10946"
+NAME="AEN10888"
 ></A
 ><H3
 ><A
@@ -351,7 +351,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
+>#define     HTML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -364,7 +364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10952"
+NAME="AEN10894"
 ></A
 ><H3
 ><A
@@ -380,7 +380,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
+>#define     HTML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -393,7 +393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10958"
+NAME="AEN10900"
 ></A
 ><H3
 ><A
@@ -409,7 +409,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
+>#define     HTML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -422,7 +422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10964"
+NAME="AEN10906"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE</PRE
+>#define     HTML_PRESERVE_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -451,7 +451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10970"
+NAME="AEN10912"
 ></A
 ><H3
 ><A
@@ -467,7 +467,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_PI_NODE		XML_PI_NODE</PRE
+>#define     HTML_PI_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -480,7 +480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10976"
+NAME="AEN10918"
 ></A
 ><H3
 ><A
@@ -517,7 +517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10985"
+NAME="AEN10927"
 ></A
 ><P
 ></P
@@ -544,7 +544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -561,7 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -576,7 +576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -587,7 +587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11002"
+NAME="AEN10944"
 ></A
 ><H3
 ><A
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11011"
+NAME="AEN10953"
 ></A
 ><P
 ></P
@@ -651,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -668,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -683,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document, do not intialize the DTD if not provided</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -694,7 +694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11028"
+NAME="AEN10970"
 ></A
 ><H3
 ><A
@@ -727,7 +727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11036"
+NAME="AEN10978"
 ></A
 ><P
 ></P
@@ -754,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -769,7 +769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current encoding as flagged in the HTML source</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -780,7 +780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11049"
+NAME="AEN10991"
 ></A
 ><H3
 ><A
@@ -816,7 +816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11057"
+NAME="AEN10999"
 ></A
 ><P
 ></P
@@ -843,7 +843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -860,7 +860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -875,7 +875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -886,7 +886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11074"
+NAME="AEN11016"
 ></A
 ><H3
 ><A
@@ -922,7 +922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11082"
+NAME="AEN11024"
 ></A
 ><P
 ></P
@@ -949,7 +949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -966,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -983,7 +983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -994,7 +994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11099"
+NAME="AEN11041"
 ></A
 ><H3
 ><A
@@ -1028,7 +1028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11107"
+NAME="AEN11049"
 ></A
 ><P
 ></P
@@ -1055,7 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1087,7 +1087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1098,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11124"
+NAME="AEN11066"
 ></A
 ><H3
 ><A
@@ -1135,7 +1135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11132"
+NAME="AEN11074"
 ></A
 ><P
 ></P
@@ -1162,7 +1162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1179,7 +1179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1194,7 +1194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1205,7 +1205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11149"
+NAME="AEN11091"
 ></A
 ><H3
 ><A
@@ -1244,7 +1244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11158"
+NAME="AEN11100"
 ></A
 ><P
 ></P
@@ -1271,7 +1271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1288,7 +1288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1305,7 +1305,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1316,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11175"
+NAME="AEN11117"
 ></A
 ><H3
 ><A
@@ -1355,7 +1355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11184"
+NAME="AEN11126"
 ></A
 ><P
 ></P
@@ -1382,7 +1382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1399,7 +1399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1416,7 +1416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1427,7 +1427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11201"
+NAME="AEN11143"
 ></A
 ><H3
 ><A
@@ -1469,7 +1469,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11211"
+NAME="AEN11153"
 ></A
 ><P
 ></P
@@ -1496,7 +1496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1513,7 +1513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1530,7 +1530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1547,7 +1547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1564,7 +1564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1579,7 +1579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1590,7 +1590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11240"
+NAME="AEN11182"
 ></A
 ><H3
 ><A
@@ -1623,7 +1623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11247"
+NAME="AEN11189"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1667,7 +1667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1684,7 +1684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1699,7 +1699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1710,7 +1710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11268"
+NAME="AEN11210"
 ></A
 ><H3
 ><A
@@ -1743,7 +1743,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11275"
+NAME="AEN11217"
 ></A
 ><P
 ></P
@@ -1770,7 +1770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1787,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1804,7 +1804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1821,7 +1821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1836,7 +1836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index d9dfd45..4adae41 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15917"
+NAME="AEN15847"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15920"
+NAME="AEN15850"
 ></A
 ><H2
 >Synopsis</H2
@@ -282,7 +282,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15949"
+NAME="AEN15879"
 ></A
 ><H2
 >Description</H2
@@ -292,14 +292,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15952"
+NAME="AEN15882"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15954"
+NAME="AEN15884"
 ></A
 ><H3
 ><A
@@ -341,7 +341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15961"
+NAME="AEN15891"
 ></A
 ><P
 ></P
@@ -368,7 +368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  user provided data for the callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -385,7 +385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name (including "-&gt;" when links are shown)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -402,7 +402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -419,7 +419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the owner string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -436,7 +436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the group string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -453,7 +453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file size</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -470,7 +470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the link count</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -487,7 +487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the year</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -504,7 +504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the month</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -521,7 +521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the day</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -538,7 +538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the hour</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -555,7 +555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -566,7 +566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16014"
+NAME="AEN15944"
 ></A
 ><H3
 ><A
@@ -595,7 +595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16020"
+NAME="AEN15950"
 ></A
 ><P
 ></P
@@ -622,7 +622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user provided context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -639,7 +639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the data received</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -656,7 +656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> its size in bytes</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -667,7 +667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16037"
+NAME="AEN15967"
 ></A
 ><H3
 ><A
@@ -697,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16043"
+NAME="AEN15973"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16049"
+NAME="AEN15979"
 ></A
 ><H3
 ><A
@@ -752,7 +752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16055"
+NAME="AEN15985"
 ></A
 ><P
 ></P
@@ -779,7 +779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to initialize the context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -790,7 +790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16064"
+NAME="AEN15994"
 ></A
 ><H3
 ><A
@@ -817,7 +817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16070"
+NAME="AEN16000"
 ></A
 ><P
 ></P
@@ -844,7 +844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -855,7 +855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16079"
+NAME="AEN16009"
 ></A
 ><H3
 ><A
@@ -883,7 +883,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16085"
+NAME="AEN16015"
 ></A
 ><P
 ></P
@@ -910,7 +910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP server name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -927,7 +927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the port (use 21 if 0)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -938,7 +938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16098"
+NAME="AEN16028"
 ></A
 ><H3
 ><A
@@ -965,7 +965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16104"
+NAME="AEN16034"
 ></A
 ><P
 ></P
@@ -992,7 +992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URL to the resource</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1003,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16113"
+NAME="AEN16043"
 ></A
 ><H3
 ><A
@@ -1030,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16119"
+NAME="AEN16049"
 ></A
 ><P
 ></P
@@ -1057,7 +1057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1083,7 +1083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16132"
+NAME="AEN16062"
 ></A
 ><H3
 ><A
@@ -1110,7 +1110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16138"
+NAME="AEN16068"
 ></A
 ><P
 ></P
@@ -1137,7 +1137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1152,7 +1152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1163,7 +1163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16151"
+NAME="AEN16081"
 ></A
 ><H3
 ><A
@@ -1190,7 +1190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16157"
+NAME="AEN16087"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1232,7 +1232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1243,7 +1243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16170"
+NAME="AEN16100"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16176"
+NAME="AEN16106"
 ></A
 ><P
 ></P
@@ -1300,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1311,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16185"
+NAME="AEN16115"
 ></A
 ><H3
 ><A
@@ -1344,7 +1344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16191"
+NAME="AEN16121"
 ></A
 ><P
 ></P
@@ -1371,7 +1371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy host name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1388,7 +1388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy port</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1405,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy user name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1422,7 +1422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy password</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1439,12 +1439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of proxy 1 for using SITE, 2 for USER a<TT
-CLASS="PARAMETER"
-><I
->b</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1455,7 +1450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16217"
+NAME="AEN16146"
 ></A
 ><H3
 ><A
@@ -1487,7 +1482,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16223"
+NAME="AEN16152"
 ></A
 ><P
 ></P
@@ -1514,7 +1509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1531,7 +1526,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to update the context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1546,7 +1541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if Ok, -1 in case of error (other host).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1557,7 +1552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16240"
+NAME="AEN16169"
 ></A
 ><H3
 ><A
@@ -1584,7 +1579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16246"
+NAME="AEN16175"
 ></A
 ><P
 ></P
@@ -1611,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1626,7 +1621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1637,7 +1632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16259"
+NAME="AEN16188"
 ></A
 ><H3
 ><A
@@ -1664,7 +1659,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16265"
+NAME="AEN16194"
 ></A
 ><P
 ></P
@@ -1691,7 +1686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1706,7 +1701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number, or 0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1717,7 +1712,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16278"
+NAME="AEN16207"
 ></A
 ><H3
 ><A
@@ -1745,7 +1740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16284"
+NAME="AEN16213"
 ></A
 ><P
 ></P
@@ -1772,7 +1767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1789,7 +1784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a directory on the server</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1804,7 +1799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 1 if CWD worked, 0 if it failed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1815,7 +1810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16301"
+NAME="AEN16230"
 ></A
 ><H3
 ><A
@@ -1843,7 +1838,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16307"
+NAME="AEN16236"
 ></A
 ><P
 ></P
@@ -1870,7 +1865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1885,7 +1880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1896,7 +1891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16320"
+NAME="AEN16249"
 ></A
 ><H3
 ><A
@@ -1923,7 +1918,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16326"
+NAME="AEN16255"
 ></A
 ><P
 ></P
@@ -1950,7 +1945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1965,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1976,7 +1971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16339"
+NAME="AEN16268"
 ></A
 ><H3
 ><A
@@ -2010,7 +2005,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16346"
+NAME="AEN16275"
 ></A
 ><P
 ></P
@@ -2037,7 +2032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2054,7 +2049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2071,7 +2066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2088,7 +2083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optional files to list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2103,7 +2098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2114,7 +2109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16371"
+NAME="AEN16300"
 ></A
 ><H3
 ><A
@@ -2142,7 +2137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16377"
+NAME="AEN16306"
 ></A
 ><P
 ></P
@@ -2169,7 +2164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2186,7 +2181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve (or NULL if path is in context).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2201,7 +2196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the socket for the data connection, or &lt;0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2212,7 +2207,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16394"
+NAME="AEN16323"
 ></A
 ><H3
 ><A
@@ -2246,7 +2241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16401"
+NAME="AEN16330"
 ></A
 ><P
 ></P
@@ -2273,7 +2268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2290,7 +2285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2307,7 +2302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2324,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2339,7 +2334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2350,7 +2345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16426"
+NAME="AEN16355"
 ></A
 ><H3
 ><A
@@ -2390,7 +2385,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16434"
+NAME="AEN16363"
 ></A
 ><P
 ></P
@@ -2417,7 +2412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2434,7 +2429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2451,7 +2446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2466,8 +2461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte read. 0 is an indication of an end of connection.
--1 indicates a parameter error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index 03b3e57..da7d1c9 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15620"
+NAME="AEN15550"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15623"
+NAME="AEN15553"
 ></A
 ><H2
 >Synopsis</H2
@@ -221,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15639"
+NAME="AEN15569"
 ></A
 ><H2
 >Description</H2
@@ -231,14 +231,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15642"
+NAME="AEN15572"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15644"
+NAME="AEN15574"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15650"
+NAME="AEN15580"
 ></A
 ><H3
 ><A
@@ -293,7 +293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15655"
+NAME="AEN15585"
 ></A
 ><H3
 ><A
@@ -323,7 +323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15661"
+NAME="AEN15591"
 ></A
 ><P
 ></P
@@ -350,7 +350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -361,7 +361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15670"
+NAME="AEN15600"
 ></A
 ><H3
 ><A
@@ -391,7 +391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15676"
+NAME="AEN15606"
 ></A
 ><P
 ></P
@@ -418,7 +418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -435,7 +435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -452,8 +452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if available the Content-Type information will be
-returned at that location</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -468,8 +467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of failure, 0 incase of success. The contentType,
-if provided must be freed by the caller</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -480,7 +478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15697"
+NAME="AEN15627"
 ></A
 ><H3
 ><A
@@ -518,7 +516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15704"
+NAME="AEN15634"
 ></A
 ><P
 ></P
@@ -545,7 +543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -562,7 +560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP method to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -579,7 +577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -596,7 +594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Content-Type information IN and OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -613,7 +611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra headers</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -624,7 +622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15729"
+NAME="AEN15659"
 ></A
 ><H3
 ><A
@@ -663,7 +661,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15736"
+NAME="AEN15666"
 ></A
 ><P
 ></P
@@ -690,7 +688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -707,7 +705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP method to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -724,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -741,7 +739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Content-Type information IN and OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -758,7 +756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the redirected URL OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -775,7 +773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra headers</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -786,7 +784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15765"
+NAME="AEN15695"
 ></A
 ><H3
 ><A
@@ -815,7 +813,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15771"
+NAME="AEN15701"
 ></A
 ><P
 ></P
@@ -842,7 +840,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -859,8 +857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if available the Content-Type information will be
-returned at that location</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -871,7 +868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15784"
+NAME="AEN15714"
 ></A
 ><H3
 ><A
@@ -901,7 +898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15790"
+NAME="AEN15720"
 ></A
 ><P
 ></P
@@ -928,7 +925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -945,8 +942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if available the Content-Type information will be
-returned at that location</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -963,7 +959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if availble the redirected URL will be returned</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -974,7 +970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15807"
+NAME="AEN15737"
 ></A
 ><H3
 ><A
@@ -1001,7 +997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15813"
+NAME="AEN15743"
 ></A
 ><P
 ></P
@@ -1028,7 +1024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1043,7 +1039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the HTTP return code for the request.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1054,7 +1050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15826"
+NAME="AEN15756"
 ></A
 ><H3
 ><A
@@ -1081,7 +1077,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15832"
+NAME="AEN15762"
 ></A
 ><P
 ></P
@@ -1108,7 +1104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1123,8 +1119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the stashed value of the WWW-Authenticate or Proxy-Authenticate
-header.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1135,7 +1130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15845"
+NAME="AEN15775"
 ></A
 ><H3
 ><A
@@ -1175,7 +1170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15853"
+NAME="AEN15783"
 ></A
 ><P
 ></P
@@ -1202,7 +1197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1219,7 +1214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1236,7 +1231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1251,8 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte read. 0 is an indication of an end of connection.
--1 indicates a parameter error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1263,7 +1257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15874"
+NAME="AEN15804"
 ></A
 ><H3
 ><A
@@ -1292,7 +1286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15880"
+NAME="AEN15810"
 ></A
 ><P
 ></P
@@ -1319,7 +1313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1336,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1351,7 +1345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of failure, 0 incase of success.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1362,7 +1356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15897"
+NAME="AEN15827"
 ></A
 ><H3
 ><A
@@ -1390,7 +1384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15903"
+NAME="AEN15833"
 ></A
 ><P
 ></P
@@ -1417,7 +1411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index b04cfef..4bf1c0d 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -1270,7 +1270,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DEFAULT_VERSION	"1.0"</PRE
+>#define     XML_DEFAULT_VERSION</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1403,26 +1403,13 @@
 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="AEN351"
+NAME="AEN350"
 ></A
 ><H3
 ><A
@@ -1459,33 +1446,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN357"
+NAME="AEN356"
 ></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="AEN362"
+NAME="AEN360"
 ></A
 ><H3
 ><A
@@ -1515,33 +1489,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN367"
+NAME="AEN365"
 ></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="AEN372"
+NAME="AEN369"
 ></A
 ><H3
 ><A
@@ -1588,7 +1549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN378"
+NAME="AEN375"
 ></A
 ><H3
 ><A
@@ -1604,7 +1565,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DETECT_IDS		2</PRE
+>#define     XML_DETECT_IDS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1617,7 +1578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN384"
+NAME="AEN381"
 ></A
 ><H3
 ><A
@@ -1633,7 +1594,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_COMPLETE_ATTRS	4</PRE
+>#define     XML_COMPLETE_ATTRS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1647,7 +1608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN390"
+NAME="AEN387"
 ></A
 ><H3
 ><A
@@ -1754,33 +1715,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN396"
+NAME="AEN393"
 ></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="AEN401"
+NAME="AEN397"
 ></A
 ><H3
 ><A
@@ -1813,33 +1761,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN407"
+NAME="AEN403"
 ></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="AEN412"
+NAME="AEN407"
 ></A
 ><H3
 ><A
@@ -1875,7 +1810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN420"
+NAME="AEN415"
 ></A
 ><P
 ></P
@@ -1962,7 +1897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN441"
+NAME="AEN436"
 ></A
 ><H3
 ><A
@@ -1999,7 +1934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN449"
+NAME="AEN444"
 ></A
 ><P
 ></P
@@ -2088,7 +2023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN470"
+NAME="AEN465"
 ></A
 ><H3
 ><A
@@ -2125,7 +2060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN478"
+NAME="AEN473"
 ></A
 ><P
 ></P
@@ -2214,7 +2149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN499"
+NAME="AEN494"
 ></A
 ><H3
 ><A
@@ -2246,7 +2181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN506"
+NAME="AEN501"
 ></A
 ><P
 ></P
@@ -2316,7 +2251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN523"
+NAME="AEN518"
 ></A
 ><H3
 ><A
@@ -2348,7 +2283,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN530"
+NAME="AEN525"
 ></A
 ><P
 ></P
@@ -2418,7 +2353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN547"
+NAME="AEN542"
 ></A
 ><H3
 ><A
@@ -2460,7 +2395,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN556"
+NAME="AEN551"
 ></A
 ><P
 ></P
@@ -2583,7 +2518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN585"
+NAME="AEN580"
 ></A
 ><H3
 ><A
@@ -2620,7 +2555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN593"
+NAME="AEN588"
 ></A
 ><P
 ></P
@@ -2709,7 +2644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN614"
+NAME="AEN609"
 ></A
 ><H3
 ><A
@@ -2752,7 +2687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN623"
+NAME="AEN618"
 ></A
 ><P
 ></P
@@ -2892,7 +2827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN656"
+NAME="AEN651"
 ></A
 ><H3
 ><A
@@ -2926,7 +2861,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN663"
+NAME="AEN658"
 ></A
 ><P
 ></P
@@ -3015,7 +2950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN684"
+NAME="AEN679"
 ></A
 ><H3
 ><A
@@ -3056,7 +2991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN693"
+NAME="AEN688"
 ></A
 ><P
 ></P
@@ -3162,7 +3097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN718"
+NAME="AEN713"
 ></A
 ><H3
 ><A
@@ -3191,7 +3126,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN724"
+NAME="AEN719"
 ></A
 ><P
 ></P
@@ -3246,7 +3181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN737"
+NAME="AEN732"
 ></A
 ><H3
 ><A
@@ -3271,7 +3206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN742"
+NAME="AEN737"
 ></A
 ><P
 ></P
@@ -3309,7 +3244,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN751"
+NAME="AEN746"
 ></A
 ><H3
 ><A
@@ -3334,7 +3269,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN756"
+NAME="AEN751"
 ></A
 ><P
 ></P
@@ -3372,7 +3307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN765"
+NAME="AEN760"
 ></A
 ><H3
 ><A
@@ -3405,7 +3340,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN772"
+NAME="AEN767"
 ></A
 ><P
 ></P
@@ -3477,7 +3412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN789"
+NAME="AEN784"
 ></A
 ><H3
 ><A
@@ -3506,7 +3441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN795"
+NAME="AEN790"
 ></A
 ><P
 ></P
@@ -3561,7 +3496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN808"
+NAME="AEN803"
 ></A
 ><H3
 ><A
@@ -3594,7 +3529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN815"
+NAME="AEN810"
 ></A
 ><P
 ></P
@@ -3666,7 +3601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN832"
+NAME="AEN827"
 ></A
 ><H3
 ><A
@@ -3695,7 +3630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN838"
+NAME="AEN833"
 ></A
 ><P
 ></P
@@ -3750,7 +3685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN851"
+NAME="AEN846"
 ></A
 ><H3
 ><A
@@ -3780,7 +3715,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN857"
+NAME="AEN852"
 ></A
 ><P
 ></P
@@ -3852,7 +3787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN874"
+NAME="AEN869"
 ></A
 ><H3
 ><A
@@ -3882,7 +3817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN880"
+NAME="AEN875"
 ></A
 ><P
 ></P
@@ -3954,7 +3889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN897"
+NAME="AEN892"
 ></A
 ><H3
 ><A
@@ -3987,7 +3922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN904"
+NAME="AEN899"
 ></A
 ><P
 ></P
@@ -4059,7 +3994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN921"
+NAME="AEN916"
 ></A
 ><H3
 ><A
@@ -4088,7 +4023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN927"
+NAME="AEN922"
 ></A
 ><P
 ></P
@@ -4143,7 +4078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN940"
+NAME="AEN935"
 ></A
 ><H3
 ><A
@@ -4173,7 +4108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN946"
+NAME="AEN941"
 ></A
 ><P
 ></P
@@ -4245,7 +4180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN963"
+NAME="AEN958"
 ></A
 ><H3
 ><A
@@ -4272,7 +4207,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN968"
+NAME="AEN963"
 ></A
 ><P
 ></P
@@ -4344,7 +4279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN985"
+NAME="AEN980"
 ></A
 ><H3
 ><A
@@ -4371,7 +4306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN990"
+NAME="AEN985"
 ></A
 ><P
 ></P
@@ -4443,7 +4378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1007"
+NAME="AEN1002"
 ></A
 ><H3
 ><A
@@ -4470,7 +4405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1012"
+NAME="AEN1007"
 ></A
 ><P
 ></P
@@ -4542,7 +4477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1029"
+NAME="AEN1024"
 ></A
 ><H3
 ><A
@@ -4567,7 +4502,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1034"
+NAME="AEN1029"
 ></A
 ><P
 ></P
@@ -4620,7 +4555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1047"
+NAME="AEN1042"
 ></A
 ><H3
 ><A
@@ -4645,7 +4580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1052"
+NAME="AEN1047"
 ></A
 ><P
 ></P
@@ -4698,7 +4633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1065"
+NAME="AEN1060"
 ></A
 ><H3
 ><A
@@ -4723,7 +4658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1070"
+NAME="AEN1065"
 ></A
 ><P
 ></P
@@ -4776,7 +4711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1083"
+NAME="AEN1078"
 ></A
 ><H3
 ><A
@@ -4833,33 +4768,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1089"
+NAME="AEN1084"
 ></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="AEN1094"
+NAME="AEN1088"
 ></A
 ><H3
 ><A
@@ -4895,7 +4817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1102"
+NAME="AEN1096"
 ></A
 ><P
 ></P
@@ -4922,7 +4844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The System ID of the resource requested</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4939,7 +4861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The Public ID of the resource requested</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4982,7 +4904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1123"
+NAME="AEN1117"
 ></A
 ><H3
 ><A
@@ -4998,7 +4920,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal</PRE
+>#define     xmlSubstituteEntitiesDefaultValue</PRE
 ></TD
 ></TR
 ></TABLE
@@ -5008,7 +4930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1128"
+NAME="AEN1122"
 ></A
 ><H3
 ><A
@@ -5038,7 +4960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1128"
 ></A
 ><H3
 ><A
@@ -5069,7 +4991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1140"
+NAME="AEN1134"
 ></A
 ><H3
 ><A
@@ -5101,7 +5023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1147"
+NAME="AEN1141"
 ></A
 ><P
 ></P
@@ -5128,7 +5050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5145,7 +5067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5160,8 +5082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5172,7 +5093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1164"
+NAME="AEN1158"
 ></A
 ><H3
 ><A
@@ -5204,7 +5125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1171"
+NAME="AEN1165"
 ></A
 ><P
 ></P
@@ -5231,7 +5152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5248,7 +5169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5263,8 +5184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5275,7 +5195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1188"
+NAME="AEN1182"
 ></A
 ><H3
 ><A
@@ -5310,7 +5230,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1196"
+NAME="AEN1190"
 ></A
 ><P
 ></P
@@ -5337,7 +5257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5352,7 +5272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5363,7 +5283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1209"
+NAME="AEN1203"
 ></A
 ><H3
 ><A
@@ -5397,7 +5317,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1217"
+NAME="AEN1211"
 ></A
 ><P
 ></P
@@ -5424,7 +5344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5441,12 +5361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5461,7 +5376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5472,7 +5387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1235"
+NAME="AEN1228"
 ></A
 ><H3
 ><A
@@ -5503,7 +5418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1242"
+NAME="AEN1235"
 ></A
 ><P
 ></P
@@ -5530,7 +5445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input char *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5547,12 +5462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5567,7 +5477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5578,7 +5488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1260"
+NAME="AEN1252"
 ></A
 ><H3
 ><A
@@ -5608,7 +5518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1267"
+NAME="AEN1259"
 ></A
 ><P
 ></P
@@ -5635,7 +5545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input char *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5650,7 +5560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5661,7 +5571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1280"
+NAME="AEN1272"
 ></A
 ><H3
 ><A
@@ -5696,7 +5606,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1288"
+NAME="AEN1280"
 ></A
 ><P
 ></P
@@ -5723,7 +5633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5740,7 +5650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index of the first char (zero based)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5757,7 +5667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the substring</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5772,7 +5682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5783,7 +5693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1309"
+NAME="AEN1301"
 ></A
 ><H3
 ><A
@@ -5820,7 +5730,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1318"
+NAME="AEN1310"
 ></A
 ><P
 ></P
@@ -5847,7 +5757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5864,7 +5774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5879,7 +5789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5890,7 +5800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1335"
+NAME="AEN1327"
 ></A
 ><H3
 ><A
@@ -5927,7 +5837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1344"
+NAME="AEN1336"
 ></A
 ><P
 ></P
@@ -5954,7 +5864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5971,7 +5881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5986,7 +5896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5997,7 +5907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1361"
+NAME="AEN1353"
 ></A
 ><H3
 ><A
@@ -6034,7 +5944,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1370"
+NAME="AEN1362"
 ></A
 ><P
 ></P
@@ -6061,7 +5971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6078,7 +5988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6093,7 +6003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6104,7 +6014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1387"
+NAME="AEN1379"
 ></A
 ><H3
 ><A
@@ -6138,7 +6048,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1395"
+NAME="AEN1387"
 ></A
 ><P
 ></P
@@ -6165,7 +6075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6182,7 +6092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6197,7 +6107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6208,7 +6118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1412"
+NAME="AEN1404"
 ></A
 ><H3
 ><A
@@ -6243,7 +6153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1420"
+NAME="AEN1412"
 ></A
 ><P
 ></P
@@ -6270,7 +6180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6287,7 +6197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6304,7 +6214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6319,7 +6229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6330,7 +6240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1441"
+NAME="AEN1433"
 ></A
 ><H3
 ><A
@@ -6364,7 +6274,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1449"
+NAME="AEN1441"
 ></A
 ><P
 ></P
@@ -6391,7 +6301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6408,7 +6318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6423,7 +6333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6434,7 +6344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1466"
+NAME="AEN1458"
 ></A
 ><H3
 ><A
@@ -6469,7 +6379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1474"
+NAME="AEN1466"
 ></A
 ><P
 ></P
@@ -6496,7 +6406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6513,7 +6423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6530,7 +6440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6545,7 +6455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6556,7 +6466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1495"
+NAME="AEN1487"
 ></A
 ><H3
 ><A
@@ -6594,7 +6504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1504"
+NAME="AEN1496"
 ></A
 ><P
 ></P
@@ -6621,7 +6531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6638,7 +6548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6653,7 +6563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if they are equal, 0 if they are different</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6664,7 +6574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1521"
+NAME="AEN1513"
 ></A
 ><H3
 ><A
@@ -6694,7 +6604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1528"
+NAME="AEN1520"
 ></A
 ><P
 ></P
@@ -6721,7 +6631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6736,7 +6646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar contained in the ARRAY.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6747,7 +6657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1541"
+NAME="AEN1533"
 ></A
 ><H3
 ><A
@@ -6786,7 +6696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1550"
+NAME="AEN1542"
 ></A
 ><P
 ></P
@@ -6813,7 +6723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6830,7 +6740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6845,7 +6755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6856,7 +6766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1567"
+NAME="AEN1559"
 ></A
 ><H3
 ><A
@@ -6900,7 +6810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1577"
+NAME="AEN1569"
 ></A
 ><P
 ></P
@@ -6927,7 +6837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6944,7 +6854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6961,12 +6871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->add</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6981,13 +6886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar *, the original <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-> is reallocated if needed
-and should not be freed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6998,7 +6897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1600"
+NAME="AEN1590"
 ></A
 ><H3
 ><A
@@ -7031,7 +6930,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1608"
+NAME="AEN1598"
 ></A
 ><P
 ></P
@@ -7058,7 +6957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7073,7 +6972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7084,7 +6983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1621"
+NAME="AEN1611"
 ></A
 ><H3
 ><A
@@ -7115,7 +7014,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1628"
+NAME="AEN1618"
 ></A
 ><P
 ></P
@@ -7142,7 +7041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7159,7 +7058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7174,7 +7073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7185,7 +7084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1645"
+NAME="AEN1635"
 ></A
 ><H3
 ><A
@@ -7216,7 +7115,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1652"
+NAME="AEN1642"
 ></A
 ><P
 ></P
@@ -7243,7 +7142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7258,7 +7157,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7269,7 +7168,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1665"
+NAME="AEN1655"
 ></A
 ><H3
 ><A
@@ -7304,7 +7203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1672"
+NAME="AEN1662"
 ></A
 ><P
 ></P
@@ -7331,7 +7230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7346,7 +7245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7357,7 +7256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1685"
+NAME="AEN1675"
 ></A
 ><H3
 ><A
@@ -7411,7 +7310,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1695"
+NAME="AEN1685"
 ></A
 ><P
 ></P
@@ -7438,7 +7337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7453,7 +7352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7464,7 +7363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1708"
+NAME="AEN1698"
 ></A
 ><H3
 ><A
@@ -7494,7 +7393,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1715"
+NAME="AEN1705"
 ></A
 ><P
 ></P
@@ -7521,7 +7420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7532,7 +7431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1724"
+NAME="AEN1714"
 ></A
 ><H3
 ><A
@@ -7559,7 +7458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1730"
+NAME="AEN1720"
 ></A
 ><P
 ></P
@@ -7586,7 +7485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7601,7 +7500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7612,7 +7511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1743"
+NAME="AEN1733"
 ></A
 ><H3
 ><A
@@ -7646,7 +7545,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1751"
+NAME="AEN1741"
 ></A
 ><P
 ></P
@@ -7673,7 +7572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7688,7 +7587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7699,7 +7598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1764"
+NAME="AEN1754"
 ></A
 ><H3
 ><A
@@ -7731,7 +7630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1771"
+NAME="AEN1761"
 ></A
 ><P
 ></P
@@ -7758,7 +7657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7775,7 +7674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7790,7 +7689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7801,7 +7700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1788"
+NAME="AEN1778"
 ></A
 ><H3
 ><A
@@ -7833,7 +7732,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1795"
+NAME="AEN1785"
 ></A
 ><P
 ></P
@@ -7860,7 +7759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7875,7 +7774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7886,7 +7785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1808"
+NAME="AEN1798"
 ></A
 ><H3
 ><A
@@ -7921,7 +7820,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1817"
+NAME="AEN1807"
 ></A
 ><P
 ></P
@@ -7948,7 +7847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7963,8 +7862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7975,7 +7873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1830"
+NAME="AEN1820"
 ></A
 ><H3
 ><A
@@ -8009,7 +7907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1838"
+NAME="AEN1828"
 ></A
 ><P
 ></P
@@ -8036,7 +7934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8051,8 +7949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8063,7 +7960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1851"
+NAME="AEN1841"
 ></A
 ><H3
 ><A
@@ -8103,7 +8000,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1860"
+NAME="AEN1850"
 ></A
 ><P
 ></P
@@ -8130,7 +8027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8147,7 +8044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8164,8 +8061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8180,7 +8076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8191,7 +8087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1881"
+NAME="AEN1871"
 ></A
 ><H3
 ><A
@@ -8224,7 +8120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1888"
+NAME="AEN1878"
 ></A
 ><P
 ></P
@@ -8251,7 +8147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8268,7 +8164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8285,7 +8181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8300,7 +8196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8311,7 +8207,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1909"
+NAME="AEN1899"
 ></A
 ><H3
 ><A
@@ -8345,7 +8241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1916"
+NAME="AEN1906"
 ></A
 ><P
 ></P
@@ -8372,7 +8268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8389,7 +8285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8406,7 +8302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an in-memory XML document input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8423,7 +8319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the XML document in bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8438,7 +8334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8449,7 +8345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1941"
+NAME="AEN1931"
 ></A
 ><H3
 ><A
@@ -8487,7 +8383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1949"
+NAME="AEN1939"
 ></A
 ><P
 ></P
@@ -8514,7 +8410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8531,7 +8427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8548,7 +8444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8565,8 +8461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read not Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8581,7 +8476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8592,7 +8487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1974"
+NAME="AEN1964"
 ></A
 ><H3
 ><A
@@ -8630,7 +8525,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1982"
+NAME="AEN1972"
 ></A
 ><P
 ></P
@@ -8657,7 +8552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8674,7 +8569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8691,8 +8586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8707,7 +8601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8718,7 +8612,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2003"
+NAME="AEN1993"
 ></A
 ><H3
 ><A
@@ -8758,7 +8652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2013"
+NAME="AEN2003"
 ></A
 ><P
 ></P
@@ -8785,7 +8679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8802,7 +8696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8817,7 +8711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8828,7 +8722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2030"
+NAME="AEN2020"
 ></A
 ><H3
 ><A
@@ -8862,7 +8756,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2039"
+NAME="AEN2029"
 ></A
 ><P
 ></P
@@ -8889,7 +8783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8904,7 +8798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8915,7 +8809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2052"
+NAME="AEN2042"
 ></A
 ><H3
 ><A
@@ -8952,7 +8846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2061"
+NAME="AEN2051"
 ></A
 ><P
 ></P
@@ -8979,7 +8873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8996,7 +8890,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9011,7 +8905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9022,7 +8916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2078"
+NAME="AEN2068"
 ></A
 ><H3
 ><A
@@ -9063,7 +8957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2088"
+NAME="AEN2078"
 ></A
 ><P
 ></P
@@ -9090,7 +8984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9107,7 +9001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9124,7 +9018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9139,7 +9033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9150,7 +9044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2109"
+NAME="AEN2099"
 ></A
 ><H3
 ><A
@@ -9191,7 +9085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2119"
+NAME="AEN2109"
 ></A
 ><P
 ></P
@@ -9218,7 +9112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9235,7 +9129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Input Buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9252,7 +9146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9267,13 +9161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.
-<TT
-CLASS="PARAMETER"
-><I
->input</I
-></TT
-> will be freed at parsing end.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9284,7 +9172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2141"
+NAME="AEN2130"
 ></A
 ><H3
 ><A
@@ -9333,7 +9221,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2152"
+NAME="AEN2141"
 ></A
 ><P
 ></P
@@ -9360,7 +9248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9377,7 +9265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9394,7 +9282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9411,7 +9299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9428,7 +9316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string in UTF8 or ISO-Latin (zero terminated)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9445,7 +9333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9460,8 +9348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the chunk is well balanced, -1 in case of args problem and
-the parser error code otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9472,7 +9359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2185"
+NAME="AEN2174"
 ></A
 ><H3
 ><A
@@ -9524,7 +9411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2197"
+NAME="AEN2186"
 ></A
 ><P
 ></P
@@ -9551,7 +9438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9568,7 +9455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9585,7 +9472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9602,7 +9489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9619,7 +9506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9636,7 +9523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9653,7 +9540,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9668,8 +9555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the entity is well formed, -1 in case of args problem and
-the parser error code otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9680,7 +9566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2234"
+NAME="AEN2223"
 ></A
 ><H3
 ><A
@@ -9726,7 +9612,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2245"
+NAME="AEN2234"
 ></A
 ><P
 ></P
@@ -9753,7 +9639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the existing parsing context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9770,7 +9656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9787,7 +9673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9804,7 +9690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9819,8 +9705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the entity is well formed, -1 in case of args problem and
-the parser error code otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9831,7 +9716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2270"
+NAME="AEN2259"
 ></A
 ><H3
 ><A
@@ -9859,7 +9744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2276"
+NAME="AEN2265"
 ></A
 ><H3
 ><A
@@ -9887,7 +9772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2282"
+NAME="AEN2271"
 ></A
 ><H3
 ><A
@@ -9917,7 +9802,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2289"
+NAME="AEN2278"
 ></A
 ><P
 ></P
@@ -9944,7 +9829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9955,7 +9840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2298"
+NAME="AEN2287"
 ></A
 ><H3
 ><A
@@ -9985,7 +9870,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2305"
+NAME="AEN2294"
 ></A
 ><P
 ></P
@@ -10012,7 +9897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10023,7 +9908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2314"
+NAME="AEN2303"
 ></A
 ><H3
 ><A
@@ -10054,7 +9939,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2321"
+NAME="AEN2310"
 ></A
 ><P
 ></P
@@ -10081,7 +9966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10092,7 +9977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2330"
+NAME="AEN2319"
 ></A
 ><H3
 ><A
@@ -10129,7 +10014,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2338"
+NAME="AEN2327"
 ></A
 ><P
 ></P
@@ -10156,7 +10041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10173,7 +10058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar * buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10190,7 +10075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10201,7 +10086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2355"
+NAME="AEN2344"
 ></A
 ><H3
 ><A
@@ -10234,7 +10119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2363"
+NAME="AEN2352"
 ></A
 ><P
 ></P
@@ -10261,7 +10146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10276,7 +10161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10287,7 +10172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2376"
+NAME="AEN2365"
 ></A
 ><H3
 ><A
@@ -10313,7 +10198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2381"
+NAME="AEN2370"
 ></A
 ><P
 ></P
@@ -10383,7 +10268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2398"
+NAME="AEN2387"
 ></A
 ><H3
 ><A
@@ -10413,7 +10298,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2404"
+NAME="AEN2393"
 ></A
 ><P
 ></P
@@ -10500,7 +10385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2425"
+NAME="AEN2414"
 ></A
 ><H3
 ><A
@@ -10530,7 +10415,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2431"
+NAME="AEN2420"
 ></A
 ><P
 ></P
@@ -10617,7 +10502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2452"
+NAME="AEN2441"
 ></A
 ><H3
 ><A
@@ -10667,7 +10552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2462"
+NAME="AEN2451"
 ></A
 ><P
 ></P
@@ -10694,7 +10579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10711,7 +10596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10728,7 +10613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10745,7 +10630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10762,7 +10647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10777,7 +10662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10788,7 +10673,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2491"
+NAME="AEN2480"
 ></A
 ><H3
 ><A
@@ -10821,7 +10706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2498"
+NAME="AEN2487"
 ></A
 ><P
 ></P
@@ -10848,7 +10733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10865,7 +10750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10882,7 +10767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10899,7 +10784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10914,7 +10799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10925,7 +10810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2523"
+NAME="AEN2512"
 ></A
 ><H3
 ><A
@@ -10973,7 +10858,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2534"
+NAME="AEN2523"
 ></A
 ><P
 ></P
@@ -11000,7 +10885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11017,7 +10902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11034,7 +10919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11051,7 +10936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11068,7 +10953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11085,7 +10970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11100,7 +10985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11111,7 +10996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2567"
+NAME="AEN2556"
 ></A
 ><H3
 ><A
@@ -11158,7 +11043,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2578"
+NAME="AEN2567"
 ></A
 ><P
 ></P
@@ -11185,7 +11070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11202,7 +11087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O Input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11219,7 +11104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11234,7 +11119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11245,7 +11130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2599"
+NAME="AEN2588"
 ></A
 ><H3
 ><A
@@ -11283,7 +11168,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2608"
+NAME="AEN2597"
 ></A
 ><P
 ></P
@@ -11310,7 +11195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11327,7 +11212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node within the tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11342,7 +11227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an xmlParserNodeInfo block pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11353,7 +11238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2625"
+NAME="AEN2614"
 ></A
 ><H3
 ><A
@@ -11383,7 +11268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2632"
+NAME="AEN2621"
 ></A
 ><P
 ></P
@@ -11410,7 +11295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11421,7 +11306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2641"
+NAME="AEN2630"
 ></A
 ><H3
 ><A
@@ -11452,7 +11337,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2648"
+NAME="AEN2637"
 ></A
 ><P
 ></P
@@ -11479,7 +11364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11490,7 +11375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2657"
+NAME="AEN2646"
 ></A
 ><H3
 ><A
@@ -11528,7 +11413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2666"
+NAME="AEN2655"
 ></A
 ><P
 ></P
@@ -11555,7 +11440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11572,7 +11457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11587,7 +11472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a long indicating the position of the record</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11598,7 +11483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2683"
+NAME="AEN2672"
 ></A
 ><H3
 ><A
@@ -11632,7 +11517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2691"
+NAME="AEN2680"
 ></A
 ><P
 ></P
@@ -11659,7 +11544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11676,7 +11561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11687,7 +11572,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2704"
+NAME="AEN2693"
 ></A
 ><H3
 ><A
@@ -11715,7 +11600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2710"
+NAME="AEN2699"
 ></A
 ><P
 ></P
@@ -11753,7 +11638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2719"
+NAME="AEN2708"
 ></A
 ><H3
 ><A
@@ -11782,7 +11667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2725"
+NAME="AEN2714"
 ></A
 ><P
 ></P
@@ -11818,7 +11703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2734"
+NAME="AEN2723"
 ></A
 ><H3
 ><A
@@ -11851,7 +11736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2741"
+NAME="AEN2730"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index d56c012..5696d4f 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17976"
+NAME="AEN17897"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17979"
+NAME="AEN17900"
 ></A
 ><H2
 >Synopsis</H2
@@ -1131,7 +1131,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18254"
+NAME="AEN18175"
 ></A
 ><H2
 >Description</H2
@@ -1141,14 +1141,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18257"
+NAME="AEN18178"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18259"
+NAME="AEN18180"
 ></A
 ><H3
 ><A
@@ -1164,7 +1164,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MAX_NAMELEN 100</PRE
+>#define     XML_MAX_NAMELEN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1177,7 +1177,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18265"
+NAME="AEN18186"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define INPUT_CHUNK	250</PRE
+>#define     INPUT_CHUNK</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1206,7 +1206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18271"
+NAME="AEN18192"
 ></A
 ><H3
 ><A
@@ -1264,7 +1264,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18287"
+NAME="AEN18208"
 ></A
 ><P
 ></P
@@ -1291,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1302,7 +1302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18296"
+NAME="AEN18217"
 ></A
 ><H3
 ><A
@@ -1343,7 +1343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18307"
+NAME="AEN18228"
 ></A
 ><P
 ></P
@@ -1370,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1381,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18316"
+NAME="AEN18237"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_BASECHAR(c) xmlIsBaseChar(c)</PRE
+>#define     IS_BASECHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1410,7 +1410,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18323"
+NAME="AEN18244"
 ></A
 ><P
 ></P
@@ -1437,7 +1437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1448,7 +1448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18332"
+NAME="AEN18253"
 ></A
 ><H3
 ><A
@@ -1464,7 +1464,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_DIGIT(c) xmlIsDigit(c)</PRE
+>#define     IS_DIGIT(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1477,7 +1477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18339"
+NAME="AEN18260"
 ></A
 ><P
 ></P
@@ -1504,7 +1504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1515,7 +1515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18348"
+NAME="AEN18269"
 ></A
 ><H3
 ><A
@@ -1531,7 +1531,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_COMBINING(c) xmlIsCombining(c)</PRE
+>#define     IS_COMBINING(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1544,7 +1544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18355"
+NAME="AEN18276"
 ></A
 ><P
 ></P
@@ -1571,7 +1571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1582,7 +1582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18364"
+NAME="AEN18285"
 ></A
 ><H3
 ><A
@@ -1598,7 +1598,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_EXTENDER(c) xmlIsExtender(c)</PRE
+>#define     IS_EXTENDER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1655,7 +1655,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18385"
+NAME="AEN18306"
 ></A
 ><P
 ></P
@@ -1682,7 +1682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1693,7 +1693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18394"
+NAME="AEN18315"
 ></A
 ><H3
 ><A
@@ -1709,7 +1709,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)</PRE
+>#define     IS_IDEOGRAPHIC(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1737,7 +1737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18406"
+NAME="AEN18327"
 ></A
 ><P
 ></P
@@ -1764,7 +1764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1775,7 +1775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18415"
+NAME="AEN18336"
 ></A
 ><H3
 ><A
@@ -1791,7 +1791,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
+>#define     IS_LETTER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1804,7 +1804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18422"
+NAME="AEN18343"
 ></A
 ><P
 ></P
@@ -1831,7 +1831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1842,7 +1842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18431"
+NAME="AEN18352"
 ></A
 ><H3
 ><A
@@ -1858,7 +1858,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)</PRE
+>#define     IS_PUBIDCHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1880,7 +1880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18441"
+NAME="AEN18362"
 ></A
 ><P
 ></P
@@ -1907,7 +1907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1918,7 +1918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18450"
+NAME="AEN18371"
 ></A
 ><H3
 ><A
@@ -1945,7 +1945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18456"
+NAME="AEN18377"
 ></A
 ><P
 ></P
@@ -1972,7 +1972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1983,7 +1983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18465"
+NAME="AEN18386"
 ></A
 ><H3
 ><A
@@ -2010,7 +2010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18471"
+NAME="AEN18392"
 ></A
 ><P
 ></P
@@ -2037,7 +2037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2048,7 +2048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18480"
+NAME="AEN18401"
 ></A
 ><H3
 ><A
@@ -2075,7 +2075,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18486"
+NAME="AEN18407"
 ></A
 ><P
 ></P
@@ -2102,7 +2102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2113,7 +2113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18495"
+NAME="AEN18416"
 ></A
 ><H3
 ><A
@@ -2155,7 +2155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18505"
+NAME="AEN18426"
 ></A
 ><P
 ></P
@@ -2182,7 +2182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2197,7 +2197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2208,7 +2208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18518"
+NAME="AEN18439"
 ></A
 ><H3
 ><A
@@ -2252,7 +2252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18529"
+NAME="AEN18450"
 ></A
 ><P
 ></P
@@ -2279,7 +2279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2294,7 +2294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2305,7 +2305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18542"
+NAME="AEN18463"
 ></A
 ><H3
 ><A
@@ -2342,7 +2342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18551"
+NAME="AEN18472"
 ></A
 ><P
 ></P
@@ -2369,7 +2369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2384,7 +2384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2395,7 +2395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18564"
+NAME="AEN18485"
 ></A
 ><H3
 ><A
@@ -2423,7 +2423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18570"
+NAME="AEN18491"
 ></A
 ><P
 ></P
@@ -2450,7 +2450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2465,7 +2465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2476,7 +2476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18583"
+NAME="AEN18504"
 ></A
 ><H3
 ><A
@@ -2504,7 +2504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18589"
+NAME="AEN18510"
 ></A
 ><P
 ></P
@@ -2531,7 +2531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2546,7 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2557,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18602"
+NAME="AEN18523"
 ></A
 ><H3
 ><A
@@ -2600,7 +2600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18613"
+NAME="AEN18534"
 ></A
 ><P
 ></P
@@ -2627,7 +2627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2642,7 +2642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2653,7 +2653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18626"
+NAME="AEN18547"
 ></A
 ><H3
 ><A
@@ -2681,7 +2681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18632"
+NAME="AEN18553"
 ></A
 ><P
 ></P
@@ -2708,7 +2708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2723,7 +2723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2734,7 +2734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18645"
+NAME="AEN18566"
 ></A
 ><H3
 ><A
@@ -2806,7 +2806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18665"
+NAME="AEN18586"
 ></A
 ><P
 ></P
@@ -2833,7 +2833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2848,7 +2848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2859,7 +2859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18678"
+NAME="AEN18599"
 ></A
 ><H3
 ><A
@@ -2920,7 +2920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18694"
+NAME="AEN18615"
 ></A
 ><P
 ></P
@@ -2947,7 +2947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2962,7 +2962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2973,7 +2973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18707"
+NAME="AEN18628"
 ></A
 ><H3
 ><A
@@ -3006,7 +3006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18715"
+NAME="AEN18636"
 ></A
 ><P
 ></P
@@ -3059,7 +3059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18728"
+NAME="AEN18649"
 ></A
 ><H3
 ><A
@@ -3091,7 +3091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18735"
+NAME="AEN18656"
 ></A
 ><P
 ></P
@@ -3118,7 +3118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3133,7 +3133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3144,7 +3144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18748"
+NAME="AEN18669"
 ></A
 ><H3
 ><A
@@ -3175,7 +3175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18755"
+NAME="AEN18676"
 ></A
 ><P
 ></P
@@ -3202,7 +3202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3219,7 +3219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3234,7 +3234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3245,7 +3245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18772"
+NAME="AEN18693"
 ></A
 ><H3
 ><A
@@ -3275,7 +3275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18779"
+NAME="AEN18700"
 ></A
 ><P
 ></P
@@ -3300,7 +3300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserCtxtPtr or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3311,7 +3311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18788"
+NAME="AEN18709"
 ></A
 ><H3
 ><A
@@ -3354,7 +3354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18798"
+NAME="AEN18719"
 ></A
 ><P
 ></P
@@ -3381,7 +3381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity URL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3398,7 +3398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity PUBLIC ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3415,7 +3415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a posible base for the target URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3430,7 +3430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3441,7 +3441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18819"
+NAME="AEN18740"
 ></A
 ><H3
 ><A
@@ -3476,7 +3476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18827"
+NAME="AEN18748"
 ></A
 ><P
 ></P
@@ -3503,7 +3503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3520,7 +3520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding value (number)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3535,7 +3535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3546,7 +3546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18844"
+NAME="AEN18765"
 ></A
 ><H3
 ><A
@@ -3581,7 +3581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18852"
+NAME="AEN18773"
 ></A
 ><P
 ></P
@@ -3608,7 +3608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3625,7 +3625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3640,7 +3640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3651,7 +3651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18869"
+NAME="AEN18790"
 ></A
 ><H3
 ><A
@@ -3682,7 +3682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18876"
+NAME="AEN18797"
 ></A
 ><P
 ></P
@@ -3720,7 +3720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18885"
+NAME="AEN18806"
 ></A
 ><H3
 ><A
@@ -3757,7 +3757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18894"
+NAME="AEN18815"
 ></A
 ><P
 ></P
@@ -3784,7 +3784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3801,7 +3801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML entity pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3812,7 +3812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18907"
+NAME="AEN18828"
 ></A
 ><H3
 ><A
@@ -3849,7 +3849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18916"
+NAME="AEN18837"
 ></A
 ><P
 ></P
@@ -3876,7 +3876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3893,7 +3893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an memory buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3908,7 +3908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3919,7 +3919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18933"
+NAME="AEN18854"
 ></A
 ><H3
 ><A
@@ -3956,7 +3956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18942"
+NAME="AEN18863"
 ></A
 ><P
 ></P
@@ -3983,7 +3983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4000,7 +4000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Entity pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4015,7 +4015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4026,7 +4026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18959"
+NAME="AEN18880"
 ></A
 ><H3
 ><A
@@ -4061,7 +4061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18967"
+NAME="AEN18888"
 ></A
 ><P
 ></P
@@ -4088,7 +4088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4105,7 +4105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input fragment (entity, XML fragment ...).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4116,7 +4116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18980"
+NAME="AEN18901"
 ></A
 ><H3
 ><A
@@ -4150,7 +4150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18988"
+NAME="AEN18909"
 ></A
 ><P
 ></P
@@ -4177,7 +4177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4192,7 +4192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current xmlChar in the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4203,7 +4203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19001"
+NAME="AEN18922"
 ></A
 ><H3
 ><A
@@ -4233,7 +4233,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19008"
+NAME="AEN18929"
 ></A
 ><P
 ></P
@@ -4260,7 +4260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4271,7 +4271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19017"
+NAME="AEN18938"
 ></A
 ><H3
 ><A
@@ -4305,7 +4305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19025"
+NAME="AEN18946"
 ></A
 ><P
 ></P
@@ -4332,7 +4332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4349,7 +4349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename to use as entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4364,7 +4364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4375,7 +4375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19042"
+NAME="AEN18963"
 ></A
 ><H3
 ><A
@@ -4408,7 +4408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19050"
+NAME="AEN18971"
 ></A
 ><P
 ></P
@@ -4435,7 +4435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4450,7 +4450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4461,7 +4461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19063"
+NAME="AEN18984"
 ></A
 ><H3
 ><A
@@ -4508,7 +4508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19076"
+NAME="AEN18997"
 ></A
 ><P
 ></P
@@ -4535,7 +4535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4552,7 +4552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4569,7 +4569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4584,8 +4584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4596,7 +4595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19097"
+NAME="AEN19018"
 ></A
 ><H3
 ><A
@@ -4637,7 +4636,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19108"
+NAME="AEN19029"
 ></A
 ><P
 ></P
@@ -4664,7 +4663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4679,7 +4678,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4690,7 +4689,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19121"
+NAME="AEN19042"
 ></A
 ><H3
 ><A
@@ -4736,7 +4735,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19134"
+NAME="AEN19055"
 ></A
 ><P
 ></P
@@ -4763,7 +4762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4780,7 +4779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4795,8 +4794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4807,7 +4805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19151"
+NAME="AEN19072"
 ></A
 ><H3
 ><A
@@ -4847,7 +4845,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19162"
+NAME="AEN19083"
 ></A
 ><P
 ></P
@@ -4874,7 +4872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4889,7 +4887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4900,7 +4898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19175"
+NAME="AEN19096"
 ></A
 ><H3
 ><A
@@ -4935,7 +4933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19184"
+NAME="AEN19105"
 ></A
 ><P
 ></P
@@ -4962,7 +4960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4977,7 +4975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string parser or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4988,7 +4986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19197"
+NAME="AEN19118"
 ></A
 ><H3
 ><A
@@ -5026,7 +5024,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19207"
+NAME="AEN19128"
 ></A
 ><P
 ></P
@@ -5053,7 +5051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5064,7 +5062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19216"
+NAME="AEN19137"
 ></A
 ><H3
 ><A
@@ -5108,7 +5106,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19228"
+NAME="AEN19149"
 ></A
 ><P
 ></P
@@ -5135,7 +5133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5150,7 +5148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5161,7 +5159,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19241"
+NAME="AEN19162"
 ></A
 ><H3
 ><A
@@ -5201,7 +5199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19252"
+NAME="AEN19173"
 ></A
 ><P
 ></P
@@ -5228,7 +5226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5243,7 +5241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5254,7 +5252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19265"
+NAME="AEN19186"
 ></A
 ><H3
 ><A
@@ -5291,7 +5289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19275"
+NAME="AEN19196"
 ></A
 ><P
 ></P
@@ -5318,7 +5316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5333,7 +5331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Nmtoken parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5344,7 +5342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19288"
+NAME="AEN19209"
 ></A
 ><H3
 ><A
@@ -5384,7 +5382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19298"
+NAME="AEN19219"
 ></A
 ><P
 ></P
@@ -5411,7 +5409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5428,7 +5426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if non-NULL store a copy of the original entity value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5443,7 +5441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the EntityValue parsed with reference substitued or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5454,7 +5452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19315"
+NAME="AEN19236"
 ></A
 ><H3
 ><A
@@ -5544,7 +5542,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19336"
+NAME="AEN19257"
 ></A
 ><P
 ></P
@@ -5571,7 +5569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5586,7 +5584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the AttValue parsed or NULL. The value has to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5597,7 +5595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19349"
+NAME="AEN19270"
 ></A
 ><H3
 ><A
@@ -5632,7 +5630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19358"
+NAME="AEN19279"
 ></A
 ><P
 ></P
@@ -5659,7 +5657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5674,7 +5672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the SystemLiteral parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5685,7 +5683,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19371"
+NAME="AEN19292"
 ></A
 ><H3
 ><A
@@ -5720,7 +5718,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19380"
+NAME="AEN19301"
 ></A
 ><P
 ></P
@@ -5747,7 +5745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5762,7 +5760,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PubidLiteral parsed or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5773,7 +5771,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19393"
+NAME="AEN19314"
 ></A
 ><H3
 ><A
@@ -5812,7 +5810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19402"
+NAME="AEN19323"
 ></A
 ><P
 ></P
@@ -5839,7 +5837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5856,7 +5854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int indicating whether we are within a CDATA section</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5867,7 +5865,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19415"
+NAME="AEN19336"
 ></A
 ><H3
 ><A
@@ -5913,7 +5911,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19427"
+NAME="AEN19348"
 ></A
 ><P
 ></P
@@ -5940,7 +5938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5957,7 +5955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar** receiving PubidLiteral</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5974,8 +5972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> indicate whether we should restrict parsing to only
-production [75], see NOTE below</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5990,9 +5987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6003,7 +5998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19448"
+NAME="AEN19369"
 ></A
 ><H3
 ><A
@@ -6037,7 +6032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19456"
+NAME="AEN19377"
 ></A
 ><P
 ></P
@@ -6064,7 +6059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6075,7 +6070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19465"
+NAME="AEN19386"
 ></A
 ><H3
 ><A
@@ -6110,7 +6105,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19474"
+NAME="AEN19395"
 ></A
 ><P
 ></P
@@ -6137,7 +6132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6152,7 +6147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PITarget name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6163,7 +6158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19487"
+NAME="AEN19408"
 ></A
 ><H3
 ><A
@@ -6197,7 +6192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19496"
+NAME="AEN19417"
 ></A
 ><P
 ></P
@@ -6224,7 +6219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6235,7 +6230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19505"
+NAME="AEN19426"
 ></A
 ><H3
 ><A
@@ -6277,7 +6272,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19516"
+NAME="AEN19437"
 ></A
 ><P
 ></P
@@ -6304,7 +6299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6315,7 +6310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19525"
+NAME="AEN19446"
 ></A
 ><H3
 ><A
@@ -6360,7 +6355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19539"
+NAME="AEN19460"
 ></A
 ><P
 ></P
@@ -6387,7 +6382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6398,7 +6393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19548"
+NAME="AEN19469"
 ></A
 ><H3
 ><A
@@ -6471,7 +6466,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19568"
+NAME="AEN19489"
 ></A
 ><P
 ></P
@@ -6498,7 +6493,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6515,7 +6510,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Receive a possible fixed default value for the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6530,8 +6525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
-or XML_ATTRIBUTE_FIXED. </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6542,7 +6536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19585"
+NAME="AEN19506"
 ></A
 ><H3
 ><A
@@ -6583,7 +6577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19596"
+NAME="AEN19517"
 ></A
 ><P
 ></P
@@ -6610,7 +6604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6625,7 +6619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the notation attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6636,7 +6630,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19609"
+NAME="AEN19530"
 ></A
 ><H3
 ><A
@@ -6675,7 +6669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19619"
+NAME="AEN19540"
 ></A
 ><P
 ></P
@@ -6702,7 +6696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6717,7 +6711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the enumeration attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6728,7 +6722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19632"
+NAME="AEN19553"
 ></A
 ><H3
 ><A
@@ -6766,7 +6760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19642"
+NAME="AEN19563"
 ></A
 ><P
 ></P
@@ -6793,7 +6787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6810,7 +6804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6825,7 +6819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6836,7 +6830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19659"
+NAME="AEN19580"
 ></A
 ><H3
 ><A
@@ -6915,7 +6909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19680"
+NAME="AEN19601"
 ></A
 ><P
 ></P
@@ -6942,7 +6936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6959,7 +6953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6974,7 +6968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute type</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6985,7 +6979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19697"
+NAME="AEN19618"
 ></A
 ><H3
 ><A
@@ -7019,7 +7013,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19706"
+NAME="AEN19627"
 ></A
 ><P
 ></P
@@ -7046,7 +7040,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7057,7 +7051,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19715"
+NAME="AEN19636"
 ></A
 ><H3
 ><A
@@ -7107,7 +7101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19728"
+NAME="AEN19649"
 ></A
 ><P
 ></P
@@ -7134,7 +7128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7149,7 +7143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of the xmlElementContentPtr describing the element choices</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7160,7 +7154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19741"
+NAME="AEN19662"
 ></A
 ><H3
 ><A
@@ -7192,6 +7186,329 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
+NAME="AEN19669"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><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="AEN19682"
+></A
+><H3
+><A
+NAME="XMLPARSEELEMENTCHILDRENCONTENTDECL"
+></A
+>xmlParseElementChildrenContentDecl ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
+>xmlElementContentPtr</A
+> xmlParseElementChildrenContentDecl
+                                            (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse the declaration for a Mixed Element content
+The leading '(' and spaces have been skipped in xmlParseElementContentDecl</P
+><P
+>[47] children ::= (choice | seq) ('?' | '*' | '+')?</P
+><P
+>[48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?</P
+><P
+>[49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'</P
+><P
+>[50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'</P
+><P
+>[ VC: Proper Group/PE Nesting ] applies to [49] and [50]
+TODO Parameter-entity replacement text must be properly nested
+with parenthetized groups. That is to say, if either of the
+opening or closing parentheses in a choice, seq, or Mixed
+construct is contained in the replacement text for a parameter
+entity, both must be contained in the same replacement text. For
+interoperability, if a parameter-entity reference appears in a
+choice, seq, or Mixed construct, its replacement text should not
+be empty, and neither the first nor last non-blank character of
+the replacement text should be a connector (| or ,).</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19695"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><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="AEN19708"
+></A
+><H3
+><A
+NAME="XMLPARSEELEMENTCONTENTDECL"
+></A
+>xmlParseElementContentDecl ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlParseElementContentDecl      (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             <A
+HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
+>xmlElementContentPtr</A
+> *result);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse the declaration for an Element content either Mixed or Children,
+the cases EMPTY and ANY are handled directly in xmlParseElementDecl</P
+><P
+>[46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19718"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</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
+>result</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="AEN19739"
+></A
+><H3
+><A
+NAME="XMLPARSEELEMENTDECL"
+></A
+>xmlParseElementDecl ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlParseElementDecl             (<A
+HREF="libxml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse an Element declaration.</P
+><P
+>[45] elementdecl ::= '&lt;!ELEMENT' S Name S contentspec S? '&gt;'</P
+><P
+>[ VC: Unique Element Type Declaration ]
+No element type may be declared more than once</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
 NAME="AEN19748"
 ></A
 ><P
@@ -7249,330 +7566,6 @@
 ></A
 ><H3
 ><A
-NAME="XMLPARSEELEMENTCHILDRENCONTENTDECL"
-></A
->xmlParseElementChildrenContentDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
->xmlElementContentPtr</A
-> xmlParseElementChildrenContentDecl
-                                            (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse the declaration for a Mixed Element content
-The leading '(' and spaces have been skipped in xmlParseElementContentDecl</P
-><P
->[47] children ::= (choice | seq) ('?' | '*' | '+')?</P
-><P
->[48] cp ::= (Name | choice | seq) ('?' | '*' | '+')?</P
-><P
->[49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')'</P
-><P
->[50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')'</P
-><P
->[ VC: Proper Group/PE Nesting ] applies to [49] and [50]
-TODO Parameter-entity replacement text must be properly nested
-with parenthetized groups. That is to say, if either of the
-opening or closing parentheses in a choice, seq, or Mixed
-construct is contained in the replacement text for a parameter
-entity, both must be contained in the same replacement text. For
-interoperability, if a parameter-entity reference appears in a
-choice, seq, or Mixed construct, its replacement text should not
-be empty, and neither the first nor last non-blank character of
-the replacement text should be a connector (| or ,).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN19774"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the tree of xmlElementContentPtr describing the element 
-hierarchy.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN19787"
-></A
-><H3
-><A
-NAME="XMLPARSEELEMENTCONTENTDECL"
-></A
->xmlParseElementContentDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParseElementContentDecl      (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             <A
-HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
->xmlElementContentPtr</A
-> *result);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse the declaration for an Element content either Mixed or Children,
-the cases EMPTY and ANY are handled directly in xmlParseElementDecl</P
-><P
->[46] contentspec ::= 'EMPTY' | 'ANY' | Mixed | children</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN19797"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the name of the element being defined.</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->result</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the Element Content pointer will be stored here if any</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the type of element content XML_ELEMENT_TYPE_xxx</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN19818"
-></A
-><H3
-><A
-NAME="XMLPARSEELEMENTDECL"
-></A
->xmlParseElementDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParseElementDecl             (<A
-HREF="libxml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse an Element declaration.</P
-><P
->[45] elementdecl ::= '&lt;!ELEMENT' S Name S contentspec S? '&gt;'</P
-><P
->[ VC: Unique Element Type Declaration ]
-No element type may be declared more than once</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN19827"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the type of the element, or -1 in case of error</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN19840"
-></A
-><H3
-><A
 NAME="XMLPARSEMARKUPDECL"
 ></A
 >xmlParseMarkupDecl ()</H3
@@ -7615,7 +7608,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19850"
+NAME="AEN19771"
 ></A
 ><P
 ></P
@@ -7642,7 +7635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7653,7 +7646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19859"
+NAME="AEN19780"
 ></A
 ><H3
 ><A
@@ -7693,7 +7686,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19869"
+NAME="AEN19790"
 ></A
 ><P
 ></P
@@ -7720,7 +7713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7735,7 +7728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int), 0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7746,7 +7739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19882"
+NAME="AEN19803"
 ></A
 ><H3
 ><A
@@ -7799,7 +7792,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19893"
+NAME="AEN19814"
 ></A
 ><P
 ></P
@@ -7826,7 +7819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7841,7 +7834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found, or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7852,7 +7845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19906"
+NAME="AEN19827"
 ></A
 ><H3
 ><A
@@ -7893,7 +7886,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19916"
+NAME="AEN19837"
 ></A
 ><P
 ></P
@@ -7920,7 +7913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7931,7 +7924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19925"
+NAME="AEN19846"
 ></A
 ><H3
 ><A
@@ -7984,7 +7977,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19937"
+NAME="AEN19858"
 ></A
 ><P
 ></P
@@ -8011,7 +8004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8022,7 +8015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19946"
+NAME="AEN19867"
 ></A
 ><H3
 ><A
@@ -8059,7 +8052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19955"
+NAME="AEN19876"
 ></A
 ><P
 ></P
@@ -8086,7 +8079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8097,7 +8090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19964"
+NAME="AEN19885"
 ></A
 ><H3
 ><A
@@ -8157,7 +8150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19981"
+NAME="AEN19902"
 ></A
 ><P
 ></P
@@ -8184,7 +8177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8201,7 +8194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** used to store the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8216,7 +8209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute name, and the value in *value.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8227,7 +8220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19998"
+NAME="AEN19919"
 ></A
 ><H3
 ><A
@@ -8279,7 +8272,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20013"
+NAME="AEN19934"
 ></A
 ><P
 ></P
@@ -8306,7 +8299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8321,7 +8314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the element name parsed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8332,7 +8325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20026"
+NAME="AEN19947"
 ></A
 ><H3
 ><A
@@ -8368,7 +8361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20036"
+NAME="AEN19957"
 ></A
 ><P
 ></P
@@ -8395,7 +8388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8406,7 +8399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20045"
+NAME="AEN19966"
 ></A
 ><H3
 ><A
@@ -8444,7 +8437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20056"
+NAME="AEN19977"
 ></A
 ><P
 ></P
@@ -8471,7 +8464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8482,7 +8475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20065"
+NAME="AEN19986"
 ></A
 ><H3
 ><A
@@ -8514,7 +8507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20073"
+NAME="AEN19994"
 ></A
 ><P
 ></P
@@ -8541,7 +8534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8552,7 +8545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20082"
+NAME="AEN20003"
 ></A
 ><H3
 ><A
@@ -8601,7 +8594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20092"
+NAME="AEN20013"
 ></A
 ><P
 ></P
@@ -8628,7 +8621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8639,7 +8632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20101"
+NAME="AEN20022"
 ></A
 ><H3
 ><A
@@ -8674,7 +8667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20110"
+NAME="AEN20031"
 ></A
 ><P
 ></P
@@ -8701,7 +8694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8716,7 +8709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string giving the XML version number, or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8727,7 +8720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20123"
+NAME="AEN20044"
 ></A
 ><H3
 ><A
@@ -8764,7 +8757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20133"
+NAME="AEN20054"
 ></A
 ><P
 ></P
@@ -8791,7 +8784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8806,7 +8799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the version string, e.g. "1.0"</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8817,7 +8810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20146"
+NAME="AEN20067"
 ></A
 ><H3
 ><A
@@ -8852,7 +8845,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20155"
+NAME="AEN20076"
 ></A
 ><P
 ></P
@@ -8879,7 +8872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8894,7 +8887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding name value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8905,7 +8898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20168"
+NAME="AEN20089"
 ></A
 ><H3
 ><A
@@ -8942,7 +8935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20178"
+NAME="AEN20099"
 ></A
 ><P
 ></P
@@ -8969,7 +8962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8984,7 +8977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8995,7 +8988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20191"
+NAME="AEN20112"
 ></A
 ><H3
 ><A
@@ -9042,7 +9035,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20200"
+NAME="AEN20121"
 ></A
 ><P
 ></P
@@ -9069,7 +9062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9084,7 +9077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if standalone, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9095,7 +9088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20213"
+NAME="AEN20134"
 ></A
 ><H3
 ><A
@@ -9127,7 +9120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20221"
+NAME="AEN20142"
 ></A
 ><P
 ></P
@@ -9154,7 +9147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9165,7 +9158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20230"
+NAME="AEN20151"
 ></A
 ><H3
 ><A
@@ -9199,7 +9192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20239"
+NAME="AEN20160"
 ></A
 ><P
 ></P
@@ -9226,7 +9219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9237,7 +9230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20248"
+NAME="AEN20169"
 ></A
 ><H3
 ><A
@@ -9269,7 +9262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20256"
+NAME="AEN20177"
 ></A
 ><P
 ></P
@@ -9296,7 +9289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9307,7 +9300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20265"
+NAME="AEN20186"
 ></A
 ><H3
 ><A
@@ -9349,7 +9342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20276"
+NAME="AEN20197"
 ></A
 ><P
 ></P
@@ -9376,7 +9369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9393,7 +9386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the external identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9410,7 +9403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the system identifier (or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9421,7 +9414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20293"
+NAME="AEN20214"
 ></A
 ><H3
 ><A
@@ -9437,7 +9430,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_NONE	0</PRE
+>#define     XML_SUBSTITUTE_NONE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9447,7 +9440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20298"
+NAME="AEN20219"
 ></A
 ><H3
 ><A
@@ -9463,7 +9456,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_REF	1</PRE
+>#define     XML_SUBSTITUTE_REF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9473,7 +9466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20303"
+NAME="AEN20224"
 ></A
 ><H3
 ><A
@@ -9489,7 +9482,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_PEREF	2</PRE
+>#define     XML_SUBSTITUTE_PEREF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9499,7 +9492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20308"
+NAME="AEN20229"
 ></A
 ><H3
 ><A
@@ -9515,7 +9508,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_BOTH 	3</PRE
+>#define     XML_SUBSTITUTE_BOTH</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9525,7 +9518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20313"
+NAME="AEN20234"
 ></A
 ><H3
 ><A
@@ -9579,7 +9572,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20327"
+NAME="AEN20248"
 ></A
 ><P
 ></P
@@ -9606,7 +9599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9623,7 +9616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len to decode (in bytes !), -1 for no size limit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9640,7 +9633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9657,7 +9650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9674,7 +9667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9691,7 +9684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9706,8 +9699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9718,7 +9710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20360"
+NAME="AEN20281"
 ></A
 ><H3
 ><A
@@ -9772,7 +9764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20374"
+NAME="AEN20295"
 ></A
 ><P
 ></P
@@ -9799,7 +9791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9816,7 +9808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9833,7 +9825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9850,7 +9842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9867,7 +9859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9884,7 +9876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9899,8 +9891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9911,7 +9902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20407"
+NAME="AEN20328"
 ></A
 ><H3
 ><A
@@ -9943,7 +9934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20414"
+NAME="AEN20335"
 ></A
 ><P
 ></P
@@ -10013,7 +10004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20431"
+NAME="AEN20352"
 ></A
 ><H3
 ><A
@@ -10044,7 +10035,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20438"
+NAME="AEN20359"
 ></A
 ><P
 ></P
@@ -10097,7 +10088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20451"
+NAME="AEN20372"
 ></A
 ><H3
 ><A
@@ -10129,7 +10120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20458"
+NAME="AEN20379"
 ></A
 ><P
 ></P
@@ -10199,7 +10190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20475"
+NAME="AEN20396"
 ></A
 ><H3
 ><A
@@ -10230,7 +10221,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20482"
+NAME="AEN20403"
 ></A
 ><P
 ></P
@@ -10283,7 +10274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20495"
+NAME="AEN20416"
 ></A
 ><H3
 ><A
@@ -10314,7 +10305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20502"
+NAME="AEN20423"
 ></A
 ><P
 ></P
@@ -10367,7 +10358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20515"
+NAME="AEN20436"
 ></A
 ><H3
 ><A
@@ -10399,7 +10390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20522"
+NAME="AEN20443"
 ></A
 ><P
 ></P
@@ -10469,7 +10460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20539"
+NAME="AEN20460"
 ></A
 ><H3
 ><A
@@ -10500,7 +10491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20546"
+NAME="AEN20467"
 ></A
 ><P
 ></P
@@ -10527,7 +10518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10542,7 +10533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of space chars skipped</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10553,7 +10544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20559"
+NAME="AEN20480"
 ></A
 ><H3
 ><A
@@ -10589,7 +10580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20567"
+NAME="AEN20488"
 ></A
 ><P
 ></P
@@ -10616,7 +10607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10633,7 +10624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the beginning of the char</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10650,7 +10641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10665,7 +10656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its lenght</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10676,7 +10667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20588"
+NAME="AEN20509"
 ></A
 ><H3
 ><A
@@ -10735,7 +10726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20601"
+NAME="AEN20522"
 ></A
 ><P
 ></P
@@ -10762,7 +10753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10773,7 +10764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20610"
+NAME="AEN20531"
 ></A
 ><H3
 ><A
@@ -10830,7 +10821,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20625"
+NAME="AEN20546"
 ></A
 ><P
 ></P
@@ -10857,7 +10848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10868,7 +10859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20634"
+NAME="AEN20555"
 ></A
 ><H3
 ><A
@@ -10896,7 +10887,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20640"
+NAME="AEN20561"
 ></A
 ><P
 ></P
@@ -10949,7 +10940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20653"
+NAME="AEN20574"
 ></A
 ><H3
 ><A
@@ -11003,7 +10994,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20665"
+NAME="AEN20586"
 ></A
 ><P
 ></P
@@ -11030,7 +11021,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11047,7 +11038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11062,7 +11053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its lenght</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11073,7 +11064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20682"
+NAME="AEN20603"
 ></A
 ><H3
 ><A
@@ -11104,7 +11095,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20689"
+NAME="AEN20610"
 ></A
 ><P
 ></P
@@ -11131,7 +11122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an arry of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11148,7 +11139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11163,7 +11154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11174,7 +11165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20706"
+NAME="AEN20627"
 ></A
 ><H3
 ><A
@@ -11206,7 +11197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20713"
+NAME="AEN20634"
 ></A
 ><P
 ></P
@@ -11233,7 +11224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Ignored, compatibility</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11250,7 +11241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an arry of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11267,7 +11258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11282,7 +11273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11293,7 +11284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20734"
+NAME="AEN20655"
 ></A
 ><H3
 ><A
@@ -11323,7 +11314,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20741"
+NAME="AEN20662"
 ></A
 ><P
 ></P
@@ -11350,7 +11341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11361,7 +11352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20750"
+NAME="AEN20671"
 ></A
 ><H3
 ><A
@@ -11391,7 +11382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20757"
+NAME="AEN20678"
 ></A
 ><P
 ></P
@@ -11418,7 +11409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11429,7 +11420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20766"
+NAME="AEN20687"
 ></A
 ><H3
 ><A
@@ -11462,7 +11453,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20773"
+NAME="AEN20694"
 ></A
 ><H3
 ><A
@@ -11495,7 +11486,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20780"
+NAME="AEN20701"
 ></A
 ><P
 ></P
@@ -11522,7 +11513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11539,7 +11530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11554,7 +11545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index e258da0..dd10007 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2767"
+NAME="AEN2756"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2770"
+NAME="AEN2759"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2862"
+NAME="AEN2851"
 ></A
 ><H2
 >Description</H2
@@ -519,14 +519,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2865"
+NAME="AEN2854"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2867"
+NAME="AEN2856"
 ></A
 ><H3
 ><A
@@ -556,7 +556,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2874"
+NAME="AEN2863"
 ></A
 ><P
 ></P
@@ -583,7 +583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -598,7 +598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -609,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2887"
+NAME="AEN2876"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2894"
+NAME="AEN2883"
 ></A
 ><P
 ></P
@@ -667,7 +667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -682,7 +682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -693,7 +693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2907"
+NAME="AEN2896"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2914"
+NAME="AEN2903"
 ></A
 ><P
 ></P
@@ -752,7 +752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -769,7 +769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> A SAX Locator</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -780,7 +780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2927"
+NAME="AEN2916"
 ></A
 ><H3
 ><A
@@ -807,7 +807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2933"
+NAME="AEN2922"
 ></A
 ><P
 ></P
@@ -834,7 +834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -849,7 +849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -860,7 +860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2946"
+NAME="AEN2935"
 ></A
 ><H3
 ><A
@@ -887,7 +887,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2952"
+NAME="AEN2941"
 ></A
 ><P
 ></P
@@ -914,7 +914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -929,7 +929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -940,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2965"
+NAME="AEN2954"
 ></A
 ><H3
 ><A
@@ -967,7 +967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2971"
+NAME="AEN2960"
 ></A
 ><P
 ></P
@@ -994,7 +994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1009,7 +1009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1020,7 +1020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2984"
+NAME="AEN2973"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2990"
+NAME="AEN2979"
 ></A
 ><P
 ></P
@@ -1074,7 +1074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1089,7 +1089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1100,7 +1100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3003"
+NAME="AEN2992"
 ></A
 ><H3
 ><A
@@ -1127,7 +1127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3009"
+NAME="AEN2998"
 ></A
 ><P
 ></P
@@ -1154,7 +1154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1169,7 +1169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1180,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3022"
+NAME="AEN3011"
 ></A
 ><H3
 ><A
@@ -1219,7 +1219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3031"
+NAME="AEN3020"
 ></A
 ><P
 ></P
@@ -1246,7 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1263,7 +1263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1280,7 +1280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1297,7 +1297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1308,7 +1308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3052"
+NAME="AEN3041"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3061"
+NAME="AEN3050"
 ></A
 ><P
 ></P
@@ -1374,7 +1374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1391,7 +1391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1408,7 +1408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1425,7 +1425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1436,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3082"
+NAME="AEN3071"
 ></A
 ><H3
 ><A
@@ -1470,7 +1470,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3090"
+NAME="AEN3079"
 ></A
 ><P
 ></P
@@ -1497,7 +1497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1514,7 +1514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1529,7 +1529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1540,7 +1540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3107"
+NAME="AEN3096"
 ></A
 ><H3
 ><A
@@ -1574,7 +1574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3115"
+NAME="AEN3104"
 ></A
 ><P
 ></P
@@ -1601,7 +1601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1618,7 +1618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1633,7 +1633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1644,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3132"
+NAME="AEN3121"
 ></A
 ><H3
 ><A
@@ -1692,7 +1692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3143"
+NAME="AEN3132"
 ></A
 ><P
 ></P
@@ -1719,7 +1719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1736,7 +1736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1753,7 +1753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1768,7 +1768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1779,7 +1779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3164"
+NAME="AEN3153"
 ></A
 ><H3
 ><A
@@ -1823,7 +1823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3174"
+NAME="AEN3163"
 ></A
 ><P
 ></P
@@ -1850,7 +1850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1867,7 +1867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1884,7 +1884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1901,7 +1901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1918,7 +1918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1935,7 +1935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity value (without processing).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1946,7 +1946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3203"
+NAME="AEN3192"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3213"
+NAME="AEN3202"
 ></A
 ><P
 ></P
@@ -2018,7 +2018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2035,7 +2035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2069,7 +2069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2086,7 +2086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2103,7 +2103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2120,7 +2120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree of enumerated value set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2131,7 +2131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3246"
+NAME="AEN3235"
 ></A
 ><H3
 ><A
@@ -2167,7 +2167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3254"
+NAME="AEN3243"
 ></A
 ><P
 ></P
@@ -2194,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2211,7 +2211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2228,7 +2228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2245,7 +2245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the element value tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2256,7 +2256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3275"
+NAME="AEN3264"
 ></A
 ><H3
 ><A
@@ -2295,7 +2295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3284"
+NAME="AEN3273"
 ></A
 ><P
 ></P
@@ -2322,7 +2322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2339,7 +2339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the notation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2356,7 +2356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2373,7 +2373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2384,7 +2384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3305"
+NAME="AEN3294"
 ></A
 ><H3
 ><A
@@ -2427,7 +2427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3315"
+NAME="AEN3304"
 ></A
 ><P
 ></P
@@ -2454,7 +2454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2471,7 +2471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2488,7 +2488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2505,7 +2505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2522,7 +2522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the notation</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2533,7 +2533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3340"
+NAME="AEN3329"
 ></A
 ><H3
 ><A
@@ -2560,7 +2560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3346"
+NAME="AEN3335"
 ></A
 ><P
 ></P
@@ -2587,7 +2587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2598,7 +2598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3355"
+NAME="AEN3344"
 ></A
 ><H3
 ><A
@@ -2625,7 +2625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3361"
+NAME="AEN3350"
 ></A
 ><P
 ></P
@@ -2652,7 +2652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2663,7 +2663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3370"
+NAME="AEN3359"
 ></A
 ><H3
 ><A
@@ -2701,7 +2701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3378"
+NAME="AEN3367"
 ></A
 ><P
 ></P
@@ -2728,7 +2728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2745,7 +2745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2762,7 +2762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2773,7 +2773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3395"
+NAME="AEN3384"
 ></A
 ><H3
 ><A
@@ -2808,7 +2808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3403"
+NAME="AEN3392"
 ></A
 ><P
 ></P
@@ -2835,7 +2835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2852,7 +2852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2869,7 +2869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An array of name/value attributes pairs, NULL terminated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2880,7 +2880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3420"
+NAME="AEN3409"
 ></A
 ><H3
 ><A
@@ -2911,7 +2911,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3427"
+NAME="AEN3416"
 ></A
 ><P
 ></P
@@ -2938,7 +2938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2955,7 +2955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2966,7 +2966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3440"
+NAME="AEN3429"
 ></A
 ><H3
 ><A
@@ -2997,7 +2997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3447"
+NAME="AEN3436"
 ></A
 ><P
 ></P
@@ -3024,7 +3024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3041,7 +3041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The entity name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3052,7 +3052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3460"
+NAME="AEN3449"
 ></A
 ><H3
 ><A
@@ -3085,7 +3085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3467"
+NAME="AEN3456"
 ></A
 ><P
 ></P
@@ -3112,7 +3112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3129,7 +3129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3146,7 +3146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3157,7 +3157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3484"
+NAME="AEN3473"
 ></A
 ><H3
 ><A
@@ -3190,7 +3190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3491"
+NAME="AEN3480"
 ></A
 ><P
 ></P
@@ -3217,7 +3217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3234,7 +3234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3251,7 +3251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3262,7 +3262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3508"
+NAME="AEN3497"
 ></A
 ><H3
 ><A
@@ -3297,7 +3297,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3516"
+NAME="AEN3505"
 ></A
 ><P
 ></P
@@ -3324,7 +3324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3341,7 +3341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the target name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3358,7 +3358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the PI data's</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3369,7 +3369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3533"
+NAME="AEN3522"
 ></A
 ><H3
 ><A
@@ -3404,7 +3404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3541"
+NAME="AEN3530"
 ></A
 ><P
 ></P
@@ -3431,7 +3431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3448,7 +3448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3465,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3476,7 +3476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3558"
+NAME="AEN3547"
 ></A
 ><H3
 ><A
@@ -3507,7 +3507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3565"
+NAME="AEN3554"
 ></A
 ><P
 ></P
@@ -3534,7 +3534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3551,7 +3551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3562,7 +3562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3578"
+NAME="AEN3567"
 ></A
 ><H3
 ><A
@@ -3592,7 +3592,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3585"
+NAME="AEN3574"
 ></A
 ><P
 ></P
@@ -3619,7 +3619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3634,7 +3634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNsPtr or NULL if none</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3645,7 +3645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3598"
+NAME="AEN3587"
 ></A
 ><H3
 ><A
@@ -3677,7 +3677,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3605"
+NAME="AEN3594"
 ></A
 ><P
 ></P
@@ -3704,7 +3704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3721,7 +3721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace to check against</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3736,7 +3736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3747,7 +3747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3622"
+NAME="AEN3611"
 ></A
 ><H3
 ><A
@@ -3782,7 +3782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3630"
+NAME="AEN3619"
 ></A
 ><P
 ></P
@@ -3809,7 +3809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3826,7 +3826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3843,7 +3843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3854,7 +3854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3647"
+NAME="AEN3636"
 ></A
 ><H3
 ><A
@@ -3885,7 +3885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3654"
+NAME="AEN3643"
 ></A
 ><P
 ></P
@@ -3912,7 +3912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3929,7 +3929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3940,7 +3940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3667"
+NAME="AEN3656"
 ></A
 ><H3
 ><A
@@ -3972,7 +3972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3674"
+NAME="AEN3663"
 ></A
 ><P
 ></P
@@ -3999,7 +3999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4016,7 +4016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The pcdata content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4033,7 +4033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the block length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4044,7 +4044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3691"
+NAME="AEN3680"
 ></A
 ><H3
 ><A
@@ -4072,7 +4072,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3697"
+NAME="AEN3686"
 ></A
 ><H3
 ><A
@@ -4100,7 +4100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3703"
+NAME="AEN3692"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 2e585c8..d34312d 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3714"
+NAME="AEN3703"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3717"
+NAME="AEN3706"
 ></A
 ><H2
 >Synopsis</H2
@@ -1811,7 +1811,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4172"
+NAME="AEN4161"
 ></A
 ><H2
 >Description</H2
@@ -1821,14 +1821,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4175"
+NAME="AEN4164"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4177"
+NAME="AEN4166"
 ></A
 ><H3
 ><A
@@ -1854,7 +1854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4182"
+NAME="AEN4171"
 ></A
 ><H3
 ><A
@@ -1904,26 +1904,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4187"
+NAME="AEN4176"
 ></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
@@ -1934,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4193"
+NAME="AEN4181"
 ></A
 ><H3
 ><A
@@ -1950,7 +1937,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define BAD_CAST (xmlChar *)</PRE
+>#define     BAD_CAST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1962,7 +1949,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4199"
+NAME="AEN4187"
 ></A
 ><H3
 ><A
@@ -1994,33 +1981,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4205"
+NAME="AEN4193"
 ></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="AEN4210"
+NAME="AEN4197"
 ></A
 ><H3
 ><A
@@ -2059,7 +2033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4216"
+NAME="AEN4203"
 ></A
 ><H3
 ><A
@@ -2092,7 +2066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4222"
+NAME="AEN4209"
 ></A
 ><H3
 ><A
@@ -2123,33 +2097,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4228"
+NAME="AEN4215"
 ></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="AEN4233"
+NAME="AEN4219"
 ></A
 ><H3
 ><A
@@ -2166,9 +2127,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlAttribute {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ATTRIBUTE_DECL, must be second ! */
     const xmlChar          *name;	/* Attribute name */
     struct _xmlNode    *children;	/* NULL */
@@ -2197,33 +2156,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4239"
+NAME="AEN4225"
 ></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="AEN4244"
+NAME="AEN4229"
 ></A
 ><H3
 ><A
@@ -2256,7 +2202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4250"
+NAME="AEN4235"
 ></A
 ><H3
 ><A
@@ -2289,7 +2235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4256"
+NAME="AEN4241"
 ></A
 ><H3
 ><A
@@ -2325,33 +2271,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4262"
+NAME="AEN4247"
 ></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="AEN4267"
+NAME="AEN4251"
 ></A
 ><H3
 ><A
@@ -2385,7 +2318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4273"
+NAME="AEN4257"
 ></A
 ><H3
 ><A
@@ -2402,9 +2335,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlElement {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	        /* for Corba, must be first ! */
-#endif
     xmlElementType          type;       /* XML_ELEMENT_DECL, must be second ! */
     const xmlChar          *name;	/* Element name */
     struct _xmlNode    *children;	/* NULL */
@@ -2430,33 +2361,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4279"
+NAME="AEN4263"
 ></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="AEN4284"
+NAME="AEN4267"
 ></A
 ><H3
 ><A
@@ -2472,7 +2390,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL</PRE
+>#define     XML_LOCAL_NAMESPACE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2482,33 +2400,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4289"
+NAME="AEN4272"
 ></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="AEN4294"
+NAME="AEN4276"
 ></A
 ><H3
 ><A
@@ -2546,33 +2451,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4301"
+NAME="AEN4283"
 ></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="AEN4306"
+NAME="AEN4287"
 ></A
 ><H3
 ><A
@@ -2589,9 +2481,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlDtd {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType  type;       /* XML_DTD_NODE, must be second ! */
     const xmlChar *name;	/* Name of the DTD */
     struct _xmlNode *children;	/* the value of the property link */
@@ -2622,33 +2512,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4312"
+NAME="AEN4293"
 ></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="AEN4317"
+NAME="AEN4297"
 ></A
 ><H3
 ><A
@@ -2665,9 +2542,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlAttr {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType   type;      /* XML_ATTRIBUTE_NODE, must be second ! */
     const xmlChar   *name;      /* the name of the property */
     struct _xmlNode *children;	/* the value of the property */
@@ -2690,33 +2565,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4323"
+NAME="AEN4303"
 ></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="AEN4328"
+NAME="AEN4307"
 ></A
 ><H3
 ><A
@@ -2748,33 +2610,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4334"
+NAME="AEN4313"
 ></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="AEN4339"
+NAME="AEN4317"
 ></A
 ><H3
 ><A
@@ -2806,33 +2655,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4345"
+NAME="AEN4323"
 ></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="AEN4350"
+NAME="AEN4327"
 ></A
 ><H3
 ><A
@@ -2864,7 +2700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4356"
+NAME="AEN4333"
 ></A
 ><H3
 ><A
@@ -2897,33 +2733,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4362"
+NAME="AEN4339"
 ></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="AEN4367"
+NAME="AEN4343"
 ></A
 ><H3
 ><A
@@ -2940,9 +2763,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlNode {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType   type;	/* type number, must be second ! */
     const xmlChar   *name;      /* the name of the node, or the entity */
     struct _xmlNode *children;	/* parent-&gt;childs link */
@@ -2973,33 +2794,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4373"
+NAME="AEN4349"
 ></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="AEN4378"
+NAME="AEN4353"
 ></A
 ><H3
 ><A
@@ -3016,9 +2824,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlDoc {
-#ifndef XML_WITHOUT_CORBA
     void           *_private;	/* for Corba, must be first ! */
-#endif
     xmlElementType  type;       /* XML_DOCUMENT_NODE, must be second ! */
     char           *name;	/* name/filename/URI of the document */
     struct _xmlNode *children;	/* the document tree */
@@ -3053,33 +2859,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4384"
+NAME="AEN4359"
 ></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="AEN4389"
+NAME="AEN4363"
 ></A
 ><H3
 ><A
@@ -3095,7 +2888,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlChildrenNode children</PRE
+>#define     xmlChildrenNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3107,7 +2900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4395"
+NAME="AEN4369"
 ></A
 ><H3
 ><A
@@ -3123,7 +2916,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlRootNode children</PRE
+>#define     xmlRootNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3135,7 +2928,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4401"
+NAME="AEN4375"
 ></A
 ><H3
 ><A
@@ -3168,7 +2961,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4408"
+NAME="AEN4382"
 ></A
 ><P
 ></P
@@ -3195,7 +2988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  allocation method to use</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3206,7 +2999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4417"
+NAME="AEN4391"
 ></A
 ><H3
 ><A
@@ -3240,7 +3033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4424"
+NAME="AEN4398"
 ></A
 ><P
 ></P
@@ -3265,7 +3058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current allocation scheme</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3276,7 +3069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4433"
+NAME="AEN4407"
 ></A
 ><H3
 ><A
@@ -3306,7 +3099,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4440"
+NAME="AEN4414"
 ></A
 ><P
 ></P
@@ -3331,7 +3124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3342,7 +3135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4449"
+NAME="AEN4423"
 ></A
 ><H3
 ><A
@@ -3375,7 +3168,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4457"
+NAME="AEN4431"
 ></A
 ><P
 ></P
@@ -3402,7 +3195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> initial size of buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3417,7 +3210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3428,7 +3221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4470"
+NAME="AEN4444"
 ></A
 ><H3
 ><A
@@ -3464,7 +3257,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4478"
+NAME="AEN4452"
 ></A
 ><P
 ></P
@@ -3491,7 +3284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to resize</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3508,7 +3301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the desired size</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3523,7 +3316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of problems, 1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3534,7 +3327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4495"
+NAME="AEN4469"
 ></A
 ><H3
 ><A
@@ -3564,7 +3357,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4502"
+NAME="AEN4476"
 ></A
 ><P
 ></P
@@ -3591,7 +3384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3602,7 +3395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4511"
+NAME="AEN4485"
 ></A
 ><H3
 ><A
@@ -3636,7 +3429,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4519"
+NAME="AEN4493"
 ></A
 ><P
 ></P
@@ -3663,7 +3456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3680,7 +3473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3695,7 +3488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3706,7 +3499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4536"
+NAME="AEN4510"
 ></A
 ><H3
 ><A
@@ -3742,7 +3535,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4544"
+NAME="AEN4518"
 ></A
 ><P
 ></P
@@ -3769,7 +3562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3786,7 +3579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3803,7 +3596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3814,7 +3607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4561"
+NAME="AEN4535"
 ></A
 ><H3
 ><A
@@ -3855,7 +3648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4570"
+NAME="AEN4544"
 ></A
 ><P
 ></P
@@ -3882,7 +3675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3899,7 +3692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3916,7 +3709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3927,7 +3720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4587"
+NAME="AEN4561"
 ></A
 ><H3
 ><A
@@ -3961,7 +3754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4595"
+NAME="AEN4569"
 ></A
 ><P
 ></P
@@ -3988,7 +3781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4005,7 +3798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4016,7 +3809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4608"
+NAME="AEN4582"
 ></A
 ><H3
 ><A
@@ -4047,7 +3840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4615"
+NAME="AEN4589"
 ></A
 ><P
 ></P
@@ -4074,7 +3867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4091,7 +3884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the C char string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4102,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4628"
+NAME="AEN4602"
 ></A
 ><H3
 ><A
@@ -4133,7 +3926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4635"
+NAME="AEN4609"
 ></A
 ><P
 ></P
@@ -4160,7 +3953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4177,7 +3970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4192,7 +3985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar removed, or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4203,7 +3996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4652"
+NAME="AEN4626"
 ></A
 ><H3
 ><A
@@ -4234,7 +4027,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4659"
+NAME="AEN4633"
 ></A
 ><P
 ></P
@@ -4261,7 +4054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4278,7 +4071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimum free size to allocate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4293,7 +4086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new available space or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4304,7 +4097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4676"
+NAME="AEN4650"
 ></A
 ><H3
 ><A
@@ -4334,7 +4127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4683"
+NAME="AEN4657"
 ></A
 ><P
 ></P
@@ -4361,7 +4154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4372,7 +4165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4692"
+NAME="AEN4666"
 ></A
 ><H3
 ><A
@@ -4405,7 +4198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4700"
+NAME="AEN4674"
 ></A
 ><P
 ></P
@@ -4432,7 +4225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4447,7 +4240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4458,7 +4251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4713"
+NAME="AEN4687"
 ></A
 ><H3
 ><A
@@ -4486,7 +4279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4719"
+NAME="AEN4693"
 ></A
 ><P
 ></P
@@ -4539,7 +4332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4732"
+NAME="AEN4706"
 ></A
 ><H3
 ><A
@@ -4573,7 +4366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4740"
+NAME="AEN4714"
 ></A
 ><P
 ></P
@@ -4600,7 +4393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4617,7 +4410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  allocation scheme to use</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4628,7 +4421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4753"
+NAME="AEN4727"
 ></A
 ><H3
 ><A
@@ -4658,7 +4451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4760"
+NAME="AEN4734"
 ></A
 ><P
 ></P
@@ -4685,7 +4478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4700,7 +4493,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the length of data in the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4711,7 +4504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4773"
+NAME="AEN4747"
 ></A
 ><H3
 ><A
@@ -4756,7 +4549,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4784"
+NAME="AEN4758"
 ></A
 ><P
 ></P
@@ -4783,7 +4576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4800,7 +4593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4817,7 +4610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external (PUBLIC) ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4834,7 +4627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4849,7 +4642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4860,7 +4653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4809"
+NAME="AEN4783"
 ></A
 ><H3
 ><A
@@ -4909,7 +4702,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4821"
+NAME="AEN4795"
 ></A
 ><P
 ></P
@@ -4936,7 +4729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4953,7 +4746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4970,7 +4763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4987,7 +4780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5002,7 +4795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5013,7 +4806,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4846"
+NAME="AEN4820"
 ></A
 ><H3
 ><A
@@ -5046,7 +4839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4854"
+NAME="AEN4828"
 ></A
 ><P
 ></P
@@ -5073,7 +4866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5088,7 +4881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the DTD structure or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5099,7 +4892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4867"
+NAME="AEN4841"
 ></A
 ><H3
 ><A
@@ -5129,7 +4922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4874"
+NAME="AEN4848"
 ></A
 ><P
 ></P
@@ -5156,7 +4949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD structure to free up</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5167,7 +4960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4883"
+NAME="AEN4857"
 ></A
 ><H3
 ><A
@@ -5210,7 +5003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4893"
+NAME="AEN4867"
 ></A
 ><P
 ></P
@@ -5237,7 +5030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5254,7 +5047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5271,7 +5064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5286,7 +5079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL this functionnality had been removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5297,7 +5090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4914"
+NAME="AEN4888"
 ></A
 ><H3
 ><A
@@ -5342,7 +5135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4924"
+NAME="AEN4898"
 ></A
 ><P
 ></P
@@ -5369,7 +5162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5386,7 +5179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5403,7 +5196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5418,7 +5211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->returns a new namespace pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5429,7 +5222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4945"
+NAME="AEN4919"
 ></A
 ><H3
 ><A
@@ -5459,7 +5252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4952"
+NAME="AEN4926"
 ></A
 ><P
 ></P
@@ -5486,7 +5279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5497,7 +5290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4961"
+NAME="AEN4935"
 ></A
 ><H3
 ><A
@@ -5527,7 +5320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4968"
+NAME="AEN4942"
 ></A
 ><P
 ></P
@@ -5554,7 +5347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5565,7 +5358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4977"
+NAME="AEN4951"
 ></A
 ><H3
 ><A
@@ -5598,7 +5391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4985"
+NAME="AEN4959"
 ></A
 ><P
 ></P
@@ -5625,7 +5418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  xmlChar string giving the version of XML "1.0"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5640,7 +5433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5651,7 +5444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4998"
+NAME="AEN4972"
 ></A
 ><H3
 ><A
@@ -5681,7 +5474,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5005"
+NAME="AEN4979"
 ></A
 ><P
 ></P
@@ -5708,8 +5501,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document
-@:  </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5720,7 +5512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5014"
+NAME="AEN4988"
 ></A
 ><H3
 ><A
@@ -5761,7 +5553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5024"
+NAME="AEN4998"
 ></A
 ><P
 ></P
@@ -5788,7 +5580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5805,7 +5597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5822,7 +5614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5837,7 +5629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5848,7 +5640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5045"
+NAME="AEN5019"
 ></A
 ><H3
 ><A
@@ -5889,7 +5681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5055"
+NAME="AEN5029"
 ></A
 ><P
 ></P
@@ -5916,7 +5708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5933,7 +5725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5950,7 +5742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5965,7 +5757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5976,7 +5768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5076"
+NAME="AEN5050"
 ></A
 ><H3
 ><A
@@ -6021,7 +5813,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5087"
+NAME="AEN5061"
 ></A
 ><P
 ></P
@@ -6048,7 +5840,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6065,7 +5857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6082,7 +5874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6099,7 +5891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6114,7 +5906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6125,7 +5917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5112"
+NAME="AEN5086"
 ></A
 ><H3
 ><A
@@ -6155,7 +5947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5119"
+NAME="AEN5093"
 ></A
 ><P
 ></P
@@ -6182,7 +5974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first property in the list</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6193,7 +5985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5128"
+NAME="AEN5102"
 ></A
 ><H3
 ><A
@@ -6223,7 +6015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5135"
+NAME="AEN5109"
 ></A
 ><P
 ></P
@@ -6250,7 +6042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6261,7 +6053,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5144"
+NAME="AEN5118"
 ></A
 ><H3
 ><A
@@ -6298,7 +6090,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5153"
+NAME="AEN5127"
 ></A
 ><P
 ></P
@@ -6325,7 +6117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attribute will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6342,7 +6134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6357,7 +6149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6368,7 +6160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5170"
+NAME="AEN5144"
 ></A
 ><H3
 ><A
@@ -6405,7 +6197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5179"
+NAME="AEN5153"
 ></A
 ><P
 ></P
@@ -6432,7 +6224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attributes will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6449,7 +6241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6464,7 +6256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6475,7 +6267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5196"
+NAME="AEN5170"
 ></A
 ><H3
 ><A
@@ -6508,7 +6300,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5204"
+NAME="AEN5178"
 ></A
 ><P
 ></P
@@ -6535,7 +6327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the dtd</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6550,7 +6342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDtdPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6561,7 +6353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5217"
+NAME="AEN5191"
 ></A
 ><H3
 ><A
@@ -6596,7 +6388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5225"
+NAME="AEN5199"
 ></A
 ><P
 ></P
@@ -6623,7 +6415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6640,7 +6432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6655,7 +6447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDocPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6666,7 +6458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5242"
+NAME="AEN5216"
 ></A
 ><H3
 ><A
@@ -6737,7 +6529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5258"
+NAME="AEN5232"
 ></A
 ><P
 ></P
@@ -6764,7 +6556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6781,7 +6573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6798,7 +6590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6815,7 +6607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6830,7 +6622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6841,7 +6633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5283"
+NAME="AEN5257"
 ></A
 ><H3
 ><A
@@ -6897,7 +6689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5296"
+NAME="AEN5270"
 ></A
 ><P
 ></P
@@ -6924,7 +6716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6941,7 +6733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6958,7 +6750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6975,7 +6767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6990,7 +6782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7001,7 +6793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5321"
+NAME="AEN5295"
 ></A
 ><H3
 ><A
@@ -7043,7 +6835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5331"
+NAME="AEN5305"
 ></A
 ><P
 ></P
@@ -7070,7 +6862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7087,7 +6879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7102,7 +6894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7113,7 +6905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5348"
+NAME="AEN5322"
 ></A
 ><H3
 ><A
@@ -7190,7 +6982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5365"
+NAME="AEN5339"
 ></A
 ><P
 ></P
@@ -7217,7 +7009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7234,7 +7026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7251,7 +7043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7268,7 +7060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7283,7 +7075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7294,7 +7086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5390"
+NAME="AEN5364"
 ></A
 ><H3
 ><A
@@ -7356,7 +7148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5404"
+NAME="AEN5378"
 ></A
 ><P
 ></P
@@ -7383,7 +7175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7400,7 +7192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7417,7 +7209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7434,7 +7226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7449,7 +7241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7460,7 +7252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5429"
+NAME="AEN5403"
 ></A
 ><H3
 ><A
@@ -7497,7 +7289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5438"
+NAME="AEN5412"
 ></A
 ><P
 ></P
@@ -7524,7 +7316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7541,7 +7333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7556,7 +7348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7567,7 +7359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5455"
+NAME="AEN5429"
 ></A
 ><H3
 ><A
@@ -7600,7 +7392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5463"
+NAME="AEN5437"
 ></A
 ><P
 ></P
@@ -7627,7 +7419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7642,7 +7434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7653,7 +7445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5476"
+NAME="AEN5450"
 ></A
 ><H3
 ><A
@@ -7690,7 +7482,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5485"
+NAME="AEN5459"
 ></A
 ><P
 ></P
@@ -7717,7 +7509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the processing instruction name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7734,7 +7526,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the PI content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7749,7 +7541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7760,7 +7552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5502"
+NAME="AEN5476"
 ></A
 ><H3
 ><A
@@ -7799,7 +7591,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5511"
+NAME="AEN5485"
 ></A
 ><P
 ></P
@@ -7826,7 +7618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7843,7 +7635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7860,7 +7652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7875,7 +7667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7886,7 +7678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5532"
+NAME="AEN5506"
 ></A
 ><H3
 ><A
@@ -7920,7 +7712,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5540"
+NAME="AEN5514"
 ></A
 ><P
 ></P
@@ -7947,7 +7739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7964,7 +7756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7979,7 +7771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7990,7 +7782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5557"
+NAME="AEN5531"
 ></A
 ><H3
 ><A
@@ -8027,7 +7819,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5566"
+NAME="AEN5540"
 ></A
 ><P
 ></P
@@ -8054,7 +7846,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8071,7 +7863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8086,7 +7878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8097,7 +7889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5583"
+NAME="AEN5557"
 ></A
 ><H3
 ><A
@@ -8130,7 +7922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5591"
+NAME="AEN5565"
 ></A
 ><P
 ></P
@@ -8157,7 +7949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8172,7 +7964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8183,7 +7975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5604"
+NAME="AEN5578"
 ></A
 ><H3
 ><A
@@ -8221,7 +8013,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5613"
+NAME="AEN5587"
 ></A
 ><P
 ></P
@@ -8248,7 +8040,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8265,7 +8057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the CData block content content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8282,7 +8074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8297,7 +8089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8308,7 +8100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5634"
+NAME="AEN5608"
 ></A
 ><H3
 ><A
@@ -8345,7 +8137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5643"
+NAME="AEN5617"
 ></A
 ><P
 ></P
@@ -8372,7 +8164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8389,7 +8181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char ref string, starting with # or "&amp;# ... ;"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8404,7 +8196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8415,7 +8207,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5660"
+NAME="AEN5634"
 ></A
 ><H3
 ><A
@@ -8452,7 +8244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5669"
+NAME="AEN5643"
 ></A
 ><P
 ></P
@@ -8479,7 +8271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8496,7 +8288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reference name, or the reference string with &amp; and ;</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8511,7 +8303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8522,7 +8314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5686"
+NAME="AEN5660"
 ></A
 ><H3
 ><A
@@ -8556,7 +8348,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5694"
+NAME="AEN5668"
 ></A
 ><P
 ></P
@@ -8583,7 +8375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8600,7 +8392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8615,7 +8407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8626,7 +8418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5711"
+NAME="AEN5685"
 ></A
 ><H3
 ><A
@@ -8664,7 +8456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5720"
+NAME="AEN5694"
 ></A
 ><P
 ></P
@@ -8691,7 +8483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8725,7 +8517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8740,7 +8532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8751,7 +8543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5741"
+NAME="AEN5715"
 ></A
 ><H3
 ><A
@@ -8784,7 +8576,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5749"
+NAME="AEN5723"
 ></A
 ><P
 ></P
@@ -8811,7 +8603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8826,7 +8618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8837,7 +8629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5762"
+NAME="AEN5736"
 ></A
 ><H3
 ><A
@@ -8870,7 +8662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5770"
+NAME="AEN5744"
 ></A
 ><P
 ></P
@@ -8897,7 +8689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document owning the fragment</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8912,7 +8704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8923,7 +8715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5783"
+NAME="AEN5757"
 ></A
 ><H3
 ><A
@@ -8957,7 +8749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5791"
+NAME="AEN5765"
 ></A
 ><P
 ></P
@@ -8984,7 +8776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8999,7 +8791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNodePtr for the root or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9010,7 +8802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5804"
+NAME="AEN5778"
 ></A
 ><H3
 ><A
@@ -9043,7 +8835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5812"
+NAME="AEN5786"
 ></A
 ><P
 ></P
@@ -9070,7 +8862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9085,7 +8877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL if none.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9096,7 +8888,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5825"
+NAME="AEN5799"
 ></A
 ><H3
 ><A
@@ -9126,7 +8918,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5832"
+NAME="AEN5806"
 ></A
 ><P
 ></P
@@ -9153,7 +8945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9168,7 +8960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9179,7 +8971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5845"
+NAME="AEN5819"
 ></A
 ><H3
 ><A
@@ -9210,7 +9002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5852"
+NAME="AEN5826"
 ></A
 ><P
 ></P
@@ -9237,7 +9029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9252,7 +9044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9263,7 +9055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5865"
+NAME="AEN5839"
 ></A
 ><H3
 ><A
@@ -9301,7 +9093,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5874"
+NAME="AEN5848"
 ></A
 ><P
 ></P
@@ -9328,7 +9120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9345,7 +9137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new document root element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9360,7 +9152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old root element if any was found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9371,7 +9163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5891"
+NAME="AEN5865"
 ></A
 ><H3
 ><A
@@ -9405,7 +9197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5899"
+NAME="AEN5873"
 ></A
 ><P
 ></P
@@ -9432,7 +9224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9449,7 +9241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new tag name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9460,7 +9252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5912"
+NAME="AEN5886"
 ></A
 ><H3
 ><A
@@ -9508,7 +9300,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5923"
+NAME="AEN5897"
 ></A
 ><P
 ></P
@@ -9535,7 +9327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9552,7 +9344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9567,7 +9359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9578,7 +9370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5940"
+NAME="AEN5914"
 ></A
 ><H3
 ><A
@@ -9621,7 +9413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5950"
+NAME="AEN5924"
 ></A
 ><P
 ></P
@@ -9648,7 +9440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9665,7 +9457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9680,7 +9472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9691,7 +9483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5967"
+NAME="AEN5941"
 ></A
 ><H3
 ><A
@@ -9730,7 +9522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5976"
+NAME="AEN5950"
 ></A
 ><P
 ></P
@@ -9757,7 +9549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the old node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9774,7 +9566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9789,7 +9581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9800,7 +9592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5993"
+NAME="AEN5967"
 ></A
 ><H3
 ><A
@@ -9855,7 +9647,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6005"
+NAME="AEN5979"
 ></A
 ><P
 ></P
@@ -9882,7 +9674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9899,7 +9691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9914,7 +9706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9925,7 +9717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6022"
+NAME="AEN5996"
 ></A
 ><H3
 ><A
@@ -9980,7 +9772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6034"
+NAME="AEN6008"
 ></A
 ><P
 ></P
@@ -10007,7 +9799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10024,7 +9816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10039,7 +9831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10050,7 +9842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6051"
+NAME="AEN6025"
 ></A
 ><H3
 ><A
@@ -10105,7 +9897,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6063"
+NAME="AEN6037"
 ></A
 ><P
 ></P
@@ -10132,7 +9924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10149,7 +9941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10164,7 +9956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10175,7 +9967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6080"
+NAME="AEN6054"
 ></A
 ><H3
 ><A
@@ -10205,7 +9997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6087"
+NAME="AEN6061"
 ></A
 ><P
 ></P
@@ -10232,7 +10024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10243,7 +10035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6096"
+NAME="AEN6070"
 ></A
 ><H3
 ><A
@@ -10280,7 +10072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6105"
+NAME="AEN6079"
 ></A
 ><P
 ></P
@@ -10307,7 +10099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first text node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10324,7 +10116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second text node being merged</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10339,7 +10131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the first text node augmented</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10350,7 +10142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6122"
+NAME="AEN6096"
 ></A
 ><H3
 ><A
@@ -10385,7 +10177,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6130"
+NAME="AEN6104"
 ></A
 ><P
 ></P
@@ -10412,7 +10204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10429,7 +10221,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10446,12 +10238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-> lenght</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10462,7 +10249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6148"
+NAME="AEN6121"
 ></A
 ><H3
 ><A
@@ -10493,7 +10280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6155"
+NAME="AEN6128"
 ></A
 ><P
 ></P
@@ -10520,7 +10307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10531,7 +10318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6164"
+NAME="AEN6137"
 ></A
 ><H3
 ><A
@@ -10565,7 +10352,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6172"
+NAME="AEN6145"
 ></A
 ><P
 ></P
@@ -10592,7 +10379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10603,7 +10390,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6181"
+NAME="AEN6154"
 ></A
 ><H3
 ><A
@@ -10637,7 +10424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6189"
+NAME="AEN6162"
 ></A
 ><P
 ></P
@@ -10664,7 +10451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the top element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10681,7 +10468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10692,7 +10479,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6202"
+NAME="AEN6175"
 ></A
 ><H3
 ><A
@@ -10726,7 +10513,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6210"
+NAME="AEN6183"
 ></A
 ><P
 ></P
@@ -10770,7 +10557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10781,7 +10568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6223"
+NAME="AEN6196"
 ></A
 ><H3
 ><A
@@ -10833,7 +10620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6234"
+NAME="AEN6207"
 ></A
 ><P
 ></P
@@ -10860,7 +10647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10877,7 +10664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10894,7 +10681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10909,7 +10696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10920,7 +10707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6255"
+NAME="AEN6228"
 ></A
 ><H3
 ><A
@@ -10962,7 +10749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6265"
+NAME="AEN6238"
 ></A
 ><P
 ></P
@@ -10989,7 +10776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11006,7 +10793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11023,7 +10810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11038,7 +10825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11049,7 +10836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6286"
+NAME="AEN6259"
 ></A
 ><H3
 ><A
@@ -11086,7 +10873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6295"
+NAME="AEN6268"
 ></A
 ><P
 ></P
@@ -11113,7 +10900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11130,7 +10917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11145,9 +10932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11158,7 +10943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6312"
+NAME="AEN6285"
 ></A
 ><H3
 ><A
@@ -11192,7 +10977,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6320"
+NAME="AEN6293"
 ></A
 ><P
 ></P
@@ -11219,7 +11004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11236,7 +11021,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11247,7 +11032,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6333"
+NAME="AEN6306"
 ></A
 ><H3
 ><A
@@ -11280,7 +11065,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6341"
+NAME="AEN6314"
 ></A
 ><P
 ></P
@@ -11307,7 +11092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11322,7 +11107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11333,7 +11118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6354"
+NAME="AEN6327"
 ></A
 ><H3
 ><A
@@ -11366,7 +11151,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6362"
+NAME="AEN6335"
 ></A
 ><P
 ></P
@@ -11393,7 +11178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11408,7 +11193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11419,7 +11204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6375"
+NAME="AEN6348"
 ></A
 ><H3
 ><A
@@ -11460,7 +11245,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6385"
+NAME="AEN6358"
 ></A
 ><P
 ></P
@@ -11487,7 +11272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11504,7 +11289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11521,7 +11306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11536,7 +11321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11547,7 +11332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6406"
+NAME="AEN6379"
 ></A
 ><H3
 ><A
@@ -11590,7 +11375,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6416"
+NAME="AEN6389"
 ></A
 ><P
 ></P
@@ -11617,7 +11402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11634,7 +11419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11649,8 +11434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11661,7 +11445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6433"
+NAME="AEN6406"
 ></A
 ><H3
 ><A
@@ -11703,7 +11487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6443"
+NAME="AEN6416"
 ></A
 ><P
 ></P
@@ -11730,7 +11514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11747,7 +11531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11762,8 +11546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute or the attribute declaration or NULL if 
-neither was found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11774,7 +11557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6460"
+NAME="AEN6433"
 ></A
 ><H3
 ><A
@@ -11822,7 +11605,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6471"
+NAME="AEN6444"
 ></A
 ><P
 ></P
@@ -11849,7 +11632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11866,7 +11649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11883,7 +11666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11898,8 +11681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute or the attribute declaration or NULL
-if neither was found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11910,7 +11692,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6492"
+NAME="AEN6465"
 ></A
 ><H3
 ><A
@@ -11956,7 +11738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6503"
+NAME="AEN6476"
 ></A
 ><P
 ></P
@@ -11983,7 +11765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12000,7 +11782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12017,7 +11799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12034,7 +11816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12049,7 +11831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12060,7 +11842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6528"
+NAME="AEN6501"
 ></A
 ><H3
 ><A
@@ -12108,7 +11890,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6539"
+NAME="AEN6512"
 ></A
 ><P
 ></P
@@ -12135,7 +11917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12152,7 +11934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12169,7 +11951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12184,8 +11966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12196,7 +11977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6560"
+NAME="AEN6533"
 ></A
 ><H3
 ><A
@@ -12234,7 +12015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6569"
+NAME="AEN6542"
 ></A
 ><P
 ></P
@@ -12261,7 +12042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12278,7 +12059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12293,7 +12074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12304,7 +12085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6586"
+NAME="AEN6559"
 ></A
 ><H3
 ><A
@@ -12343,7 +12124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6595"
+NAME="AEN6568"
 ></A
 ><P
 ></P
@@ -12370,7 +12151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12387,7 +12168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12404,7 +12185,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the string value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12419,7 +12200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12430,7 +12211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6616"
+NAME="AEN6589"
 ></A
 ><H3
 ><A
@@ -12469,7 +12250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6625"
+NAME="AEN6598"
 ></A
 ><P
 ></P
@@ -12496,7 +12277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12513,7 +12294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12530,7 +12311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12545,7 +12326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12556,7 +12337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6646"
+NAME="AEN6619"
 ></A
 ><H3
 ><A
@@ -12599,7 +12380,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6656"
+NAME="AEN6629"
 ></A
 ><P
 ></P
@@ -12626,7 +12407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12643,7 +12424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12660,7 +12441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12675,7 +12456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12686,7 +12467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6677"
+NAME="AEN6650"
 ></A
 ><H3
 ><A
@@ -12720,7 +12501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6685"
+NAME="AEN6658"
 ></A
 ><P
 ></P
@@ -12747,7 +12528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12764,7 +12545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12775,7 +12556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6698"
+NAME="AEN6671"
 ></A
 ><H3
 ><A
@@ -12810,7 +12591,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6706"
+NAME="AEN6679"
 ></A
 ><P
 ></P
@@ -12837,7 +12618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12854,7 +12635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12871,12 +12652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12887,7 +12663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6724"
+NAME="AEN6696"
 ></A
 ><H3
 ><A
@@ -12921,7 +12697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6732"
+NAME="AEN6704"
 ></A
 ><P
 ></P
@@ -12948,7 +12724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12965,7 +12741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12976,7 +12752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6745"
+NAME="AEN6717"
 ></A
 ><H3
 ><A
@@ -13011,7 +12787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6753"
+NAME="AEN6725"
 ></A
 ><P
 ></P
@@ -13038,7 +12814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13055,7 +12831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13072,12 +12848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13088,7 +12859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6771"
+NAME="AEN6742"
 ></A
 ><H3
 ><A
@@ -13124,7 +12895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6779"
+NAME="AEN6750"
 ></A
 ><P
 ></P
@@ -13151,7 +12922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13166,8 +12937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL if no content is available.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13178,7 +12948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6792"
+NAME="AEN6763"
 ></A
 ><H3
 ><A
@@ -13212,7 +12982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6800"
+NAME="AEN6771"
 ></A
 ><P
 ></P
@@ -13239,7 +13009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13254,8 +13024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the lang value, or NULL if not found
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13266,7 +13035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6813"
+NAME="AEN6784"
 ></A
 ><H3
 ><A
@@ -13301,7 +13070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6821"
+NAME="AEN6792"
 ></A
 ><P
 ></P
@@ -13328,7 +13097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13345,7 +13114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the langage description</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13356,7 +13125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6834"
+NAME="AEN6805"
 ></A
 ><H3
 ><A
@@ -13388,7 +13157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6841"
+NAME="AEN6812"
 ></A
 ><P
 ></P
@@ -13415,7 +13184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13430,7 +13199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13441,7 +13210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6854"
+NAME="AEN6825"
 ></A
 ><H3
 ><A
@@ -13476,7 +13245,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6862"
+NAME="AEN6833"
 ></A
 ><P
 ></P
@@ -13503,7 +13272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13531,7 +13300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6875"
+NAME="AEN6846"
 ></A
 ><H3
 ><A
@@ -13578,7 +13347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6885"
+NAME="AEN6856"
 ></A
 ><P
 ></P
@@ -13605,7 +13374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the node pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13622,7 +13391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13637,8 +13406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the base URL, or NULL if not found
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13649,7 +13417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6902"
+NAME="AEN6873"
 ></A
 ><H3
 ><A
@@ -13684,7 +13452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6910"
+NAME="AEN6881"
 ></A
 ><P
 ></P
@@ -13711,7 +13479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13728,7 +13496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new base URI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13739,7 +13507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6923"
+NAME="AEN6894"
 ></A
 ><H3
 ><A
@@ -13770,7 +13538,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6930"
+NAME="AEN6901"
 ></A
 ><P
 ></P
@@ -13812,7 +13580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13823,7 +13591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6943"
+NAME="AEN6914"
 ></A
 ><H3
 ><A
@@ -13851,7 +13619,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6949"
+NAME="AEN6920"
 ></A
 ><P
 ></P
@@ -13904,7 +13672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6962"
+NAME="AEN6933"
 ></A
 ><H3
 ><A
@@ -13938,7 +13706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6970"
+NAME="AEN6941"
 ></A
 ><P
 ></P
@@ -13965,7 +13733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13982,7 +13750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13997,7 +13765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14008,7 +13776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6987"
+NAME="AEN6958"
 ></A
 ><H3
 ><A
@@ -14046,7 +13814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6996"
+NAME="AEN6967"
 ></A
 ><P
 ></P
@@ -14073,7 +13841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14090,7 +13858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14107,7 +13875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14122,7 +13890,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14133,7 +13901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7017"
+NAME="AEN6988"
 ></A
 ><H3
 ><A
@@ -14165,7 +13933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7024"
+NAME="AEN6995"
 ></A
 ><P
 ></P
@@ -14220,7 +13988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7037"
+NAME="AEN7008"
 ></A
 ><H3
 ><A
@@ -14255,7 +14023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7045"
+NAME="AEN7016"
 ></A
 ><P
 ></P
@@ -14282,7 +14050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14299,7 +14067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14310,7 +14078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7058"
+NAME="AEN7029"
 ></A
 ><H3
 ><A
@@ -14342,7 +14110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7065"
+NAME="AEN7036"
 ></A
 ><P
 ></P
@@ -14369,7 +14137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14386,7 +14154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14397,7 +14165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7078"
+NAME="AEN7049"
 ></A
 ><H3
 ><A
@@ -14433,7 +14201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7086"
+NAME="AEN7057"
 ></A
 ><P
 ></P
@@ -14460,7 +14228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14477,7 +14245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14488,7 +14256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7099"
+NAME="AEN7070"
 ></A
 ><H3
 ><A
@@ -14533,7 +14301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7108"
+NAME="AEN7079"
 ></A
 ><P
 ></P
@@ -14560,7 +14328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14577,7 +14345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node defining the subtree to reconciliate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14592,7 +14360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of namespace declarations created or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14603,7 +14371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7125"
+NAME="AEN7096"
 ></A
 ><H3
 ><A
@@ -14640,6 +14408,131 @@
 ><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
@@ -14667,7 +14560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14684,7 +14577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14701,24 +14594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14729,115 +14605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-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"
+NAME="AEN7150"
 ></A
 ><H3
 ><A
@@ -14875,7 +14643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7187"
+NAME="AEN7158"
 ></A
 ><P
 ></P
@@ -14902,7 +14670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Document to generate XML text from</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14919,7 +14687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Memory pointer for allocated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14936,7 +14704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Length of the generated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14953,7 +14721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Character encoding to use when generating XML text</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14964,7 +14732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7208"
+NAME="AEN7179"
 ></A
 ><H3
 ><A
@@ -14999,7 +14767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7215"
+NAME="AEN7186"
 ></A
 ><P
 ></P
@@ -15105,7 +14873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7240"
+NAME="AEN7211"
 ></A
 ><H3
 ><A
@@ -15139,7 +14907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7248"
+NAME="AEN7219"
 ></A
 ><P
 ></P
@@ -15166,7 +14934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15183,7 +14951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15198,7 +14966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15209,7 +14977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7265"
+NAME="AEN7236"
 ></A
 ><H3
 ><A
@@ -15247,7 +15015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7274"
+NAME="AEN7245"
 ></A
 ><P
 ></P
@@ -15274,7 +15042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15291,7 +15059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15308,7 +15076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15319,7 +15087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7291"
+NAME="AEN7262"
 ></A
 ><H3
 ><A
@@ -15357,7 +15125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7299"
+NAME="AEN7270"
 ></A
 ><P
 ></P
@@ -15384,7 +15152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15401,7 +15169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15416,7 +15184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15427,7 +15195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7316"
+NAME="AEN7287"
 ></A
 ><H3
 ><A
@@ -15466,7 +15234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7324"
+NAME="AEN7295"
 ></A
 ><P
 ></P
@@ -15493,7 +15261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15510,7 +15278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15527,7 +15295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15542,7 +15310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15553,7 +15321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7345"
+NAME="AEN7316"
 ></A
 ><H3
 ><A
@@ -15593,7 +15361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7354"
+NAME="AEN7325"
 ></A
 ><P
 ></P
@@ -15620,7 +15388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15637,7 +15405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15654,7 +15422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15671,7 +15439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15688,7 +15456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15699,7 +15467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7379"
+NAME="AEN7350"
 ></A
 ><H3
 ><A
@@ -15731,7 +15499,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7386"
+NAME="AEN7357"
 ></A
 ><P
 ></P
@@ -15758,7 +15526,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15775,7 +15543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15792,7 +15560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of an encoding (or NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15807,7 +15575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15818,7 +15586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7407"
+NAME="AEN7378"
 ></A
 ><H3
 ><A
@@ -15848,7 +15616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7414"
+NAME="AEN7385"
 ></A
 ><P
 ></P
@@ -15875,7 +15643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15890,7 +15658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15901,7 +15669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7427"
+NAME="AEN7398"
 ></A
 ><H3
 ><A
@@ -15933,7 +15701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7434"
+NAME="AEN7405"
 ></A
 ><P
 ></P
@@ -15960,7 +15728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15977,7 +15745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15988,7 +15756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7447"
+NAME="AEN7418"
 ></A
 ><H3
 ><A
@@ -16015,7 +15783,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7453"
+NAME="AEN7424"
 ></A
 ><P
 ></P
@@ -16040,7 +15808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16051,7 +15819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7462"
+NAME="AEN7433"
 ></A
 ><H3
 ><A
@@ -16079,7 +15847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7468"
+NAME="AEN7439"
 ></A
 ><P
 ></P
@@ -16106,7 +15874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index 702fe90..a583e51 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9740"
+NAME="AEN9701"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9743"
+NAME="AEN9704"
 ></A
 ><H2
 >Synopsis</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9775"
+NAME="AEN9736"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9778"
+NAME="AEN9739"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9780"
+NAME="AEN9741"
 ></A
 ><H3
 ><A
@@ -324,7 +324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9786"
+NAME="AEN9747"
 ></A
 ><H3
 ><A
@@ -337,7 +337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9790"
+NAME="AEN9751"
 ></A
 ><H3
 ><A
@@ -367,7 +367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9797"
+NAME="AEN9758"
 ></A
 ><P
 ></P
@@ -403,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9806"
+NAME="AEN9767"
 ></A
 ><H3
 ><A
@@ -445,7 +445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9816"
+NAME="AEN9777"
 ></A
 ><P
 ></P
@@ -515,7 +515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9833"
+NAME="AEN9794"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9841"
+NAME="AEN9802"
 ></A
 ><P
 ></P
@@ -600,7 +600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9854"
+NAME="AEN9815"
 ></A
 ><H3
 ><A
@@ -639,7 +639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9863"
+NAME="AEN9824"
 ></A
 ><P
 ></P
@@ -709,7 +709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9880"
+NAME="AEN9841"
 ></A
 ><H3
 ><A
@@ -742,7 +742,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9888"
+NAME="AEN9849"
 ></A
 ><P
 ></P
@@ -795,7 +795,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9901"
+NAME="AEN9862"
 ></A
 ><H3
 ><A
@@ -834,7 +834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9910"
+NAME="AEN9871"
 ></A
 ><P
 ></P
@@ -889,7 +889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9923"
+NAME="AEN9884"
 ></A
 ><H3
 ><A
@@ -927,7 +927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9932"
+NAME="AEN9893"
 ></A
 ><P
 ></P
@@ -997,7 +997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9949"
+NAME="AEN9910"
 ></A
 ><H3
 ><A
@@ -1030,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9956"
+NAME="AEN9917"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9977"
+NAME="AEN9938"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9984"
+NAME="AEN9945"
 ></A
 ><P
 ></P
@@ -1200,7 +1200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9997"
+NAME="AEN9958"
 ></A
 ><H3
 ><A
@@ -1235,7 +1235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10005"
+NAME="AEN9966"
 ></A
 ><P
 ></P
@@ -1288,7 +1288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10018"
+NAME="AEN9979"
 ></A
 ><H3
 ><A
@@ -1318,7 +1318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10025"
+NAME="AEN9986"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 90cb20a..f76fb42 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7954"
+NAME="AEN7923"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7957"
+NAME="AEN7926"
 ></A
 ><H2
 >Synopsis</H2
@@ -941,7 +941,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8174"
+NAME="AEN8143"
 ></A
 ><H2
 >Description</H2
@@ -951,14 +951,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8177"
+NAME="AEN8146"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8179"
+NAME="AEN8148"
 ></A
 ><H3
 ><A
@@ -984,33 +984,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8184"
+NAME="AEN8153"
 ></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="AEN8189"
+NAME="AEN8157"
 ></A
 ><H3
 ><A
@@ -1037,7 +1024,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8194"
+NAME="AEN8162"
 ></A
 ><P
 ></P
@@ -1109,7 +1096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8211"
+NAME="AEN8179"
 ></A
 ><H3
 ><A
@@ -1136,7 +1123,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8216"
+NAME="AEN8184"
 ></A
 ><P
 ></P
@@ -1208,7 +1195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8233"
+NAME="AEN8201"
 ></A
 ><H3
 ><A
@@ -1254,163 +1241,85 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8238"
+NAME="AEN8206"
 ></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="AEN8243"
+NAME="AEN8210"
 ></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="AEN8248"
+NAME="AEN8214"
 ></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="AEN8253"
+NAME="AEN8218"
 ></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="AEN8258"
+NAME="AEN8222"
 ></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="AEN8263"
+NAME="AEN8226"
 ></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="AEN8268"
+NAME="AEN8230"
 ></A
 ><H3
 ><A
@@ -1453,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8280"
+NAME="AEN8242"
 ></A
 ><P
 ></P
@@ -1480,7 +1389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1497,7 +1406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1512,8 +1421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not a QName, otherwise the local part, and prefix
-is updated to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1524,7 +1432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8297"
+NAME="AEN8259"
 ></A
 ><H3
 ><A
@@ -1573,7 +1481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8309"
+NAME="AEN8271"
 ></A
 ><P
 ></P
@@ -1600,7 +1508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1617,7 +1525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1634,7 +1542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1651,7 +1559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1668,7 +1576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1683,7 +1591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1694,7 +1602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8338"
+NAME="AEN8300"
 ></A
 ><H3
 ><A
@@ -1727,7 +1635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8346"
+NAME="AEN8308"
 ></A
 ><P
 ></P
@@ -1754,7 +1662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1769,7 +1677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlNotationTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1780,7 +1688,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8359"
+NAME="AEN8321"
 ></A
 ><H3
 ><A
@@ -1810,7 +1718,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8366"
+NAME="AEN8328"
 ></A
 ><P
 ></P
@@ -1837,7 +1745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An notation table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1848,7 +1756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8375"
+NAME="AEN8337"
 ></A
 ><H3
 ><A
@@ -1882,7 +1790,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8383"
+NAME="AEN8345"
 ></A
 ><P
 ></P
@@ -1909,7 +1817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1926,7 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation declaration</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1937,7 +1845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8396"
+NAME="AEN8358"
 ></A
 ><H3
 ><A
@@ -1971,7 +1879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8404"
+NAME="AEN8366"
 ></A
 ><P
 ></P
@@ -1998,7 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2015,7 +1923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2026,7 +1934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8417"
+NAME="AEN8379"
 ></A
 ><H3
 ><A
@@ -2063,7 +1971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8426"
+NAME="AEN8388"
 ></A
 ><P
 ></P
@@ -2090,7 +1998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the subelement name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2107,7 +2015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of element content decl</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2122,7 +2030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new element content structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2133,7 +2041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8443"
+NAME="AEN8405"
 ></A
 ><H3
 ><A
@@ -2166,7 +2074,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8451"
+NAME="AEN8413"
 ></A
 ><P
 ></P
@@ -2193,7 +2101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element content pointer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2208,7 +2116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementContentPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2219,7 +2127,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8464"
+NAME="AEN8426"
 ></A
 ><H3
 ><A
@@ -2249,7 +2157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8471"
+NAME="AEN8433"
 ></A
 ><P
 ></P
@@ -2276,7 +2184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2287,7 +2195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8480"
+NAME="AEN8442"
 ></A
 ><H3
 ><A
@@ -2320,7 +2228,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8487"
+NAME="AEN8449"
 ></A
 ><P
 ></P
@@ -2347,7 +2255,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2364,7 +2272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2381,7 +2289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 1 if one must print the englobing parenthesis, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2392,7 +2300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8504"
+NAME="AEN8466"
 ></A
 ><H3
 ><A
@@ -2441,7 +2349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8516"
+NAME="AEN8478"
 ></A
 ><P
 ></P
@@ -2468,7 +2376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2485,7 +2393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2502,7 +2410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2519,7 +2427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2536,7 +2444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2551,7 +2459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2562,7 +2470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8545"
+NAME="AEN8507"
 ></A
 ><H3
 ><A
@@ -2595,7 +2503,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8553"
+NAME="AEN8515"
 ></A
 ><P
 ></P
@@ -2622,7 +2530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2637,7 +2545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2648,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8566"
+NAME="AEN8528"
 ></A
 ><H3
 ><A
@@ -2678,7 +2586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8573"
+NAME="AEN8535"
 ></A
 ><P
 ></P
@@ -2705,7 +2613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2716,7 +2624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8582"
+NAME="AEN8544"
 ></A
 ><H3
 ><A
@@ -2750,7 +2658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8590"
+NAME="AEN8552"
 ></A
 ><P
 ></P
@@ -2777,7 +2685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2794,7 +2702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2805,7 +2713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8603"
+NAME="AEN8565"
 ></A
 ><H3
 ><A
@@ -2840,7 +2748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8611"
+NAME="AEN8573"
 ></A
 ><P
 ></P
@@ -2867,7 +2775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2884,7 +2792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2895,7 +2803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8624"
+NAME="AEN8586"
 ></A
 ><H3
 ><A
@@ -2928,7 +2836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8632"
+NAME="AEN8594"
 ></A
 ><P
 ></P
@@ -2955,7 +2863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2970,8 +2878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2982,7 +2889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8645"
+NAME="AEN8607"
 ></A
 ><H3
 ><A
@@ -3012,7 +2919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8652"
+NAME="AEN8614"
 ></A
 ><P
 ></P
@@ -3039,7 +2946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to free.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3050,7 +2957,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8661"
+NAME="AEN8623"
 ></A
 ><H3
 ><A
@@ -3083,7 +2990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8669"
+NAME="AEN8631"
 ></A
 ><P
 ></P
@@ -3110,7 +3017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3125,8 +3032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3137,7 +3043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8682"
+NAME="AEN8644"
 ></A
 ><H3
 ><A
@@ -3208,7 +3114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8699"
+NAME="AEN8661"
 ></A
 ><P
 ></P
@@ -3235,7 +3141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3252,7 +3158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3269,7 +3175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3286,7 +3192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3303,7 +3209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3320,7 +3226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3337,7 +3243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3354,7 +3260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3371,7 +3277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if it's an enumeration, the associated list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3386,7 +3292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not new, othervise the attribute decl</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3397,7 +3303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8744"
+NAME="AEN8706"
 ></A
 ><H3
 ><A
@@ -3430,7 +3336,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8752"
+NAME="AEN8714"
 ></A
 ><P
 ></P
@@ -3457,7 +3363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3472,7 +3378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlAttributeTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3483,7 +3389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8765"
+NAME="AEN8727"
 ></A
 ><H3
 ><A
@@ -3513,7 +3419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8772"
+NAME="AEN8734"
 ></A
 ><P
 ></P
@@ -3540,7 +3446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3551,7 +3457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8781"
+NAME="AEN8743"
 ></A
 ><H3
 ><A
@@ -3585,7 +3491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8789"
+NAME="AEN8751"
 ></A
 ><P
 ></P
@@ -3612,7 +3518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3629,7 +3535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3640,7 +3546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8802"
+NAME="AEN8764"
 ></A
 ><H3
 ><A
@@ -3675,7 +3581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8810"
+NAME="AEN8772"
 ></A
 ><P
 ></P
@@ -3702,7 +3608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3719,7 +3625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute declaration</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3730,7 +3636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8823"
+NAME="AEN8785"
 ></A
 ><H3
 ><A
@@ -3775,7 +3681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8834"
+NAME="AEN8796"
 ></A
 ><P
 ></P
@@ -3802,7 +3708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3819,7 +3725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3836,7 +3742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3853,7 +3759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3868,7 +3774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlIDPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3879,7 +3785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8859"
+NAME="AEN8821"
 ></A
 ><H3
 ><A
@@ -3910,7 +3816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8866"
+NAME="AEN8828"
 ></A
 ><P
 ></P
@@ -3963,7 +3869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8879"
+NAME="AEN8841"
 ></A
 ><H3
 ><A
@@ -3993,7 +3899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8886"
+NAME="AEN8848"
 ></A
 ><P
 ></P
@@ -4020,7 +3926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An id table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4031,7 +3937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8895"
+NAME="AEN8857"
 ></A
 ><H3
 ><A
@@ -4068,7 +3974,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8904"
+NAME="AEN8866"
 ></A
 ><P
 ></P
@@ -4095,7 +4001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4112,7 +4018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4127,7 +4033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4138,7 +4044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8921"
+NAME="AEN8883"
 ></A
 ><H3
 ><A
@@ -4178,7 +4084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8930"
+NAME="AEN8892"
 ></A
 ><P
 ></P
@@ -4205,7 +4111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4222,7 +4128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4239,7 +4145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4254,7 +4160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4265,7 +4171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8951"
+NAME="AEN8913"
 ></A
 ><H3
 ><A
@@ -4299,7 +4205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8959"
+NAME="AEN8921"
 ></A
 ><P
 ></P
@@ -4326,7 +4232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4343,7 +4249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4358,7 +4264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4369,7 +4275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8976"
+NAME="AEN8938"
 ></A
 ><H3
 ><A
@@ -4414,7 +4320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8987"
+NAME="AEN8949"
 ></A
 ><P
 ></P
@@ -4441,7 +4347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4458,7 +4364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4475,7 +4381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4492,7 +4398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the Ref</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4507,7 +4413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlRefPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4518,7 +4424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9012"
+NAME="AEN8974"
 ></A
 ><H3
 ><A
@@ -4549,7 +4455,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9019"
+NAME="AEN8981"
 ></A
 ><P
 ></P
@@ -4602,7 +4508,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9032"
+NAME="AEN8994"
 ></A
 ><H3
 ><A
@@ -4632,7 +4538,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9039"
+NAME="AEN9001"
 ></A
 ><P
 ></P
@@ -4659,7 +4565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An ref table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4670,7 +4576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9048"
+NAME="AEN9010"
 ></A
 ><H3
 ><A
@@ -4710,7 +4616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9057"
+NAME="AEN9019"
 ></A
 ><P
 ></P
@@ -4737,7 +4643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4754,7 +4660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4771,7 +4677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4786,7 +4692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4797,7 +4703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9078"
+NAME="AEN9040"
 ></A
 ><H3
 ><A
@@ -4831,7 +4737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9086"
+NAME="AEN9048"
 ></A
 ><P
 ></P
@@ -4858,7 +4764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4875,7 +4781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4890,7 +4796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4901,7 +4807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9103"
+NAME="AEN9065"
 ></A
 ><H3
 ><A
@@ -4938,7 +4844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9112"
+NAME="AEN9074"
 ></A
 ><P
 ></P
@@ -4965,7 +4871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4982,7 +4888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4997,7 +4903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise node set for the ID.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5008,7 +4914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9129"
+NAME="AEN9091"
 ></A
 ><H3
 ><A
@@ -5046,7 +4952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9137"
+NAME="AEN9099"
 ></A
 ><P
 ></P
@@ -5073,7 +4979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5090,7 +4996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5105,7 +5011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5116,7 +5022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9154"
+NAME="AEN9116"
 ></A
 ><H3
 ><A
@@ -5159,7 +5065,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9163"
+NAME="AEN9125"
 ></A
 ><P
 ></P
@@ -5186,7 +5092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5203,7 +5109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5220,7 +5126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5235,7 +5141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5246,7 +5152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9184"
+NAME="AEN9146"
 ></A
 ><H3
 ><A
@@ -5306,7 +5212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9199"
+NAME="AEN9161"
 ></A
 ><P
 ></P
@@ -5333,7 +5239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5350,7 +5256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5367,7 +5273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5384,7 +5290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5399,8 +5305,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new normalized string if normalization is needed, NULL otherwise
-the caller must free the returned value.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5411,7 +5316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9224"
+NAME="AEN9186"
 ></A
 ><H3
 ><A
@@ -5456,7 +5361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9234"
+NAME="AEN9196"
 ></A
 ><P
 ></P
@@ -5483,7 +5388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5500,7 +5405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5517,7 +5422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5532,7 +5437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5543,7 +5448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9255"
+NAME="AEN9217"
 ></A
 ><H3
 ><A
@@ -5592,7 +5497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9267"
+NAME="AEN9229"
 ></A
 ><P
 ></P
@@ -5619,7 +5524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5636,7 +5541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5651,7 +5556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5662,7 +5567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9284"
+NAME="AEN9246"
 ></A
 ><H3
 ><A
@@ -5704,7 +5609,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9293"
+NAME="AEN9255"
 ></A
 ><P
 ></P
@@ -5731,7 +5636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5748,7 +5653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5765,7 +5670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a notation definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5780,7 +5685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5791,7 +5696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9314"
+NAME="AEN9276"
 ></A
 ><H3
 ><A
@@ -5831,7 +5736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9324"
+NAME="AEN9286"
 ></A
 ><P
 ></P
@@ -5858,7 +5763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5875,7 +5780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5892,7 +5797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a dtd instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5907,7 +5812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5918,7 +5823,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9345"
+NAME="AEN9307"
 ></A
 ><H3
 ><A
@@ -5959,7 +5864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9354"
+NAME="AEN9316"
 ></A
 ><P
 ></P
@@ -5986,7 +5891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6003,7 +5908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6018,7 +5923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6029,7 +5934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9371"
+NAME="AEN9333"
 ></A
 ><H3
 ><A
@@ -6067,7 +5972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9380"
+NAME="AEN9342"
 ></A
 ><P
 ></P
@@ -6094,7 +5999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6111,7 +6016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6126,7 +6031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6137,7 +6042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9397"
+NAME="AEN9359"
 ></A
 ><H3
 ><A
@@ -6175,7 +6080,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9406"
+NAME="AEN9368"
 ></A
 ><P
 ></P
@@ -6202,7 +6107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6219,7 +6124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6236,7 +6141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6251,7 +6156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6262,7 +6167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9427"
+NAME="AEN9389"
 ></A
 ><H3
 ><A
@@ -6310,7 +6215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9438"
+NAME="AEN9400"
 ></A
 ><P
 ></P
@@ -6337,7 +6242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6354,7 +6259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6371,7 +6276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6386,7 +6291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6397,7 +6302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9459"
+NAME="AEN9421"
 ></A
 ><H3
 ><A
@@ -6455,7 +6360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9471"
+NAME="AEN9433"
 ></A
 ><P
 ></P
@@ -6482,7 +6387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6499,7 +6404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6516,7 +6421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6533,7 +6438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6550,7 +6455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value (without entities processing)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6565,7 +6470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6576,7 +6481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9500"
+NAME="AEN9462"
 ></A
 ><H3
 ><A
@@ -6613,7 +6518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9509"
+NAME="AEN9471"
 ></A
 ><P
 ></P
@@ -6640,7 +6545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6657,7 +6562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6672,7 +6577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6683,7 +6588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9526"
+NAME="AEN9488"
 ></A
 ><H3
 ><A
@@ -6722,7 +6627,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9535"
+NAME="AEN9497"
 ></A
 ><P
 ></P
@@ -6749,7 +6654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6766,7 +6671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6783,7 +6688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6798,7 +6703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6809,7 +6714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9556"
+NAME="AEN9518"
 ></A
 ><H3
 ><A
@@ -6844,7 +6749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9564"
+NAME="AEN9526"
 ></A
 ><P
 ></P
@@ -6871,7 +6776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6888,7 +6793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6903,7 +6808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no, 1 if yes, and -1 if no element description is available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6914,7 +6819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9581"
+NAME="AEN9543"
 ></A
 ><H3
 ><A
@@ -6956,7 +6861,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9591"
+NAME="AEN9553"
 ></A
 ><P
 ></P
@@ -6983,7 +6888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7000,7 +6905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7017,7 +6922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7032,7 +6937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlAttributePtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7043,7 +6948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9612"
+NAME="AEN9574"
 ></A
 ><H3
 ><A
@@ -7080,7 +6985,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9621"
+NAME="AEN9583"
 ></A
 ><P
 ></P
@@ -7107,7 +7012,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7124,7 +7029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7139,7 +7044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNotationPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7150,7 +7055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9638"
+NAME="AEN9600"
 ></A
 ><H3
 ><A
@@ -7187,7 +7092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9647"
+NAME="AEN9609"
 ></A
 ><P
 ></P
@@ -7214,7 +7119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7231,7 +7136,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7246,7 +7151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlElementPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7257,7 +7162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9664"
+NAME="AEN9626"
 ></A
 ><H3
 ><A
@@ -7317,7 +7222,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9676"
+NAME="AEN9638"
 ></A
 ><P
 ></P
@@ -7344,7 +7249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert after</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7361,7 +7266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert next</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7378,7 +7283,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7395,7 +7300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7410,14 +7315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7428,7 +7326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9702"
+NAME="AEN9663"
 ></A
 ><H3
 ><A
@@ -7464,7 +7362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9710"
+NAME="AEN9671"
 ></A
 ><P
 ></P
@@ -7491,7 +7389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element content tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7508,7 +7406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7525,7 +7423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the number of element in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7542,7 +7440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7557,7 +7455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of element in the list, or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 81d4cc9..2733cbf 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15581"
+NAME="AEN15511"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15584"
+NAME="AEN15514"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15589"
+NAME="AEN15519"
 ></A
 ><H2
 >Description</H2
@@ -169,14 +169,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15592"
+NAME="AEN15522"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15594"
+NAME="AEN15524"
 ></A
 ><H3
 ><A
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15602"
+NAME="AEN15532"
 ></A
 ><P
 ></P
@@ -238,7 +238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -253,8 +253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no substition were done, -1 if some processing failed
-or the number of substitutions done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index d43cd80..cf4d8ce 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10039"
+NAME="AEN10000"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10042"
+NAME="AEN10003"
 ></A
 ><H2
 >Synopsis</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10057"
+NAME="AEN10018"
 ></A
 ><H2
 >Description</H2
@@ -218,14 +218,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10060"
+NAME="AEN10021"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10062"
+NAME="AEN10023"
 ></A
 ><H3
 ><A
@@ -378,7 +378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10067"
+NAME="AEN10028"
 ></A
 ><H3
 ><A
@@ -405,7 +405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10072"
+NAME="AEN10033"
 ></A
 ><P
 ></P
@@ -477,7 +477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10089"
+NAME="AEN10050"
 ></A
 ><H3
 ><A
@@ -539,7 +539,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10101"
+NAME="AEN10062"
 ></A
 ><P
 ></P
@@ -566,7 +566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new error handling context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -583,7 +583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new handler function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -594,7 +594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10114"
+NAME="AEN10075"
 ></A
 ><H3
 ><A
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10120"
+NAME="AEN10081"
 ></A
 ><P
 ></P
@@ -651,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -668,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -685,7 +685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -696,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10137"
+NAME="AEN10098"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10143"
+NAME="AEN10104"
 ></A
 ><P
 ></P
@@ -753,7 +753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -770,7 +770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -787,7 +787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -798,7 +798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10160"
+NAME="AEN10121"
 ></A
 ><H3
 ><A
@@ -828,7 +828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10166"
+NAME="AEN10127"
 ></A
 ><P
 ></P
@@ -855,7 +855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -872,7 +872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -900,7 +900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10183"
+NAME="AEN10144"
 ></A
 ><H3
 ><A
@@ -930,7 +930,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10189"
+NAME="AEN10150"
 ></A
 ><P
 ></P
@@ -957,7 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -974,7 +974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -991,7 +991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1002,7 +1002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10206"
+NAME="AEN10167"
 ></A
 ><H3
 ><A
@@ -1032,7 +1032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10213"
+NAME="AEN10174"
 ></A
 ><P
 ></P
@@ -1059,7 +1059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1070,7 +1070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10222"
+NAME="AEN10183"
 ></A
 ><H3
 ><A
@@ -1100,7 +1100,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10229"
+NAME="AEN10190"
 ></A
 ><P
 ></P
@@ -1127,7 +1127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index f7950f1..477851e 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16460"
+NAME="AEN16389"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16463"
+NAME="AEN16392"
 ></A
 ><H2
 >Synopsis</H2
@@ -537,7 +537,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16562"
+NAME="AEN16491"
 ></A
 ><H2
 >Description</H2
@@ -547,14 +547,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16565"
+NAME="AEN16494"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16567"
+NAME="AEN16496"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16572"
+NAME="AEN16501"
 ></A
 ><P
 ></P
@@ -632,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16585"
+NAME="AEN16514"
 ></A
 ><H3
 ><A
@@ -657,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16590"
+NAME="AEN16519"
 ></A
 ><P
 ></P
@@ -695,7 +695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16599"
+NAME="AEN16528"
 ></A
 ><H3
 ><A
@@ -722,7 +722,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16604"
+NAME="AEN16533"
 ></A
 ><P
 ></P
@@ -809,7 +809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16625"
+NAME="AEN16554"
 ></A
 ><H3
 ><A
@@ -834,7 +834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16630"
+NAME="AEN16559"
 ></A
 ><P
 ></P
@@ -872,7 +872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16639"
+NAME="AEN16568"
 ></A
 ><H3
 ><A
@@ -907,33 +907,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16644"
+NAME="AEN16573"
 ></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="AEN16649"
+NAME="AEN16577"
 ></A
 ><H3
 ><A
@@ -958,7 +945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16654"
+NAME="AEN16582"
 ></A
 ><P
 ></P
@@ -1011,7 +998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16667"
+NAME="AEN16595"
 ></A
 ><H3
 ><A
@@ -1036,7 +1023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16672"
+NAME="AEN16600"
 ></A
 ><P
 ></P
@@ -1074,7 +1061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16681"
+NAME="AEN16609"
 ></A
 ><H3
 ><A
@@ -1101,7 +1088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16686"
+NAME="AEN16614"
 ></A
 ><P
 ></P
@@ -1188,7 +1175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16707"
+NAME="AEN16635"
 ></A
 ><H3
 ><A
@@ -1213,7 +1200,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16712"
+NAME="AEN16640"
 ></A
 ><P
 ></P
@@ -1251,7 +1238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16721"
+NAME="AEN16649"
 ></A
 ><H3
 ><A
@@ -1287,33 +1274,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16726"
+NAME="AEN16654"
 ></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="AEN16731"
+NAME="AEN16658"
 ></A
 ><H3
 ><A
@@ -1342,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16737"
+NAME="AEN16664"
 ></A
 ><H3
 ><A
@@ -1376,7 +1350,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16745"
+NAME="AEN16672"
 ></A
 ><P
 ></P
@@ -1403,7 +1377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1418,7 +1392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1429,7 +1403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16758"
+NAME="AEN16685"
 ></A
 ><H3
 ><A
@@ -1462,7 +1436,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16765"
+NAME="AEN16692"
 ></A
 ><P
 ></P
@@ -1532,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16782"
+NAME="AEN16709"
 ></A
 ><H3
 ><A
@@ -1571,7 +1545,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16790"
+NAME="AEN16717"
 ></A
 ><P
 ></P
@@ -1598,7 +1572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1615,7 +1589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1630,7 +1604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1641,7 +1615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16807"
+NAME="AEN16734"
 ></A
 ><H3
 ><A
@@ -1680,7 +1654,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16816"
+NAME="AEN16743"
 ></A
 ><P
 ></P
@@ -1707,7 +1681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1724,7 +1698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1739,7 +1713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1750,7 +1724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16833"
+NAME="AEN16760"
 ></A
 ><H3
 ><A
@@ -1786,7 +1760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16841"
+NAME="AEN16768"
 ></A
 ><P
 ></P
@@ -1813,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1830,7 +1804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1845,7 +1819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1856,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16858"
+NAME="AEN16785"
 ></A
 ><H3
 ><A
@@ -1893,7 +1867,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16866"
+NAME="AEN16793"
 ></A
 ><P
 ></P
@@ -1920,7 +1894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the memory input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1937,7 +1911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the memory block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1954,7 +1928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1969,7 +1943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1980,7 +1954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16887"
+NAME="AEN16814"
 ></A
 ><H3
 ><A
@@ -2024,7 +1998,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16897"
+NAME="AEN16824"
 ></A
 ><P
 ></P
@@ -2051,7 +2025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2068,7 +2042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2085,7 +2059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2102,7 +2076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2117,7 +2091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2128,7 +2102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16922"
+NAME="AEN16849"
 ></A
 ><H3
 ><A
@@ -2161,7 +2135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16929"
+NAME="AEN16856"
 ></A
 ><P
 ></P
@@ -2188,7 +2162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2205,7 +2179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2220,8 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2232,7 +2205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16946"
+NAME="AEN16873"
 ></A
 ><H3
 ><A
@@ -2268,7 +2241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16954"
+NAME="AEN16881"
 ></A
 ><P
 ></P
@@ -2295,7 +2268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2312,7 +2285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2327,8 +2300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2339,7 +2311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16971"
+NAME="AEN16898"
 ></A
 ><H3
 ><A
@@ -2373,7 +2345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16978"
+NAME="AEN16905"
 ></A
 ><P
 ></P
@@ -2400,7 +2372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2417,7 +2389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2434,7 +2406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2449,8 +2421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2461,7 +2432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16999"
+NAME="AEN16926"
 ></A
 ><H3
 ><A
@@ -2491,7 +2462,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17006"
+NAME="AEN16933"
 ></A
 ><P
 ></P
@@ -2518,7 +2489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2529,7 +2500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17015"
+NAME="AEN16942"
 ></A
 ><H3
 ><A
@@ -2554,7 +2525,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17020"
+NAME="AEN16947"
 ></A
 ><P
 ></P
@@ -2607,7 +2578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17033"
+NAME="AEN16960"
 ></A
 ><H3
 ><A
@@ -2649,7 +2620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17043"
+NAME="AEN16970"
 ></A
 ><P
 ></P
@@ -2676,7 +2647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2693,7 +2664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2710,7 +2681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputReadCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2727,7 +2698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2742,7 +2713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2753,7 +2724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17068"
+NAME="AEN16995"
 ></A
 ><H3
 ><A
@@ -2782,7 +2753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17074"
+NAME="AEN17001"
 ></A
 ><H3
 ><A
@@ -2815,7 +2786,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17082"
+NAME="AEN17009"
 ></A
 ><P
 ></P
@@ -2842,7 +2813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2857,7 +2828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2868,7 +2839,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17095"
+NAME="AEN17022"
 ></A
 ><H3
 ><A
@@ -2909,7 +2880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17103"
+NAME="AEN17030"
 ></A
 ><P
 ></P
@@ -2936,7 +2907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2953,7 +2924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2970,7 +2941,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ration (0 none, 9 max).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2985,7 +2956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2996,7 +2967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17124"
+NAME="AEN17051"
 ></A
 ><H3
 ><A
@@ -3035,7 +3006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17133"
+NAME="AEN17060"
 ></A
 ><P
 ></P
@@ -3062,7 +3033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3079,7 +3050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3094,7 +3065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3105,7 +3076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17150"
+NAME="AEN17077"
 ></A
 ><H3
 ><A
@@ -3140,7 +3111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17158"
+NAME="AEN17085"
 ></A
 ><P
 ></P
@@ -3167,7 +3138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3184,7 +3155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3199,7 +3170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3210,7 +3181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17175"
+NAME="AEN17102"
 ></A
 ><H3
 ><A
@@ -3253,7 +3224,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17185"
+NAME="AEN17112"
 ></A
 ><P
 ></P
@@ -3280,7 +3251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O write function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3297,7 +3268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3314,7 +3285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3346,7 +3317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3357,7 +3328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17210"
+NAME="AEN17137"
 ></A
 ><H3
 ><A
@@ -3392,7 +3363,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17217"
+NAME="AEN17144"
 ></A
 ><P
 ></P
@@ -3419,7 +3390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3436,7 +3407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3453,7 +3424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3468,8 +3439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars immediately written, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3480,7 +3450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17238"
+NAME="AEN17165"
 ></A
 ><H3
 ><A
@@ -3514,7 +3484,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17245"
+NAME="AEN17172"
 ></A
 ><P
 ></P
@@ -3541,7 +3511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3558,7 +3528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a zero terminated C string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3573,8 +3543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars immediately written, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3585,7 +3554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17262"
+NAME="AEN17189"
 ></A
 ><H3
 ><A
@@ -3615,7 +3584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17269"
+NAME="AEN17196"
 ></A
 ><P
 ></P
@@ -3642,7 +3611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3657,7 +3626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3668,7 +3637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17282"
+NAME="AEN17209"
 ></A
 ><H3
 ><A
@@ -3699,7 +3668,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17289"
+NAME="AEN17216"
 ></A
 ><P
 ></P
@@ -3726,7 +3695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3741,7 +3710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3752,7 +3721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17302"
+NAME="AEN17229"
 ></A
 ><H3
 ><A
@@ -3794,7 +3763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17312"
+NAME="AEN17239"
 ></A
 ><P
 ></P
@@ -3821,7 +3790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3838,7 +3807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3855,7 +3824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputWriteCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3872,7 +3841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3887,7 +3856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3898,7 +3867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17337"
+NAME="AEN17264"
 ></A
 ><H3
 ><A
@@ -3933,7 +3902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17345"
+NAME="AEN17272"
 ></A
 ><P
 ></P
@@ -3960,7 +3929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output I/O buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3977,7 +3946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3994,7 +3963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding if any assuming the i/O layer handles the trancoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4009,7 +3978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4020,7 +3989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17366"
+NAME="AEN17293"
 ></A
 ><H3
 ><A
@@ -4056,7 +4025,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17374"
+NAME="AEN17301"
 ></A
 ><P
 ></P
@@ -4083,7 +4052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output I/O buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4100,7 +4069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4117,7 +4086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding if any assuming the i/O layer handles the trancoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4134,7 +4103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4149,7 +4118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4160,7 +4129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17399"
+NAME="AEN17326"
 ></A
 ><H3
 ><A
@@ -4201,7 +4170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17408"
+NAME="AEN17335"
 ></A
 ><P
 ></P
@@ -4228,7 +4197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4245,7 +4214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4262,7 +4231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4279,7 +4248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4296,7 +4265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4313,7 +4282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4324,7 +4293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17437"
+NAME="AEN17364"
 ></A
 ><H3
 ><A
@@ -4359,7 +4328,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17445"
+NAME="AEN17372"
 ></A
 ><P
 ></P
@@ -4386,7 +4355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4403,7 +4372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4420,7 +4389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 8bcc107..4f6ad74 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -110,7 +110,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21914"
+NAME="AEN21815"
 ></A
 ><H2
 >Name</H2
@@ -118,7 +118,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21917"
+NAME="AEN21818"
 ></A
 ><H2
 >Synopsis</H2
@@ -261,7 +261,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21949"
+NAME="AEN21850"
 ></A
 ><H2
 >Description</H2
@@ -271,14 +271,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21952"
+NAME="AEN21853"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21954"
+NAME="AEN21855"
 ></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="AEN21960"
+NAME="AEN21861"
 ></A
 ><H3
 ><A
@@ -325,7 +325,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
+>#define     MEM_LIST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -335,7 +335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21965"
+NAME="AEN21866"
 ></A
 ><H3
 ><A
@@ -360,7 +360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21970"
+NAME="AEN21871"
 ></A
 ><P
 ></P
@@ -398,7 +398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21979"
+NAME="AEN21880"
 ></A
 ><H3
 ><A
@@ -423,7 +423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21984"
+NAME="AEN21885"
 ></A
 ><P
 ></P
@@ -461,7 +461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21993"
+NAME="AEN21894"
 ></A
 ><H3
 ><A
@@ -487,7 +487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21998"
+NAME="AEN21899"
 ></A
 ><P
 ></P
@@ -542,7 +542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22011"
+NAME="AEN21912"
 ></A
 ><H3
 ><A
@@ -567,7 +567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22016"
+NAME="AEN21917"
 ></A
 ><P
 ></P
@@ -620,7 +620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22029"
+NAME="AEN21930"
 ></A
 ><H3
 ><A
@@ -666,7 +666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22040"
+NAME="AEN21941"
 ></A
 ><P
 ></P
@@ -693,10 +693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -713,10 +710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -733,10 +727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -753,10 +744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -771,7 +759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -782,7 +770,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22069"
+NAME="AEN21966"
 ></A
 ><H3
 ><A
@@ -824,7 +812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22079"
+NAME="AEN21976"
 ></A
 ><P
 ></P
@@ -851,10 +839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -871,10 +856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -891,10 +873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -911,10 +890,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -929,7 +905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -940,7 +916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22108"
+NAME="AEN22001"
 ></A
 ><H3
 ><A
@@ -967,7 +943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22114"
+NAME="AEN22007"
 ></A
 ><P
 ></P
@@ -992,7 +968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1003,7 +979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22123"
+NAME="AEN22016"
 ></A
 ><H3
 ><A
@@ -1030,7 +1006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22129"
+NAME="AEN22022"
 ></A
 ><P
 ></P
@@ -1055,7 +1031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int representing the amount of memory allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1066,7 +1042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22138"
+NAME="AEN22031"
 ></A
 ><H3
 ><A
@@ -1096,7 +1072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22145"
+NAME="AEN22038"
 ></A
 ><P
 ></P
@@ -1123,8 +1099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file, if NULL, the result is
-written to the file .memorylist</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1135,7 +1110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22154"
+NAME="AEN22047"
 ></A
 ><H3
 ><A
@@ -1172,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22162"
+NAME="AEN22055"
 ></A
 ><P
 ></P
@@ -1199,7 +1174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1216,7 +1191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of entries to dump</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1227,7 +1202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22175"
+NAME="AEN22068"
 ></A
 ><H3
 ><A
@@ -1255,7 +1230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22181"
+NAME="AEN22074"
 ></A
 ><H3
 ><A
@@ -1271,7 +1246,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlMalloc(x) xmlMallocLoc((x), __FILE__, __LINE__)</PRE
+>#define     xmlMalloc(x)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1280,7 +1255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22186"
+NAME="AEN22079"
 ></A
 ><P
 ></P
@@ -1318,7 +1293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22195"
+NAME="AEN22088"
 ></A
 ><H3
 ><A
@@ -1334,7 +1309,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlRealloc(p, x) xmlReallocLoc((p), (x), __FILE__, __LINE__)</PRE
+>#define     xmlRealloc(p, x)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1343,7 +1318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22200"
+NAME="AEN22093"
 ></A
 ><P
 ></P
@@ -1398,7 +1373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22213"
+NAME="AEN22106"
 ></A
 ><H3
 ><A
@@ -1414,7 +1389,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlMemStrdup(x) xmlMemStrdupLoc((x), __FILE__, __LINE__)</PRE
+>#define     xmlMemStrdup(x)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1423,7 +1398,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22218"
+NAME="AEN22111"
 ></A
 ><P
 ></P
@@ -1461,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22227"
+NAME="AEN22120"
 ></A
 ><H3
 ><A
@@ -1493,7 +1468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22234"
+NAME="AEN22127"
 ></A
 ><P
 ></P
@@ -1520,7 +1495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1537,7 +1512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1554,7 +1529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1565,7 +1540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22251"
+NAME="AEN22144"
 ></A
 ><H3
 ><A
@@ -1598,7 +1573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22258"
+NAME="AEN22151"
 ></A
 ><P
 ></P
@@ -1625,7 +1600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1642,7 +1617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1659,7 +1634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1676,7 +1651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1687,7 +1662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22279"
+NAME="AEN22172"
 ></A
 ><H3
 ><A
@@ -1719,7 +1694,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22286"
+NAME="AEN22179"
 ></A
 ><P
 ></P
@@ -1763,7 +1738,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1780,7 +1755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1795,7 +1770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occured.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 57e9972..f94ec49 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11305"
+NAME="AEN11247"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11308"
+NAME="AEN11250"
 ></A
 ><H2
 >Synopsis</H2
@@ -590,7 +590,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11434"
+NAME="AEN11376"
 ></A
 ><H2
 >Description</H2
@@ -600,14 +600,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11437"
+NAME="AEN11379"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11439"
+NAME="AEN11381"
 ></A
 ><H3
 ><A
@@ -688,33 +688,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11445"
+NAME="AEN11387"
 ></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="AEN11450"
+NAME="AEN11391"
 ></A
 ><H3
 ><A
@@ -757,33 +744,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11456"
+NAME="AEN11397"
 ></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="AEN11461"
+NAME="AEN11401"
 ></A
 ><H3
 ><A
@@ -839,7 +813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11468"
+NAME="AEN11408"
 ></A
 ><H3
 ><A
@@ -869,33 +843,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11473"
+NAME="AEN11413"
 ></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="AEN11478"
+NAME="AEN11417"
 ></A
 ><H3
 ><A
@@ -932,7 +893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11483"
+NAME="AEN11422"
 ></A
 ><H3
 ><A
@@ -968,7 +929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11488"
+NAME="AEN11427"
 ></A
 ><H3
 ><A
@@ -996,7 +957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11494"
+NAME="AEN11433"
 ></A
 ><P
 ></P
@@ -1032,7 +993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11503"
+NAME="AEN11442"
 ></A
 ><H3
 ><A
@@ -1061,7 +1022,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11509"
+NAME="AEN11448"
 ></A
 ><P
 ></P
@@ -1131,7 +1092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11526"
+NAME="AEN11465"
 ></A
 ><H3
 ><A
@@ -1160,33 +1121,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11531"
+NAME="AEN11470"
 ></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="AEN11536"
+NAME="AEN11474"
 ></A
 ><H3
 ><A
@@ -1215,33 +1163,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11541"
+NAME="AEN11479"
 ></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="AEN11546"
+NAME="AEN11483"
 ></A
 ><H3
 ><A
@@ -1270,7 +1205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11552"
+NAME="AEN11489"
 ></A
 ><P
 ></P
@@ -1325,7 +1260,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11565"
+NAME="AEN11502"
 ></A
 ><H3
 ><A
@@ -1354,33 +1289,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11570"
+NAME="AEN11507"
 ></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="AEN11575"
+NAME="AEN11511"
 ></A
 ><H3
 ><A
@@ -1415,7 +1337,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11583"
+NAME="AEN11519"
 ></A
 ><P
 ></P
@@ -1485,7 +1407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11600"
+NAME="AEN11536"
 ></A
 ><H3
 ><A
@@ -1514,33 +1436,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11605"
+NAME="AEN11541"
 ></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="AEN11610"
+NAME="AEN11545"
 ></A
 ><H3
 ><A
@@ -1572,33 +1481,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11617"
+NAME="AEN11552"
 ></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="AEN11622"
+NAME="AEN11556"
 ></A
 ><H3
 ><A
@@ -1631,7 +1527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11629"
+NAME="AEN11563"
 ></A
 ><P
 ></P
@@ -1686,7 +1582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11642"
+NAME="AEN11576"
 ></A
 ><H3
 ><A
@@ -1702,7 +1598,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)-&gt;nodeNr : 0)</PRE
+>#define     xmlXPathNodeSetGetLength(ns)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1711,7 +1607,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11647"
+NAME="AEN11581"
 ></A
 ><P
 ></P
@@ -1749,7 +1645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11656"
+NAME="AEN11590"
 ></A
 ><H3
 ><A
@@ -1774,7 +1670,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11661"
+NAME="AEN11595"
 ></A
 ><P
 ></P
@@ -1829,7 +1725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11674"
+NAME="AEN11608"
 ></A
 ><H3
 ><A
@@ -1859,7 +1755,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11681"
+NAME="AEN11615"
 ></A
 ><P
 ></P
@@ -1886,7 +1782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1897,7 +1793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11690"
+NAME="AEN11624"
 ></A
 ><H3
 ><A
@@ -1935,7 +1831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11699"
+NAME="AEN11633"
 ></A
 ><P
 ></P
@@ -1962,7 +1858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an initial xmlNodePtr, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1977,7 +1873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1988,7 +1884,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11712"
+NAME="AEN11646"
 ></A
 ><H3
 ><A
@@ -2027,7 +1923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11721"
+NAME="AEN11655"
 ></A
 ><P
 ></P
@@ -2054,7 +1950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing NodeSetList object</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2065,7 +1961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11730"
+NAME="AEN11664"
 ></A
 ><H3
 ><A
@@ -2095,7 +1991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11737"
+NAME="AEN11671"
 ></A
 ><P
 ></P
@@ -2122,7 +2018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlNodeSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2133,7 +2029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11746"
+NAME="AEN11680"
 ></A
 ><H3
 ><A
@@ -2166,7 +2062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11754"
+NAME="AEN11688"
 ></A
 ><P
 ></P
@@ -2193,7 +2089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2208,7 +2104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2219,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11767"
+NAME="AEN11701"
 ></A
 ><H3
 ><A
@@ -2253,7 +2149,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11775"
+NAME="AEN11709"
 ></A
 ><P
 ></P
@@ -2280,7 +2176,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2297,7 +2193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2312,8 +2208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-2 in case of error 1 if first point &lt; second point, 0 if
-that's the same node, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2324,7 +2219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11792"
+NAME="AEN11726"
 ></A
 ><H3
 ><A
@@ -2354,7 +2249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11799"
+NAME="AEN11733"
 ></A
 ><P
 ></P
@@ -2381,7 +2276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2396,7 +2291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2407,7 +2302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11812"
+NAME="AEN11746"
 ></A
 ><H3
 ><A
@@ -2437,7 +2332,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11819"
+NAME="AEN11753"
 ></A
 ><P
 ></P
@@ -2464,7 +2359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2479,7 +2374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2490,7 +2385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11832"
+NAME="AEN11766"
 ></A
 ><H3
 ><A
@@ -2520,7 +2415,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11839"
+NAME="AEN11773"
 ></A
 ><P
 ></P
@@ -2547,7 +2442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2562,7 +2457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2573,7 +2468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11852"
+NAME="AEN11786"
 ></A
 ><H3
 ><A
@@ -2601,7 +2496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11858"
+NAME="AEN11792"
 ></A
 ><P
 ></P
@@ -2654,7 +2549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11871"
+NAME="AEN11805"
 ></A
 ><H3
 ><A
@@ -2684,7 +2579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11878"
+NAME="AEN11812"
 ></A
 ><P
 ></P
@@ -2711,7 +2606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a boolean</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2726,7 +2621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2737,7 +2632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11891"
+NAME="AEN11825"
 ></A
 ><H3
 ><A
@@ -2770,7 +2665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11899"
+NAME="AEN11833"
 ></A
 ><P
 ></P
@@ -2797,7 +2692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2812,7 +2707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2823,7 +2718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11912"
+NAME="AEN11846"
 ></A
 ><H3
 ><A
@@ -2856,7 +2751,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11920"
+NAME="AEN11854"
 ></A
 ><P
 ></P
@@ -2883,7 +2778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2898,7 +2793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2909,7 +2804,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11933"
+NAME="AEN11867"
 ></A
 ><H3
 ><A
@@ -2942,7 +2837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11941"
+NAME="AEN11875"
 ></A
 ><P
 ></P
@@ -2969,7 +2864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2984,7 +2879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2995,7 +2890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11954"
+NAME="AEN11888"
 ></A
 ><H3
 ><A
@@ -3028,7 +2923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11962"
+NAME="AEN11896"
 ></A
 ><P
 ></P
@@ -3055,7 +2950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3070,7 +2965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3081,7 +2976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11975"
+NAME="AEN11909"
 ></A
 ><H3
 ><A
@@ -3111,7 +3006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11982"
+NAME="AEN11916"
 ></A
 ><P
 ></P
@@ -3138,7 +3033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a boolean</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3153,7 +3048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3164,7 +3059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11995"
+NAME="AEN11929"
 ></A
 ><H3
 ><A
@@ -3197,7 +3092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12003"
+NAME="AEN11937"
 ></A
 ><P
 ></P
@@ -3224,7 +3119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3239,7 +3134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3250,7 +3145,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12016"
+NAME="AEN11950"
 ></A
 ><H3
 ><A
@@ -3283,7 +3178,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12024"
+NAME="AEN11958"
 ></A
 ><P
 ></P
@@ -3310,7 +3205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3325,7 +3220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3336,7 +3231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12037"
+NAME="AEN11971"
 ></A
 ><H3
 ><A
@@ -3369,7 +3264,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12045"
+NAME="AEN11979"
 ></A
 ><P
 ></P
@@ -3396,7 +3291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3411,7 +3306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3422,7 +3317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12058"
+NAME="AEN11992"
 ></A
 ><H3
 ><A
@@ -3458,6 +3353,273 @@
 ><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
@@ -3485,7 +3647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3500,9 +3662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string value of the object, NULL in case of error.
-A new string is allocated only if needed (val isn't a
-string object).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3517,291 +3677,6 @@
 ></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
@@ -3826,7 +3701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12155"
+NAME="AEN12086"
 ></A
 ><H3
 ><A
@@ -3859,7 +3734,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12163"
+NAME="AEN12094"
 ></A
 ><P
 ></P
@@ -3886,7 +3761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3901,7 +3776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3912,7 +3787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12176"
+NAME="AEN12107"
 ></A
 ><H3
 ><A
@@ -3942,7 +3817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12183"
+NAME="AEN12114"
 ></A
 ><P
 ></P
@@ -3969,7 +3844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3980,7 +3855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12192"
+NAME="AEN12123"
 ></A
 ><H3
 ><A
@@ -4017,7 +3892,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12201"
+NAME="AEN12132"
 ></A
 ><P
 ></P
@@ -4044,7 +3919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4076,8 +3951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4088,7 +3962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12218"
+NAME="AEN12149"
 ></A
 ><H3
 ><A
@@ -4123,7 +3997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12226"
+NAME="AEN12157"
 ></A
 ><P
 ></P
@@ -4193,7 +4067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12243"
+NAME="AEN12174"
 ></A
 ><H3
 ><A
@@ -4230,7 +4104,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12252"
+NAME="AEN12183"
 ></A
 ><P
 ></P
@@ -4257,7 +4131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4274,7 +4148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4289,8 +4163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the evaluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4301,7 +4174,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12269"
+NAME="AEN12200"
 ></A
 ><H3
 ><A
@@ -4344,7 +4217,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12278"
+NAME="AEN12209"
 ></A
 ><P
 ></P
@@ -4371,7 +4244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4388,7 +4261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Predicate Expression evaluation result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4414,7 +4287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12295"
+NAME="AEN12226"
 ></A
 ><H3
 ><A
@@ -4447,7 +4320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12303"
+NAME="AEN12234"
 ></A
 ><P
 ></P
@@ -4474,7 +4347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4489,8 +4362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4501,7 +4373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12316"
+NAME="AEN12247"
 ></A
 ><H3
 ><A
@@ -4538,7 +4410,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12325"
+NAME="AEN12256"
 ></A
 ><P
 ></P
@@ -4565,7 +4437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compiled XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4582,7 +4454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4597,8 +4469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4609,7 +4480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12342"
+NAME="AEN12273"
 ></A
 ><H3
 ><A
@@ -4644,7 +4515,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12350"
+NAME="AEN12281"
 ></A
 ><P
 ></P
@@ -4671,7 +4542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPATH comp</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index d9d8fe8..60324d0 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12364"
+NAME="AEN12295"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12367"
+NAME="AEN12298"
 ></A
 ><H2
 >Synopsis</H2
@@ -1189,7 +1189,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12653"
+NAME="AEN12584"
 ></A
 ><H2
 >Description</H2
@@ -1199,14 +1199,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12656"
+NAME="AEN12587"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12658"
+NAME="AEN12589"
 ></A
 ><H3
 ><A
@@ -1234,7 +1234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12664"
+NAME="AEN12595"
 ></A
 ><H3
 ><A
@@ -1262,7 +1262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12670"
+NAME="AEN12601"
 ></A
 ><H3
 ><A
@@ -1289,7 +1289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12676"
+NAME="AEN12607"
 ></A
 ><P
 ></P
@@ -1316,7 +1316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1327,7 +1327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12685"
+NAME="AEN12616"
 ></A
 ><H3
 ><A
@@ -1354,7 +1354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12691"
+NAME="AEN12622"
 ></A
 ><P
 ></P
@@ -1381,7 +1381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1392,7 +1392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12700"
+NAME="AEN12631"
 ></A
 ><H3
 ><A
@@ -1420,7 +1420,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12706"
+NAME="AEN12637"
 ></A
 ><P
 ></P
@@ -1447,7 +1447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath type</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1458,7 +1458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12715"
+NAME="AEN12646"
 ></A
 ><H3
 ><A
@@ -1485,7 +1485,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12721"
+NAME="AEN12652"
 ></A
 ><P
 ></P
@@ -1512,7 +1512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of expected args</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1523,7 +1523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12730"
+NAME="AEN12661"
 ></A
 ><H3
 ><A
@@ -1551,7 +1551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12736"
+NAME="AEN12667"
 ></A
 ><H3
 ><A
@@ -1579,7 +1579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12742"
+NAME="AEN12673"
 ></A
 ><H3
 ><A
@@ -1607,7 +1607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12748"
+NAME="AEN12679"
 ></A
 ><H3
 ><A
@@ -1635,7 +1635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12754"
+NAME="AEN12685"
 ></A
 ><P
 ></P
@@ -1671,7 +1671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12763"
+NAME="AEN12694"
 ></A
 ><H3
 ><A
@@ -1706,7 +1706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12771"
+NAME="AEN12702"
 ></A
 ><P
 ></P
@@ -1733,7 +1733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1750,7 +1750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lookup function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1778,7 +1778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12788"
+NAME="AEN12719"
 ></A
 ><H3
 ><A
@@ -1809,7 +1809,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12794"
+NAME="AEN12725"
 ></A
 ><P
 ></P
@@ -1898,7 +1898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12815"
+NAME="AEN12746"
 ></A
 ><H3
 ><A
@@ -1933,7 +1933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12823"
+NAME="AEN12754"
 ></A
 ><P
 ></P
@@ -1960,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * to dump the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1977,7 +1977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to inspect</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1994,7 +1994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indentation level</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2005,7 +2005,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12840"
+NAME="AEN12771"
 ></A
 ><H3
 ><A
@@ -2038,7 +2038,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12847"
+NAME="AEN12778"
 ></A
 ><P
 ></P
@@ -2110,7 +2110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12864"
+NAME="AEN12795"
 ></A
 ><H3
 ><A
@@ -2154,7 +2154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12874"
+NAME="AEN12805"
 ></A
 ><P
 ></P
@@ -2181,7 +2181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2198,7 +2198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2215,7 +2215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2230,7 +2230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2241,7 +2241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12895"
+NAME="AEN12826"
 ></A
 ><H3
 ><A
@@ -2279,7 +2279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12904"
+NAME="AEN12835"
 ></A
 ><P
 ></P
@@ -2306,7 +2306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2338,7 +2338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2349,7 +2349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12921"
+NAME="AEN12852"
 ></A
 ><H3
 ><A
@@ -2377,7 +2377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12927"
+NAME="AEN12858"
 ></A
 ><P
 ></P
@@ -2415,7 +2415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12936"
+NAME="AEN12867"
 ></A
 ><H3
 ><A
@@ -2458,7 +2458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12946"
+NAME="AEN12877"
 ></A
 ><P
 ></P
@@ -2485,7 +2485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2502,7 +2502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2519,7 +2519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function implementation or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2534,7 +2534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2545,7 +2545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12967"
+NAME="AEN12898"
 ></A
 ><H3
 ><A
@@ -2592,7 +2592,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12978"
+NAME="AEN12909"
 ></A
 ><P
 ></P
@@ -2619,7 +2619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2636,7 +2636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2653,7 +2653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2670,7 +2670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function implementation or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2685,7 +2685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2696,7 +2696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13003"
+NAME="AEN12934"
 ></A
 ><H3
 ><A
@@ -2740,7 +2740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13013"
+NAME="AEN12944"
 ></A
 ><P
 ></P
@@ -2767,7 +2767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2784,7 +2784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2801,7 +2801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2816,7 +2816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2827,7 +2827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13034"
+NAME="AEN12965"
 ></A
 ><H3
 ><A
@@ -2875,7 +2875,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13045"
+NAME="AEN12976"
 ></A
 ><P
 ></P
@@ -2902,7 +2902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2919,7 +2919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2936,7 +2936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2953,7 +2953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2968,7 +2968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2979,7 +2979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13070"
+NAME="AEN13001"
 ></A
 ><H3
 ><A
@@ -3017,7 +3017,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13079"
+NAME="AEN13010"
 ></A
 ><P
 ></P
@@ -3044,7 +3044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3061,7 +3061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3076,7 +3076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathFunction or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3087,7 +3087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13096"
+NAME="AEN13027"
 ></A
 ><H3
 ><A
@@ -3129,7 +3129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13106"
+NAME="AEN13037"
 ></A
 ><P
 ></P
@@ -3156,7 +3156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3173,7 +3173,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3190,7 +3190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3205,7 +3205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathFunction or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3216,7 +3216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13127"
+NAME="AEN13058"
 ></A
 ><H3
 ><A
@@ -3246,7 +3246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13134"
+NAME="AEN13065"
 ></A
 ><P
 ></P
@@ -3273,7 +3273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3284,7 +3284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13143"
+NAME="AEN13074"
 ></A
 ><H3
 ><A
@@ -3322,7 +3322,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13152"
+NAME="AEN13083"
 ></A
 ><P
 ></P
@@ -3349,7 +3349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3366,7 +3366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3381,7 +3381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3392,7 +3392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13169"
+NAME="AEN13100"
 ></A
 ><H3
 ><A
@@ -3434,7 +3434,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13179"
+NAME="AEN13110"
 ></A
 ><P
 ></P
@@ -3461,7 +3461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3478,7 +3478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3495,7 +3495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3510,7 +3510,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3521,7 +3521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13200"
+NAME="AEN13131"
 ></A
 ><H3
 ><A
@@ -3552,7 +3552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13207"
+NAME="AEN13138"
 ></A
 ><P
 ></P
@@ -3579,7 +3579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3590,7 +3590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13216"
+NAME="AEN13147"
 ></A
 ><H3
 ><A
@@ -3628,7 +3628,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13225"
+NAME="AEN13156"
 ></A
 ><P
 ></P
@@ -3655,7 +3655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3672,7 +3672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3687,7 +3687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathParserContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3698,7 +3698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13242"
+NAME="AEN13173"
 ></A
 ><H3
 ><A
@@ -3728,7 +3728,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13249"
+NAME="AEN13180"
 ></A
 ><P
 ></P
@@ -3755,7 +3755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3766,7 +3766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13258"
+NAME="AEN13189"
 ></A
 ><H3
 ><A
@@ -3797,7 +3797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13265"
+NAME="AEN13196"
 ></A
 ><P
 ></P
@@ -3850,7 +3850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13278"
+NAME="AEN13209"
 ></A
 ><H3
 ><A
@@ -3882,7 +3882,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13285"
+NAME="AEN13216"
 ></A
 ><P
 ></P
@@ -3952,7 +3952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13302"
+NAME="AEN13233"
 ></A
 ><H3
 ><A
@@ -3990,7 +3990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13311"
+NAME="AEN13242"
 ></A
 ><P
 ></P
@@ -4017,7 +4017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4032,7 +4032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4043,7 +4043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13324"
+NAME="AEN13255"
 ></A
 ><H3
 ><A
@@ -4078,7 +4078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13332"
+NAME="AEN13263"
 ></A
 ><P
 ></P
@@ -4105,7 +4105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4120,7 +4120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4131,7 +4131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13345"
+NAME="AEN13276"
 ></A
 ><H3
 ><A
@@ -4169,7 +4169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13354"
+NAME="AEN13285"
 ></A
 ><P
 ></P
@@ -4196,7 +4196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4211,7 +4211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4222,7 +4222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13367"
+NAME="AEN13298"
 ></A
 ><H3
 ><A
@@ -4252,7 +4252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13374"
+NAME="AEN13305"
 ></A
 ><P
 ></P
@@ -4279,7 +4279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4294,7 +4294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4305,7 +4305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13387"
+NAME="AEN13318"
 ></A
 ><H3
 ><A
@@ -4343,7 +4343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13396"
+NAME="AEN13327"
 ></A
 ><P
 ></P
@@ -4370,7 +4370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the double value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4385,7 +4385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4396,7 +4396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13409"
+NAME="AEN13340"
 ></A
 ><H3
 ><A
@@ -4431,7 +4431,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13417"
+NAME="AEN13348"
 ></A
 ><P
 ></P
@@ -4458,7 +4458,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the boolean value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4473,7 +4473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4484,7 +4484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13430"
+NAME="AEN13361"
 ></A
 ><H3
 ><A
@@ -4523,7 +4523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13439"
+NAME="AEN13370"
 ></A
 ><P
 ></P
@@ -4550,7 +4550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4565,7 +4565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4576,7 +4576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13452"
+NAME="AEN13383"
 ></A
 ><H3
 ><A
@@ -4615,7 +4615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13461"
+NAME="AEN13392"
 ></A
 ><P
 ></P
@@ -4642,7 +4642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4657,7 +4657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4668,7 +4668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13474"
+NAME="AEN13405"
 ></A
 ><H3
 ><A
@@ -4702,7 +4702,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13482"
+NAME="AEN13413"
 ></A
 ><P
 ></P
@@ -4729,7 +4729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4746,7 +4746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4757,7 +4757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13495"
+NAME="AEN13426"
 ></A
 ><H3
 ><A
@@ -4792,7 +4792,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13503"
+NAME="AEN13434"
 ></A
 ><P
 ></P
@@ -4819,7 +4819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4836,7 +4836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4847,7 +4847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13516"
+NAME="AEN13447"
 ></A
 ><H3
 ><A
@@ -4877,7 +4877,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13523"
+NAME="AEN13454"
 ></A
 ><P
 ></P
@@ -4904,7 +4904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4915,7 +4915,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13532"
+NAME="AEN13463"
 ></A
 ><H3
 ><A
@@ -4960,7 +4960,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13540"
+NAME="AEN13471"
 ></A
 ><P
 ></P
@@ -4987,7 +4987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5004,7 +5004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5015,7 +5015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13553"
+NAME="AEN13484"
 ></A
 ><H3
 ><A
@@ -5045,7 +5045,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13560"
+NAME="AEN13491"
 ></A
 ><P
 ></P
@@ -5072,7 +5072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5083,7 +5083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13569"
+NAME="AEN13500"
 ></A
 ><H3
 ><A
@@ -5114,7 +5114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13576"
+NAME="AEN13507"
 ></A
 ><P
 ></P
@@ -5141,7 +5141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5152,7 +5152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13585"
+NAME="AEN13516"
 ></A
 ><H3
 ><A
@@ -5190,7 +5190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13595"
+NAME="AEN13526"
 ></A
 ><P
 ></P
@@ -5217,7 +5217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5232,7 +5232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5243,7 +5243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13608"
+NAME="AEN13539"
 ></A
 ><H3
 ><A
@@ -5281,7 +5281,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13618"
+NAME="AEN13549"
 ></A
 ><P
 ></P
@@ -5308,7 +5308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5323,7 +5323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5334,7 +5334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13631"
+NAME="AEN13562"
 ></A
 ><H3
 ><A
@@ -5375,7 +5375,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13641"
+NAME="AEN13572"
 ></A
 ><P
 ></P
@@ -5402,7 +5402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to scan</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5417,7 +5417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the double value.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5428,7 +5428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13654"
+NAME="AEN13585"
 ></A
 ><H3
 ><A
@@ -5471,7 +5471,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13663"
+NAME="AEN13594"
 ></A
 ><P
 ></P
@@ -5498,7 +5498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5515,7 +5515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Predicate Expression evaluation result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5541,7 +5541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13680"
+NAME="AEN13611"
 ></A
 ><H3
 ><A
@@ -5569,7 +5569,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13686"
+NAME="AEN13617"
 ></A
 ><H3
 ><A
@@ -5632,7 +5632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13695"
+NAME="AEN13626"
 ></A
 ><P
 ></P
@@ -5659,7 +5659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5676,7 +5676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5687,7 +5687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13708"
+NAME="AEN13639"
 ></A
 ><H3
 ><A
@@ -5717,7 +5717,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13715"
+NAME="AEN13646"
 ></A
 ><P
 ></P
@@ -5744,7 +5744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5755,7 +5755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13724"
+NAME="AEN13655"
 ></A
 ><H3
 ><A
@@ -5793,7 +5793,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13733"
+NAME="AEN13664"
 ></A
 ><P
 ></P
@@ -5846,7 +5846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13746"
+NAME="AEN13677"
 ></A
 ><H3
 ><A
@@ -5904,7 +5904,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13759"
+NAME="AEN13690"
 ></A
 ><P
 ></P
@@ -5931,7 +5931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first NodeSet or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5948,7 +5948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second NodeSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5963,7 +5963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->val1 once extended or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5974,7 +5974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13776"
+NAME="AEN13707"
 ></A
 ><H3
 ><A
@@ -6008,7 +6008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13784"
+NAME="AEN13715"
 ></A
 ><P
 ></P
@@ -6035,7 +6035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6052,7 +6052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6063,7 +6063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13797"
+NAME="AEN13728"
 ></A
 ><H3
 ><A
@@ -6094,7 +6094,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13804"
+NAME="AEN13735"
 ></A
 ><P
 ></P
@@ -6121,7 +6121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6138,7 +6138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index to remove</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6149,7 +6149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13817"
+NAME="AEN13748"
 ></A
 ><H3
 ><A
@@ -6179,7 +6179,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13824"
+NAME="AEN13755"
 ></A
 ><P
 ></P
@@ -6217,7 +6217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13833"
+NAME="AEN13764"
 ></A
 ><H3
 ><A
@@ -6256,7 +6256,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13842"
+NAME="AEN13773"
 ></A
 ><P
 ></P
@@ -6283,7 +6283,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing NodeSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6298,7 +6298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6309,7 +6309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13855"
+NAME="AEN13786"
 ></A
 ><H3
 ><A
@@ -6347,7 +6347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13864"
+NAME="AEN13795"
 ></A
 ><P
 ></P
@@ -6374,7 +6374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6389,7 +6389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6400,7 +6400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13877"
+NAME="AEN13808"
 ></A
 ><H3
 ><A
@@ -6439,7 +6439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13886"
+NAME="AEN13817"
 ></A
 ><P
 ></P
@@ -6477,7 +6477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13895"
+NAME="AEN13826"
 ></A
 ><H3
 ><A
@@ -6507,7 +6507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13902"
+NAME="AEN13833"
 ></A
 ><P
 ></P
@@ -6545,7 +6545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13911"
+NAME="AEN13842"
 ></A
 ><H3
 ><A
@@ -6578,7 +6578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13919"
+NAME="AEN13850"
 ></A
 ><P
 ></P
@@ -6631,7 +6631,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13932"
+NAME="AEN13863"
 ></A
 ><H3
 ><A
@@ -6661,7 +6661,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13939"
+NAME="AEN13870"
 ></A
 ><P
 ></P
@@ -6699,7 +6699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13948"
+NAME="AEN13879"
 ></A
 ><H3
 ><A
@@ -6739,7 +6739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13957"
+NAME="AEN13888"
 ></A
 ><P
 ></P
@@ -6766,7 +6766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6781,7 +6781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the results of the test.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6792,7 +6792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13970"
+NAME="AEN13901"
 ></A
 ><H3
 ><A
@@ -6878,7 +6878,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13986"
+NAME="AEN13917"
 ></A
 ><P
 ></P
@@ -6905,7 +6905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6922,7 +6922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  less than (1) or greater than (0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6939,7 +6939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  is the comparison strict</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6954,7 +6954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the comparaison succeeded, 0 if it failed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6965,7 +6965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14007"
+NAME="AEN13938"
 ></A
 ><H3
 ><A
@@ -6997,7 +6997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14014"
+NAME="AEN13945"
 ></A
 ><P
 ></P
@@ -7024,7 +7024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7035,7 +7035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14023"
+NAME="AEN13954"
 ></A
 ><H3
 ><A
@@ -7067,7 +7067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14030"
+NAME="AEN13961"
 ></A
 ><P
 ></P
@@ -7094,7 +7094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7105,7 +7105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14039"
+NAME="AEN13970"
 ></A
 ><H3
 ><A
@@ -7137,7 +7137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14046"
+NAME="AEN13977"
 ></A
 ><P
 ></P
@@ -7164,7 +7164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7175,7 +7175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14055"
+NAME="AEN13986"
 ></A
 ><H3
 ><A
@@ -7207,7 +7207,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14062"
+NAME="AEN13993"
 ></A
 ><P
 ></P
@@ -7234,7 +7234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7245,7 +7245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14071"
+NAME="AEN14002"
 ></A
 ><H3
 ><A
@@ -7287,7 +7287,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14080"
+NAME="AEN14011"
 ></A
 ><P
 ></P
@@ -7314,7 +7314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7325,7 +7325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14089"
+NAME="AEN14020"
 ></A
 ><H3
 ><A
@@ -7367,7 +7367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14098"
+NAME="AEN14029"
 ></A
 ><P
 ></P
@@ -7394,7 +7394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7405,7 +7405,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14107"
+NAME="AEN14038"
 ></A
 ><H3
 ><A
@@ -7440,7 +7440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14115"
+NAME="AEN14046"
 ></A
 ><P
 ></P
@@ -7467,7 +7467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a name string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7482,7 +7482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7493,7 +7493,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14128"
+NAME="AEN14059"
 ></A
 ><H3
 ><A
@@ -7531,7 +7531,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14137"
+NAME="AEN14068"
 ></A
 ><P
 ></P
@@ -7558,7 +7558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7575,7 +7575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7590,7 +7590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7601,7 +7601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14154"
+NAME="AEN14085"
 ></A
 ><H3
 ><A
@@ -7639,7 +7639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14163"
+NAME="AEN14094"
 ></A
 ><P
 ></P
@@ -7666,7 +7666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7683,7 +7683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7698,7 +7698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7709,7 +7709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14180"
+NAME="AEN14111"
 ></A
 ><H3
 ><A
@@ -7748,7 +7748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14189"
+NAME="AEN14120"
 ></A
 ><P
 ></P
@@ -7775,7 +7775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7792,7 +7792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7807,7 +7807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7818,7 +7818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14206"
+NAME="AEN14137"
 ></A
 ><H3
 ><A
@@ -7859,7 +7859,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14215"
+NAME="AEN14146"
 ></A
 ><P
 ></P
@@ -7886,7 +7886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7903,7 +7903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7918,7 +7918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7929,7 +7929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14232"
+NAME="AEN14163"
 ></A
 ><H3
 ><A
@@ -7967,7 +7967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14241"
+NAME="AEN14172"
 ></A
 ><P
 ></P
@@ -7994,7 +7994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8011,7 +8011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8026,7 +8026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8037,7 +8037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14258"
+NAME="AEN14189"
 ></A
 ><H3
 ><A
@@ -8078,7 +8078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14267"
+NAME="AEN14198"
 ></A
 ><P
 ></P
@@ -8105,7 +8105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8122,7 +8122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8137,7 +8137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8148,7 +8148,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14284"
+NAME="AEN14215"
 ></A
 ><H3
 ><A
@@ -8187,7 +8187,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14293"
+NAME="AEN14224"
 ></A
 ><P
 ></P
@@ -8214,7 +8214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8231,7 +8231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8246,7 +8246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8257,7 +8257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14310"
+NAME="AEN14241"
 ></A
 ><H3
 ><A
@@ -8298,7 +8298,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14319"
+NAME="AEN14250"
 ></A
 ><P
 ></P
@@ -8325,7 +8325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8342,7 +8342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8357,7 +8357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8368,7 +8368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14336"
+NAME="AEN14267"
 ></A
 ><H3
 ><A
@@ -8408,7 +8408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14345"
+NAME="AEN14276"
 ></A
 ><P
 ></P
@@ -8435,7 +8435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8452,7 +8452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current attribute in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8467,7 +8467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8478,7 +8478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14362"
+NAME="AEN14293"
 ></A
 ><H3
 ><A
@@ -8516,7 +8516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14371"
+NAME="AEN14302"
 ></A
 ><P
 ></P
@@ -8543,7 +8543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8560,7 +8560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current attribute in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8575,7 +8575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8586,7 +8586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14388"
+NAME="AEN14319"
 ></A
 ><H3
 ><A
@@ -8627,7 +8627,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14397"
+NAME="AEN14328"
 ></A
 ><P
 ></P
@@ -8654,7 +8654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8671,7 +8671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8686,7 +8686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8697,7 +8697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14414"
+NAME="AEN14345"
 ></A
 ><H3
 ><A
@@ -8739,7 +8739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14423"
+NAME="AEN14354"
 ></A
 ><P
 ></P
@@ -8766,7 +8766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8783,7 +8783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8798,7 +8798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8809,7 +8809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14440"
+NAME="AEN14371"
 ></A
 ><H3
 ><A
@@ -8849,7 +8849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14449"
+NAME="AEN14380"
 ></A
 ><P
 ></P
@@ -8876,7 +8876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8893,7 +8893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8908,7 +8908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8919,7 +8919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14466"
+NAME="AEN14397"
 ></A
 ><H3
 ><A
@@ -8958,7 +8958,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14475"
+NAME="AEN14406"
 ></A
 ><P
 ></P
@@ -8985,7 +8985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9002,7 +9002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9013,7 +9013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14488"
+NAME="AEN14419"
 ></A
 ><H3
 ><A
@@ -9057,7 +9057,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14498"
+NAME="AEN14429"
 ></A
 ><P
 ></P
@@ -9084,7 +9084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9101,7 +9101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9112,7 +9112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14511"
+NAME="AEN14442"
 ></A
 ><H3
 ><A
@@ -9147,7 +9147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14519"
+NAME="AEN14450"
 ></A
 ><P
 ></P
@@ -9174,7 +9174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9191,7 +9191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9202,7 +9202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14532"
+NAME="AEN14463"
 ></A
 ><H3
 ><A
@@ -9242,7 +9242,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14540"
+NAME="AEN14471"
 ></A
 ><P
 ></P
@@ -9269,7 +9269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9286,7 +9286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9297,7 +9297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14553"
+NAME="AEN14484"
 ></A
 ><H3
 ><A
@@ -9338,7 +9338,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14561"
+NAME="AEN14492"
 ></A
 ><P
 ></P
@@ -9365,7 +9365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9382,7 +9382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9393,7 +9393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14574"
+NAME="AEN14505"
 ></A
 ><H3
 ><A
@@ -9432,7 +9432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14582"
+NAME="AEN14513"
 ></A
 ><P
 ></P
@@ -9459,7 +9459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9476,7 +9476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9487,7 +9487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14595"
+NAME="AEN14526"
 ></A
 ><H3
 ><A
@@ -9523,7 +9523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14603"
+NAME="AEN14534"
 ></A
 ><P
 ></P
@@ -9550,7 +9550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9567,7 +9567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9578,7 +9578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14616"
+NAME="AEN14547"
 ></A
 ><H3
 ><A
@@ -9615,7 +9615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14624"
+NAME="AEN14555"
 ></A
 ><P
 ></P
@@ -9642,7 +9642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9659,7 +9659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9670,7 +9670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14637"
+NAME="AEN14568"
 ></A
 ><H3
 ><A
@@ -9707,7 +9707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14645"
+NAME="AEN14576"
 ></A
 ><P
 ></P
@@ -9734,7 +9734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9751,7 +9751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9762,7 +9762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14658"
+NAME="AEN14589"
 ></A
 ><H3
 ><A
@@ -9817,7 +9817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14666"
+NAME="AEN14597"
 ></A
 ><P
 ></P
@@ -9844,7 +9844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9861,7 +9861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9872,7 +9872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14679"
+NAME="AEN14610"
 ></A
 ><H3
 ><A
@@ -9912,7 +9912,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14687"
+NAME="AEN14618"
 ></A
 ><P
 ></P
@@ -9939,7 +9939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9956,7 +9956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9967,7 +9967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14700"
+NAME="AEN14631"
 ></A
 ><H3
 ><A
@@ -10008,7 +10008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14708"
+NAME="AEN14639"
 ></A
 ><P
 ></P
@@ -10035,7 +10035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10052,7 +10052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10063,7 +10063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14721"
+NAME="AEN14652"
 ></A
 ><H3
 ><A
@@ -10104,7 +10104,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14729"
+NAME="AEN14660"
 ></A
 ><P
 ></P
@@ -10131,7 +10131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10148,7 +10148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10159,7 +10159,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14742"
+NAME="AEN14673"
 ></A
 ><H3
 ><A
@@ -10203,7 +10203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14750"
+NAME="AEN14681"
 ></A
 ><P
 ></P
@@ -10230,7 +10230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10247,7 +10247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10258,7 +10258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14763"
+NAME="AEN14694"
 ></A
 ><H3
 ><A
@@ -10295,7 +10295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14771"
+NAME="AEN14702"
 ></A
 ><P
 ></P
@@ -10322,7 +10322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10339,7 +10339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10350,7 +10350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14784"
+NAME="AEN14715"
 ></A
 ><H3
 ><A
@@ -10388,7 +10388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14793"
+NAME="AEN14724"
 ></A
 ><P
 ></P
@@ -10415,7 +10415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10432,7 +10432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10443,7 +10443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14806"
+NAME="AEN14737"
 ></A
 ><H3
 ><A
@@ -10481,7 +10481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14815"
+NAME="AEN14746"
 ></A
 ><P
 ></P
@@ -10508,7 +10508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10525,7 +10525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10536,7 +10536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14828"
+NAME="AEN14759"
 ></A
 ><H3
 ><A
@@ -10579,7 +10579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14836"
+NAME="AEN14767"
 ></A
 ><P
 ></P
@@ -10606,7 +10606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10623,7 +10623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10634,7 +10634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14849"
+NAME="AEN14780"
 ></A
 ><H3
 ><A
@@ -10669,7 +10669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14857"
+NAME="AEN14788"
 ></A
 ><P
 ></P
@@ -10696,7 +10696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10713,7 +10713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10724,7 +10724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14870"
+NAME="AEN14801"
 ></A
 ><H3
 ><A
@@ -10761,7 +10761,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14878"
+NAME="AEN14809"
 ></A
 ><P
 ></P
@@ -10788,7 +10788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10805,7 +10805,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10816,7 +10816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14891"
+NAME="AEN14822"
 ></A
 ><H3
 ><A
@@ -10853,7 +10853,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14899"
+NAME="AEN14830"
 ></A
 ><P
 ></P
@@ -10880,7 +10880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10897,7 +10897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10908,7 +10908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14912"
+NAME="AEN14843"
 ></A
 ><H3
 ><A
@@ -10945,7 +10945,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14920"
+NAME="AEN14851"
 ></A
 ><P
 ></P
@@ -10972,7 +10972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10989,7 +10989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11000,7 +11000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14933"
+NAME="AEN14864"
 ></A
 ><H3
 ><A
@@ -11038,7 +11038,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14941"
+NAME="AEN14872"
 ></A
 ><P
 ></P
@@ -11065,7 +11065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11082,7 +11082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11093,7 +11093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14954"
+NAME="AEN14885"
 ></A
 ><H3
 ><A
@@ -11133,7 +11133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14962"
+NAME="AEN14893"
 ></A
 ><P
 ></P
@@ -11160,7 +11160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11177,7 +11177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index c53a759..5d5d6f7 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14980"
+NAME="AEN14911"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14983"
+NAME="AEN14914"
 ></A
 ><H2
 >Synopsis</H2
@@ -410,7 +410,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15058"
+NAME="AEN14989"
 ></A
 ><H2
 >Description</H2
@@ -420,14 +420,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15061"
+NAME="AEN14992"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15063"
+NAME="AEN14994"
 ></A
 ><H3
 ><A
@@ -457,33 +457,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15068"
+NAME="AEN14999"
 ></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="AEN15073"
+NAME="AEN15003"
 ></A
 ><H3
 ><A
@@ -521,7 +508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15082"
+NAME="AEN15012"
 ></A
 ><P
 ></P
@@ -548,7 +535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an initial xmlXPathObjectPtr, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -563,7 +550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -574,7 +561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15095"
+NAME="AEN15025"
 ></A
 ><H3
 ><A
@@ -604,7 +591,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15102"
+NAME="AEN15032"
 ></A
 ><P
 ></P
@@ -631,7 +618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlLocationSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -642,7 +629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15111"
+NAME="AEN15041"
 ></A
 ><H3
 ><A
@@ -689,7 +676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15122"
+NAME="AEN15052"
 ></A
 ><P
 ></P
@@ -716,7 +703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first LocationSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -733,7 +720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second LocationSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -748,7 +735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->val1 once extended or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -759,7 +746,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15139"
+NAME="AEN15069"
 ></A
 ><H3
 ><A
@@ -798,7 +785,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15148"
+NAME="AEN15078"
 ></A
 ><P
 ></P
@@ -825,7 +812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -842,7 +829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the start index</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -859,7 +846,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -876,7 +863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending index</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -891,7 +878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -902,7 +889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15173"
+NAME="AEN15103"
 ></A
 ><H3
 ><A
@@ -939,7 +926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15182"
+NAME="AEN15112"
 ></A
 ><P
 ></P
@@ -966,7 +953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -983,7 +970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -998,7 +985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1009,7 +996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15199"
+NAME="AEN15129"
 ></A
 ><H3
 ><A
@@ -1046,7 +1033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15208"
+NAME="AEN15138"
 ></A
 ><P
 ></P
@@ -1073,7 +1060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1090,7 +1077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1105,7 +1092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1116,7 +1103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15225"
+NAME="AEN15155"
 ></A
 ><H3
 ><A
@@ -1153,7 +1140,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15234"
+NAME="AEN15164"
 ></A
 ><P
 ></P
@@ -1180,7 +1167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1197,7 +1184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1212,7 +1199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1223,7 +1210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15251"
+NAME="AEN15181"
 ></A
 ><H3
 ><A
@@ -1260,7 +1247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15260"
+NAME="AEN15190"
 ></A
 ><P
 ></P
@@ -1287,7 +1274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1304,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1319,7 +1306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1330,7 +1317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15277"
+NAME="AEN15207"
 ></A
 ><H3
 ><A
@@ -1379,7 +1366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15288"
+NAME="AEN15218"
 ></A
 ><P
 ></P
@@ -1406,7 +1393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the start NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1423,7 +1410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the end NodePtr value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1438,7 +1425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1449,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15305"
+NAME="AEN15235"
 ></A
 ><H3
 ><A
@@ -1489,7 +1476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15314"
+NAME="AEN15244"
 ></A
 ><P
 ></P
@@ -1516,7 +1503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1531,7 +1518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1542,7 +1529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15327"
+NAME="AEN15257"
 ></A
 ><H3
 ><A
@@ -1579,7 +1566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15336"
+NAME="AEN15266"
 ></A
 ><P
 ></P
@@ -1606,7 +1593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1623,7 +1610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1638,7 +1625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1649,7 +1636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15353"
+NAME="AEN15283"
 ></A
 ><H3
 ><A
@@ -1682,7 +1669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15361"
+NAME="AEN15291"
 ></A
 ><P
 ></P
@@ -1709,7 +1696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting and ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1724,7 +1711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1735,7 +1722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15374"
+NAME="AEN15304"
 ></A
 ><H3
 ><A
@@ -1775,7 +1762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15383"
+NAME="AEN15313"
 ></A
 ><P
 ></P
@@ -1802,7 +1789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1819,7 +1806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlXPathObjectPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1830,7 +1817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15396"
+NAME="AEN15326"
 ></A
 ><H3
 ><A
@@ -1868,7 +1855,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15405"
+NAME="AEN15335"
 ></A
 ><P
 ></P
@@ -1895,7 +1882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the LocationSet value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1910,7 +1897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1921,7 +1908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15418"
+NAME="AEN15348"
 ></A
 ><H3
 ><A
@@ -1955,7 +1942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15426"
+NAME="AEN15356"
 ></A
 ><P
 ></P
@@ -1982,7 +1969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1999,7 +1986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlXPathObjectPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2010,7 +1997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15439"
+NAME="AEN15369"
 ></A
 ><H3
 ><A
@@ -2041,7 +2028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15446"
+NAME="AEN15376"
 ></A
 ><P
 ></P
@@ -2068,7 +2055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2085,7 +2072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index to remove</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2096,7 +2083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15459"
+NAME="AEN15389"
 ></A
 ><H3
 ><A
@@ -2137,7 +2124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15469"
+NAME="AEN15399"
 ></A
 ><P
 ></P
@@ -2164,7 +2151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2181,7 +2168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node that directly contains the XPointer being evaluated or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2198,8 +2185,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element from which a user or program initiated traversal of
-the link, or NULL.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2214,7 +2200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2225,7 +2211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15490"
+NAME="AEN15420"
 ></A
 ><H3
 ><A
@@ -2262,7 +2248,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15499"
+NAME="AEN15429"
 ></A
 ><P
 ></P
@@ -2289,7 +2275,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2306,7 +2292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2321,8 +2307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2333,7 +2318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15516"
+NAME="AEN15446"
 ></A
 ><H3
 ><A
@@ -2367,7 +2352,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15524"
+NAME="AEN15454"
 ></A
 ><P
 ></P
@@ -2394,7 +2379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2411,7 +2396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of args</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2422,7 +2407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15537"
+NAME="AEN15467"
 ></A
 ><H3
 ><A
@@ -2449,13 +2434,14 @@
 ></TR
 ></TABLE
 ><P
->Build a node list tree copy of the XPointer result.</P
+>Build a node list tree copy of the XPointer result.
+This will drop Attributes and Namespace declarations.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15545"
+NAME="AEN15475"
 ></A
 ><P
 ></P
@@ -2482,7 +2468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer result from the evaluation.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2497,8 +2483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an xmlNodePtr list or NULL.
-the caller has to free the node tree.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2509,7 +2494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15558"
+NAME="AEN15488"
 ></A
 ><H3
 ><A
@@ -2546,7 +2531,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15567"
+NAME="AEN15497"
 ></A
 ><P
 ></P
@@ -2573,7 +2558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 120cad0..620a1da 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -129,8 +129,8 @@
 has been drastically improve. Don't take those changes as an excuse to not
 upgrade, it may cost a lot on the long term ...</p>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
-<p>$Id: upgrade.html,v 1.7 2000/06/30 18:39:56 veillard Exp $</p>
+<p>$Id: upgrade.html,v 1.8 2001/03/16 22:04:15 veillard Exp $</p>
 </body>
 </html>
diff --git a/doc/xml.html b/doc/xml.html
index cfcc402..20d771c 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -1549,7 +1549,9 @@
   <li><a href="mailto:doolin@cs.utk.edu">David Doolin</a> provides a
     precompiled Windows version
     <p><a
-    href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a></p>
+    href="http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/">http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/</a>
+    (older). The distribution now includes projects and makefiles for Windows
+    compiler contributed by various people.</p>
   </li>
   <li><a
     href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
@@ -1557,19 +1559,21 @@
     href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
     libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML
     application server</a></li>
-  <li><a href="mailto:fnatter@gmx.net">Felix Natter</a> and 
-    <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a
+  <li><a href="mailto:fnatter@gmx.net">Felix Natter</a> and <a
+    href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a
     href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions
     documentation</li>
   <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a> provided <a
-    href="http://xmlsoft.org/messages/0488.html">man pages</a> (not yet
-    integrated in the distribution)</li>
+    href="http://xmlsoft.org/messages/0488.html">man pages</a></li>
+  <li>Seems <a href="http://www.arsdigita.com/">ArsDigita</a> wrote a Tcl
+    wrapper for libxml called <a
+    href="http://www.linuxgazette.com/issue63/washington.html">ns_xml</a></li>
 </ul>
 
 <p></p>
 
 <p><a href="mailto:Daniel.Veillard@imag.fr">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.89 2001/06/22 16:03:51 veillard Exp $</p>
+<p>$Id: xml.html,v 1.90 2001/06/23 17:39:29 veillard Exp $</p>
 </body>
 </html>
diff --git a/doc/xmldtd.html b/doc/xmldtd.html
index c0920ad..7477d23 100644
--- a/doc/xmldtd.html
+++ b/doc/xmldtd.html
@@ -198,7 +198,7 @@
 
 <p></p>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
 <p>$Id$</p>
 </body>
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 52cf60b..1faf3f9 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -18,7 +18,7 @@
 <p>Mailing-list archive:  <a
 href="http://xmlsoft.org/messages/">http://xmlsoft.org/messages/</a></p>
 
-<p>Version: $Revision: 1.3 $</p>
+<p>Version: $Revision: 1.4 $</p>
 
 <p>Table of Content:</p>
 <ol>
@@ -194,8 +194,8 @@
   </li>
 </ol>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
-<p>$Id: xmlio.html,v 1.3 2000/08/31 14:57:50 veillard Exp $</p>
+<p>$Id: xmlio.html,v 1.4 2001/01/29 08:22:12 veillard Exp $</p>
 </body>
 </html>
diff --git a/doc/xmlmem.html b/doc/xmlmem.html
index 0ec47fb..e16e69a 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -153,7 +153,7 @@
 
 <p></p>
 
-<p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
 <p>$Id$</p>
 </body>