preparing release 2.5.5 updated the documentation and regenerated it.

* configure.in NEWS: preparing release 2.5.5
* doc/* : updated the documentation and regenerated it.
Daniel
diff --git a/ChangeLog b/ChangeLog
index 12acfb5..9a1df7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 24 16:36:23 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in NEWS: preparing release 2.5.5
+	* doc/* : updated the documentation and regenerated it.
+
 Mon Mar 24 14:56:01 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* xpath.c: fixed some problems related to #75813 about handling
diff --git a/NEWS b/NEWS
index 5c55b8c..be20b53 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,16 @@
   Schemas
 
 
+2.5.5: Mar 24 2003
+   - Lot of fixes on the Relax NG implementation. More testing including
+    DocBook and TEI examples.
+   - Increased the support for W3C XML Schemas datatype
+   - Several bug fixes in the URI handling layer
+   - Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding
+    conversion, line counting in the parser.
+   - Added support for $XMLLINT_INDENT environment variable, FTP delete
+   - Fixed the RPM spec file name
+
 
 2.5.4: Feb 20 2003:
    - Conformance testing and lot of fixes on Relax NG and XInclude
diff --git a/configure.in b/configure.in
index 725c7ef..e764f75 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=5
-LIBXML_MICRO_VERSION=4
+LIBXML_MICRO_VERSION=5
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index d7bed97..9d521b2 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -520,7 +520,6 @@
 <ANCHOR id ="XMLRELAXNGNEWVALIDCTXT" href="libxml/libxml-relaxng.html#XMLRELAXNGNEWVALIDCTXT">
 <ANCHOR id ="XMLRELAXNGFREEVALIDCTXT" href="libxml/libxml-relaxng.html#XMLRELAXNGFREEVALIDCTXT">
 <ANCHOR id ="XMLRELAXNGVALIDATEDOC" href="libxml/libxml-relaxng.html#XMLRELAXNGVALIDATEDOC">
-<ANCHOR id ="XMLRELAXNGVALIDATESTREAM" href="libxml/libxml-relaxng.html#XMLRELAXNGVALIDATESTREAM">
 <ANCHOR id ="XMLRELAXNGCLEANUPTYPES" href="libxml/libxml-relaxng.html#XMLRELAXNGCLEANUPTYPES">
 <ANCHOR id ="LIBXML-URI" href="libxml/libxml-uri.html">
 <ANCHOR id ="XMLURI" href="libxml/libxml-uri.html#XMLURI">
diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html
index a56c516..87b60be 100644
--- a/doc/html/libxml-c14n.html
+++ b/doc/html/libxml-c14n.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22736"
+NAME="AEN22522"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22739"
+NAME="AEN22525"
 ></A
 ><H2
 >Synopsis</H2
@@ -248,7 +248,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22764"
+NAME="AEN22550"
 ></A
 ><H2
 >Description</H2
@@ -258,14 +258,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22767"
+NAME="AEN22553"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22769"
+NAME="AEN22555"
 ></A
 ><H3
 ><A
@@ -311,7 +311,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22779"
+NAME="AEN22565"
 ></A
 ><P
 ></P
@@ -338,7 +338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the XML document for canonization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -355,8 +355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the nodes set to be included in the canonized image
-     		or NULL if all document nodes should be included</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -373,8 +372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->		the exclusive flag (0 - non-exclusive canonicalization;
-		otherwise - exclusive canonicalization)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -391,10 +389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of inclusive namespace prefixes 
-		ended with a NULL or NULL if there is no
-		inclusive namespaces (only for exclusive 
-		canonicalization, ignored otherwise)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -411,7 +406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 	include comments in the result (!=0) or not (==0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -428,9 +423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the output buffer to store canonical XML; this 
-		buffer MUST have encoder==NULL because C14N requires
-		UTF-8 output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -448,7 +441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->non-negative value on success or a negative value on fail  </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -459,7 +452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22812"
+NAME="AEN22598"
 ></A
 ><H3
 ><A
@@ -505,7 +498,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22822"
+NAME="AEN22608"
 ></A
 ><P
 ></P
@@ -532,7 +525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the XML document for canonization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -549,8 +542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the nodes set to be included in the canonized image
-     		or NULL if all document nodes should be included</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -567,8 +559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->		the exclusive flag (0 - non-exclusive canonicalization;
-		otherwise - exclusive canonicalization)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -585,10 +576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of inclusive namespace prefixes 
-		ended with a NULL or NULL if there is no
-		inclusive namespaces (only for exclusive 
-		canonicalization, ignored otherwise)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -605,7 +593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 	include comments in the result (!=0) or not (==0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -622,12 +610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 	the memory pointer for allocated canonical XML text;
-		the caller of this functions is responsible for calling
-		<A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->() to free allocated memory </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -645,7 +628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written on success or a negative value on fail  </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -656,7 +639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22856"
+NAME="AEN22641"
 ></A
 ><H3
 ><A
@@ -700,7 +683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22865"
+NAME="AEN22650"
 ></A
 ><P
 ></P
@@ -727,7 +710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the XML document for canonization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -744,8 +727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the nodes set to be included in the canonized image
-     		or NULL if all document nodes should be included</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -762,8 +744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->		the exclusive flag (0 - non-exclusive canonicalization;
-		otherwise - exclusive canonicalization)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -780,10 +761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of inclusive namespace prefixes 
-		ended with a NULL or NULL if there is no
-		inclusive namespaces (only for exclusive 
-		canonicalization, ignored otherwise)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -800,7 +778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 	include comments in the result (!=0) or not (==0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -817,7 +795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the filename to store canonical XML image</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -834,10 +812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	the compression level (zlib requred): 
-			-1 - libxml default,
-			 0 - uncompressed, 
-			&gt;0 - compression level</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -855,7 +830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written success or a negative value on fail  </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -866,7 +841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22902"
+NAME="AEN22687"
 ></A
 ><H3
 ><A
@@ -899,7 +874,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22909"
+NAME="AEN22694"
 ></A
 ><P
 ></P
@@ -989,7 +964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22930"
+NAME="AEN22715"
 ></A
 ><H3
 ><A
@@ -1036,7 +1011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22940"
+NAME="AEN22725"
 ></A
 ><P
 ></P
@@ -1063,7 +1038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the XML document for canonization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1080,8 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the function to use to determine is node visible 
-		or not</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1098,13 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the first parameter for <TT
-CLASS="PARAMETER"
-><I
->is_visible_callback</I
-></TT
-> function
-		(in most cases, it is nodes set)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1121,8 +1089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->		the exclusive flag (0 - non-exclusive canonicalization;
-		otherwise - exclusive canonicalization)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1139,10 +1106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of inclusive namespace prefixes 
-		ended with a NULL or NULL if there is no
-		inclusive namespaces (only for exclusive 
-		canonicalization, ignored otherwise)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1159,7 +1123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 	include comments in the result (!=0) or not (==0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1176,9 +1140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 		the output buffer to store canonical XML; this 
-		buffer MUST have encoder==NULL because C14N requires
-		UTF-8 output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1196,7 +1158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->non-negative value on success or a negative value on fail  </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index e9c0832..165f51e 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21840"
+NAME="AEN21627"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21843"
+NAME="AEN21630"
 ></A
 ><H2
 >Synopsis</H2
@@ -506,7 +506,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21944"
+NAME="AEN21731"
 ></A
 ><H2
 >Description</H2
@@ -516,14 +516,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21947"
+NAME="AEN21734"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21949"
+NAME="AEN21736"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21955"
+NAME="AEN21742"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21961"
+NAME="AEN21748"
 ></A
 ><H3
 ><A
@@ -609,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21966"
+NAME="AEN21753"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21971"
+NAME="AEN21758"
 ></A
 ><H3
 ><A
@@ -666,33 +666,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21976"
+NAME="AEN21763"
 ></A
 ><H3
 ><A
 NAME="XMLCATALOGPTR"
 ></A
 >xmlCatalogPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlCatalog *xmlCatalogPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21981"
+NAME="AEN21767"
 ></A
 ><H3
 ><A
@@ -722,7 +709,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21988"
+NAME="AEN21774"
 ></A
 ><P
 ></P
@@ -749,7 +736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should this create an SGML catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -767,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlCatalogPtr or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -778,7 +765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22001"
+NAME="AEN21787"
 ></A
 ><H3
 ><A
@@ -811,7 +798,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22008"
+NAME="AEN21794"
 ></A
 ><P
 ></P
@@ -838,7 +825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file path</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -856,7 +843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the catalog parsed or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -867,7 +854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22021"
+NAME="AEN21807"
 ></A
 ><H3
 ><A
@@ -899,7 +886,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22028"
+NAME="AEN21814"
 ></A
 ><P
 ></P
@@ -926,7 +913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file path</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -944,7 +931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the catalog parsed or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -955,7 +942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22041"
+NAME="AEN21827"
 ></A
 ><H3
 ><A
@@ -985,7 +972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22048"
+NAME="AEN21834"
 ></A
 ><P
 ></P
@@ -1012,7 +999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1030,7 +1017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of entries converted if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1041,7 +1028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22061"
+NAME="AEN21847"
 ></A
 ><H3
 ><A
@@ -1084,7 +1071,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22071"
+NAME="AEN21857"
 ></A
 ><P
 ></P
@@ -1111,7 +1098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1128,7 +1115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of record to add to the catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1145,7 +1132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system, public or prefix to match </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1162,7 +1149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the replacement value for the match</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1180,7 +1167,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1191,7 +1178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22096"
+NAME="AEN21882"
 ></A
 ><H3
 ><A
@@ -1225,7 +1212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22104"
+NAME="AEN21890"
 ></A
 ><P
 ></P
@@ -1252,7 +1239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1269,7 +1256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1287,7 +1274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of entries removed if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1298,7 +1285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22121"
+NAME="AEN21907"
 ></A
 ><H3
 ><A
@@ -1339,7 +1326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22131"
+NAME="AEN21917"
 ></A
 ><P
 ></P
@@ -1366,7 +1353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1383,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1400,7 +1387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1418,8 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1430,7 +1416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22152"
+NAME="AEN21938"
 ></A
 ><H3
 ><A
@@ -1467,7 +1453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22161"
+NAME="AEN21947"
 ></A
 ><P
 ></P
@@ -1494,7 +1480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1511,7 +1497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1529,8 +1515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1541,7 +1526,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22178"
+NAME="AEN21964"
 ></A
 ><H3
 ><A
@@ -1578,7 +1563,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22187"
+NAME="AEN21973"
 ></A
 ><P
 ></P
@@ -1605,7 +1590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1622,7 +1607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1640,8 +1625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1652,7 +1636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22204"
+NAME="AEN21990"
 ></A
 ><H3
 ><A
@@ -1689,7 +1673,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22213"
+NAME="AEN21999"
 ></A
 ><P
 ></P
@@ -1716,7 +1700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1733,7 +1717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1751,8 +1735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1763,7 +1746,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22230"
+NAME="AEN22016"
 ></A
 ><H3
 ><A
@@ -1797,7 +1780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22238"
+NAME="AEN22024"
 ></A
 ><P
 ></P
@@ -1824,7 +1807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1841,7 +1824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1852,7 +1835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22251"
+NAME="AEN22037"
 ></A
 ><H3
 ><A
@@ -1882,7 +1865,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22258"
+NAME="AEN22044"
 ></A
 ><P
 ></P
@@ -1909,7 +1892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Catalog entry</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1920,7 +1903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22267"
+NAME="AEN22053"
 ></A
 ><H3
 ><A
@@ -1950,7 +1933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22274"
+NAME="AEN22060"
 ></A
 ><P
 ></P
@@ -1977,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should this create an SGML catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1995,7 +1978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the catalog is empty, 0 if not, amd -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2006,7 +1989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22287"
+NAME="AEN22073"
 ></A
 ><H3
 ><A
@@ -2036,7 +2019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22293"
+NAME="AEN22079"
 ></A
 ><H3
 ><A
@@ -2066,7 +2049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22299"
+NAME="AEN22085"
 ></A
 ><P
 ></P
@@ -2093,7 +2076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file path</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2111,7 +2094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2122,7 +2105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22312"
+NAME="AEN22098"
 ></A
 ><H3
 ><A
@@ -2152,7 +2135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22318"
+NAME="AEN22104"
 ></A
 ><P
 ></P
@@ -2190,7 +2173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22327"
+NAME="AEN22113"
 ></A
 ><H3
 ><A
@@ -2218,7 +2201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22333"
+NAME="AEN22119"
 ></A
 ><H3
 ><A
@@ -2248,7 +2231,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22340"
+NAME="AEN22126"
 ></A
 ><P
 ></P
@@ -2275,7 +2258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2286,7 +2269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22349"
+NAME="AEN22135"
 ></A
 ><H3
 ><A
@@ -2323,7 +2306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22358"
+NAME="AEN22144"
 ></A
 ><P
 ></P
@@ -2350,7 +2333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2367,7 +2350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2385,8 +2368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2397,7 +2379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22375"
+NAME="AEN22161"
 ></A
 ><H3
 ><A
@@ -2430,7 +2412,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22383"
+NAME="AEN22169"
 ></A
 ><P
 ></P
@@ -2457,7 +2439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2475,8 +2457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2487,7 +2468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22396"
+NAME="AEN22182"
 ></A
 ><H3
 ><A
@@ -2520,7 +2501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22404"
+NAME="AEN22190"
 ></A
 ><P
 ></P
@@ -2547,7 +2528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2565,8 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2577,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22417"
+NAME="AEN22203"
 ></A
 ><H3
 ><A
@@ -2610,7 +2590,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22425"
+NAME="AEN22211"
 ></A
 ><P
 ></P
@@ -2637,7 +2617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2655,8 +2635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2667,7 +2646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22438"
+NAME="AEN22224"
 ></A
 ><H3
 ><A
@@ -2711,7 +2690,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22448"
+NAME="AEN22234"
 ></A
 ><P
 ></P
@@ -2738,7 +2717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of record to add to the catalog</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2755,7 +2734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system, public or prefix to match </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2772,7 +2751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the replacement value for the match</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2790,7 +2769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2801,7 +2780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22469"
+NAME="AEN22255"
 ></A
 ><H3
 ><A
@@ -2831,7 +2810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22476"
+NAME="AEN22262"
 ></A
 ><P
 ></P
@@ -2858,7 +2837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2876,7 +2855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of entries removed if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2887,7 +2866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22489"
+NAME="AEN22275"
 ></A
 ><H3
 ><A
@@ -2921,7 +2900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22497"
+NAME="AEN22283"
 ></A
 ><P
 ></P
@@ -2948,7 +2927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2966,7 +2945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2977,7 +2956,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22510"
+NAME="AEN22296"
 ></A
 ><H3
 ><A
@@ -3004,7 +2983,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22516"
+NAME="AEN22302"
 ></A
 ><P
 ></P
@@ -3032,7 +3011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of entries converted if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3043,7 +3022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22525"
+NAME="AEN22311"
 ></A
 ><H3
 ><A
@@ -3070,7 +3049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22531"
+NAME="AEN22317"
 ></A
 ><P
 ></P
@@ -3097,7 +3076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document's list of catalogs</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3108,7 +3087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22540"
+NAME="AEN22326"
 ></A
 ><H3
 ><A
@@ -3139,7 +3118,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22547"
+NAME="AEN22333"
 ></A
 ><P
 ></P
@@ -3166,7 +3145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document's list of catalogs</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3183,7 +3162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL to a new local catalog</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3194,7 +3173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22560"
+NAME="AEN22346"
 ></A
 ><H3
 ><A
@@ -3233,7 +3212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22569"
+NAME="AEN22355"
 ></A
 ><P
 ></P
@@ -3260,7 +3239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document's list of catalogs</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3277,7 +3256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3294,7 +3273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3312,8 +3291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3324,7 +3302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22590"
+NAME="AEN22376"
 ></A
 ><H3
 ><A
@@ -3359,7 +3337,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22598"
+NAME="AEN22384"
 ></A
 ><P
 ></P
@@ -3386,7 +3364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document's list of catalogs</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3403,7 +3381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3421,8 +3399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3433,7 +3410,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22615"
+NAME="AEN22401"
 ></A
 ><H3
 ><A
@@ -3461,7 +3438,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22621"
+NAME="AEN22407"
 ></A
 ><P
 ></P
@@ -3488,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the debug level of catalogs required</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3506,7 +3483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the previous value of the catalog debugging level</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3517,7 +3494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22634"
+NAME="AEN22420"
 ></A
 ><H3
 ><A
@@ -3552,7 +3529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22642"
+NAME="AEN22428"
 ></A
 ><P
 ></P
@@ -3579,7 +3556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the default preference for delegation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3597,7 +3574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the previous value of the default preference for delegation</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3608,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22655"
+NAME="AEN22441"
 ></A
 ><H3
 ><A
@@ -3639,7 +3616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22662"
+NAME="AEN22448"
 ></A
 ><P
 ></P
@@ -3666,7 +3643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  what catalogs should be accepted</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3677,7 +3654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22671"
+NAME="AEN22457"
 ></A
 ><H3
 ><A
@@ -3708,7 +3685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22678"
+NAME="AEN22464"
 ></A
 ><P
 ></P
@@ -3736,7 +3713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current xmlCatalogAllow value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3747,7 +3724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22687"
+NAME="AEN22473"
 ></A
 ><H3
 ><A
@@ -3784,7 +3761,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22696"
+NAME="AEN22482"
 ></A
 ><P
 ></P
@@ -3811,7 +3788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3829,7 +3806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the system ID if found or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3840,7 +3817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22709"
+NAME="AEN22495"
 ></A
 ><H3
 ><A
@@ -3877,7 +3854,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22718"
+NAME="AEN22504"
 ></A
 ><P
 ></P
@@ -3904,7 +3881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public ID string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3922,7 +3899,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 9388717..3590546 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN28512"
+NAME="AEN28258"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN28515"
+NAME="AEN28261"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN28609"
+NAME="AEN28355"
 ></A
 ><H2
 >Description</H2
@@ -519,14 +519,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN28612"
+NAME="AEN28358"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28614"
+NAME="AEN28360"
 ></A
 ><H3
 ><A
@@ -560,7 +560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28622"
+NAME="AEN28368"
 ></A
 ><P
 ></P
@@ -587,7 +587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -604,7 +604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -615,7 +615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28635"
+NAME="AEN28381"
 ></A
 ><H3
 ><A
@@ -650,7 +650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28643"
+NAME="AEN28389"
 ></A
 ><P
 ></P
@@ -677,7 +677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -694,7 +694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -711,7 +711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -722,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28660"
+NAME="AEN28406"
 ></A
 ><H3
 ><A
@@ -757,7 +757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28668"
+NAME="AEN28414"
 ></A
 ><P
 ></P
@@ -784,7 +784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -801,7 +801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -818,7 +818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -829,7 +829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28685"
+NAME="AEN28431"
 ></A
 ><H3
 ><A
@@ -864,7 +864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28693"
+NAME="AEN28439"
 ></A
 ><P
 ></P
@@ -891,7 +891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -908,7 +908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -925,7 +925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -936,7 +936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28710"
+NAME="AEN28456"
 ></A
 ><H3
 ><A
@@ -971,7 +971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28718"
+NAME="AEN28464"
 ></A
 ><P
 ></P
@@ -998,7 +998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1015,7 +1015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1032,7 +1032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1043,7 +1043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28735"
+NAME="AEN28481"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28743"
+NAME="AEN28489"
 ></A
 ><P
 ></P
@@ -1105,7 +1105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1122,7 +1122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1139,7 +1139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1150,7 +1150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28760"
+NAME="AEN28506"
 ></A
 ><H3
 ><A
@@ -1184,7 +1184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28768"
+NAME="AEN28514"
 ></A
 ><P
 ></P
@@ -1211,7 +1211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1228,7 +1228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1239,7 +1239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28781"
+NAME="AEN28527"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28789"
+NAME="AEN28535"
 ></A
 ><P
 ></P
@@ -1300,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1317,7 +1317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1328,7 +1328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28802"
+NAME="AEN28548"
 ></A
 ><H3
 ><A
@@ -1362,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28810"
+NAME="AEN28556"
 ></A
 ><P
 ></P
@@ -1389,7 +1389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1406,7 +1406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1417,7 +1417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28823"
+NAME="AEN28569"
 ></A
 ><H3
 ><A
@@ -1451,7 +1451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28831"
+NAME="AEN28577"
 ></A
 ><P
 ></P
@@ -1478,7 +1478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1495,7 +1495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1506,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28844"
+NAME="AEN28590"
 ></A
 ><H3
 ><A
@@ -1550,7 +1550,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28854"
+NAME="AEN28600"
 ></A
 ><P
 ></P
@@ -1577,7 +1577,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1594,7 +1594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node to dump</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1605,7 +1605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28867"
+NAME="AEN28613"
 ></A
 ><H3
 ><A
@@ -1640,7 +1640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28875"
+NAME="AEN28621"
 ></A
 ><P
 ></P
@@ -1667,7 +1667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node to count</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1685,12 +1685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of children of <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
->.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1701,7 +1696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28889"
+NAME="AEN28634"
 ></A
 ><H3
 ><A
@@ -1728,7 +1723,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28895"
+NAME="AEN28640"
 ></A
 ><P
 ></P
@@ -1755,7 +1750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string prompt</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1773,7 +1768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string which will be freed by the Shell.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1784,7 +1779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28908"
+NAME="AEN28653"
 ></A
 ><H3
 ><A
@@ -1821,33 +1816,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28914"
+NAME="AEN28659"
 ></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="AEN28919"
+NAME="AEN28663"
 ></A
 ><H3
 ><A
@@ -1886,7 +1868,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28928"
+NAME="AEN28672"
 ></A
 ><P
 ></P
@@ -1913,7 +1895,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1930,7 +1912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string argument</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1947,7 +1929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a first node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1964,7 +1946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a second node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1982,7 +1964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int, negative returns indicating errors.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1993,7 +1975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28953"
+NAME="AEN28697"
 ></A
 ><H3
 ><A
@@ -2021,7 +2003,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28959"
+NAME="AEN28703"
 ></A
 ><P
 ></P
@@ -2048,7 +2030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> valid xpath error id</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2065,7 +2047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the argument that cause xpath to fail</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2076,7 +2058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28972"
+NAME="AEN28716"
 ></A
 ><H3
 ><A
@@ -2106,7 +2088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28979"
+NAME="AEN28723"
 ></A
 ><P
 ></P
@@ -2133,7 +2115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a non-null node to print to the output FILE</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2144,7 +2126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28988"
+NAME="AEN28732"
 ></A
 ><H3
 ><A
@@ -2174,7 +2156,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28995"
+NAME="AEN28739"
 ></A
 ><P
 ></P
@@ -2201,7 +2183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a valid result generated by an xpath evaluation</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2212,7 +2194,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29004"
+NAME="AEN28748"
 ></A
 ><H3
 ><A
@@ -2252,7 +2234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29013"
+NAME="AEN28757"
 ></A
 ><P
 ></P
@@ -2279,7 +2261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2296,7 +2278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2313,7 +2295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2330,7 +2312,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2348,7 +2330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2359,7 +2341,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29038"
+NAME="AEN28782"
 ></A
 ><H3
 ><A
@@ -2399,7 +2381,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29047"
+NAME="AEN28791"
 ></A
 ><P
 ></P
@@ -2426,7 +2408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2443,7 +2425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2460,7 +2442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2477,7 +2459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2495,7 +2477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2506,7 +2488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29072"
+NAME="AEN28816"
 ></A
 ><H3
 ><A
@@ -2546,7 +2528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29081"
+NAME="AEN28825"
 ></A
 ><P
 ></P
@@ -2573,7 +2555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2590,7 +2572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2607,7 +2589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2624,7 +2606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2642,7 +2624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2653,7 +2635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29106"
+NAME="AEN28850"
 ></A
 ><H3
 ><A
@@ -2693,7 +2675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29115"
+NAME="AEN28859"
 ></A
 ><P
 ></P
@@ -2720,7 +2702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2737,7 +2719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2754,7 +2736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2771,7 +2753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2789,7 +2771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2800,7 +2782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29140"
+NAME="AEN28884"
 ></A
 ><H3
 ><A
@@ -2840,7 +2822,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29149"
+NAME="AEN28893"
 ></A
 ><P
 ></P
@@ -2867,7 +2849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2884,7 +2866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2901,7 +2883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2918,7 +2900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2936,7 +2918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 if loading failed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2947,7 +2929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29174"
+NAME="AEN28918"
 ></A
 ><H3
 ><A
@@ -2993,7 +2975,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29184"
+NAME="AEN28928"
 ></A
 ><P
 ></P
@@ -3020,7 +3002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3037,7 +3019,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3054,7 +3036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node in the tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3071,7 +3053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3089,7 +3071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3100,7 +3082,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29209"
+NAME="AEN28953"
 ></A
 ><H3
 ><A
@@ -3140,7 +3122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29218"
+NAME="AEN28962"
 ></A
 ><P
 ></P
@@ -3167,7 +3149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3184,7 +3166,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name (optional)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3201,7 +3183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3218,7 +3200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3236,7 +3218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3247,7 +3229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29243"
+NAME="AEN28987"
 ></A
 ><H3
 ><A
@@ -3288,7 +3270,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29252"
+NAME="AEN28996"
 ></A
 ><P
 ></P
@@ -3315,7 +3297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3332,7 +3314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD URI (optional)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3349,7 +3331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3366,7 +3348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3384,7 +3366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3395,7 +3377,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29277"
+NAME="AEN29021"
 ></A
 ><H3
 ><A
@@ -3446,7 +3428,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29288"
+NAME="AEN29032"
 ></A
 ><P
 ></P
@@ -3473,7 +3455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3490,7 +3472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3507,7 +3489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node defining a subtree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3524,7 +3506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3542,7 +3524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3553,7 +3535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29313"
+NAME="AEN29057"
 ></A
 ><H3
 ><A
@@ -3595,7 +3577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29322"
+NAME="AEN29066"
 ></A
 ><P
 ></P
@@ -3622,7 +3604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the shell context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3639,7 +3621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3656,7 +3638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3673,7 +3655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  unused</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3691,7 +3673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3702,7 +3684,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29347"
+NAME="AEN29091"
 ></A
 ><H3
 ><A
@@ -3743,7 +3725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29356"
+NAME="AEN29100"
 ></A
 ><P
 ></P
@@ -3770,7 +3752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3787,7 +3769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3804,7 +3786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line reading function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3821,7 +3803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the output FILE*, defaults to stdout if NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index 1767145..90d93d0 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23612"
+NAME="AEN23393"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23615"
+NAME="AEN23396"
 ></A
 ><H2
 >Synopsis</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23652"
+NAME="AEN23433"
 ></A
 ><H2
 >Description</H2
@@ -305,248 +305,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23655"
+NAME="AEN23436"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23657"
+NAME="AEN23438"
 ></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="AEN23662"
+NAME="AEN23442"
 ></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="AEN23667"
+NAME="AEN23446"
 ></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="AEN23672"
+NAME="AEN23450"
 ></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="AEN23677"
+NAME="AEN23454"
 ></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="AEN23682"
+NAME="AEN23458"
 ></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="AEN23687"
+NAME="AEN23462"
 ></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="AEN23692"
+NAME="AEN23466"
 ></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="AEN23697"
+NAME="AEN23470"
 ></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="AEN23702"
+NAME="AEN23474"
 ></A
 ><H3
 ><A
@@ -578,7 +461,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23708"
+NAME="AEN23480"
 ></A
 ><P
 ></P
@@ -605,7 +488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -622,12 +505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -644,7 +522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -661,12 +539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -683,7 +556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the quote character to escape (' or ") or zero.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -701,20 +574,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 unpredictable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -725,7 +585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23741"
+NAME="AEN23509"
 ></A
 ><H3
 ><A
@@ -766,7 +626,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23750"
+NAME="AEN23518"
 ></A
 ><P
 ></P
@@ -793,7 +653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -810,7 +670,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
@@ -827,7 +687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -844,7 +704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -862,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -873,7 +733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23775"
+NAME="AEN23543"
 ></A
 ><H3
 ><A
@@ -907,7 +767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23783"
+NAME="AEN23551"
 ></A
 ><P
 ></P
@@ -934,7 +794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -951,7 +811,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
@@ -969,7 +829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -980,7 +840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23800"
+NAME="AEN23568"
 ></A
 ><H3
 ><A
@@ -1019,7 +879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23808"
+NAME="AEN23576"
 ></A
 ><P
 ></P
@@ -1046,7 +906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1063,7 +923,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
@@ -1080,7 +940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1097,7 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1115,7 +975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1126,7 +986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23833"
+NAME="AEN23601"
 ></A
 ><H3
 ><A
@@ -1159,7 +1019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23840"
+NAME="AEN23608"
 ></A
 ><P
 ></P
@@ -1186,7 +1046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1203,7 +1063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1221,7 +1081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1232,7 +1092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23857"
+NAME="AEN23625"
 ></A
 ><H3
 ><A
@@ -1263,7 +1123,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23864"
+NAME="AEN23632"
 ></A
 ><P
 ></P
@@ -1290,7 +1150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an SGML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1301,7 +1161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23873"
+NAME="AEN23641"
 ></A
 ><H3
 ><A
@@ -1355,7 +1215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23884"
+NAME="AEN23652"
 ></A
 ><P
 ></P
@@ -1382,7 +1242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1399,7 +1259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1416,7 +1276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1433,7 +1293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1450,7 +1310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1467,7 +1327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1485,7 +1345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1496,7 +1356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23917"
+NAME="AEN23685"
 ></A
 ><H3
 ><A
@@ -1529,7 +1389,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23924"
+NAME="AEN23692"
 ></A
 ><P
 ></P
@@ -1556,7 +1416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1573,7 +1433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1590,7 +1450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1607,7 +1467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1625,7 +1485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1636,7 +1496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23949"
+NAME="AEN23717"
 ></A
 ><H3
 ><A
@@ -1669,7 +1529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23956"
+NAME="AEN23724"
 ></A
 ><P
 ></P
@@ -1696,7 +1556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1713,7 +1573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SGML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1731,7 +1591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1742,7 +1602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23973"
+NAME="AEN23741"
 ></A
 ><H3
 ><A
@@ -1773,7 +1633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23980"
+NAME="AEN23748"
 ></A
 ><P
 ></P
@@ -1800,7 +1660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an SGML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1818,8 +1678,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 24f64a7..943107a 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN26832"
+NAME="AEN26600"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN26835"
+NAME="AEN26603"
 ></A
 ><H2
 >Synopsis</H2
@@ -403,7 +403,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26900"
+NAME="AEN26668"
 ></A
 ><H2
 >Description</H2
@@ -413,14 +413,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26903"
+NAME="AEN26671"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26905"
+NAME="AEN26673"
 ></A
 ><H3
 ><A
@@ -486,7 +486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26912"
+NAME="AEN26680"
 ></A
 ><H3
 ><A
@@ -517,7 +517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26918"
+NAME="AEN26686"
 ></A
 ><P
 ></P
@@ -544,7 +544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the UTF-8 result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -561,12 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -583,7 +578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars in the original encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -600,12 +595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -623,21 +613,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 octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -648,7 +624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26947"
+NAME="AEN26711"
 ></A
 ><H3
 ><A
@@ -681,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26953"
+NAME="AEN26717"
 ></A
 ><P
 ></P
@@ -708,7 +684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -725,12 +701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -747,7 +718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -764,12 +735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -787,21 +753,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
@@ -812,7 +764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26982"
+NAME="AEN26742"
 ></A
 ><H3
 ><A
@@ -846,33 +798,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26987"
+NAME="AEN26747"
 ></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="AEN26992"
+NAME="AEN26751"
 ></A
 ><H3
 ><A
@@ -903,7 +842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26998"
+NAME="AEN26757"
 ></A
 ><H3
 ><A
@@ -932,7 +871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27004"
+NAME="AEN26763"
 ></A
 ><H3
 ><A
@@ -962,7 +901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27011"
+NAME="AEN26770"
 ></A
 ><P
 ></P
@@ -989,7 +928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingHandlerPtr handler block</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1000,7 +939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27020"
+NAME="AEN26779"
 ></A
 ><H3
 ><A
@@ -1034,7 +973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27028"
+NAME="AEN26787"
 ></A
 ><P
 ></P
@@ -1061,7 +1000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlCharEncoding value.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1079,7 +1018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the handler or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1090,7 +1029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27041"
+NAME="AEN26800"
 ></A
 ><H3
 ><A
@@ -1121,7 +1060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27048"
+NAME="AEN26807"
 ></A
 ><P
 ></P
@@ -1148,7 +1087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string describing the char encoding.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1166,7 +1105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the handler or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1177,7 +1116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27061"
+NAME="AEN26820"
 ></A
 ><H3
 ><A
@@ -1216,7 +1155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27070"
+NAME="AEN26829"
 ></A
 ><P
 ></P
@@ -1243,7 +1182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1260,7 +1199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingInputFunc to read that encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1277,7 +1216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingOutputFunc to write that encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1295,7 +1234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlCharEncodingHandlerPtr created (or NULL in case of error).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1306,7 +1245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27091"
+NAME="AEN26850"
 ></A
 ><H3
 ><A
@@ -1345,7 +1284,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27099"
+NAME="AEN26858"
 ></A
 ><P
 ></P
@@ -1372,7 +1311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -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
@@ -1407,7 +1346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1418,7 +1357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27116"
+NAME="AEN26875"
 ></A
 ><H3
 ><A
@@ -1450,7 +1389,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27123"
+NAME="AEN26882"
 ></A
 ><P
 ></P
@@ -1477,7 +1416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1495,7 +1434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1506,7 +1445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27136"
+NAME="AEN26895"
 ></A
 ><H3
 ><A
@@ -1533,7 +1472,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27142"
+NAME="AEN26901"
 ></A
 ><P
 ></P
@@ -1560,7 +1499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1578,7 +1517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found the original name otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1589,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27155"
+NAME="AEN26914"
 ></A
 ><H3
 ><A
@@ -1617,7 +1556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27161"
+NAME="AEN26920"
 ></A
 ><H3
 ><A
@@ -1649,7 +1588,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27168"
+NAME="AEN26927"
 ></A
 ><P
 ></P
@@ -1676,7 +1615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1694,8 +1633,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
@@ -1706,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27181"
+NAME="AEN26940"
 ></A
 ><H3
 ><A
@@ -1741,7 +1679,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27189"
+NAME="AEN26948"
 ></A
 ><P
 ></P
@@ -1768,7 +1706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1786,7 +1724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the canonical name for the given encoding</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1797,7 +1735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27202"
+NAME="AEN26961"
 ></A
 ><H3
 ><A
@@ -1829,7 +1767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27209"
+NAME="AEN26968"
 ></A
 ><P
 ></P
@@ -1856,8 +1794,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
@@ -1874,7 +1811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1892,7 +1829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1903,7 +1840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27226"
+NAME="AEN26985"
 ></A
 ><H3
 ><A
@@ -1951,7 +1888,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27236"
+NAME="AEN26995"
 ></A
 ><P
 ></P
@@ -1978,7 +1915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1995,7 +1932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2012,7 +1949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2030,10 +1967,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
@@ -2044,7 +1978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27257"
+NAME="AEN27016"
 ></A
 ><H3
 ><A
@@ -2082,7 +2016,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27266"
+NAME="AEN27025"
 ></A
 ><P
 ></P
@@ -2109,7 +2043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char encoding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2126,7 +2060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2143,7 +2077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2161,10 +2095,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
@@ -2175,7 +2106,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27287"
+NAME="AEN27046"
 ></A
 ><H3
 ><A
@@ -2214,7 +2145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27296"
+NAME="AEN27055"
 ></A
 ><P
 ></P
@@ -2241,7 +2172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2258,7 +2189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the output.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2275,7 +2206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlBuffer for the input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2293,10 +2224,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
@@ -2307,7 +2235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27317"
+NAME="AEN27076"
 ></A
 ><H3
 ><A
@@ -2337,7 +2265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27324"
+NAME="AEN27083"
 ></A
 ><P
 ></P
@@ -2364,7 +2292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	char enconding transformation data structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2382,7 +2310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2393,7 +2321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27337"
+NAME="AEN27096"
 ></A
 ><H3
 ><A
@@ -2424,7 +2352,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27343"
+NAME="AEN27102"
 ></A
 ><P
 ></P
@@ -2451,7 +2379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2468,12 +2396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2490,7 +2413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2507,12 +2430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2530,20 +2448,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 unpredictable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of ocetes consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2554,7 +2459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27372"
+NAME="AEN27127"
 ></A
 ><H3
 ><A
@@ -2585,7 +2490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27378"
+NAME="AEN27133"
 ></A
 ><P
 ></P
@@ -2612,7 +2517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2629,12 +2534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2651,7 +2551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of ISO Latin 1 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2668,12 +2568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2691,20 +2586,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 unpredictable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of ocetes consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2715,7 +2597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27407"
+NAME="AEN27158"
 ></A
 ><H3
 ><A
@@ -2748,7 +2630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27414"
+NAME="AEN27165"
 ></A
 ><P
 ></P
@@ -2775,7 +2657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2792,12 +2674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to <TT
-CLASS="PARAMETER"
-><I
->bytes</I
-></TT
-> len</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2815,13 +2692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the char value or -1 in case of error and update <TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
-> with the
-       number of bytes used</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2832,7 +2703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27433"
+NAME="AEN27182"
 ></A
 ><H3
 ><A
@@ -2874,7 +2745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27441"
+NAME="AEN27190"
 ></A
 ><P
 ></P
@@ -2901,7 +2772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> Pointer to putative utf-8 encoded string.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2919,12 +2790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> true if <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is valid.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2935,7 +2801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27455"
+NAME="AEN27203"
 ></A
 ><H3
 ><A
@@ -2966,7 +2832,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27462"
+NAME="AEN27210"
 ></A
 ><P
 ></P
@@ -2993,7 +2859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3010,7 +2876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of characters in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3028,8 +2894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the storage size of
-the first 'len' characters of ARRAY&#13;</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3040,7 +2905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27479"
+NAME="AEN27227"
 ></A
 ><H3
 ><A
@@ -3074,7 +2939,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27487"
+NAME="AEN27235"
 ></A
 ><P
 ></P
@@ -3101,7 +2966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3118,12 +2983,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
@@ -3141,7 +3001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new UTF8 * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3152,7 +3012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27505"
+NAME="AEN27252"
 ></A
 ><H3
 ><A
@@ -3187,7 +3047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27513"
+NAME="AEN27260"
 ></A
 ><P
 ></P
@@ -3214,7 +3074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3231,7 +3091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the position of the desired UTF8 char (in chars)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3249,7 +3109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the UTF8 character or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3260,7 +3120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27530"
+NAME="AEN27277"
 ></A
 ><H3
 ><A
@@ -3294,7 +3154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27538"
+NAME="AEN27285"
 ></A
 ><P
 ></P
@@ -3321,7 +3181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input UTF8 *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3338,7 +3198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the UTF8 character to be found</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3356,8 +3216,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
@@ -3368,7 +3227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27555"
+NAME="AEN27302"
 ></A
 ><H3
 ><A
@@ -3403,7 +3262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27563"
+NAME="AEN27310"
 ></A
 ><P
 ></P
@@ -3430,7 +3289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3447,7 +3306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> relative pos of first char</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3464,7 +3323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->   total number to copy</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3482,8 +3341,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
@@ -3494,7 +3352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27584"
+NAME="AEN27331"
 ></A
 ><H3
 ><A
@@ -3525,7 +3383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27591"
+NAME="AEN27338"
 ></A
 ><P
 ></P
@@ -3552,7 +3410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a sequence of UTF-8 encoded bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3570,7 +3428,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 84d164f..b6dbfaa 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9506"
+NAME="AEN9440"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9509"
+NAME="AEN9443"
 ></A
 ><H2
 >Synopsis</H2
@@ -367,7 +367,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9571"
+NAME="AEN9505"
 ></A
 ><H2
 >Description</H2
@@ -377,14 +377,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9574"
+NAME="AEN9508"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9576"
+NAME="AEN9510"
 ></A
 ><H3
 ><A
@@ -417,7 +417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9581"
+NAME="AEN9515"
 ></A
 ><H3
 ><A
@@ -464,33 +464,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9586"
+NAME="AEN9520"
 ></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="AEN9591"
+NAME="AEN9524"
 ></A
 ><H3
 ><A
@@ -518,7 +505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9597"
+NAME="AEN9530"
 ></A
 ><H3
 ><A
@@ -568,7 +555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9609"
+NAME="AEN9542"
 ></A
 ><P
 ></P
@@ -595,7 +582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -612,7 +599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -629,7 +616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -646,7 +633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -663,7 +650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -680,7 +667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -698,7 +685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -709,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9642"
+NAME="AEN9575"
 ></A
 ><H3
 ><A
@@ -759,7 +746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9654"
+NAME="AEN9587"
 ></A
 ><P
 ></P
@@ -786,7 +773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -803,7 +790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -820,7 +807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -837,7 +824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -854,7 +841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -871,7 +858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -900,7 +887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9687"
+NAME="AEN9620"
 ></A
 ><H3
 ><A
@@ -933,7 +920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9695"
+NAME="AEN9628"
 ></A
 ><P
 ></P
@@ -960,7 +947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -978,7 +965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -989,7 +976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9708"
+NAME="AEN9641"
 ></A
 ><H3
 ><A
@@ -1028,7 +1015,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9717"
+NAME="AEN9650"
 ></A
 ><P
 ></P
@@ -1055,7 +1042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1090,7 +1077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1101,7 +1088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9734"
+NAME="AEN9667"
 ></A
 ><H3
 ><A
@@ -1140,7 +1127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9743"
+NAME="AEN9676"
 ></A
 ><P
 ></P
@@ -1167,7 +1154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1184,7 +1171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1202,7 +1189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1213,7 +1200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9760"
+NAME="AEN9693"
 ></A
 ><H3
 ><A
@@ -1251,7 +1238,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9769"
+NAME="AEN9702"
 ></A
 ><P
 ></P
@@ -1278,7 +1265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1295,7 +1282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1313,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1324,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9786"
+NAME="AEN9719"
 ></A
 ><H3
 ><A
@@ -1368,7 +1355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9797"
+NAME="AEN9730"
 ></A
 ><P
 ></P
@@ -1395,7 +1382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1412,7 +1399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1430,7 +1417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1441,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9814"
+NAME="AEN9747"
 ></A
 ><H3
 ><A
@@ -1481,7 +1468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9823"
+NAME="AEN9756"
 ></A
 ><P
 ></P
@@ -1508,7 +1495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1525,7 +1512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1543,7 +1530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1554,7 +1541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9840"
+NAME="AEN9773"
 ></A
 ><H3
 ><A
@@ -1592,7 +1579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9849"
+NAME="AEN9782"
 ></A
 ><P
 ></P
@@ -1619,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1636,7 +1623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1654,7 +1641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1665,7 +1652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9866"
+NAME="AEN9799"
 ></A
 ><H3
 ><A
@@ -1695,7 +1682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9873"
+NAME="AEN9806"
 ></A
 ><P
 ></P
@@ -1723,7 +1710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntitiesTablePtr just created or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1734,7 +1721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9882"
+NAME="AEN9815"
 ></A
 ><H3
 ><A
@@ -1767,7 +1754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9890"
+NAME="AEN9823"
 ></A
 ><P
 ></P
@@ -1794,7 +1781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1812,7 +1799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlEntitiesTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1823,7 +1810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9903"
+NAME="AEN9836"
 ></A
 ><H3
 ><A
@@ -1853,7 +1840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9910"
+NAME="AEN9843"
 ></A
 ><P
 ></P
@@ -1880,7 +1867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1891,7 +1878,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9919"
+NAME="AEN9852"
 ></A
 ><H3
 ><A
@@ -1925,7 +1912,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9927"
+NAME="AEN9860"
 ></A
 ><P
 ></P
@@ -1952,7 +1939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1969,7 +1956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1980,7 +1967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9940"
+NAME="AEN9873"
 ></A
 ><H3
 ><A
@@ -2014,7 +2001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9948"
+NAME="AEN9881"
 ></A
 ><P
 ></P
@@ -2041,7 +2028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2058,7 +2045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2069,7 +2056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9961"
+NAME="AEN9894"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index 60ea14a..dd2d485 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23260"
+NAME="AEN23042"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23263"
+NAME="AEN23045"
 ></A
 ><H2
 >Synopsis</H2
@@ -311,7 +311,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23307"
+NAME="AEN23089"
 ></A
 ><H2
 >Description</H2
@@ -321,14 +321,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23310"
+NAME="AEN23092"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23312"
+NAME="AEN23094"
 ></A
 ><H3
 ><A
@@ -356,7 +356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23318"
+NAME="AEN23100"
 ></A
 ><P
 ></P
@@ -394,7 +394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23327"
+NAME="AEN23109"
 ></A
 ><H3
 ><A
@@ -422,7 +422,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23333"
+NAME="AEN23115"
 ></A
 ><P
 ></P
@@ -460,7 +460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23342"
+NAME="AEN23124"
 ></A
 ><H3
 ><A
@@ -523,33 +523,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23347"
+NAME="AEN23129"
 ></A
 ><H3
 ><A
 NAME="XMLGLOBALSTATEPTR"
 ></A
 >xmlGlobalStatePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlGlobalState *xmlGlobalStatePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23352"
+NAME="AEN23133"
 ></A
 ><H3
 ><A
@@ -583,7 +570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23360"
+NAME="AEN23141"
 ></A
 ><P
 ></P
@@ -610,7 +597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to a newly allocated global state</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -621,7 +608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23369"
+NAME="AEN23150"
 ></A
 ><H3
 ><A
@@ -654,7 +641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23377"
+NAME="AEN23158"
 ></A
 ><P
 ></P
@@ -681,7 +668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> function pointer to the new RegisterNodeFunc</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -699,7 +686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old value of the registration function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -710,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23390"
+NAME="AEN23171"
 ></A
 ><H3
 ><A
@@ -744,7 +731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23398"
+NAME="AEN23179"
 ></A
 ><P
 ></P
@@ -771,7 +758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> function pointer to the new DeregisterNodeFunc</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -789,7 +776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the previous value of the deregistration function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -800,7 +787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23411"
+NAME="AEN23192"
 ></A
 ><H3
 ><A
@@ -830,7 +817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23418"
+NAME="AEN23199"
 ></A
 ><P
 ></P
@@ -868,7 +855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23427"
+NAME="AEN23208"
 ></A
 ><H3
 ><A
@@ -898,7 +885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23434"
+NAME="AEN23215"
 ></A
 ><P
 ></P
@@ -953,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23447"
+NAME="AEN23228"
 ></A
 ><H3
 ><A
@@ -984,7 +971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23454"
+NAME="AEN23235"
 ></A
 ><H3
 ><A
@@ -1017,7 +1004,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23462"
+NAME="AEN23243"
 ></A
 ><P
 ></P
@@ -1055,7 +1042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23471"
+NAME="AEN23252"
 ></A
 ><H3
 ><A
@@ -1083,7 +1070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23477"
+NAME="AEN23258"
 ></A
 ><H3
 ><A
@@ -1111,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23483"
+NAME="AEN23264"
 ></A
 ><H3
 ><A
@@ -1139,7 +1126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23489"
+NAME="AEN23270"
 ></A
 ><H3
 ><A
@@ -1168,7 +1155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23495"
+NAME="AEN23276"
 ></A
 ><H3
 ><A
@@ -1196,7 +1183,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23501"
+NAME="AEN23282"
 ></A
 ><H3
 ><A
@@ -1224,7 +1211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23507"
+NAME="AEN23288"
 ></A
 ><H3
 ><A
@@ -1253,7 +1240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23513"
+NAME="AEN23294"
 ></A
 ><H3
 ><A
@@ -1282,7 +1269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23519"
+NAME="AEN23300"
 ></A
 ><H3
 ><A
@@ -1310,7 +1297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23525"
+NAME="AEN23306"
 ></A
 ><H3
 ><A
@@ -1338,7 +1325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23531"
+NAME="AEN23312"
 ></A
 ><H3
 ><A
@@ -1367,7 +1354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23537"
+NAME="AEN23318"
 ></A
 ><H3
 ><A
@@ -1396,7 +1383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23543"
+NAME="AEN23324"
 ></A
 ><H3
 ><A
@@ -1424,7 +1411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23549"
+NAME="AEN23330"
 ></A
 ><H3
 ><A
@@ -1456,7 +1443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23555"
+NAME="AEN23336"
 ></A
 ><H3
 ><A
@@ -1487,7 +1474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23561"
+NAME="AEN23342"
 ></A
 ><H3
 ><A
@@ -1517,7 +1504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23567"
+NAME="AEN23348"
 ></A
 ><H3
 ><A
@@ -1547,7 +1534,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23573"
+NAME="AEN23354"
 ></A
 ><H3
 ><A
@@ -1575,7 +1562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23579"
+NAME="AEN23360"
 ></A
 ><H3
 ><A
@@ -1604,7 +1591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23585"
+NAME="AEN23366"
 ></A
 ><H3
 ><A
@@ -1635,7 +1622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23591"
+NAME="AEN23372"
 ></A
 ><H3
 ><A
@@ -1667,7 +1654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23597"
+NAME="AEN23378"
 ></A
 ><H3
 ><A
@@ -1693,7 +1680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23602"
+NAME="AEN23383"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 06ac543..3a43620 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN27609"
+NAME="AEN27356"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN27612"
+NAME="AEN27359"
 ></A
 ><H2
 >Synopsis</H2
@@ -524,7 +524,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27710"
+NAME="AEN27457"
 ></A
 ><H2
 >Description</H2
@@ -534,14 +534,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27713"
+NAME="AEN27460"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27715"
+NAME="AEN27462"
 ></A
 ><H3
 ><A
@@ -567,33 +567,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27720"
+NAME="AEN27467"
 ></A
 ><H3
 ><A
 NAME="XMLHASHTABLEPTR"
 ></A
 >xmlHashTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlHashTable *xmlHashTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27725"
+NAME="AEN27471"
 ></A
 ><H3
 ><A
@@ -624,7 +611,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27732"
+NAME="AEN27478"
 ></A
 ><P
 ></P
@@ -651,7 +638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the data in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -668,7 +655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name associated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -679,7 +666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27745"
+NAME="AEN27491"
 ></A
 ><H3
 ><A
@@ -710,7 +697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27752"
+NAME="AEN27498"
 ></A
 ><P
 ></P
@@ -737,7 +724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the data in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -754,7 +741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name associated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -765,7 +752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27765"
+NAME="AEN27511"
 ></A
 ><H3
 ><A
@@ -797,7 +784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27772"
+NAME="AEN27518"
 ></A
 ><P
 ></P
@@ -824,7 +811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the data in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -841,7 +828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra scannner data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -858,7 +845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name associated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -869,7 +856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27789"
+NAME="AEN27535"
 ></A
 ><H3
 ><A
@@ -909,7 +896,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27798"
+NAME="AEN27544"
 ></A
 ><P
 ></P
@@ -936,7 +923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the data in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -953,7 +940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra scannner data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -970,7 +957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -987,7 +974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second name associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1004,7 +991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the third name associated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1015,7 +1002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27823"
+NAME="AEN27569"
 ></A
 ><H3
 ><A
@@ -1045,7 +1032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27830"
+NAME="AEN27576"
 ></A
 ><P
 ></P
@@ -1072,7 +1059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the size of the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1090,7 +1077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object, or NULL if an error occured.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1101,7 +1088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27843"
+NAME="AEN27589"
 ></A
 ><H3
 ><A
@@ -1146,7 +1133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27853"
+NAME="AEN27599"
 ></A
 ><P
 ></P
@@ -1173,7 +1160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1190,7 +1177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the deallocator function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1201,7 +1188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27866"
+NAME="AEN27612"
 ></A
 ><H3
 ><A
@@ -1252,7 +1239,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27877"
+NAME="AEN27623"
 ></A
 ><P
 ></P
@@ -1279,7 +1266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1296,7 +1283,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1313,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1331,7 +1318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1342,7 +1329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27898"
+NAME="AEN27644"
 ></A
 ><H3
 ><A
@@ -1408,7 +1395,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27912"
+NAME="AEN27658"
 ></A
 ><P
 ></P
@@ -1435,7 +1422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1452,7 +1439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1469,7 +1456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1486,7 +1473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for replaced item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1504,7 +1491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1515,7 +1502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27937"
+NAME="AEN27683"
 ></A
 ><H3
 ><A
@@ -1575,7 +1562,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27950"
+NAME="AEN27696"
 ></A
 ><P
 ></P
@@ -1602,7 +1589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1619,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1636,7 +1623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1653,7 +1640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1671,7 +1658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1682,7 +1669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN27975"
+NAME="AEN27721"
 ></A
 ><H3
 ><A
@@ -1752,7 +1739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN27990"
+NAME="AEN27736"
 ></A
 ><P
 ></P
@@ -1779,7 +1766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1796,7 +1783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1813,7 +1800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1830,7 +1817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1847,7 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for replaced item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1865,7 +1852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1876,7 +1863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28019"
+NAME="AEN27765"
 ></A
 ><H3
 ><A
@@ -1946,7 +1933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28034"
+NAME="AEN27780"
 ></A
 ><P
 ></P
@@ -1973,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1990,7 +1977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2007,7 +1994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2024,7 +2011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2041,7 +2028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2059,7 +2046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2070,7 +2057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28063"
+NAME="AEN27809"
 ></A
 ><H3
 ><A
@@ -2149,7 +2136,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28080"
+NAME="AEN27826"
 ></A
 ><P
 ></P
@@ -2176,7 +2163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2193,7 +2180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2210,7 +2197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2227,7 +2214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2244,7 +2231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a pointer to the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2261,7 +2248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for replaced item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2279,7 +2266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 the addition succeeded and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2290,7 +2277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28113"
+NAME="AEN27859"
 ></A
 ><H3
 ><A
@@ -2345,7 +2332,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28125"
+NAME="AEN27871"
 ></A
 ><P
 ></P
@@ -2372,7 +2359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2389,7 +2376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2406,7 +2393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for removed item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2424,7 +2411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the removal succeeded and -1 in case of error or not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2435,7 +2422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28146"
+NAME="AEN27892"
 ></A
 ><H3
 ><A
@@ -2499,7 +2486,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28160"
+NAME="AEN27906"
 ></A
 ><P
 ></P
@@ -2526,7 +2513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2543,7 +2530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2560,7 +2547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2577,7 +2564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for removed item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2595,7 +2582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the removal succeeded and -1 in case of error or not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2606,7 +2593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28185"
+NAME="AEN27931"
 ></A
 ><H3
 ><A
@@ -2679,7 +2666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28201"
+NAME="AEN27947"
 ></A
 ><P
 ></P
@@ -2706,7 +2693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2723,7 +2710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2740,7 +2727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2757,7 +2744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2774,7 +2761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the deallocator function for removed item (if any)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2792,7 +2779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the removal succeeded and -1 in case of error or not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2803,7 +2790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28230"
+NAME="AEN27976"
 ></A
 ><H3
 ><A
@@ -2842,7 +2829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28239"
+NAME="AEN27985"
 ></A
 ><P
 ></P
@@ -2869,7 +2856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2886,7 +2873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2897,7 +2884,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28252"
+NAME="AEN27998"
 ></A
 ><H3
 ><A
@@ -2945,7 +2932,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28263"
+NAME="AEN28009"
 ></A
 ><P
 ></P
@@ -2972,7 +2959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2989,7 +2976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3006,7 +2993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3017,7 +3004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28280"
+NAME="AEN28026"
 ></A
 ><H3
 ><A
@@ -3074,7 +3061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28293"
+NAME="AEN28039"
 ></A
 ><P
 ></P
@@ -3101,7 +3088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3118,7 +3105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3135,7 +3122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3152,7 +3139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3163,7 +3150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28314"
+NAME="AEN28060"
 ></A
 ><H3
 ><A
@@ -3210,7 +3197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28325"
+NAME="AEN28071"
 ></A
 ><P
 ></P
@@ -3237,7 +3224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3254,7 +3241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the copier function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3272,7 +3259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new table or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3283,7 +3270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28342"
+NAME="AEN28088"
 ></A
 ><H3
 ><A
@@ -3318,7 +3305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28350"
+NAME="AEN28096"
 ></A
 ><P
 ></P
@@ -3345,7 +3332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3363,8 +3350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of elements in the hash table or
--1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3375,7 +3361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28363"
+NAME="AEN28109"
 ></A
 ><H3
 ><A
@@ -3420,7 +3406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28373"
+NAME="AEN28119"
 ></A
 ><P
 ></P
@@ -3447,7 +3433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3464,7 +3450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the scanner function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3481,7 +3467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra data passed to f</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3492,7 +3478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28390"
+NAME="AEN28136"
 ></A
 ><H3
 ><A
@@ -3566,7 +3552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28406"
+NAME="AEN28152"
 ></A
 ><P
 ></P
@@ -3593,7 +3579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3610,7 +3596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3627,7 +3613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3644,7 +3630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3661,7 +3647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the scanner function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3678,7 +3664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra data passed to f</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3689,7 +3675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28435"
+NAME="AEN28181"
 ></A
 ><H3
 ><A
@@ -3734,7 +3720,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28445"
+NAME="AEN28191"
 ></A
 ><P
 ></P
@@ -3761,7 +3747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3778,7 +3764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the scanner function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3795,7 +3781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra data passed to f</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3806,7 +3792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN28462"
+NAME="AEN28208"
 ></A
 ><H3
 ><A
@@ -3880,7 +3866,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN28478"
+NAME="AEN28224"
 ></A
 ><P
 ></P
@@ -3907,7 +3893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the hash table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3924,7 +3910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3941,7 +3927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a second name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3958,7 +3944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a third name of the userdata or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3975,7 +3961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the scanner function for items in the hash</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3992,7 +3978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra data passed to f</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 054e39a..d2460b0 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13156"
+NAME="AEN13034"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13159"
+NAME="AEN13037"
 ></A
 ><H2
 >Synopsis</H2
@@ -402,7 +402,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13225"
+NAME="AEN13103"
 ></A
 ><H2
 >Description</H2
@@ -412,248 +412,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13228"
+NAME="AEN13106"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13230"
+NAME="AEN13108"
 ></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="AEN13235"
+NAME="AEN13112"
 ></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="AEN13240"
+NAME="AEN13116"
 ></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="AEN13245"
+NAME="AEN13120"
 ></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="AEN13250"
+NAME="AEN13124"
 ></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="AEN13255"
+NAME="AEN13128"
 ></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="AEN13260"
+NAME="AEN13132"
 ></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="AEN13265"
+NAME="AEN13136"
 ></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="AEN13270"
+NAME="AEN13140"
 ></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="AEN13275"
+NAME="AEN13144"
 ></A
 ><H3
 ><A
@@ -706,33 +589,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13280"
+NAME="AEN13149"
 ></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="AEN13285"
+NAME="AEN13153"
 ></A
 ><H3
 ><A
@@ -762,33 +632,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13290"
+NAME="AEN13158"
 ></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="AEN13295"
+NAME="AEN13162"
 ></A
 ><H3
 ><A
@@ -821,7 +678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13303"
+NAME="AEN13170"
 ></A
 ><P
 ></P
@@ -848,7 +705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name in lowercase</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -866,7 +723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the related htmlElemDescPtr or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -877,7 +734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13316"
+NAME="AEN13183"
 ></A
 ><H3
 ><A
@@ -912,7 +769,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13325"
+NAME="AEN13192"
 ></A
 ><P
 ></P
@@ -939,7 +796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -968,7 +825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13338"
+NAME="AEN13205"
 ></A
 ><H3
 ><A
@@ -1000,7 +857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13346"
+NAME="AEN13213"
 ></A
 ><P
 ></P
@@ -1027,7 +884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity's unicode value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1045,7 +902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1056,7 +913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13359"
+NAME="AEN13226"
 ></A
 ><H3
 ><A
@@ -1092,7 +949,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13367"
+NAME="AEN13234"
 ></A
 ><P
 ></P
@@ -1119,7 +976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1136,7 +993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1154,7 +1011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclosed, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1165,7 +1022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13384"
+NAME="AEN13251"
 ></A
 ><H3
 ><A
@@ -1206,7 +1063,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13393"
+NAME="AEN13260"
 ></A
 ><P
 ></P
@@ -1233,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1250,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1267,7 +1124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1285,7 +1142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if autoclose, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1296,7 +1153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13414"
+NAME="AEN13281"
 ></A
 ><H3
 ><A
@@ -1335,7 +1192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13424"
+NAME="AEN13291"
 ></A
 ><P
 ></P
@@ -1362,7 +1219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1379,7 +1236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  location to store the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1397,8 +1254,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
@@ -1409,7 +1265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13441"
+NAME="AEN13308"
 ></A
 ><H3
 ><A
@@ -1445,7 +1301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13450"
+NAME="AEN13317"
 ></A
 ><P
 ></P
@@ -1472,7 +1328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1490,7 +1346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1501,7 +1357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13463"
+NAME="AEN13330"
 ></A
 ><H3
 ><A
@@ -1535,7 +1391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13472"
+NAME="AEN13339"
 ></A
 ><P
 ></P
@@ -1562,7 +1418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1573,7 +1429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13481"
+NAME="AEN13348"
 ></A
 ><H3
 ><A
@@ -1604,7 +1460,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13488"
+NAME="AEN13355"
 ></A
 ><P
 ></P
@@ -1631,7 +1487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1649,8 +1505,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
@@ -1661,7 +1516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13501"
+NAME="AEN13368"
 ></A
 ><H3
 ><A
@@ -1702,7 +1557,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13510"
+NAME="AEN13377"
 ></A
 ><P
 ></P
@@ -1729,7 +1584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1746,7 +1601,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
@@ -1763,7 +1618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1780,7 +1635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1798,8 +1653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree unless SAX is NULL or the document is
-    not well formed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1810,7 +1664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13535"
+NAME="AEN13402"
 ></A
 ><H3
 ><A
@@ -1844,7 +1698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13543"
+NAME="AEN13410"
 ></A
 ><P
 ></P
@@ -1871,7 +1725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1888,7 +1742,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
@@ -1906,7 +1760,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1917,7 +1771,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13560"
+NAME="AEN13427"
 ></A
 ><H3
 ><A
@@ -1956,7 +1810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13568"
+NAME="AEN13435"
 ></A
 ><P
 ></P
@@ -1983,7 +1837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2000,7 +1854,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
@@ -2017,7 +1871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2034,7 +1888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2052,8 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree unless SAX is NULL or the document is
-    not well formed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2064,7 +1917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13593"
+NAME="AEN13460"
 ></A
 ><H3
 ><A
@@ -2096,7 +1949,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13600"
+NAME="AEN13467"
 ></A
 ><P
 ></P
@@ -2123,7 +1976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2140,7 +1993,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
@@ -2158,7 +2011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2169,7 +2022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13617"
+NAME="AEN13484"
 ></A
 ><H3
 ><A
@@ -2200,7 +2053,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13623"
+NAME="AEN13490"
 ></A
 ><P
 ></P
@@ -2227,7 +2080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2244,12 +2097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2266,7 +2114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2283,12 +2131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2306,20 +2149,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 unpredictable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2330,7 +2160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13652"
+NAME="AEN13515"
 ></A
 ><H3
 ><A
@@ -2362,7 +2192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13658"
+NAME="AEN13521"
 ></A
 ><P
 ></P
@@ -2389,7 +2219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of bytes to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2406,12 +2236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->out</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2428,7 +2253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of UTF-8 chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2445,12 +2270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->in</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2467,7 +2287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the quote character to escape (' or ") or zero.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2485,20 +2305,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 unpredictable.
-The value of <TT
-CLASS="PARAMETER"
-><I
->outlen</I
-></TT
-> after return is the number of octets consumed.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2509,7 +2316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13691"
+NAME="AEN13550"
 ></A
 ><H3
 ><A
@@ -2539,7 +2346,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13698"
+NAME="AEN13557"
 ></A
 ><P
 ></P
@@ -2566,7 +2373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2584,7 +2391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 is the attribute is a script 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2595,7 +2402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13711"
+NAME="AEN13570"
 ></A
 ><H3
 ><A
@@ -2622,7 +2429,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13717"
+NAME="AEN13576"
 ></A
 ><P
 ></P
@@ -2649,7 +2456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2667,7 +2474,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
@@ -2678,7 +2485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13730"
+NAME="AEN13589"
 ></A
 ><H3
 ><A
@@ -2709,7 +2516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13737"
+NAME="AEN13596"
 ></A
 ><P
 ></P
@@ -2736,7 +2543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2747,7 +2554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13746"
+NAME="AEN13605"
 ></A
 ><H3
 ><A
@@ -2795,7 +2602,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13756"
+NAME="AEN13615"
 ></A
 ><P
 ></P
@@ -2822,7 +2629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2839,7 +2646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2856,7 +2663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2873,7 +2680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2890,7 +2697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2907,7 +2714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2925,7 +2732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2936,7 +2743,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13789"
+NAME="AEN13648"
 ></A
 ><H3
 ><A
@@ -2969,7 +2776,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13796"
+NAME="AEN13655"
 ></A
 ><P
 ></P
@@ -2996,7 +2803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3013,7 +2820,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3030,7 +2837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3047,7 +2854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3065,7 +2872,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 cf8ceaa..d1e21c7 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13826"
+NAME="AEN13685"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13829"
+NAME="AEN13688"
 ></A
 ><H2
 >Synopsis</H2
@@ -384,7 +384,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13891"
+NAME="AEN13750"
 ></A
 ><H2
 >Description</H2
@@ -394,14 +394,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13894"
+NAME="AEN13753"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13896"
+NAME="AEN13755"
 ></A
 ><H3
 ><A
@@ -417,7 +417,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
+>#define     HTML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -430,7 +430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13902"
+NAME="AEN13761"
 ></A
 ><H3
 ><A
@@ -446,7 +446,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
+>#define     HTML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -459,7 +459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13908"
+NAME="AEN13767"
 ></A
 ><H3
 ><A
@@ -475,7 +475,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
+>#define     HTML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -488,7 +488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13914"
+NAME="AEN13773"
 ></A
 ><H3
 ><A
@@ -504,7 +504,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE</PRE
+>#define     HTML_PRESERVE_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -517,7 +517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13920"
+NAME="AEN13779"
 ></A
 ><H3
 ><A
@@ -533,7 +533,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_PI_NODE		XML_PI_NODE</PRE
+>#define     HTML_PI_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -546,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13926"
+NAME="AEN13785"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13935"
+NAME="AEN13794"
 ></A
 ><P
 ></P
@@ -610,7 +610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -627,7 +627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -645,7 +645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -656,7 +656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13952"
+NAME="AEN13811"
 ></A
 ><H3
 ><A
@@ -704,7 +704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13963"
+NAME="AEN13822"
 ></A
 ><P
 ></P
@@ -731,7 +731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  URI for the dtd, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -748,7 +748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID of the DTD, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -766,7 +766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document, do not initialize the DTD if not provided</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -777,7 +777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13980"
+NAME="AEN13839"
 ></A
 ><H3
 ><A
@@ -810,7 +810,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13988"
+NAME="AEN13847"
 ></A
 ><P
 ></P
@@ -837,7 +837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -855,7 +855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current encoding as flagged in the HTML source</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -866,7 +866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14001"
+NAME="AEN13860"
 ></A
 ><H3
 ><A
@@ -902,7 +902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14009"
+NAME="AEN13868"
 ></A
 ><P
 ></P
@@ -929,7 +929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -946,7 +946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -964,7 +964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -975,7 +975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14026"
+NAME="AEN13885"
 ></A
 ><H3
 ><A
@@ -1011,7 +1011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14034"
+NAME="AEN13893"
 ></A
 ><P
 ></P
@@ -1038,7 +1038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1055,7 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1072,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1083,7 +1083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14051"
+NAME="AEN13910"
 ></A
 ><H3
 ><A
@@ -1117,7 +1117,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14059"
+NAME="AEN13918"
 ></A
 ><P
 ></P
@@ -1144,7 +1144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1161,7 +1161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1179,7 +1179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1190,7 +1190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14076"
+NAME="AEN13935"
 ></A
 ><H3
 ><A
@@ -1227,7 +1227,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14084"
+NAME="AEN13943"
 ></A
 ><P
 ></P
@@ -1254,7 +1254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1271,7 +1271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1289,7 +1289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1300,7 +1300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14101"
+NAME="AEN13960"
 ></A
 ><H3
 ><A
@@ -1339,7 +1339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14110"
+NAME="AEN13969"
 ></A
 ><P
 ></P
@@ -1366,7 +1366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1383,7 +1383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1400,7 +1400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1418,7 +1418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1429,7 +1429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14131"
+NAME="AEN13990"
 ></A
 ><H3
 ><A
@@ -1468,7 +1468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14140"
+NAME="AEN13999"
 ></A
 ><P
 ></P
@@ -1495,7 +1495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1512,7 +1512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1529,7 +1529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1540,7 +1540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14157"
+NAME="AEN14016"
 ></A
 ><H3
 ><A
@@ -1582,7 +1582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14167"
+NAME="AEN14026"
 ></A
 ><P
 ></P
@@ -1609,7 +1609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1626,7 +1626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1643,7 +1643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1660,7 +1660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1677,7 +1677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1695,7 +1695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1706,7 +1706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14196"
+NAME="AEN14055"
 ></A
 ><H3
 ><A
@@ -1739,7 +1739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14203"
+NAME="AEN14062"
 ></A
 ><P
 ></P
@@ -1766,7 +1766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1783,7 +1783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1800,7 +1800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1818,7 +1818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1829,7 +1829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14224"
+NAME="AEN14083"
 ></A
 ><H3
 ><A
@@ -1862,7 +1862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14231"
+NAME="AEN14090"
 ></A
 ><P
 ></P
@@ -1889,7 +1889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1906,7 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1923,7 +1923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document encoding</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1940,7 +1940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1958,7 +1958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1969,7 +1969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14256"
+NAME="AEN14115"
 ></A
 ><H3
 ><A
@@ -2009,7 +2009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14265"
+NAME="AEN14124"
 ></A
 ><P
 ></P
@@ -2036,7 +2036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2053,7 +2053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2070,7 +2070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2087,7 +2087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2104,7 +2104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2115,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14290"
+NAME="AEN14149"
 ></A
 ><H3
 ><A
@@ -2150,7 +2150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14298"
+NAME="AEN14157"
 ></A
 ><P
 ></P
@@ -2177,7 +2177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2194,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2211,7 +2211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2222,7 +2222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14315"
+NAME="AEN14174"
 ></A
 ><H3
 ><A
@@ -2258,7 +2258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14323"
+NAME="AEN14182"
 ></A
 ><P
 ></P
@@ -2285,7 +2285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2302,7 +2302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2319,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2336,7 +2336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2347,7 +2347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14344"
+NAME="AEN14203"
 ></A
 ><H3
 ><A
@@ -2377,7 +2377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14351"
+NAME="AEN14210"
 ></A
 ><P
 ></P
@@ -2404,7 +2404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2422,7 +2422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> false if the attribute is not boolean, true otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2433,7 +2433,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14364"
+NAME="AEN14223"
 ></A
 ><H3
 ><A
@@ -2473,7 +2473,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14373"
+NAME="AEN14232"
 ></A
 ><P
 ></P
@@ -2500,7 +2500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2517,7 +2517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2534,7 +2534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2551,7 +2551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index e8aed48..7bc1da1 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20047"
+NAME="AEN19835"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20050"
+NAME="AEN19838"
 ></A
 ><H2
 >Synopsis</H2
@@ -288,7 +288,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20080"
+NAME="AEN19868"
 ></A
 ><H2
 >Description</H2
@@ -298,14 +298,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20083"
+NAME="AEN19871"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20085"
+NAME="AEN19873"
 ></A
 ><H3
 ><A
@@ -347,7 +347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20092"
+NAME="AEN19880"
 ></A
 ><P
 ></P
@@ -374,7 +374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  user provided data for the callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -391,7 +391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name (including "-&gt;" when links are shown)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -408,7 +408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -425,7 +425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the owner string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -442,7 +442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the group string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -476,7 +476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the link count</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -493,7 +493,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the year</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -510,7 +510,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the month</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -527,7 +527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the day</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -544,7 +544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the hour</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -561,7 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -572,7 +572,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20145"
+NAME="AEN19933"
 ></A
 ><H3
 ><A
@@ -601,7 +601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20151"
+NAME="AEN19939"
 ></A
 ><P
 ></P
@@ -628,7 +628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user provided context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -645,7 +645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the data received</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -662,7 +662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> its size in bytes</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -673,7 +673,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20168"
+NAME="AEN19956"
 ></A
 ><H3
 ><A
@@ -703,7 +703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20174"
+NAME="AEN19962"
 ></A
 ><H3
 ><A
@@ -731,7 +731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20180"
+NAME="AEN19968"
 ></A
 ><H3
 ><A
@@ -758,7 +758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20186"
+NAME="AEN19974"
 ></A
 ><P
 ></P
@@ -785,7 +785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to initialize the context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -796,7 +796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20195"
+NAME="AEN19983"
 ></A
 ><H3
 ><A
@@ -823,7 +823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20201"
+NAME="AEN19989"
 ></A
 ><P
 ></P
@@ -850,7 +850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -861,7 +861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20210"
+NAME="AEN19998"
 ></A
 ><H3
 ><A
@@ -889,7 +889,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20216"
+NAME="AEN20004"
 ></A
 ><P
 ></P
@@ -916,7 +916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP server name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -933,7 +933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the port (use 21 if 0)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -944,7 +944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20229"
+NAME="AEN20017"
 ></A
 ><H3
 ><A
@@ -971,7 +971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20235"
+NAME="AEN20023"
 ></A
 ><P
 ></P
@@ -998,7 +998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URL to the resource</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1009,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20244"
+NAME="AEN20032"
 ></A
 ><H3
 ><A
@@ -1036,7 +1036,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20250"
+NAME="AEN20038"
 ></A
 ><P
 ></P
@@ -1063,7 +1063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1081,7 +1081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1092,7 +1092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20263"
+NAME="AEN20051"
 ></A
 ><H3
 ><A
@@ -1119,7 +1119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20269"
+NAME="AEN20057"
 ></A
 ><P
 ></P
@@ -1146,7 +1146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1164,7 +1164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1175,7 +1175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20282"
+NAME="AEN20070"
 ></A
 ><H3
 ><A
@@ -1202,7 +1202,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20288"
+NAME="AEN20076"
 ></A
 ><P
 ></P
@@ -1229,7 +1229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1247,7 +1247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1258,7 +1258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20301"
+NAME="AEN20089"
 ></A
 ><H3
 ><A
@@ -1288,7 +1288,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20307"
+NAME="AEN20095"
 ></A
 ><P
 ></P
@@ -1315,7 +1315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1326,7 +1326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20316"
+NAME="AEN20104"
 ></A
 ><H3
 ><A
@@ -1359,7 +1359,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20322"
+NAME="AEN20110"
 ></A
 ><P
 ></P
@@ -1386,7 +1386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy host name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1403,7 +1403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy port</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1420,7 +1420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy user name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1437,7 +1437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy password</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1454,12 +1454,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
@@ -1470,7 +1465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20348"
+NAME="AEN20135"
 ></A
 ><H3
 ><A
@@ -1502,7 +1497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20354"
+NAME="AEN20141"
 ></A
 ><P
 ></P
@@ -1529,7 +1524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1546,7 +1541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to update the context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1564,7 +1559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if Ok, -1 in case of error (other host).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1575,7 +1570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20371"
+NAME="AEN20158"
 ></A
 ><H3
 ><A
@@ -1602,7 +1597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20377"
+NAME="AEN20164"
 ></A
 ><P
 ></P
@@ -1629,7 +1624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1647,7 +1642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1658,7 +1653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20390"
+NAME="AEN20177"
 ></A
 ><H3
 ><A
@@ -1685,7 +1680,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20396"
+NAME="AEN20183"
 ></A
 ><P
 ></P
@@ -1712,7 +1707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1730,7 +1725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number, or 0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1741,7 +1736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20409"
+NAME="AEN20196"
 ></A
 ><H3
 ><A
@@ -1769,7 +1764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20415"
+NAME="AEN20202"
 ></A
 ><P
 ></P
@@ -1796,7 +1791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1813,7 +1808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a directory on the server</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1831,7 +1826,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
@@ -1842,7 +1837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20432"
+NAME="AEN20219"
 ></A
 ><H3
 ><A
@@ -1870,7 +1865,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20438"
+NAME="AEN20225"
 ></A
 ><P
 ></P
@@ -1897,7 +1892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1914,7 +1909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file or directory on the server</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1932,7 +1927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 1 if DELE worked, 0 if it failed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1943,7 +1938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20455"
+NAME="AEN20242"
 ></A
 ><H3
 ><A
@@ -1971,7 +1966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20461"
+NAME="AEN20248"
 ></A
 ><P
 ></P
@@ -1998,7 +1993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2016,7 +2011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2027,7 +2022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20474"
+NAME="AEN20261"
 ></A
 ><H3
 ><A
@@ -2054,7 +2049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20480"
+NAME="AEN20267"
 ></A
 ><P
 ></P
@@ -2081,7 +2076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2099,7 +2094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2110,7 +2105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20493"
+NAME="AEN20280"
 ></A
 ><H3
 ><A
@@ -2144,7 +2139,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20500"
+NAME="AEN20287"
 ></A
 ><P
 ></P
@@ -2171,7 +2166,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2188,7 +2183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2205,7 +2200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2222,7 +2217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optional files to list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2240,7 +2235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2251,7 +2246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20525"
+NAME="AEN20312"
 ></A
 ><H3
 ><A
@@ -2279,7 +2274,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20531"
+NAME="AEN20318"
 ></A
 ><P
 ></P
@@ -2306,7 +2301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2323,7 +2318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve (or NULL if path is in context).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2341,7 +2336,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
@@ -2352,7 +2347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20548"
+NAME="AEN20335"
 ></A
 ><H3
 ><A
@@ -2386,7 +2381,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20555"
+NAME="AEN20342"
 ></A
 ><P
 ></P
@@ -2413,7 +2408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2430,7 +2425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2447,7 +2442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2464,7 +2459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2482,7 +2477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2493,7 +2488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20580"
+NAME="AEN20367"
 ></A
 ><H3
 ><A
@@ -2533,7 +2528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20588"
+NAME="AEN20375"
 ></A
 ><P
 ></P
@@ -2560,7 +2555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2577,7 +2572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2594,7 +2589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2612,8 +2607,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 635e62a..a0148b7 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19741"
+NAME="AEN19529"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19744"
+NAME="AEN19532"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19760"
+NAME="AEN19548"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +234,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19763"
+NAME="AEN19551"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19765"
+NAME="AEN19553"
 ></A
 ><H3
 ><A
@@ -270,7 +270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19771"
+NAME="AEN19559"
 ></A
 ><H3
 ><A
@@ -298,7 +298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19777"
+NAME="AEN19565"
 ></A
 ><H3
 ><A
@@ -328,7 +328,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19783"
+NAME="AEN19571"
 ></A
 ><P
 ></P
@@ -355,7 +355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -366,7 +366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19792"
+NAME="AEN19580"
 ></A
 ><H3
 ><A
@@ -396,7 +396,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19798"
+NAME="AEN19586"
 ></A
 ><P
 ></P
@@ -423,7 +423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -440,7 +440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -457,8 +457,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
@@ -476,8 +475,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
@@ -488,7 +486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19819"
+NAME="AEN19607"
 ></A
 ><H3
 ><A
@@ -527,7 +525,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19826"
+NAME="AEN19614"
 ></A
 ><P
 ></P
@@ -554,7 +552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -571,7 +569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP method to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -588,7 +586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -605,7 +603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Content-Type information IN and OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -622,7 +620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra headers</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -639,7 +637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  input length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -650,7 +648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19855"
+NAME="AEN19643"
 ></A
 ><H3
 ><A
@@ -690,7 +688,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19862"
+NAME="AEN19650"
 ></A
 ><P
 ></P
@@ -717,7 +715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -734,7 +732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP method to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -751,7 +749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -768,7 +766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Content-Type information IN and OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -785,7 +783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the redirected URL OUT</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -802,7 +800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra headers</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -819,7 +817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  input length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -830,7 +828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19895"
+NAME="AEN19683"
 ></A
 ><H3
 ><A
@@ -859,7 +857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19901"
+NAME="AEN19689"
 ></A
 ><P
 ></P
@@ -886,7 +884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -903,8 +901,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
@@ -915,7 +912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19914"
+NAME="AEN19702"
 ></A
 ><H3
 ><A
@@ -945,7 +942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19920"
+NAME="AEN19708"
 ></A
 ><P
 ></P
@@ -972,7 +969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -989,8 +986,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
@@ -1007,7 +1003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if available the redirected URL will be returned</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1018,7 +1014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19937"
+NAME="AEN19725"
 ></A
 ><H3
 ><A
@@ -1045,7 +1041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19943"
+NAME="AEN19731"
 ></A
 ><P
 ></P
@@ -1072,7 +1068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1090,7 +1086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the HTTP return code for the request.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1101,7 +1097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19956"
+NAME="AEN19744"
 ></A
 ><H3
 ><A
@@ -1128,7 +1124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19962"
+NAME="AEN19750"
 ></A
 ><P
 ></P
@@ -1155,7 +1151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1173,8 +1169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the stashed value of the WWW-Authenticate or Proxy-Authenticate
-header.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1185,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19975"
+NAME="AEN19763"
 ></A
 ><H3
 ><A
@@ -1225,7 +1220,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19983"
+NAME="AEN19771"
 ></A
 ><P
 ></P
@@ -1252,7 +1247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1269,7 +1264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1286,7 +1281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1304,8 +1299,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
@@ -1316,7 +1310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20004"
+NAME="AEN19792"
 ></A
 ><H3
 ><A
@@ -1345,7 +1339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20010"
+NAME="AEN19798"
 ></A
 ><P
 ></P
@@ -1372,7 +1366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the HTTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1389,7 +1383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename where the content should be saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1407,7 +1401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of failure, 0 incase of success.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1418,7 +1412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20027"
+NAME="AEN19815"
 ></A
 ><H3
 ><A
@@ -1446,7 +1440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20033"
+NAME="AEN19821"
 ></A
 ><P
 ></P
@@ -1473,7 +1467,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 02cb492..f73e442 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -1301,7 +1301,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DEFAULT_VERSION	"1.0"</PRE
+>#define     XML_DEFAULT_VERSION</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1370,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to deallocate</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1475,26 +1475,13 @@
 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="AEN365"
+NAME="AEN364"
 ></A
 ><H3
 ><A
@@ -1524,33 +1511,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN370"
+NAME="AEN369"
 ></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="AEN375"
+NAME="AEN373"
 ></A
 ><H3
 ><A
@@ -1598,7 +1572,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN381"
+NAME="AEN379"
 ></A
 ><H3
 ><A
@@ -1614,7 +1588,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DETECT_IDS		2</PRE
+>#define     XML_DETECT_IDS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1627,7 +1601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN387"
+NAME="AEN385"
 ></A
 ><H3
 ><A
@@ -1643,7 +1617,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_COMPLETE_ATTRS	4</PRE
+>#define     XML_COMPLETE_ATTRS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1657,7 +1631,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN393"
+NAME="AEN391"
 ></A
 ><H3
 ><A
@@ -1673,7 +1647,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SKIP_IDS		8</PRE
+>#define     XML_SKIP_IDS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1686,7 +1660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN399"
+NAME="AEN397"
 ></A
 ><H3
 ><A
@@ -1796,7 +1770,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN405"
+NAME="AEN403"
 ></A
 ><H3
 ><A
@@ -1829,7 +1803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN411"
+NAME="AEN409"
 ></A
 ><H3
 ><A
@@ -1878,7 +1852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN422"
+NAME="AEN420"
 ></A
 ><P
 ></P
@@ -1905,7 +1879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1922,7 +1896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1939,7 +1913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1957,7 +1931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1968,7 +1942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN443"
+NAME="AEN441"
 ></A
 ><H3
 ><A
@@ -2007,7 +1981,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN452"
+NAME="AEN450"
 ></A
 ><P
 ></P
@@ -2034,7 +2008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2051,7 +2025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2068,7 +2042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2085,7 +2059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2096,7 +2070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN473"
+NAME="AEN471"
 ></A
 ><H3
 ><A
@@ -2135,7 +2109,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN482"
+NAME="AEN480"
 ></A
 ><P
 ></P
@@ -2162,7 +2136,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2179,7 +2153,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2196,7 +2170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2213,7 +2187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2224,7 +2198,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN503"
+NAME="AEN501"
 ></A
 ><H3
 ><A
@@ -2258,7 +2232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN511"
+NAME="AEN509"
 ></A
 ><P
 ></P
@@ -2285,7 +2259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2302,7 +2276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2320,7 +2294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2331,7 +2305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN528"
+NAME="AEN526"
 ></A
 ><H3
 ><A
@@ -2365,7 +2339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN536"
+NAME="AEN534"
 ></A
 ><P
 ></P
@@ -2392,7 +2366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2409,7 +2383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2427,7 +2401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2438,7 +2412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN553"
+NAME="AEN551"
 ></A
 ><H3
 ><A
@@ -2482,7 +2456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN563"
+NAME="AEN561"
 ></A
 ><P
 ></P
@@ -2509,7 +2483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2526,7 +2500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2543,7 +2517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2560,7 +2534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2577,7 +2551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2594,7 +2568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity value (without processing).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2605,7 +2579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN592"
+NAME="AEN590"
 ></A
 ><H3
 ><A
@@ -2644,7 +2618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN601"
+NAME="AEN599"
 ></A
 ><P
 ></P
@@ -2671,7 +2645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2688,7 +2662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the notation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2705,7 +2679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2722,7 +2696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2733,7 +2707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN622"
+NAME="AEN620"
 ></A
 ><H3
 ><A
@@ -2778,7 +2752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN632"
+NAME="AEN630"
 ></A
 ><P
 ></P
@@ -2805,7 +2779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2822,7 +2796,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2839,7 +2813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2856,7 +2830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2873,7 +2847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2890,7 +2864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2907,7 +2881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree of enumerated value set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2918,7 +2892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN665"
+NAME="AEN663"
 ></A
 ><H3
 ><A
@@ -2954,7 +2928,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN673"
+NAME="AEN671"
 ></A
 ><P
 ></P
@@ -2981,7 +2955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2998,7 +2972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3015,7 +2989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3032,7 +3006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the element value tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3043,7 +3017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN694"
+NAME="AEN692"
 ></A
 ><H3
 ><A
@@ -3086,7 +3060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN704"
+NAME="AEN702"
 ></A
 ><P
 ></P
@@ -3113,7 +3087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3130,7 +3104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3147,7 +3121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3164,7 +3138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3181,7 +3155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the notation</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3192,7 +3166,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN729"
+NAME="AEN727"
 ></A
 ><H3
 ><A
@@ -3224,7 +3198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN736"
+NAME="AEN734"
 ></A
 ><P
 ></P
@@ -3251,7 +3225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3268,7 +3242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> A SAX Locator</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3279,7 +3253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN749"
+NAME="AEN747"
 ></A
 ><H3
 ><A
@@ -3306,7 +3280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN755"
+NAME="AEN753"
 ></A
 ><P
 ></P
@@ -3333,7 +3307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3344,7 +3318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN764"
+NAME="AEN762"
 ></A
 ><H3
 ><A
@@ -3371,7 +3345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN770"
+NAME="AEN768"
 ></A
 ><P
 ></P
@@ -3398,7 +3372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3409,7 +3383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN779"
+NAME="AEN777"
 ></A
 ><H3
 ><A
@@ -3444,7 +3418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN787"
+NAME="AEN785"
 ></A
 ><P
 ></P
@@ -3471,7 +3445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3488,7 +3462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3505,7 +3479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An array of name/value attributes pairs, NULL terminated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3516,7 +3490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN804"
+NAME="AEN802"
 ></A
 ><H3
 ><A
@@ -3547,7 +3521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN811"
+NAME="AEN809"
 ></A
 ><P
 ></P
@@ -3574,7 +3548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3591,7 +3565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3602,7 +3576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN824"
+NAME="AEN822"
 ></A
 ><H3
 ><A
@@ -3640,7 +3614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN832"
+NAME="AEN830"
 ></A
 ><P
 ></P
@@ -3667,7 +3641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3684,7 +3658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3701,7 +3675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3712,7 +3686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN849"
+NAME="AEN847"
 ></A
 ><H3
 ><A
@@ -3743,7 +3717,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN856"
+NAME="AEN854"
 ></A
 ><P
 ></P
@@ -3770,7 +3744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3787,7 +3761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The entity name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3798,7 +3772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN869"
+NAME="AEN867"
 ></A
 ><H3
 ><A
@@ -3830,7 +3804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN876"
+NAME="AEN874"
 ></A
 ><P
 ></P
@@ -3857,7 +3831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3874,7 +3848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3891,7 +3865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3902,7 +3876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN893"
+NAME="AEN891"
 ></A
 ><H3
 ><A
@@ -3935,7 +3909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN900"
+NAME="AEN898"
 ></A
 ><P
 ></P
@@ -3962,7 +3936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3979,7 +3953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3996,7 +3970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4007,7 +3981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN917"
+NAME="AEN915"
 ></A
 ><H3
 ><A
@@ -4042,7 +4016,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN925"
+NAME="AEN923"
 ></A
 ><P
 ></P
@@ -4069,7 +4043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4086,7 +4060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the target name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4103,7 +4077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the PI data's</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4114,7 +4088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN942"
+NAME="AEN940"
 ></A
 ><H3
 ><A
@@ -4145,7 +4119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN949"
+NAME="AEN947"
 ></A
 ><P
 ></P
@@ -4172,7 +4146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4189,7 +4163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4200,7 +4174,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN962"
+NAME="AEN960"
 ></A
 ><H3
 ><A
@@ -4232,7 +4206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN969"
+NAME="AEN967"
 ></A
 ><P
 ></P
@@ -4259,7 +4233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4276,7 +4250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The pcdata content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4293,7 +4267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the block length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4304,7 +4278,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN986"
+NAME="AEN984"
 ></A
 ><H3
 ><A
@@ -4333,7 +4307,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN992"
+NAME="AEN990"
 ></A
 ><P
 ></P
@@ -4360,7 +4334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4377,7 +4351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4394,7 +4368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4405,7 +4379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1009"
+NAME="AEN1007"
 ></A
 ><H3
 ><A
@@ -4434,7 +4408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1015"
+NAME="AEN1013"
 ></A
 ><P
 ></P
@@ -4461,7 +4435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4478,7 +4452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4495,7 +4469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4506,7 +4480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1032"
+NAME="AEN1030"
 ></A
 ><H3
 ><A
@@ -4543,7 +4517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1040"
+NAME="AEN1038"
 ></A
 ><P
 ></P
@@ -4570,7 +4544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4587,7 +4561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4604,7 +4578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4615,7 +4589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1057"
+NAME="AEN1055"
 ></A
 ><H3
 ><A
@@ -4642,7 +4616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1063"
+NAME="AEN1061"
 ></A
 ><P
 ></P
@@ -4669,7 +4643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4687,7 +4661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4698,7 +4672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1076"
+NAME="AEN1074"
 ></A
 ><H3
 ><A
@@ -4725,7 +4699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1082"
+NAME="AEN1080"
 ></A
 ><P
 ></P
@@ -4752,7 +4726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4770,7 +4744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4781,7 +4755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1095"
+NAME="AEN1093"
 ></A
 ><H3
 ><A
@@ -4808,7 +4782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1101"
+NAME="AEN1099"
 ></A
 ><P
 ></P
@@ -4835,7 +4809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4853,7 +4827,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4864,7 +4838,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1114"
+NAME="AEN1112"
 ></A
 ><H3
 ><A
@@ -4922,7 +4896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1120"
+NAME="AEN1118"
 ></A
 ><H3
 ><A
@@ -4958,7 +4932,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1128"
+NAME="AEN1126"
 ></A
 ><P
 ></P
@@ -4985,7 +4959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The System ID of the resource requested</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5002,7 +4976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The Public ID of the resource requested</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5019,7 +4993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the XML parser context </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5037,7 +5011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the entity input parser.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5048,7 +5022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1149"
+NAME="AEN1147"
 ></A
 ><H3
 ><A
@@ -5078,7 +5052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1155"
+NAME="AEN1153"
 ></A
 ><H3
 ><A
@@ -5114,7 +5088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1162"
+NAME="AEN1160"
 ></A
 ><H3
 ><A
@@ -5146,7 +5120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1169"
+NAME="AEN1167"
 ></A
 ><P
 ></P
@@ -5173,7 +5147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5190,7 +5164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5208,8 +5182,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
@@ -5220,7 +5193,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1186"
+NAME="AEN1184"
 ></A
 ><H3
 ><A
@@ -5252,7 +5225,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1193"
+NAME="AEN1191"
 ></A
 ><P
 ></P
@@ -5279,7 +5252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5296,7 +5269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5314,8 +5287,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
@@ -5326,7 +5298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1210"
+NAME="AEN1208"
 ></A
 ><H3
 ><A
@@ -5361,7 +5333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1218"
+NAME="AEN1216"
 ></A
 ><P
 ></P
@@ -5388,7 +5360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5406,7 +5378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5417,7 +5389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1231"
+NAME="AEN1229"
 ></A
 ><H3
 ><A
@@ -5451,7 +5423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1239"
+NAME="AEN1237"
 ></A
 ><P
 ></P
@@ -5478,7 +5450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5495,12 +5467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5518,7 +5485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5529,7 +5496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1257"
+NAME="AEN1254"
 ></A
 ><H3
 ><A
@@ -5560,7 +5527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1264"
+NAME="AEN1261"
 ></A
 ><P
 ></P
@@ -5587,7 +5554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input char *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5604,12 +5571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5627,7 +5589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5638,7 +5600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1282"
+NAME="AEN1278"
 ></A
 ><H3
 ><A
@@ -5668,7 +5630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1289"
+NAME="AEN1285"
 ></A
 ><P
 ></P
@@ -5695,7 +5657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input char *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5713,7 +5675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5724,7 +5686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1302"
+NAME="AEN1298"
 ></A
 ><H3
 ><A
@@ -5759,7 +5721,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1310"
+NAME="AEN1306"
 ></A
 ><P
 ></P
@@ -5786,7 +5748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5803,7 +5765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index of the first char (zero based)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5820,7 +5782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the substring</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5838,7 +5800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurrence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5849,7 +5811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1331"
+NAME="AEN1327"
 ></A
 ><H3
 ><A
@@ -5886,7 +5848,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1340"
+NAME="AEN1336"
 ></A
 ><P
 ></P
@@ -5913,7 +5875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5930,7 +5892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5948,7 +5910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurrence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5959,7 +5921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1357"
+NAME="AEN1353"
 ></A
 ><H3
 ><A
@@ -5996,7 +5958,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1366"
+NAME="AEN1362"
 ></A
 ><P
 ></P
@@ -6023,7 +5985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6040,7 +6002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6058,7 +6020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurrence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6069,7 +6031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1383"
+NAME="AEN1379"
 ></A
 ><H3
 ><A
@@ -6106,7 +6068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1392"
+NAME="AEN1388"
 ></A
 ><P
 ></P
@@ -6133,7 +6095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6150,7 +6112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6168,7 +6130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurrence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6179,7 +6141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1409"
+NAME="AEN1405"
 ></A
 ><H3
 ><A
@@ -6213,7 +6175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1417"
+NAME="AEN1413"
 ></A
 ><P
 ></P
@@ -6240,7 +6202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6257,7 +6219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6275,7 +6237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6286,7 +6248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1434"
+NAME="AEN1430"
 ></A
 ><H3
 ><A
@@ -6321,7 +6283,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1442"
+NAME="AEN1438"
 ></A
 ><P
 ></P
@@ -6348,7 +6310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6365,7 +6327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6382,7 +6344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6400,7 +6362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6411,7 +6373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1463"
+NAME="AEN1459"
 ></A
 ><H3
 ><A
@@ -6445,7 +6407,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1471"
+NAME="AEN1467"
 ></A
 ><P
 ></P
@@ -6472,7 +6434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6489,7 +6451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6507,7 +6469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6518,7 +6480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1488"
+NAME="AEN1484"
 ></A
 ><H3
 ><A
@@ -6553,7 +6515,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1496"
+NAME="AEN1492"
 ></A
 ><P
 ></P
@@ -6580,7 +6542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6597,7 +6559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6614,7 +6576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6632,7 +6594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6643,7 +6605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1517"
+NAME="AEN1513"
 ></A
 ><H3
 ><A
@@ -6681,7 +6643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1526"
+NAME="AEN1522"
 ></A
 ><P
 ></P
@@ -6708,7 +6670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6725,7 +6687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6743,7 +6705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if they are equal, 0 if they are different</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6754,7 +6716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1543"
+NAME="AEN1539"
 ></A
 ><H3
 ><A
@@ -6784,7 +6746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1550"
+NAME="AEN1546"
 ></A
 ><P
 ></P
@@ -6811,7 +6773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6829,7 +6791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar contained in the ARRAY.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6840,7 +6802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1563"
+NAME="AEN1559"
 ></A
 ><H3
 ><A
@@ -6879,7 +6841,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1572"
+NAME="AEN1568"
 ></A
 ><P
 ></P
@@ -6906,7 +6868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6923,7 +6885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6941,7 +6903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6952,7 +6914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1589"
+NAME="AEN1585"
 ></A
 ><H3
 ><A
@@ -7001,7 +6963,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1600"
+NAME="AEN1596"
 ></A
 ><P
 ></P
@@ -7028,7 +6990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7045,7 +7007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7062,12 +7024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->add</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7085,13 +7042,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
@@ -7102,7 +7053,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1623"
+NAME="AEN1617"
 ></A
 ><H3
 ><A
@@ -7135,7 +7086,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1631"
+NAME="AEN1625"
 ></A
 ><P
 ></P
@@ -7162,7 +7113,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7180,7 +7131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7191,7 +7142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1644"
+NAME="AEN1638"
 ></A
 ><H3
 ><A
@@ -7222,7 +7173,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1651"
+NAME="AEN1645"
 ></A
 ><P
 ></P
@@ -7249,7 +7200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7266,7 +7217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7284,7 +7235,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7295,7 +7246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1668"
+NAME="AEN1662"
 ></A
 ><H3
 ><A
@@ -7326,7 +7277,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1675"
+NAME="AEN1669"
 ></A
 ><P
 ></P
@@ -7353,7 +7304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7371,8 +7322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree if the file was wellformed,
-NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7383,7 +7333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1688"
+NAME="AEN1682"
 ></A
 ><H3
 ><A
@@ -7418,7 +7368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1695"
+NAME="AEN1689"
 ></A
 ><P
 ></P
@@ -7445,7 +7395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7463,7 +7413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7474,7 +7424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1708"
+NAME="AEN1702"
 ></A
 ><H3
 ><A
@@ -7528,7 +7478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1718"
+NAME="AEN1712"
 ></A
 ><P
 ></P
@@ -7555,7 +7505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7573,7 +7523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7584,7 +7534,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1731"
+NAME="AEN1725"
 ></A
 ><H3
 ><A
@@ -7614,7 +7564,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1738"
+NAME="AEN1732"
 ></A
 ><P
 ></P
@@ -7641,7 +7591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7652,7 +7602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1747"
+NAME="AEN1741"
 ></A
 ><H3
 ><A
@@ -7679,7 +7629,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1753"
+NAME="AEN1747"
 ></A
 ><P
 ></P
@@ -7706,7 +7656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7724,7 +7674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7735,7 +7685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1766"
+NAME="AEN1760"
 ></A
 ><H3
 ><A
@@ -7763,7 +7713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1772"
+NAME="AEN1766"
 ></A
 ><P
 ></P
@@ -7790,7 +7740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7808,7 +7758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7819,7 +7769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1785"
+NAME="AEN1779"
 ></A
 ><H3
 ><A
@@ -7853,7 +7803,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1793"
+NAME="AEN1787"
 ></A
 ><P
 ></P
@@ -7880,7 +7830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7898,7 +7848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7909,7 +7859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1806"
+NAME="AEN1800"
 ></A
 ><H3
 ><A
@@ -7941,7 +7891,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1813"
+NAME="AEN1807"
 ></A
 ><P
 ></P
@@ -7968,7 +7918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7985,7 +7935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8003,7 +7953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8014,7 +7964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1830"
+NAME="AEN1824"
 ></A
 ><H3
 ><A
@@ -8046,7 +7996,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1837"
+NAME="AEN1831"
 ></A
 ><P
 ></P
@@ -8073,7 +8023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8091,7 +8041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8102,7 +8052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1850"
+NAME="AEN1844"
 ></A
 ><H3
 ><A
@@ -8137,7 +8087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1859"
+NAME="AEN1853"
 ></A
 ><P
 ></P
@@ -8164,7 +8114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8182,8 +8132,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
@@ -8194,7 +8143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1872"
+NAME="AEN1866"
 ></A
 ><H3
 ><A
@@ -8228,7 +8177,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1880"
+NAME="AEN1874"
 ></A
 ><P
 ></P
@@ -8255,7 +8204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8273,8 +8222,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
@@ -8285,7 +8233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1893"
+NAME="AEN1887"
 ></A
 ><H3
 ><A
@@ -8325,7 +8273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1902"
+NAME="AEN1896"
 ></A
 ><P
 ></P
@@ -8352,7 +8300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8369,7 +8317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8386,8 +8334,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
@@ -8405,7 +8352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8416,7 +8363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1923"
+NAME="AEN1917"
 ></A
 ><H3
 ><A
@@ -8449,7 +8396,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1930"
+NAME="AEN1924"
 ></A
 ><P
 ></P
@@ -8476,7 +8423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8493,7 +8440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8510,7 +8457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8528,7 +8475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8539,7 +8486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1951"
+NAME="AEN1945"
 ></A
 ><H3
 ><A
@@ -8573,7 +8520,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1958"
+NAME="AEN1952"
 ></A
 ><P
 ></P
@@ -8600,7 +8547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8617,7 +8564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8634,7 +8581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an in-memory XML document input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8651,7 +8598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the XML document in bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8669,7 +8616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8680,7 +8627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1983"
+NAME="AEN1977"
 ></A
 ><H3
 ><A
@@ -8718,7 +8665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1991"
+NAME="AEN1985"
 ></A
 ><P
 ></P
@@ -8745,7 +8692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8762,7 +8709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8779,7 +8726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8796,8 +8743,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
@@ -8815,7 +8761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8826,7 +8772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2016"
+NAME="AEN2010"
 ></A
 ><H3
 ><A
@@ -8868,7 +8814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2025"
+NAME="AEN2019"
 ></A
 ><P
 ></P
@@ -8895,7 +8841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8912,7 +8858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8929,7 +8875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8946,8 +8892,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
@@ -8964,7 +8909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8982,7 +8927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8993,7 +8938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2054"
+NAME="AEN2048"
 ></A
 ><H3
 ><A
@@ -9031,7 +8976,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2062"
+NAME="AEN2056"
 ></A
 ><P
 ></P
@@ -9058,7 +9003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9075,7 +9020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9092,8 +9037,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
@@ -9111,7 +9055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9122,7 +9066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2083"
+NAME="AEN2077"
 ></A
 ><H3
 ><A
@@ -9164,7 +9108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2092"
+NAME="AEN2086"
 ></A
 ><P
 ></P
@@ -9191,7 +9135,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9208,7 +9152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9225,8 +9169,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
@@ -9243,7 +9186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the userdata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9261,7 +9204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9272,7 +9215,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2117"
+NAME="AEN2111"
 ></A
 ><H3
 ><A
@@ -9312,7 +9255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2127"
+NAME="AEN2121"
 ></A
 ><P
 ></P
@@ -9339,7 +9282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9356,7 +9299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9374,7 +9317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9385,7 +9328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2144"
+NAME="AEN2138"
 ></A
 ><H3
 ><A
@@ -9419,7 +9362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2153"
+NAME="AEN2147"
 ></A
 ><P
 ></P
@@ -9446,7 +9389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9464,7 +9407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9475,7 +9418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2166"
+NAME="AEN2160"
 ></A
 ><H3
 ><A
@@ -9512,7 +9455,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2175"
+NAME="AEN2169"
 ></A
 ><P
 ></P
@@ -9539,7 +9482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9556,7 +9499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9574,7 +9517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9585,7 +9528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2192"
+NAME="AEN2186"
 ></A
 ><H3
 ><A
@@ -9626,7 +9569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2202"
+NAME="AEN2196"
 ></A
 ><P
 ></P
@@ -9653,7 +9596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9670,7 +9613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9687,7 +9630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9705,7 +9648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9716,7 +9659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2223"
+NAME="AEN2217"
 ></A
 ><H3
 ><A
@@ -9757,7 +9700,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2233"
+NAME="AEN2227"
 ></A
 ><P
 ></P
@@ -9784,7 +9727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9801,7 +9744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Input Buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9818,7 +9761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9836,13 +9779,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
@@ -9853,7 +9790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2255"
+NAME="AEN2248"
 ></A
 ><H3
 ><A
@@ -9902,7 +9839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2266"
+NAME="AEN2259"
 ></A
 ><P
 ></P
@@ -9929,7 +9866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9946,7 +9883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9963,7 +9900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9980,7 +9917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9997,7 +9934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string in UTF8 or ISO-Latin (zero terminated)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10014,7 +9951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10032,8 +9969,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
@@ -10044,7 +9980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2299"
+NAME="AEN2292"
 ></A
 ><H3
 ><A
@@ -10095,7 +10031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2310"
+NAME="AEN2303"
 ></A
 ><P
 ></P
@@ -10122,7 +10058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10139,7 +10075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10156,7 +10092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10173,7 +10109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10190,7 +10126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string in UTF8 or ISO-Latin (zero terminated)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10207,7 +10143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10224,7 +10160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> return nodes even if the data is broken (use 0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10242,11 +10178,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
-   
-In case recover is set to 1, the nodelist will not be empty even if
-the parsed chunk is not well balanced. </TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10257,7 +10189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2347"
+NAME="AEN2340"
 ></A
 ><H3
 ><A
@@ -10309,7 +10241,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2359"
+NAME="AEN2352"
 ></A
 ><P
 ></P
@@ -10336,7 +10268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the chunk pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10353,7 +10285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10370,7 +10302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10387,7 +10319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Used for loop detection, use 0</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10404,7 +10336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10421,7 +10353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10438,7 +10370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10456,8 +10388,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
@@ -10468,7 +10399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2396"
+NAME="AEN2389"
 ></A
 ><H3
 ><A
@@ -10514,7 +10445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2407"
+NAME="AEN2400"
 ></A
 ><P
 ></P
@@ -10541,7 +10472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the existing parsing context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10558,7 +10489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10575,7 +10506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10592,7 +10523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return value for the set of parsed nodes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10610,8 +10541,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
@@ -10622,7 +10552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2432"
+NAME="AEN2425"
 ></A
 ><H3
 ><A
@@ -10652,7 +10582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2439"
+NAME="AEN2432"
 ></A
 ><P
 ></P
@@ -10679,7 +10609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10690,7 +10620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2448"
+NAME="AEN2441"
 ></A
 ><H3
 ><A
@@ -10720,7 +10650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2455"
+NAME="AEN2448"
 ></A
 ><P
 ></P
@@ -10747,7 +10677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10758,7 +10688,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2464"
+NAME="AEN2457"
 ></A
 ><H3
 ><A
@@ -10789,7 +10719,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2471"
+NAME="AEN2464"
 ></A
 ><P
 ></P
@@ -10816,7 +10746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10827,7 +10757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2480"
+NAME="AEN2473"
 ></A
 ><H3
 ><A
@@ -10864,7 +10794,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2488"
+NAME="AEN2481"
 ></A
 ><P
 ></P
@@ -10891,7 +10821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10908,7 +10838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar * buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10925,7 +10855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10936,7 +10866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2505"
+NAME="AEN2498"
 ></A
 ><H3
 ><A
@@ -10969,7 +10899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2513"
+NAME="AEN2506"
 ></A
 ><P
 ></P
@@ -10996,7 +10926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11014,7 +10944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11025,7 +10955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2526"
+NAME="AEN2519"
 ></A
 ><H3
 ><A
@@ -11063,7 +10993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2534"
+NAME="AEN2527"
 ></A
 ><P
 ></P
@@ -11090,7 +11020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the features name array (input/output)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11107,7 +11037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array of string to be filled with the features name.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11125,9 +11055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case or error, or the total number of features,
-           len is updated with the number of strings copied,
-           strings must not be deallocated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11138,7 +11066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2551"
+NAME="AEN2544"
 ></A
 ><H3
 ><A
@@ -11170,7 +11098,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2558"
+NAME="AEN2551"
 ></A
 ><P
 ></P
@@ -11197,7 +11125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML/HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11214,7 +11142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the feature name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11231,7 +11159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  location to store the result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11249,7 +11177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case or error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11260,7 +11188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2579"
+NAME="AEN2572"
 ></A
 ><H3
 ><A
@@ -11292,7 +11220,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2586"
+NAME="AEN2579"
 ></A
 ><P
 ></P
@@ -11319,7 +11247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML/HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11336,7 +11264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the feature name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11353,7 +11281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the location of the new value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11371,7 +11299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case or error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11382,7 +11310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2607"
+NAME="AEN2600"
 ></A
 ><H3
 ><A
@@ -11445,7 +11373,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2619"
+NAME="AEN2612"
 ></A
 ><P
 ></P
@@ -11472,7 +11400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11489,7 +11417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11506,7 +11434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of chars</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11523,7 +11451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of chars in the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11540,7 +11468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional file name or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11558,7 +11486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11569,7 +11497,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2648"
+NAME="AEN2641"
 ></A
 ><H3
 ><A
@@ -11602,7 +11530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2655"
+NAME="AEN2648"
 ></A
 ><P
 ></P
@@ -11629,7 +11557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11646,7 +11574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11663,7 +11591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in byte of the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11680,7 +11608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  last chunk indicator</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11698,7 +11626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11709,7 +11637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2680"
+NAME="AEN2673"
 ></A
 ><H3
 ><A
@@ -11757,7 +11685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2691"
+NAME="AEN2684"
 ></A
 ><P
 ></P
@@ -11784,7 +11712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11801,7 +11729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11818,7 +11746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11835,7 +11763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11852,7 +11780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11869,7 +11797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11887,7 +11815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11898,7 +11826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2724"
+NAME="AEN2717"
 ></A
 ><H3
 ><A
@@ -11945,7 +11873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2735"
+NAME="AEN2728"
 ></A
 ><P
 ></P
@@ -11972,7 +11900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11989,7 +11917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O Input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12006,7 +11934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12024,7 +11952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12035,7 +11963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2756"
+NAME="AEN2749"
 ></A
 ><H3
 ><A
@@ -12073,7 +12001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2765"
+NAME="AEN2758"
 ></A
 ><P
 ></P
@@ -12117,7 +12045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node within the tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12135,7 +12063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an xmlParserNodeInfo block pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12146,7 +12074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2782"
+NAME="AEN2775"
 ></A
 ><H3
 ><A
@@ -12176,7 +12104,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2789"
+NAME="AEN2782"
 ></A
 ><P
 ></P
@@ -12203,7 +12131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12214,7 +12142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2798"
+NAME="AEN2791"
 ></A
 ><H3
 ><A
@@ -12245,7 +12173,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2805"
+NAME="AEN2798"
 ></A
 ><P
 ></P
@@ -12272,7 +12200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12283,7 +12211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2814"
+NAME="AEN2807"
 ></A
 ><H3
 ><A
@@ -12321,7 +12249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2823"
+NAME="AEN2816"
 ></A
 ><P
 ></P
@@ -12348,7 +12276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12365,7 +12293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12383,7 +12311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a long indicating the position of the record</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12394,7 +12322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2840"
+NAME="AEN2833"
 ></A
 ><H3
 ><A
@@ -12428,7 +12356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2848"
+NAME="AEN2841"
 ></A
 ><P
 ></P
@@ -12455,7 +12383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12472,7 +12400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12483,7 +12411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2861"
+NAME="AEN2854"
 ></A
 ><H3
 ><A
@@ -12513,7 +12441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2868"
+NAME="AEN2861"
 ></A
 ><P
 ></P
@@ -12540,7 +12468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new entity resolver function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12551,7 +12479,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2877"
+NAME="AEN2870"
 ></A
 ><H3
 ><A
@@ -12582,7 +12510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2884"
+NAME="AEN2877"
 ></A
 ><P
 ></P
@@ -12610,7 +12538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlExternalEntityLoader function pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12621,7 +12549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2893"
+NAME="AEN2886"
 ></A
 ><H3
 ><A
@@ -12658,7 +12586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2901"
+NAME="AEN2894"
 ></A
 ><P
 ></P
@@ -12685,7 +12613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12702,7 +12630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Public ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12719,7 +12647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context in which the entity is called or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12737,7 +12665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputPtr or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 5e0b6a0..73f7b7d 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23998"
+NAME="AEN23766"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN24001"
+NAME="AEN23769"
 ></A
 ><H2
 >Synopsis</H2
@@ -1134,7 +1134,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24276"
+NAME="AEN24044"
 ></A
 ><H2
 >Description</H2
@@ -1144,14 +1144,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24279"
+NAME="AEN24047"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24281"
+NAME="AEN24049"
 ></A
 ><H3
 ><A
@@ -1167,7 +1167,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MAX_NAMELEN 100</PRE
+>#define     XML_MAX_NAMELEN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1180,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24287"
+NAME="AEN24055"
 ></A
 ><H3
 ><A
@@ -1196,7 +1196,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define INPUT_CHUNK	250</PRE
+>#define     INPUT_CHUNK</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1209,7 +1209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24293"
+NAME="AEN24061"
 ></A
 ><H3
 ><A
@@ -1267,7 +1267,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24309"
+NAME="AEN24077"
 ></A
 ><P
 ></P
@@ -1294,7 +1294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1305,7 +1305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24318"
+NAME="AEN24086"
 ></A
 ><H3
 ><A
@@ -1346,7 +1346,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24329"
+NAME="AEN24097"
 ></A
 ><P
 ></P
@@ -1373,7 +1373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1384,7 +1384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24338"
+NAME="AEN24106"
 ></A
 ><H3
 ><A
@@ -1400,7 +1400,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_BASECHAR(c) xmlIsBaseChar(c)</PRE
+>#define     IS_BASECHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1413,7 +1413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24345"
+NAME="AEN24113"
 ></A
 ><P
 ></P
@@ -1440,7 +1440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1451,7 +1451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24354"
+NAME="AEN24122"
 ></A
 ><H3
 ><A
@@ -1467,7 +1467,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_DIGIT(c) xmlIsDigit(c)</PRE
+>#define     IS_DIGIT(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1480,7 +1480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24361"
+NAME="AEN24129"
 ></A
 ><P
 ></P
@@ -1507,7 +1507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1518,7 +1518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24370"
+NAME="AEN24138"
 ></A
 ><H3
 ><A
@@ -1534,7 +1534,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_COMBINING(c) xmlIsCombining(c)</PRE
+>#define     IS_COMBINING(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1547,7 +1547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24377"
+NAME="AEN24145"
 ></A
 ><P
 ></P
@@ -1574,7 +1574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1585,7 +1585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24386"
+NAME="AEN24154"
 ></A
 ><H3
 ><A
@@ -1601,7 +1601,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_EXTENDER(c) xmlIsExtender(c)</PRE
+>#define     IS_EXTENDER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1658,7 +1658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24407"
+NAME="AEN24175"
 ></A
 ><P
 ></P
@@ -1685,7 +1685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1696,7 +1696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24416"
+NAME="AEN24184"
 ></A
 ><H3
 ><A
@@ -1712,7 +1712,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)</PRE
+>#define     IS_IDEOGRAPHIC(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1740,7 +1740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24428"
+NAME="AEN24196"
 ></A
 ><P
 ></P
@@ -1767,7 +1767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1778,7 +1778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24437"
+NAME="AEN24205"
 ></A
 ><H3
 ><A
@@ -1794,7 +1794,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
+>#define     IS_LETTER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1807,7 +1807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24444"
+NAME="AEN24212"
 ></A
 ><P
 ></P
@@ -1834,7 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1845,7 +1845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24453"
+NAME="AEN24221"
 ></A
 ><H3
 ><A
@@ -1861,7 +1861,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)</PRE
+>#define     IS_PUBIDCHAR(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1883,7 +1883,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24463"
+NAME="AEN24231"
 ></A
 ><P
 ></P
@@ -1910,7 +1910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an UNICODE value (int)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1921,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24472"
+NAME="AEN24240"
 ></A
 ><H3
 ><A
@@ -1948,7 +1948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24478"
+NAME="AEN24246"
 ></A
 ><P
 ></P
@@ -1975,7 +1975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1986,7 +1986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24487"
+NAME="AEN24255"
 ></A
 ><H3
 ><A
@@ -2013,7 +2013,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24493"
+NAME="AEN24261"
 ></A
 ><P
 ></P
@@ -2040,7 +2040,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2051,7 +2051,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24502"
+NAME="AEN24270"
 ></A
 ><H3
 ><A
@@ -2078,7 +2078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24508"
+NAME="AEN24276"
 ></A
 ><P
 ></P
@@ -2105,7 +2105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  and UTF8 string pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2116,7 +2116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24517"
+NAME="AEN24285"
 ></A
 ><H3
 ><A
@@ -2158,7 +2158,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24527"
+NAME="AEN24295"
 ></A
 ><P
 ></P
@@ -2185,7 +2185,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2203,7 +2203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2214,7 +2214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24540"
+NAME="AEN24308"
 ></A
 ><H3
 ><A
@@ -2258,7 +2258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24551"
+NAME="AEN24319"
 ></A
 ><P
 ></P
@@ -2285,7 +2285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2303,7 +2303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2314,7 +2314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24564"
+NAME="AEN24332"
 ></A
 ><H3
 ><A
@@ -2351,7 +2351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24573"
+NAME="AEN24341"
 ></A
 ><P
 ></P
@@ -2378,7 +2378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2396,7 +2396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2407,7 +2407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24586"
+NAME="AEN24354"
 ></A
 ><H3
 ><A
@@ -2435,7 +2435,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24592"
+NAME="AEN24360"
 ></A
 ><P
 ></P
@@ -2462,7 +2462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2480,7 +2480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2491,7 +2491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24605"
+NAME="AEN24373"
 ></A
 ><H3
 ><A
@@ -2519,7 +2519,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24611"
+NAME="AEN24379"
 ></A
 ><P
 ></P
@@ -2546,7 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2564,7 +2564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2575,7 +2575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24624"
+NAME="AEN24392"
 ></A
 ><H3
 ><A
@@ -2618,7 +2618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24635"
+NAME="AEN24403"
 ></A
 ><P
 ></P
@@ -2645,7 +2645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2663,7 +2663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2674,7 +2674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24648"
+NAME="AEN24416"
 ></A
 ><H3
 ><A
@@ -2746,7 +2746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24668"
+NAME="AEN24436"
 ></A
 ><P
 ></P
@@ -2773,7 +2773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2791,7 +2791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2802,7 +2802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24681"
+NAME="AEN24449"
 ></A
 ><H3
 ><A
@@ -2830,7 +2830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24687"
+NAME="AEN24455"
 ></A
 ><P
 ></P
@@ -2857,7 +2857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2875,7 +2875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2886,7 +2886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24700"
+NAME="AEN24468"
 ></A
 ><H3
 ><A
@@ -2947,7 +2947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24716"
+NAME="AEN24484"
 ></A
 ><P
 ></P
@@ -2974,7 +2974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an unicode character (int)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2992,7 +2992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not, non-zero otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3003,7 +3003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24729"
+NAME="AEN24497"
 ></A
 ><H3
 ><A
@@ -3035,7 +3035,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24736"
+NAME="AEN24504"
 ></A
 ><P
 ></P
@@ -3062,7 +3062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3080,7 +3080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3091,7 +3091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24749"
+NAME="AEN24517"
 ></A
 ><H3
 ><A
@@ -3122,7 +3122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24756"
+NAME="AEN24524"
 ></A
 ><P
 ></P
@@ -3149,7 +3149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3166,7 +3166,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3184,7 +3184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3195,7 +3195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24773"
+NAME="AEN24541"
 ></A
 ><H3
 ><A
@@ -3225,7 +3225,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24780"
+NAME="AEN24548"
 ></A
 ><P
 ></P
@@ -3253,7 +3253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserCtxtPtr or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3264,7 +3264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24789"
+NAME="AEN24557"
 ></A
 ><H3
 ><A
@@ -3307,7 +3307,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24799"
+NAME="AEN24567"
 ></A
 ><P
 ></P
@@ -3334,7 +3334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity URL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3351,7 +3351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity PUBLIC ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3368,7 +3368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a possible base for the target URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3386,7 +3386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3397,7 +3397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24820"
+NAME="AEN24588"
 ></A
 ><H3
 ><A
@@ -3432,7 +3432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24828"
+NAME="AEN24596"
 ></A
 ><P
 ></P
@@ -3459,7 +3459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3476,7 +3476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding value (number)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3494,7 +3494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3505,7 +3505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24845"
+NAME="AEN24613"
 ></A
 ><H3
 ><A
@@ -3540,7 +3540,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24853"
+NAME="AEN24621"
 ></A
 ><P
 ></P
@@ -3567,7 +3567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3584,7 +3584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3602,7 +3602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3613,7 +3613,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24870"
+NAME="AEN24638"
 ></A
 ><H3
 ><A
@@ -3650,7 +3650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24879"
+NAME="AEN24647"
 ></A
 ><P
 ></P
@@ -3677,7 +3677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3694,7 +3694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML entity pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3705,7 +3705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24892"
+NAME="AEN24660"
 ></A
 ><H3
 ><A
@@ -3742,7 +3742,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24901"
+NAME="AEN24669"
 ></A
 ><P
 ></P
@@ -3769,7 +3769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3786,7 +3786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an memory buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3804,7 +3804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3815,7 +3815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24918"
+NAME="AEN24686"
 ></A
 ><H3
 ><A
@@ -3852,7 +3852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24927"
+NAME="AEN24695"
 ></A
 ><P
 ></P
@@ -3879,7 +3879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3896,7 +3896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Entity pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3914,7 +3914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3925,7 +3925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24944"
+NAME="AEN24712"
 ></A
 ><H3
 ><A
@@ -3960,7 +3960,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24952"
+NAME="AEN24720"
 ></A
 ><P
 ></P
@@ -3987,7 +3987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4004,7 +4004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input fragment (entity, XML fragment ...).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4015,7 +4015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24965"
+NAME="AEN24733"
 ></A
 ><H3
 ><A
@@ -4049,7 +4049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24973"
+NAME="AEN24741"
 ></A
 ><P
 ></P
@@ -4076,7 +4076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4094,7 +4094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current xmlChar in the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4105,7 +4105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24986"
+NAME="AEN24754"
 ></A
 ><H3
 ><A
@@ -4135,7 +4135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24993"
+NAME="AEN24761"
 ></A
 ><P
 ></P
@@ -4162,7 +4162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4173,7 +4173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25002"
+NAME="AEN24770"
 ></A
 ><H3
 ><A
@@ -4207,7 +4207,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25010"
+NAME="AEN24778"
 ></A
 ><P
 ></P
@@ -4234,7 +4234,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4251,7 +4251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename to use as entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4269,7 +4269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4280,7 +4280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25027"
+NAME="AEN24795"
 ></A
 ><H3
 ><A
@@ -4313,7 +4313,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25035"
+NAME="AEN24803"
 ></A
 ><P
 ></P
@@ -4340,7 +4340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4358,7 +4358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4369,7 +4369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25048"
+NAME="AEN24816"
 ></A
 ><H3
 ><A
@@ -4416,7 +4416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25061"
+NAME="AEN24829"
 ></A
 ><P
 ></P
@@ -4443,7 +4443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4460,7 +4460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4477,7 +4477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4495,8 +4495,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
@@ -4507,7 +4506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25082"
+NAME="AEN24850"
 ></A
 ><H3
 ><A
@@ -4548,7 +4547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25093"
+NAME="AEN24861"
 ></A
 ><P
 ></P
@@ -4575,7 +4574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4593,7 +4592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4604,7 +4603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25106"
+NAME="AEN24874"
 ></A
 ><H3
 ><A
@@ -4650,7 +4649,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25119"
+NAME="AEN24887"
 ></A
 ><P
 ></P
@@ -4677,7 +4676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4694,7 +4693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4712,8 +4711,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
@@ -4724,7 +4722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25136"
+NAME="AEN24904"
 ></A
 ><H3
 ><A
@@ -4764,7 +4762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25147"
+NAME="AEN24915"
 ></A
 ><P
 ></P
@@ -4791,7 +4789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4809,7 +4807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4820,7 +4818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25160"
+NAME="AEN24928"
 ></A
 ><H3
 ><A
@@ -4855,7 +4853,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25169"
+NAME="AEN24937"
 ></A
 ><P
 ></P
@@ -4882,7 +4880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4900,7 +4898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string parser or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4911,7 +4909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25182"
+NAME="AEN24950"
 ></A
 ><H3
 ><A
@@ -4949,7 +4947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25192"
+NAME="AEN24960"
 ></A
 ><P
 ></P
@@ -4976,7 +4974,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4987,7 +4985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25201"
+NAME="AEN24969"
 ></A
 ><H3
 ><A
@@ -5031,7 +5029,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25213"
+NAME="AEN24981"
 ></A
 ><P
 ></P
@@ -5058,7 +5056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5076,7 +5074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5087,7 +5085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25226"
+NAME="AEN24994"
 ></A
 ><H3
 ><A
@@ -5127,7 +5125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25237"
+NAME="AEN25005"
 ></A
 ><P
 ></P
@@ -5154,7 +5152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5172,7 +5170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5183,7 +5181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25250"
+NAME="AEN25018"
 ></A
 ><H3
 ><A
@@ -5220,7 +5218,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25260"
+NAME="AEN25028"
 ></A
 ><P
 ></P
@@ -5247,7 +5245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5265,7 +5263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Nmtoken parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5276,7 +5274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25273"
+NAME="AEN25041"
 ></A
 ><H3
 ><A
@@ -5316,7 +5314,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25283"
+NAME="AEN25051"
 ></A
 ><P
 ></P
@@ -5343,7 +5341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5360,7 +5358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if non-NULL store a copy of the original entity value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5378,7 +5376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the EntityValue parsed with reference substituted or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5389,7 +5387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25300"
+NAME="AEN25068"
 ></A
 ><H3
 ><A
@@ -5479,7 +5477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25321"
+NAME="AEN25089"
 ></A
 ><P
 ></P
@@ -5506,7 +5504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5524,7 +5522,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
@@ -5535,7 +5533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25334"
+NAME="AEN25102"
 ></A
 ><H3
 ><A
@@ -5570,7 +5568,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25343"
+NAME="AEN25111"
 ></A
 ><P
 ></P
@@ -5597,7 +5595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5615,7 +5613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the SystemLiteral parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5626,7 +5624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25356"
+NAME="AEN25124"
 ></A
 ><H3
 ><A
@@ -5661,7 +5659,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25365"
+NAME="AEN25133"
 ></A
 ><P
 ></P
@@ -5688,7 +5686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5706,7 +5704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PubidLiteral parsed or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5717,7 +5715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25378"
+NAME="AEN25146"
 ></A
 ><H3
 ><A
@@ -5756,7 +5754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25387"
+NAME="AEN25155"
 ></A
 ><P
 ></P
@@ -5783,7 +5781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5800,7 +5798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int indicating whether we are within a CDATA section</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5811,7 +5809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25400"
+NAME="AEN25168"
 ></A
 ><H3
 ><A
@@ -5857,7 +5855,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25412"
+NAME="AEN25180"
 ></A
 ><P
 ></P
@@ -5884,7 +5882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5901,7 +5899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar** receiving PubidLiteral</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5918,8 +5916,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
@@ -5937,9 +5934,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
@@ -5950,7 +5945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25433"
+NAME="AEN25201"
 ></A
 ><H3
 ><A
@@ -5984,7 +5979,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25441"
+NAME="AEN25209"
 ></A
 ><P
 ></P
@@ -6011,7 +6006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6022,7 +6017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25450"
+NAME="AEN25218"
 ></A
 ><H3
 ><A
@@ -6057,7 +6052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25459"
+NAME="AEN25227"
 ></A
 ><P
 ></P
@@ -6084,7 +6079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6102,7 +6097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PITarget name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6113,7 +6108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25472"
+NAME="AEN25240"
 ></A
 ><H3
 ><A
@@ -6147,7 +6142,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25481"
+NAME="AEN25249"
 ></A
 ><P
 ></P
@@ -6174,7 +6169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6185,7 +6180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25490"
+NAME="AEN25258"
 ></A
 ><H3
 ><A
@@ -6227,7 +6222,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25501"
+NAME="AEN25269"
 ></A
 ><P
 ></P
@@ -6254,7 +6249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6265,7 +6260,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25510"
+NAME="AEN25278"
 ></A
 ><H3
 ><A
@@ -6310,7 +6305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25524"
+NAME="AEN25292"
 ></A
 ><P
 ></P
@@ -6337,7 +6332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6348,7 +6343,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25533"
+NAME="AEN25301"
 ></A
 ><H3
 ><A
@@ -6421,7 +6416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25553"
+NAME="AEN25321"
 ></A
 ><P
 ></P
@@ -6448,7 +6443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6465,7 +6460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Receive a possible fixed default value for the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6483,8 +6478,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
@@ -6495,7 +6489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25570"
+NAME="AEN25338"
 ></A
 ><H3
 ><A
@@ -6536,7 +6530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25581"
+NAME="AEN25349"
 ></A
 ><P
 ></P
@@ -6563,7 +6557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6581,7 +6575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the notation attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6592,7 +6586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25594"
+NAME="AEN25362"
 ></A
 ><H3
 ><A
@@ -6631,7 +6625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25604"
+NAME="AEN25372"
 ></A
 ><P
 ></P
@@ -6658,7 +6652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6676,7 +6670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the enumeration attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6687,7 +6681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25617"
+NAME="AEN25385"
 ></A
 ><H3
 ><A
@@ -6725,7 +6719,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25627"
+NAME="AEN25395"
 ></A
 ><P
 ></P
@@ -6752,7 +6746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6769,7 +6763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6787,7 +6781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6798,7 +6792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25644"
+NAME="AEN25412"
 ></A
 ><H3
 ><A
@@ -6877,7 +6871,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25665"
+NAME="AEN25433"
 ></A
 ><P
 ></P
@@ -6904,7 +6898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6921,7 +6915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6939,7 +6933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute type</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6950,7 +6944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25682"
+NAME="AEN25450"
 ></A
 ><H3
 ><A
@@ -6984,7 +6978,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25691"
+NAME="AEN25459"
 ></A
 ><P
 ></P
@@ -7011,7 +7005,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7022,7 +7016,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25700"
+NAME="AEN25468"
 ></A
 ><H3
 ><A
@@ -7076,7 +7070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25714"
+NAME="AEN25482"
 ></A
 ><P
 ></P
@@ -7103,7 +7097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7120,7 +7114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input used for the current entity, needed for boundary checks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7138,7 +7132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of the xmlElementContentPtr describing the element choices</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7149,7 +7143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25731"
+NAME="AEN25499"
 ></A
 ><H3
 ><A
@@ -7207,7 +7201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25745"
+NAME="AEN25513"
 ></A
 ><P
 ></P
@@ -7234,7 +7228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7251,7 +7245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input used for the current entity, needed for boundary checks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7269,8 +7263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the tree of xmlElementContentPtr describing the element 
-         hierarchy.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7281,7 +7274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25762"
+NAME="AEN25530"
 ></A
 ><H3
 ><A
@@ -7322,7 +7315,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25772"
+NAME="AEN25540"
 ></A
 ><P
 ></P
@@ -7349,7 +7342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7366,7 +7359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element being defined.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7383,7 +7376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Element Content pointer will be stored here if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7401,7 +7394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the type of element content XML_ELEMENT_TYPE_xxx</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7412,7 +7405,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25793"
+NAME="AEN25561"
 ></A
 ><H3
 ><A
@@ -7447,7 +7440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25802"
+NAME="AEN25570"
 ></A
 ><P
 ></P
@@ -7474,7 +7467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7492,7 +7485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the type of the element, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7503,7 +7496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25815"
+NAME="AEN25583"
 ></A
 ><H3
 ><A
@@ -7549,7 +7542,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25825"
+NAME="AEN25593"
 ></A
 ><P
 ></P
@@ -7576,7 +7569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7587,7 +7580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25834"
+NAME="AEN25602"
 ></A
 ><H3
 ><A
@@ -7627,7 +7620,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25844"
+NAME="AEN25612"
 ></A
 ><P
 ></P
@@ -7654,7 +7647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7672,7 +7665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int), 0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7683,7 +7676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25857"
+NAME="AEN25625"
 ></A
 ><H3
 ><A
@@ -7736,7 +7729,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25868"
+NAME="AEN25636"
 ></A
 ><P
 ></P
@@ -7763,7 +7756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7781,7 +7774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found, or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7792,7 +7785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25881"
+NAME="AEN25649"
 ></A
 ><H3
 ><A
@@ -7833,7 +7826,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25891"
+NAME="AEN25659"
 ></A
 ><P
 ></P
@@ -7860,7 +7853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7871,7 +7864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25900"
+NAME="AEN25668"
 ></A
 ><H3
 ><A
@@ -7924,7 +7917,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25912"
+NAME="AEN25680"
 ></A
 ><P
 ></P
@@ -7951,7 +7944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7962,7 +7955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25921"
+NAME="AEN25689"
 ></A
 ><H3
 ><A
@@ -7999,7 +7992,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25930"
+NAME="AEN25698"
 ></A
 ><P
 ></P
@@ -8026,7 +8019,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8037,7 +8030,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25939"
+NAME="AEN25707"
 ></A
 ><H3
 ><A
@@ -8097,7 +8090,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25956"
+NAME="AEN25724"
 ></A
 ><P
 ></P
@@ -8124,7 +8117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8141,7 +8134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** used to store the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8159,7 +8152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute name, and the value in *value.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8170,7 +8163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25973"
+NAME="AEN25741"
 ></A
 ><H3
 ><A
@@ -8222,7 +8215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25988"
+NAME="AEN25756"
 ></A
 ><P
 ></P
@@ -8249,7 +8242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8267,7 +8260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the element name parsed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8278,7 +8271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26001"
+NAME="AEN25769"
 ></A
 ><H3
 ><A
@@ -8314,7 +8307,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26011"
+NAME="AEN25779"
 ></A
 ><P
 ></P
@@ -8341,7 +8334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8352,7 +8345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26020"
+NAME="AEN25788"
 ></A
 ><H3
 ><A
@@ -8390,7 +8383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26031"
+NAME="AEN25799"
 ></A
 ><P
 ></P
@@ -8417,7 +8410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8428,7 +8421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26040"
+NAME="AEN25808"
 ></A
 ><H3
 ><A
@@ -8460,7 +8453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26048"
+NAME="AEN25816"
 ></A
 ><P
 ></P
@@ -8487,7 +8480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8498,7 +8491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26057"
+NAME="AEN25825"
 ></A
 ><H3
 ><A
@@ -8547,7 +8540,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26067"
+NAME="AEN25835"
 ></A
 ><P
 ></P
@@ -8574,7 +8567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8585,7 +8578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26076"
+NAME="AEN25844"
 ></A
 ><H3
 ><A
@@ -8620,7 +8613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26085"
+NAME="AEN25853"
 ></A
 ><P
 ></P
@@ -8647,7 +8640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8665,7 +8658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string giving the XML version number, or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8676,7 +8669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26098"
+NAME="AEN25866"
 ></A
 ><H3
 ><A
@@ -8713,7 +8706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26108"
+NAME="AEN25876"
 ></A
 ><P
 ></P
@@ -8740,7 +8733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8758,7 +8751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the version string, e.g. "1.0"</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8769,7 +8762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26121"
+NAME="AEN25889"
 ></A
 ><H3
 ><A
@@ -8804,7 +8797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26130"
+NAME="AEN25898"
 ></A
 ><P
 ></P
@@ -8831,7 +8824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8849,7 +8842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding name value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8860,7 +8853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26143"
+NAME="AEN25911"
 ></A
 ><H3
 ><A
@@ -8897,7 +8890,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26153"
+NAME="AEN25921"
 ></A
 ><P
 ></P
@@ -8924,7 +8917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8942,7 +8935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8953,7 +8946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26166"
+NAME="AEN25934"
 ></A
 ><H3
 ><A
@@ -9000,7 +8993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26175"
+NAME="AEN25943"
 ></A
 ><P
 ></P
@@ -9027,7 +9020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9045,7 +9038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if standalone, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9056,7 +9049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26188"
+NAME="AEN25956"
 ></A
 ><H3
 ><A
@@ -9088,7 +9081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26196"
+NAME="AEN25964"
 ></A
 ><P
 ></P
@@ -9115,7 +9108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9126,7 +9119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26205"
+NAME="AEN25973"
 ></A
 ><H3
 ><A
@@ -9160,7 +9153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26214"
+NAME="AEN25982"
 ></A
 ><P
 ></P
@@ -9187,7 +9180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9198,7 +9191,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26223"
+NAME="AEN25991"
 ></A
 ><H3
 ><A
@@ -9230,7 +9223,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26231"
+NAME="AEN25999"
 ></A
 ><P
 ></P
@@ -9257,7 +9250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9268,7 +9261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26240"
+NAME="AEN26008"
 ></A
 ><H3
 ><A
@@ -9310,7 +9303,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26251"
+NAME="AEN26019"
 ></A
 ><P
 ></P
@@ -9337,7 +9330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9354,7 +9347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the external identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9371,7 +9364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the system identifier (or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9382,7 +9375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26268"
+NAME="AEN26036"
 ></A
 ><H3
 ><A
@@ -9398,7 +9391,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_NONE	0</PRE
+>#define     XML_SUBSTITUTE_NONE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9410,7 +9403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26274"
+NAME="AEN26042"
 ></A
 ><H3
 ><A
@@ -9426,7 +9419,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_REF	1</PRE
+>#define     XML_SUBSTITUTE_REF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9438,7 +9431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26280"
+NAME="AEN26048"
 ></A
 ><H3
 ><A
@@ -9454,7 +9447,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_PEREF	2</PRE
+>#define     XML_SUBSTITUTE_PEREF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9466,7 +9459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26286"
+NAME="AEN26054"
 ></A
 ><H3
 ><A
@@ -9482,7 +9475,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_BOTH 	3</PRE
+>#define     XML_SUBSTITUTE_BOTH</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9494,7 +9487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26292"
+NAME="AEN26060"
 ></A
 ><H3
 ><A
@@ -9548,7 +9541,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26306"
+NAME="AEN26074"
 ></A
 ><P
 ></P
@@ -9575,7 +9568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9592,7 +9585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len to decode (in bytes !), -1 for no size limit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9609,7 +9602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9626,7 +9619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9643,7 +9636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9660,7 +9653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9678,8 +9671,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
@@ -9690,7 +9682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26339"
+NAME="AEN26107"
 ></A
 ><H3
 ><A
@@ -9744,7 +9736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26353"
+NAME="AEN26121"
 ></A
 ><P
 ></P
@@ -9771,7 +9763,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9788,7 +9780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9805,7 +9797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9822,7 +9814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9839,7 +9831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9856,7 +9848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9874,8 +9866,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
@@ -9886,7 +9877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26386"
+NAME="AEN26154"
 ></A
 ><H3
 ><A
@@ -9920,7 +9911,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26394"
+NAME="AEN26162"
 ></A
 ><P
 ></P
@@ -9947,7 +9938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9964,7 +9955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9982,7 +9973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of error, the index in the stack otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9993,7 +9984,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26411"
+NAME="AEN26179"
 ></A
 ><H3
 ><A
@@ -10026,7 +10017,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26419"
+NAME="AEN26187"
 ></A
 ><P
 ></P
@@ -10053,7 +10044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10071,7 +10062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the node just removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10082,7 +10073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26432"
+NAME="AEN26200"
 ></A
 ><H3
 ><A
@@ -10116,7 +10107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26440"
+NAME="AEN26208"
 ></A
 ><P
 ></P
@@ -10143,7 +10134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10160,7 +10151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10178,7 +10169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of error, the index in the stack otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10189,7 +10180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26457"
+NAME="AEN26225"
 ></A
 ><H3
 ><A
@@ -10222,7 +10213,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26465"
+NAME="AEN26233"
 ></A
 ><P
 ></P
@@ -10249,7 +10240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10267,7 +10258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the input just removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10278,7 +10269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26478"
+NAME="AEN26246"
 ></A
 ><H3
 ><A
@@ -10311,7 +10302,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26486"
+NAME="AEN26254"
 ></A
 ><P
 ></P
@@ -10338,7 +10329,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10356,7 +10347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the name just removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10367,7 +10358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26499"
+NAME="AEN26267"
 ></A
 ><H3
 ><A
@@ -10401,7 +10392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26507"
+NAME="AEN26275"
 ></A
 ><P
 ></P
@@ -10428,7 +10419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10445,7 +10436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10463,7 +10454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of error, the index in the stack otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10474,7 +10465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26524"
+NAME="AEN26292"
 ></A
 ><H3
 ><A
@@ -10505,7 +10496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26531"
+NAME="AEN26299"
 ></A
 ><P
 ></P
@@ -10532,7 +10523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10550,7 +10541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of space chars skipped</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10561,7 +10552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26544"
+NAME="AEN26312"
 ></A
 ><H3
 ><A
@@ -10597,7 +10588,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26552"
+NAME="AEN26320"
 ></A
 ><P
 ></P
@@ -10624,7 +10615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10641,7 +10632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the beginning of the char</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10658,7 +10649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10676,7 +10667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10687,7 +10678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26573"
+NAME="AEN26341"
 ></A
 ><H3
 ><A
@@ -10746,7 +10737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26586"
+NAME="AEN26354"
 ></A
 ><P
 ></P
@@ -10773,7 +10764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10784,7 +10775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26595"
+NAME="AEN26363"
 ></A
 ><H3
 ><A
@@ -10841,7 +10832,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26610"
+NAME="AEN26378"
 ></A
 ><P
 ></P
@@ -10868,7 +10859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10879,7 +10870,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26619"
+NAME="AEN26387"
 ></A
 ><H3
 ><A
@@ -10919,7 +10910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26628"
+NAME="AEN26396"
 ></A
 ><P
 ></P
@@ -10946,7 +10937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the string value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10964,7 +10955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if correct 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10975,7 +10966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26641"
+NAME="AEN26409"
 ></A
 ><H3
 ><A
@@ -11029,7 +11020,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26653"
+NAME="AEN26421"
 ></A
 ><P
 ></P
@@ -11056,7 +11047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11073,7 +11064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the length of the char read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11091,7 +11082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current char value and its length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11102,7 +11093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26670"
+NAME="AEN26438"
 ></A
 ><H3
 ><A
@@ -11133,7 +11124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26677"
+NAME="AEN26445"
 ></A
 ><P
 ></P
@@ -11160,7 +11151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11177,7 +11168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11195,7 +11186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11206,7 +11197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26694"
+NAME="AEN26462"
 ></A
 ><H3
 ><A
@@ -11238,7 +11229,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26701"
+NAME="AEN26469"
 ></A
 ><P
 ></P
@@ -11265,7 +11256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Ignored, compatibility</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11282,7 +11273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11299,7 +11290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11317,7 +11308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11328,7 +11319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26722"
+NAME="AEN26490"
 ></A
 ><H3
 ><A
@@ -11358,7 +11349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26729"
+NAME="AEN26497"
 ></A
 ><P
 ></P
@@ -11385,7 +11376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11396,7 +11387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26738"
+NAME="AEN26506"
 ></A
 ><H3
 ><A
@@ -11426,7 +11417,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26745"
+NAME="AEN26513"
 ></A
 ><P
 ></P
@@ -11453,7 +11444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11464,7 +11455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26754"
+NAME="AEN26522"
 ></A
 ><H3
 ><A
@@ -11497,7 +11488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26761"
+NAME="AEN26529"
 ></A
 ><H3
 ><A
@@ -11530,7 +11521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26768"
+NAME="AEN26536"
 ></A
 ><P
 ></P
@@ -11557,7 +11548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11574,7 +11565,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
@@ -11592,7 +11583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11603,7 +11594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26785"
+NAME="AEN26553"
 ></A
 ><H3
 ><A
@@ -11642,7 +11633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26794"
+NAME="AEN26562"
 ></A
 ><P
 ></P
@@ -11669,7 +11660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11686,7 +11677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the fist node in the chunk</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11703,7 +11694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the last nod in the chunk</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11714,7 +11705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26811"
+NAME="AEN26579"
 ></A
 ><H3
 ><A
@@ -11744,7 +11735,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26818"
+NAME="AEN26586"
 ></A
 ><P
 ></P
@@ -11771,7 +11762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> A valid function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-relaxng.html b/doc/html/libxml-relaxng.html
index 557809e..096eb88 100644
--- a/doc/html/libxml-relaxng.html
+++ b/doc/html/libxml-relaxng.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12160"
+NAME="AEN12085"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12163"
+NAME="AEN12088"
 ></A
 ><H2
 >Synopsis</H2
@@ -310,27 +310,7 @@
                                              <A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
-> instance);
-int         <A
-HREF="libxml-relaxng.html#XMLRELAXNGVALIDATESTREAM"
->xmlRelaxNGValidateStream</A
->        (<A
-HREF="libxml-relaxng.html#XMLRELAXNGVALIDCTXTPTR"
->xmlRelaxNGValidCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> input,
-                                             <A
-HREF="libxml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc,
-                                             <A
-HREF="libxml-tree.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data);
+> doc);
 void        <A
 HREF="libxml-relaxng.html#XMLRELAXNGCLEANUPTYPES"
 >xmlRelaxNGCleanupTypes</A
@@ -342,7 +322,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12214"
+NAME="AEN12134"
 ></A
 ><H2
 >Description</H2
@@ -352,14 +332,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12217"
+NAME="AEN12137"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12219"
+NAME="AEN12139"
 ></A
 ><H3
 ><A
@@ -385,33 +365,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12224"
+NAME="AEN12144"
 ></A
 ><H3
 ><A
 NAME="XMLRELAXNGPTR"
 ></A
 >xmlRelaxNGPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRelaxNG *xmlRelaxNGPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12229"
+NAME="AEN12148"
 ></A
 ><H3
 ><A
@@ -438,7 +405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12234"
+NAME="AEN12153"
 ></A
 ><P
 ></P
@@ -510,7 +477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12251"
+NAME="AEN12170"
 ></A
 ><H3
 ><A
@@ -538,7 +505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12256"
+NAME="AEN12175"
 ></A
 ><P
 ></P
@@ -610,7 +577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12273"
+NAME="AEN12192"
 ></A
 ><H3
 ><A
@@ -636,33 +603,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12278"
+NAME="AEN12197"
 ></A
 ><H3
 ><A
 NAME="XMLRELAXNGPARSERCTXTPTR"
 ></A
 >xmlRelaxNGParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRelaxNGParserCtxt *xmlRelaxNGParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12283"
+NAME="AEN12201"
 ></A
 ><H3
 ><A
@@ -690,33 +644,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12289"
+NAME="AEN12207"
 ></A
 ><H3
 ><A
 NAME="XMLRELAXNGVALIDCTXTPTR"
 ></A
 >xmlRelaxNGValidCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRelaxNGValidCtxt *xmlRelaxNGValidCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12294"
+NAME="AEN12211"
 ></A
 ><H3
 ><A
@@ -781,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12299"
+NAME="AEN12216"
 ></A
 ><H3
 ><A
@@ -813,7 +754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12306"
+NAME="AEN12223"
 ></A
 ><P
 ></P
@@ -840,7 +781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the location of the schema</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -858,7 +799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the parser context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -869,7 +810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12319"
+NAME="AEN12236"
 ></A
 ><H3
 ><A
@@ -902,7 +843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12326"
+NAME="AEN12243"
 ></A
 ><P
 ></P
@@ -929,7 +870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a char array containing the schemas</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -946,7 +887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -964,7 +905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the parser context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -975,7 +916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12343"
+NAME="AEN12260"
 ></A
 ><H3
 ><A
@@ -1005,7 +946,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12350"
+NAME="AEN12267"
 ></A
 ><P
 ></P
@@ -1032,7 +973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1043,7 +984,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12359"
+NAME="AEN12276"
 ></A
 ><H3
 ><A
@@ -1082,7 +1023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12368"
+NAME="AEN12285"
 ></A
 ><P
 ></P
@@ -1109,7 +1050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Relax-NG validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1126,7 +1067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1143,7 +1084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the warning callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1160,7 +1101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  contextual data for the callbacks</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1171,7 +1112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12389"
+NAME="AEN12306"
 ></A
 ><H3
 ><A
@@ -1206,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12397"
+NAME="AEN12314"
 ></A
 ><P
 ></P
@@ -1233,7 +1174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Relax-NG parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1251,8 +1192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the internal XML RelaxNG structure built from the resource or
-        NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1263,7 +1203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12410"
+NAME="AEN12327"
 ></A
 ><H3
 ><A
@@ -1293,7 +1233,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12417"
+NAME="AEN12334"
 ></A
 ><P
 ></P
@@ -1320,7 +1260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1331,7 +1271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12426"
+NAME="AEN12343"
 ></A
 ><H3
 ><A
@@ -1365,7 +1305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12434"
+NAME="AEN12351"
 ></A
 ><P
 ></P
@@ -1392,7 +1332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1409,7 +1349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1420,7 +1360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12447"
+NAME="AEN12364"
 ></A
 ><H3
 ><A
@@ -1454,7 +1394,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12455"
+NAME="AEN12372"
 ></A
 ><P
 ></P
@@ -1481,7 +1421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1498,7 +1438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1509,7 +1449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12468"
+NAME="AEN12385"
 ></A
 ><H3
 ><A
@@ -1548,7 +1488,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12477"
+NAME="AEN12394"
 ></A
 ><P
 ></P
@@ -1575,7 +1515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Relax-NG validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1592,7 +1532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1609,7 +1549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the warning function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1626,7 +1566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the functions context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1637,7 +1577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12498"
+NAME="AEN12415"
 ></A
 ><H3
 ><A
@@ -1671,7 +1611,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12506"
+NAME="AEN12423"
 ></A
 ><P
 ></P
@@ -1698,7 +1638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a precompiled XML RelaxNGs</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1716,7 +1656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the validation context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1727,7 +1667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12519"
+NAME="AEN12436"
 ></A
 ><H3
 ><A
@@ -1757,7 +1697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12526"
+NAME="AEN12443"
 ></A
 ><P
 ></P
@@ -1784,7 +1724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema validation context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1795,7 +1735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12535"
+NAME="AEN12452"
 ></A
 ><H3
 ><A
@@ -1818,7 +1758,7 @@
                                              <A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
-> instance);</PRE
+> doc);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1829,122 +1769,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12543"
-></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"
->  a Relax-NG validation context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->instance</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Returns</I
-></SPAN
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 if the document is valid, a positive error code
-    number otherwise and -1 in case of internal or API error.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12560"
-></A
-><H3
-><A
-NAME="XMLRELAXNGVALIDATESTREAM"
-></A
->xmlRelaxNGValidateStream ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRelaxNGValidateStream        (<A
-HREF="libxml-relaxng.html#XMLRELAXNGVALIDCTXTPTR"
->xmlRelaxNGValidCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> input,
-                                             <A
-HREF="libxml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc,
-                                             <A
-HREF="libxml-tree.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN12569"
+NAME="AEN12460"
 ></A
 ><P
 ></P
@@ -1981,58 +1806,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->input</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
->enc</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
->sax</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
->user_data</I
+>doc</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -2068,7 +1842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12598"
+NAME="AEN12477"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index 69c56ef..7b11c04 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN4112"
+NAME="AEN4102"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN4115"
+NAME="AEN4105"
 ></A
 ><H2
 >Synopsis</H2
@@ -532,7 +532,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4213"
+NAME="AEN4203"
 ></A
 ><H2
 >Description</H2
@@ -542,14 +542,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4216"
+NAME="AEN4206"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4218"
+NAME="AEN4208"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4225"
+NAME="AEN4215"
 ></A
 ><P
 ></P
@@ -606,7 +606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -624,7 +624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -635,7 +635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4238"
+NAME="AEN4228"
 ></A
 ><H3
 ><A
@@ -666,7 +666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4245"
+NAME="AEN4235"
 ></A
 ><P
 ></P
@@ -693,7 +693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -711,7 +711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -722,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4258"
+NAME="AEN4248"
 ></A
 ><H3
 ><A
@@ -754,7 +754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4265"
+NAME="AEN4255"
 ></A
 ><P
 ></P
@@ -781,7 +781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -798,7 +798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> A SAX Locator</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -809,7 +809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4278"
+NAME="AEN4268"
 ></A
 ><H3
 ><A
@@ -836,7 +836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4284"
+NAME="AEN4274"
 ></A
 ><P
 ></P
@@ -863,7 +863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -881,7 +881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -892,7 +892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4297"
+NAME="AEN4287"
 ></A
 ><H3
 ><A
@@ -919,7 +919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4303"
+NAME="AEN4293"
 ></A
 ><P
 ></P
@@ -946,7 +946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -964,7 +964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -975,7 +975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4316"
+NAME="AEN4306"
 ></A
 ><H3
 ><A
@@ -1002,7 +1002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4322"
+NAME="AEN4312"
 ></A
 ><P
 ></P
@@ -1029,7 +1029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1047,7 +1047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1058,7 +1058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4335"
+NAME="AEN4325"
 ></A
 ><H3
 ><A
@@ -1085,7 +1085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4341"
+NAME="AEN4331"
 ></A
 ><P
 ></P
@@ -1112,7 +1112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1130,7 +1130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1141,7 +1141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4354"
+NAME="AEN4344"
 ></A
 ><H3
 ><A
@@ -1168,7 +1168,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4360"
+NAME="AEN4350"
 ></A
 ><P
 ></P
@@ -1195,7 +1195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1224,7 +1224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4373"
+NAME="AEN4363"
 ></A
 ><H3
 ><A
@@ -1263,7 +1263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4382"
+NAME="AEN4372"
 ></A
 ><P
 ></P
@@ -1290,7 +1290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1307,7 +1307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1324,7 +1324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1341,7 +1341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1352,7 +1352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4403"
+NAME="AEN4393"
 ></A
 ><H3
 ><A
@@ -1391,7 +1391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4412"
+NAME="AEN4402"
 ></A
 ><P
 ></P
@@ -1418,7 +1418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1435,7 +1435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the root element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1452,7 +1452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1469,7 +1469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SYSTEM ID (e.g. filename or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1480,7 +1480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4433"
+NAME="AEN4423"
 ></A
 ><H3
 ><A
@@ -1514,7 +1514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4441"
+NAME="AEN4431"
 ></A
 ><P
 ></P
@@ -1541,7 +1541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1558,7 +1558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1576,7 +1576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1587,7 +1587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4458"
+NAME="AEN4448"
 ></A
 ><H3
 ><A
@@ -1621,7 +1621,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4466"
+NAME="AEN4456"
 ></A
 ><P
 ></P
@@ -1648,7 +1648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1665,7 +1665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1683,7 +1683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1694,7 +1694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4483"
+NAME="AEN4473"
 ></A
 ><H3
 ><A
@@ -1742,7 +1742,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4494"
+NAME="AEN4484"
 ></A
 ><P
 ></P
@@ -1769,7 +1769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1786,7 +1786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1803,7 +1803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1821,7 +1821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1832,7 +1832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4515"
+NAME="AEN4505"
 ></A
 ><H3
 ><A
@@ -1876,7 +1876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4525"
+NAME="AEN4515"
 ></A
 ><P
 ></P
@@ -1903,7 +1903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1920,7 +1920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1937,7 +1937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1954,7 +1954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1971,7 +1971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1988,7 +1988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity value (without processing).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1999,7 +1999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4554"
+NAME="AEN4544"
 ></A
 ><H3
 ><A
@@ -2044,7 +2044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4564"
+NAME="AEN4554"
 ></A
 ><P
 ></P
@@ -2071,7 +2071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2088,7 +2088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2105,7 +2105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2122,7 +2122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2139,7 +2139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2156,7 +2156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2173,7 +2173,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree of enumerated value set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2184,7 +2184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4597"
+NAME="AEN4587"
 ></A
 ><H3
 ><A
@@ -2220,7 +2220,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4605"
+NAME="AEN4595"
 ></A
 ><P
 ></P
@@ -2247,7 +2247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2264,7 +2264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2281,7 +2281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2298,7 +2298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the element value tree</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2309,7 +2309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4626"
+NAME="AEN4616"
 ></A
 ><H3
 ><A
@@ -2348,7 +2348,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4635"
+NAME="AEN4625"
 ></A
 ><P
 ></P
@@ -2375,7 +2375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2392,7 +2392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the notation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2409,7 +2409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2426,7 +2426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2437,7 +2437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4656"
+NAME="AEN4646"
 ></A
 ><H3
 ><A
@@ -2480,7 +2480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4666"
+NAME="AEN4656"
 ></A
 ><P
 ></P
@@ -2507,7 +2507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2524,7 +2524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The name of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2541,7 +2541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The public ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2558,7 +2558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> The system ID of the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2575,7 +2575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the name of the notation</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2586,7 +2586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4691"
+NAME="AEN4681"
 ></A
 ><H3
 ><A
@@ -2613,7 +2613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4697"
+NAME="AEN4687"
 ></A
 ><P
 ></P
@@ -2640,7 +2640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2651,7 +2651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4706"
+NAME="AEN4696"
 ></A
 ><H3
 ><A
@@ -2678,7 +2678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4712"
+NAME="AEN4702"
 ></A
 ><P
 ></P
@@ -2705,7 +2705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2716,7 +2716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4721"
+NAME="AEN4711"
 ></A
 ><H3
 ><A
@@ -2754,7 +2754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4729"
+NAME="AEN4719"
 ></A
 ><P
 ></P
@@ -2781,7 +2781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2798,7 +2798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2815,7 +2815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The attribute value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2826,7 +2826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4746"
+NAME="AEN4736"
 ></A
 ><H3
 ><A
@@ -2861,7 +2861,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4754"
+NAME="AEN4744"
 ></A
 ><P
 ></P
@@ -2888,7 +2888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2905,7 +2905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name, including namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2922,7 +2922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An array of name/value attributes pairs, NULL terminated</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2933,7 +2933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4771"
+NAME="AEN4761"
 ></A
 ><H3
 ><A
@@ -2964,7 +2964,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4778"
+NAME="AEN4768"
 ></A
 ><P
 ></P
@@ -2991,7 +2991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3008,7 +3008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The element name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3019,7 +3019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4791"
+NAME="AEN4781"
 ></A
 ><H3
 ><A
@@ -3050,7 +3050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4798"
+NAME="AEN4788"
 ></A
 ><P
 ></P
@@ -3077,7 +3077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3094,7 +3094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The entity name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3105,7 +3105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4811"
+NAME="AEN4801"
 ></A
 ><H3
 ><A
@@ -3137,7 +3137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4818"
+NAME="AEN4808"
 ></A
 ><P
 ></P
@@ -3164,7 +3164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3181,7 +3181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3198,7 +3198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3209,7 +3209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4835"
+NAME="AEN4825"
 ></A
 ><H3
 ><A
@@ -3242,7 +3242,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4842"
+NAME="AEN4832"
 ></A
 ><P
 ></P
@@ -3269,7 +3269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3286,7 +3286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3303,7 +3303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3314,7 +3314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4859"
+NAME="AEN4849"
 ></A
 ><H3
 ><A
@@ -3349,7 +3349,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4867"
+NAME="AEN4857"
 ></A
 ><P
 ></P
@@ -3376,7 +3376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3393,7 +3393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the target name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3410,7 +3410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the PI data's</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3421,7 +3421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4884"
+NAME="AEN4874"
 ></A
 ><H3
 ><A
@@ -3456,7 +3456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4892"
+NAME="AEN4882"
 ></A
 ><P
 ></P
@@ -3483,7 +3483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3500,7 +3500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3517,7 +3517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3528,7 +3528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4909"
+NAME="AEN4899"
 ></A
 ><H3
 ><A
@@ -3559,7 +3559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4916"
+NAME="AEN4906"
 ></A
 ><P
 ></P
@@ -3586,7 +3586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3603,7 +3603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3614,7 +3614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4929"
+NAME="AEN4919"
 ></A
 ><H3
 ><A
@@ -3644,7 +3644,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4936"
+NAME="AEN4926"
 ></A
 ><P
 ></P
@@ -3671,7 +3671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3689,7 +3689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNsPtr or NULL if none</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3700,7 +3700,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4949"
+NAME="AEN4939"
 ></A
 ><H3
 ><A
@@ -3732,7 +3732,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4956"
+NAME="AEN4946"
 ></A
 ><P
 ></P
@@ -3759,7 +3759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3776,7 +3776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace to check against</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3794,7 +3794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3805,7 +3805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4973"
+NAME="AEN4963"
 ></A
 ><H3
 ><A
@@ -3840,7 +3840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4981"
+NAME="AEN4971"
 ></A
 ><P
 ></P
@@ -3867,7 +3867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3884,7 +3884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace associated URN</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3901,7 +3901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3912,7 +3912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4998"
+NAME="AEN4988"
 ></A
 ><H3
 ><A
@@ -3943,7 +3943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5005"
+NAME="AEN4995"
 ></A
 ><P
 ></P
@@ -3970,7 +3970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3987,7 +3987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3998,7 +3998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5018"
+NAME="AEN5008"
 ></A
 ><H3
 ><A
@@ -4030,7 +4030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5025"
+NAME="AEN5015"
 ></A
 ><P
 ></P
@@ -4057,7 +4057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the user data (XML parser context)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4074,7 +4074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The pcdata content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4091,7 +4091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the block length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4102,7 +4102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5042"
+NAME="AEN5032"
 ></A
 ><H3
 ><A
@@ -4133,7 +4133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5049"
+NAME="AEN5039"
 ></A
 ><P
 ></P
@@ -4160,7 +4160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4177,7 +4177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  flag if non-zero sets the handler warning procedure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4188,7 +4188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5062"
+NAME="AEN5052"
 ></A
 ><H3
 ><A
@@ -4218,7 +4218,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5069"
+NAME="AEN5059"
 ></A
 ><P
 ></P
@@ -4245,7 +4245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4256,7 +4256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5078"
+NAME="AEN5068"
 ></A
 ><H3
 ><A
@@ -4286,7 +4286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5085"
+NAME="AEN5075"
 ></A
 ><P
 ></P
@@ -4313,7 +4313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4324,7 +4324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5094"
+NAME="AEN5084"
 ></A
 ><H3
 ><A
@@ -4352,7 +4352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5100"
+NAME="AEN5090"
 ></A
 ><H3
 ><A
@@ -4380,7 +4380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5106"
+NAME="AEN5096"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-schemasinternals.html b/doc/html/libxml-schemasinternals.html
index c7d94b5..ae9aa3b 100644
--- a/doc/html/libxml-schemasinternals.html
+++ b/doc/html/libxml-schemasinternals.html
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN34104"
+NAME="AEN33833"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN34107"
+NAME="AEN33836"
 ></A
 ><H2
 >Synopsis</H2
@@ -292,7 +292,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN34148"
+NAME="AEN33877"
 ></A
 ><H2
 >Description</H2
@@ -302,14 +302,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN34151"
+NAME="AEN33880"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34153"
+NAME="AEN33882"
 ></A
 ><H3
 ><A
@@ -368,7 +368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34158"
+NAME="AEN33887"
 ></A
 ><H3
 ><A
@@ -403,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34163"
+NAME="AEN33892"
 ></A
 ><H3
 ><A
@@ -429,33 +429,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34168"
+NAME="AEN33897"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAVALPTR"
 ></A
 >xmlSchemaValPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaVal *xmlSchemaValPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34173"
+NAME="AEN33901"
 ></A
 ><H3
 ><A
@@ -501,33 +488,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34178"
+NAME="AEN33906"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMATYPEPTR"
 ></A
 >xmlSchemaTypePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaType *xmlSchemaTypePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34183"
+NAME="AEN33910"
 ></A
 ><H3
 ><A
@@ -564,33 +538,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34188"
+NAME="AEN33915"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAFACETPTR"
 ></A
 >xmlSchemaFacetPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaFacet *xmlSchemaFacetPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34193"
+NAME="AEN33919"
 ></A
 ><H3
 ><A
@@ -619,33 +580,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34198"
+NAME="AEN33924"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAANNOTPTR"
 ></A
 >xmlSchemaAnnotPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaAnnot *xmlSchemaAnnotPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34203"
+NAME="AEN33928"
 ></A
 ><H3
 ><A
@@ -661,7 +609,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ANYATTR_SKIP	1</PRE
+>#define     XML_SCHEMAS_ANYATTR_SKIP</PRE
 ></TD
 ></TR
 ></TABLE
@@ -671,7 +619,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34208"
+NAME="AEN33933"
 ></A
 ><H3
 ><A
@@ -687,7 +635,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ANYATTR_LAX		2</PRE
+>#define     XML_SCHEMAS_ANYATTR_LAX</PRE
 ></TD
 ></TR
 ></TABLE
@@ -697,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34213"
+NAME="AEN33938"
 ></A
 ><H3
 ><A
@@ -713,7 +661,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ANYATTR_STRICT	3</PRE
+>#define     XML_SCHEMAS_ANYATTR_STRICT</PRE
 ></TD
 ></TR
 ></TABLE
@@ -723,7 +671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34218"
+NAME="AEN33943"
 ></A
 ><H3
 ><A
@@ -764,33 +712,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34223"
+NAME="AEN33948"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAATTRIBUTEPTR"
 ></A
 >xmlSchemaAttributePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaAttribute *xmlSchemaAttributePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34228"
+NAME="AEN33952"
 ></A
 ><H3
 ><A
@@ -826,33 +761,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34233"
+NAME="AEN33957"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAATTRIBUTEGROUPPTR"
 ></A
 >xmlSchemaAttributeGroupPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34238"
+NAME="AEN33961"
 ></A
 ><H3
 ><A
@@ -868,7 +790,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_TYPE_MIXED		1 &lt;&lt; 0</PRE
+>#define     XML_SCHEMAS_TYPE_MIXED</PRE
 ></TD
 ></TR
 ></TABLE
@@ -880,7 +802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34244"
+NAME="AEN33967"
 ></A
 ><H3
 ><A
@@ -896,7 +818,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_NILLABLE	1 &lt;&lt; 0</PRE
+>#define     XML_SCHEMAS_ELEM_NILLABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -908,7 +830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34250"
+NAME="AEN33973"
 ></A
 ><H3
 ><A
@@ -924,7 +846,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_GLOBAL		1 &lt;&lt; 1</PRE
+>#define     XML_SCHEMAS_ELEM_GLOBAL</PRE
 ></TD
 ></TR
 ></TABLE
@@ -936,7 +858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34256"
+NAME="AEN33979"
 ></A
 ><H3
 ><A
@@ -952,7 +874,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_DEFAULT	1 &lt;&lt; 2</PRE
+>#define     XML_SCHEMAS_ELEM_DEFAULT</PRE
 ></TD
 ></TR
 ></TABLE
@@ -964,7 +886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34262"
+NAME="AEN33985"
 ></A
 ><H3
 ><A
@@ -980,7 +902,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_FIXED		1 &lt;&lt; 3</PRE
+>#define     XML_SCHEMAS_ELEM_FIXED</PRE
 ></TD
 ></TR
 ></TABLE
@@ -992,7 +914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34268"
+NAME="AEN33991"
 ></A
 ><H3
 ><A
@@ -1008,7 +930,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_ABSTRACT	1 &lt;&lt; 4</PRE
+>#define     XML_SCHEMAS_ELEM_ABSTRACT</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1020,7 +942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34274"
+NAME="AEN33997"
 ></A
 ><H3
 ><A
@@ -1036,7 +958,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_TOPLEVEL	1 &lt;&lt; 5</PRE
+>#define     XML_SCHEMAS_ELEM_TOPLEVEL</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1048,7 +970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34280"
+NAME="AEN34003"
 ></A
 ><H3
 ><A
@@ -1064,7 +986,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_ELEM_REF		1 &lt;&lt; 6</PRE
+>#define     XML_SCHEMAS_ELEM_REF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1076,7 +998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34286"
+NAME="AEN34009"
 ></A
 ><H3
 ><A
@@ -1130,33 +1052,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34292"
+NAME="AEN34015"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAELEMENTPTR"
 ></A
 >xmlSchemaElementPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaElement *xmlSchemaElementPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34297"
+NAME="AEN34019"
 ></A
 ><H3
 ><A
@@ -1172,7 +1081,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_FACET_UNKNOWN	0</PRE
+>#define     XML_SCHEMAS_FACET_UNKNOWN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1182,7 +1091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34302"
+NAME="AEN34024"
 ></A
 ><H3
 ><A
@@ -1198,7 +1107,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_FACET_PRESERVE	1</PRE
+>#define     XML_SCHEMAS_FACET_PRESERVE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1208,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34307"
+NAME="AEN34029"
 ></A
 ><H3
 ><A
@@ -1224,7 +1133,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_FACET_REPLACE	2</PRE
+>#define     XML_SCHEMAS_FACET_REPLACE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1234,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34312"
+NAME="AEN34034"
 ></A
 ><H3
 ><A
@@ -1250,7 +1159,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_FACET_COLLAPSE	3</PRE
+>#define     XML_SCHEMAS_FACET_COLLAPSE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1260,7 +1169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34317"
+NAME="AEN34039"
 ></A
 ><H3
 ><A
@@ -1291,33 +1200,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34322"
+NAME="AEN34044"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMANOTATIONPTR"
 ></A
 >xmlSchemaNotationPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaNotation *xmlSchemaNotationPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34327"
+NAME="AEN34048"
 ></A
 ><H3
 ><A
@@ -1333,7 +1229,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_QUALIF_ELEM		1 &lt;&lt; 0</PRE
+>#define     XML_SCHEMAS_QUALIF_ELEM</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1345,7 +1241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34333"
+NAME="AEN34054"
 ></A
 ><H3
 ><A
@@ -1361,7 +1257,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SCHEMAS_QUALIF_ATTR		1 &lt;&lt; 1</PRE
+>#define     XML_SCHEMAS_QUALIF_ATTR</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1373,7 +1269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34339"
+NAME="AEN34060"
 ></A
 ><H3
 ><A
@@ -1417,7 +1313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34344"
+NAME="AEN34065"
 ></A
 ><H3
 ><A
@@ -1447,7 +1343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN34351"
+NAME="AEN34072"
 ></A
 ><P
 ></P
@@ -1474,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema type structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-threads.html b/doc/html/libxml-threads.html
index f170ab4..c58163b 100644
--- a/doc/html/libxml-threads.html
+++ b/doc/html/libxml-threads.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22983"
+NAME="AEN22767"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22986"
+NAME="AEN22770"
 ></A
 ><H2
 >Synopsis</H2
@@ -256,7 +256,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23017"
+NAME="AEN22801"
 ></A
 ><H2
 >Description</H2
@@ -266,14 +266,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23020"
+NAME="AEN22804"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23022"
+NAME="AEN22806"
 ></A
 ><H3
 ><A
@@ -299,33 +299,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23027"
+NAME="AEN22811"
 ></A
 ><H3
 ><A
 NAME="XMLMUTEXPTR"
 ></A
 >xmlMutexPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlMutex *xmlMutexPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23032"
+NAME="AEN22815"
 ></A
 ><H3
 ><A
@@ -351,33 +338,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23037"
+NAME="AEN22820"
 ></A
 ><H3
 ><A
 NAME="XMLRMUTEXPTR"
 ></A
 >xmlRMutexPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRMutex *xmlRMutexPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23042"
+NAME="AEN22824"
 ></A
 ><H3
 ><A
@@ -411,7 +385,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23050"
+NAME="AEN22832"
 ></A
 ><P
 ></P
@@ -439,7 +413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new simple mutex pointer or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -450,7 +424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23059"
+NAME="AEN22841"
 ></A
 ><H3
 ><A
@@ -483,7 +457,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23067"
+NAME="AEN22849"
 ></A
 ><P
 ></P
@@ -510,7 +484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the simple mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -521,7 +495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23076"
+NAME="AEN22858"
 ></A
 ><H3
 ><A
@@ -554,7 +528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23084"
+NAME="AEN22866"
 ></A
 ><P
 ></P
@@ -581,7 +555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the simple mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -592,7 +566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23093"
+NAME="AEN22875"
 ></A
 ><H3
 ><A
@@ -626,7 +600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23101"
+NAME="AEN22883"
 ></A
 ><P
 ></P
@@ -653,7 +627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the simple mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -664,7 +638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23110"
+NAME="AEN22892"
 ></A
 ><H3
 ><A
@@ -700,7 +674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23118"
+NAME="AEN22900"
 ></A
 ><P
 ></P
@@ -728,7 +702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new reentrant mutex pointer or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -739,7 +713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23127"
+NAME="AEN22909"
 ></A
 ><H3
 ><A
@@ -772,7 +746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23135"
+NAME="AEN22917"
 ></A
 ><P
 ></P
@@ -799,7 +773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reentrant mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -810,7 +784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23144"
+NAME="AEN22926"
 ></A
 ><H3
 ><A
@@ -843,7 +817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23152"
+NAME="AEN22934"
 ></A
 ><P
 ></P
@@ -870,7 +844,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reentrant mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -881,7 +855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23161"
+NAME="AEN22943"
 ></A
 ><H3
 ><A
@@ -915,7 +889,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23169"
+NAME="AEN22951"
 ></A
 ><P
 ></P
@@ -942,7 +916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reentrant mutex</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -953,7 +927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23178"
+NAME="AEN22960"
 ></A
 ><H3
 ><A
@@ -985,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23185"
+NAME="AEN22967"
 ></A
 ><H3
 ><A
@@ -1017,7 +991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23192"
+NAME="AEN22974"
 ></A
 ><H3
 ><A
@@ -1049,7 +1023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23199"
+NAME="AEN22981"
 ></A
 ><H3
 ><A
@@ -1079,7 +1053,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23206"
+NAME="AEN22988"
 ></A
 ><P
 ></P
@@ -1107,7 +1081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current thread ID number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1118,7 +1092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23215"
+NAME="AEN22997"
 ></A
 ><H3
 ><A
@@ -1148,7 +1122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23222"
+NAME="AEN23004"
 ></A
 ><P
 ></P
@@ -1176,7 +1150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the current thread is the main thread, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1187,7 +1161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23231"
+NAME="AEN23013"
 ></A
 ><H3
 ><A
@@ -1219,7 +1193,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23238"
+NAME="AEN23020"
 ></A
 ><H3
 ><A
@@ -1252,7 +1226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23246"
+NAME="AEN23028"
 ></A
 ><P
 ></P
@@ -1280,7 +1254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the thread global state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 2164ce1..a0fb511 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN5117"
+NAME="AEN5107"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN5120"
+NAME="AEN5110"
 ></A
 ><H2
 >Synopsis</H2
@@ -2052,7 +2052,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5636"
+NAME="AEN5626"
 ></A
 ><H2
 >Description</H2
@@ -2062,14 +2062,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5639"
+NAME="AEN5629"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5641"
+NAME="AEN5631"
 ></A
 ><H3
 ><A
@@ -2104,33 +2104,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5646"
+NAME="AEN5636"
 ></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="AEN5651"
+NAME="AEN5640"
 ></A
 ><H3
 ><A
@@ -2166,33 +2153,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5656"
+NAME="AEN5645"
 ></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="AEN5661"
+NAME="AEN5649"
 ></A
 ><H3
 ><A
@@ -2242,33 +2216,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5667"
+NAME="AEN5655"
 ></A
 ><H3
 ><A
 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="AEN5672"
+NAME="AEN5659"
 ></A
 ><H3
 ><A
@@ -2378,33 +2339,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5678"
+NAME="AEN5665"
 ></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="AEN5683"
+NAME="AEN5669"
 ></A
 ><H3
 ><A
@@ -2437,33 +2385,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5689"
+NAME="AEN5675"
 ></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="AEN5694"
+NAME="AEN5679"
 ></A
 ><H3
 ><A
@@ -2521,33 +2456,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5700"
+NAME="AEN5685"
 ></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="AEN5705"
+NAME="AEN5689"
 ></A
 ><H3
 ><A
@@ -2594,33 +2516,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5710"
+NAME="AEN5694"
 ></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="AEN5715"
+NAME="AEN5698"
 ></A
 ><H3
 ><A
@@ -2636,7 +2545,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define BASE_BUFFER_SIZE 4000</PRE
+>#define     BASE_BUFFER_SIZE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2648,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5721"
+NAME="AEN5704"
 ></A
 ><H3
 ><A
@@ -2677,7 +2586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5727"
+NAME="AEN5710"
 ></A
 ><H3
 ><A
@@ -2727,26 +2636,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5732"
+NAME="AEN5715"
 ></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
@@ -2757,7 +2653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5738"
+NAME="AEN5720"
 ></A
 ><H3
 ><A
@@ -2773,7 +2669,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define BAD_CAST (xmlChar *)</PRE
+>#define     BAD_CAST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2785,7 +2681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5744"
+NAME="AEN5726"
 ></A
 ><H3
 ><A
@@ -2817,33 +2713,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5750"
+NAME="AEN5732"
 ></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="AEN5755"
+NAME="AEN5736"
 ></A
 ><H3
 ><A
@@ -2882,7 +2765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5761"
+NAME="AEN5742"
 ></A
 ><H3
 ><A
@@ -2915,7 +2798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5767"
+NAME="AEN5748"
 ></A
 ><H3
 ><A
@@ -2946,33 +2829,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5773"
+NAME="AEN5754"
 ></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="AEN5778"
+NAME="AEN5758"
 ></A
 ><H3
 ><A
@@ -3018,33 +2888,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5784"
+NAME="AEN5764"
 ></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="AEN5789"
+NAME="AEN5768"
 ></A
 ><H3
 ><A
@@ -3077,7 +2934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5795"
+NAME="AEN5774"
 ></A
 ><H3
 ><A
@@ -3110,7 +2967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5801"
+NAME="AEN5780"
 ></A
 ><H3
 ><A
@@ -3147,33 +3004,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5807"
+NAME="AEN5786"
 ></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="AEN5812"
+NAME="AEN5790"
 ></A
 ><H3
 ><A
@@ -3207,7 +3051,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5818"
+NAME="AEN5796"
 ></A
 ><H3
 ><A
@@ -3255,33 +3099,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5824"
+NAME="AEN5802"
 ></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="AEN5829"
+NAME="AEN5806"
 ></A
 ><H3
 ><A
@@ -3297,7 +3128,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL</PRE
+>#define     XML_LOCAL_NAMESPACE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -3309,33 +3140,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5835"
+NAME="AEN5812"
 ></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="AEN5840"
+NAME="AEN5816"
 ></A
 ><H3
 ><A
@@ -3373,33 +3191,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5847"
+NAME="AEN5823"
 ></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="AEN5852"
+NAME="AEN5827"
 ></A
 ><H3
 ><A
@@ -3447,33 +3252,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5858"
+NAME="AEN5833"
 ></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="AEN5863"
+NAME="AEN5837"
 ></A
 ><H3
 ><A
@@ -3513,33 +3305,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5869"
+NAME="AEN5843"
 ></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="AEN5874"
+NAME="AEN5847"
 ></A
 ><H3
 ><A
@@ -3573,33 +3352,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5880"
+NAME="AEN5853"
 ></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="AEN5885"
+NAME="AEN5857"
 ></A
 ><H3
 ><A
@@ -3633,33 +3399,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5891"
+NAME="AEN5863"
 ></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="AEN5896"
+NAME="AEN5867"
 ></A
 ><H3
 ><A
@@ -3691,7 +3444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5902"
+NAME="AEN5873"
 ></A
 ><H3
 ><A
@@ -3724,33 +3477,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5908"
+NAME="AEN5879"
 ></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="AEN5913"
+NAME="AEN5883"
 ></A
 ><H3
 ><A
@@ -3794,33 +3534,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5919"
+NAME="AEN5889"
 ></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="AEN5924"
+NAME="AEN5893"
 ></A
 ><H3
 ><A
@@ -3847,7 +3574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5930"
+NAME="AEN5899"
 ></A
 ><P
 ></P
@@ -3885,7 +3612,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5939"
+NAME="AEN5908"
 ></A
 ><H3
 ><A
@@ -3914,7 +3641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5945"
+NAME="AEN5914"
 ></A
 ><P
 ></P
@@ -3952,7 +3679,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5954"
+NAME="AEN5923"
 ></A
 ><H3
 ><A
@@ -4004,33 +3731,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5960"
+NAME="AEN5929"
 ></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="AEN5965"
+NAME="AEN5933"
 ></A
 ><H3
 ><A
@@ -4046,7 +3760,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlChildrenNode children</PRE
+>#define     xmlChildrenNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4058,7 +3772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5971"
+NAME="AEN5939"
 ></A
 ><H3
 ><A
@@ -4074,7 +3788,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlRootNode children</PRE
+>#define     xmlRootNode</PRE
 ></TD
 ></TR
 ></TABLE
@@ -4086,7 +3800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5977"
+NAME="AEN5945"
 ></A
 ><H3
 ><A
@@ -4117,7 +3831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5984"
+NAME="AEN5952"
 ></A
 ><P
 ></P
@@ -4144,7 +3858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4161,7 +3875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> allow spaces in front and end of the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4179,8 +3893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4191,7 +3904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6001"
+NAME="AEN5969"
 ></A
 ><H3
 ><A
@@ -4222,7 +3935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6008"
+NAME="AEN5976"
 ></A
 ><P
 ></P
@@ -4249,7 +3962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4266,7 +3979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> allow spaces in front and end of the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4284,8 +3997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4296,7 +4008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6025"
+NAME="AEN5993"
 ></A
 ><H3
 ><A
@@ -4327,7 +4039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6032"
+NAME="AEN6000"
 ></A
 ><P
 ></P
@@ -4354,7 +4066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4371,7 +4083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> allow spaces in front and end of the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4389,8 +4101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4401,7 +4112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6049"
+NAME="AEN6017"
 ></A
 ><H3
 ><A
@@ -4432,7 +4143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6056"
+NAME="AEN6024"
 ></A
 ><P
 ></P
@@ -4459,7 +4170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4476,7 +4187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> allow spaces in front and end of the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4494,8 +4205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4506,7 +4216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6073"
+NAME="AEN6041"
 ></A
 ><H3
 ><A
@@ -4539,7 +4249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6080"
+NAME="AEN6048"
 ></A
 ><P
 ></P
@@ -4566,7 +4276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  allocation method to use</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4577,7 +4287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6089"
+NAME="AEN6057"
 ></A
 ><H3
 ><A
@@ -4611,7 +4321,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6096"
+NAME="AEN6064"
 ></A
 ><P
 ></P
@@ -4639,7 +4349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current allocation scheme</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4650,7 +4360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6105"
+NAME="AEN6073"
 ></A
 ><H3
 ><A
@@ -4680,7 +4390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6112"
+NAME="AEN6080"
 ></A
 ><P
 ></P
@@ -4708,7 +4418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4719,7 +4429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6121"
+NAME="AEN6089"
 ></A
 ><H3
 ><A
@@ -4752,7 +4462,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6129"
+NAME="AEN6097"
 ></A
 ><P
 ></P
@@ -4779,7 +4489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> initial size of buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4797,7 +4507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4808,7 +4518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6142"
+NAME="AEN6110"
 ></A
 ><H3
 ><A
@@ -4844,7 +4554,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6150"
+NAME="AEN6118"
 ></A
 ><P
 ></P
@@ -4871,7 +4581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to resize</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4888,7 +4598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the desired size</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4906,7 +4616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of problems, 1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4917,7 +4627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6167"
+NAME="AEN6135"
 ></A
 ><H3
 ><A
@@ -4948,7 +4658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6174"
+NAME="AEN6142"
 ></A
 ><P
 ></P
@@ -4975,7 +4685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4986,7 +4696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6183"
+NAME="AEN6151"
 ></A
 ><H3
 ><A
@@ -5020,7 +4730,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6191"
+NAME="AEN6159"
 ></A
 ><P
 ></P
@@ -5047,7 +4757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5064,7 +4774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5082,10 +4792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5096,7 +4803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6209"
+NAME="AEN6176"
 ></A
 ><H3
 ><A
@@ -5132,7 +4839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6217"
+NAME="AEN6184"
 ></A
 ><P
 ></P
@@ -5159,7 +4866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5176,10 +4883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5196,10 +4900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5210,7 +4911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6236"
+NAME="AEN6201"
 ></A
 ><H3
 ><A
@@ -5251,7 +4952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6245"
+NAME="AEN6210"
 ></A
 ><P
 ></P
@@ -5278,7 +4979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5295,10 +4996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5315,10 +5013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5329,7 +5024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6264"
+NAME="AEN6227"
 ></A
 ><H3
 ><A
@@ -5363,7 +5058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6272"
+NAME="AEN6235"
 ></A
 ><P
 ></P
@@ -5390,7 +5085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5407,10 +5102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5421,7 +5113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6286"
+NAME="AEN6248"
 ></A
 ><H3
 ><A
@@ -5452,7 +5144,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6293"
+NAME="AEN6255"
 ></A
 ><P
 ></P
@@ -5479,7 +5171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5496,7 +5188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the C char string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5507,7 +5199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6306"
+NAME="AEN6268"
 ></A
 ><H3
 ><A
@@ -5538,7 +5230,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6313"
+NAME="AEN6275"
 ></A
 ><P
 ></P
@@ -5565,7 +5257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5582,7 +5274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5600,10 +5292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> removed, or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5614,7 +5303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6331"
+NAME="AEN6292"
 ></A
 ><H3
 ><A
@@ -5645,7 +5334,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6338"
+NAME="AEN6299"
 ></A
 ><P
 ></P
@@ -5672,7 +5361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5689,7 +5378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimum free size to allocate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5707,7 +5396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new available space or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5718,7 +5407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6355"
+NAME="AEN6316"
 ></A
 ><H3
 ><A
@@ -5748,7 +5437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6362"
+NAME="AEN6323"
 ></A
 ><P
 ></P
@@ -5775,7 +5464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5786,7 +5475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6371"
+NAME="AEN6332"
 ></A
 ><H3
 ><A
@@ -5819,7 +5508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6379"
+NAME="AEN6340"
 ></A
 ><P
 ></P
@@ -5846,7 +5535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5864,7 +5553,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5875,7 +5564,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6392"
+NAME="AEN6353"
 ></A
 ><H3
 ><A
@@ -5909,7 +5598,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6400"
+NAME="AEN6361"
 ></A
 ><P
 ></P
@@ -5936,7 +5625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to tune</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5953,7 +5642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  allocation scheme to use</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5964,7 +5653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6413"
+NAME="AEN6374"
 ></A
 ><H3
 ><A
@@ -5994,7 +5683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6420"
+NAME="AEN6381"
 ></A
 ><P
 ></P
@@ -6021,7 +5710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6039,7 +5728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the length of data in the internal content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6050,7 +5739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6433"
+NAME="AEN6394"
 ></A
 ><H3
 ><A
@@ -6095,7 +5784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6444"
+NAME="AEN6405"
 ></A
 ><P
 ></P
@@ -6122,7 +5811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6139,7 +5828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6156,7 +5845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external (PUBLIC) ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6173,7 +5862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6191,7 +5880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6202,7 +5891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6469"
+NAME="AEN6430"
 ></A
 ><H3
 ><A
@@ -6251,7 +5940,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6481"
+NAME="AEN6442"
 ></A
 ><P
 ></P
@@ -6278,7 +5967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6295,7 +5984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6312,7 +6001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6329,7 +6018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6347,7 +6036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6358,7 +6047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6506"
+NAME="AEN6467"
 ></A
 ><H3
 ><A
@@ -6391,7 +6080,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6514"
+NAME="AEN6475"
 ></A
 ><P
 ></P
@@ -6418,7 +6107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6436,7 +6125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the DTD structure or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6447,7 +6136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6527"
+NAME="AEN6488"
 ></A
 ><H3
 ><A
@@ -6477,7 +6166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6534"
+NAME="AEN6495"
 ></A
 ><P
 ></P
@@ -6504,7 +6193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD structure to free up</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6515,7 +6204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6543"
+NAME="AEN6504"
 ></A
 ><H3
 ><A
@@ -6558,7 +6247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6553"
+NAME="AEN6514"
 ></A
 ><P
 ></P
@@ -6585,7 +6274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6602,7 +6291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6619,7 +6308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6637,7 +6326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL this functionality had been removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6648,7 +6337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6574"
+NAME="AEN6535"
 ></A
 ><H3
 ><A
@@ -6693,7 +6382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6584"
+NAME="AEN6545"
 ></A
 ><P
 ></P
@@ -6720,7 +6409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6737,7 +6426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6754,7 +6443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6772,7 +6461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new namespace pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6783,7 +6472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6605"
+NAME="AEN6566"
 ></A
 ><H3
 ><A
@@ -6813,7 +6502,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6612"
+NAME="AEN6573"
 ></A
 ><P
 ></P
@@ -6840,7 +6529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6851,7 +6540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6621"
+NAME="AEN6582"
 ></A
 ><H3
 ><A
@@ -6881,7 +6570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6628"
+NAME="AEN6589"
 ></A
 ><P
 ></P
@@ -6908,7 +6597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6919,7 +6608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6637"
+NAME="AEN6598"
 ></A
 ><H3
 ><A
@@ -6952,7 +6641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6645"
+NAME="AEN6606"
 ></A
 ><P
 ></P
@@ -6979,7 +6668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  xmlChar string giving the version of XML "1.0"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6997,7 +6686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7008,7 +6697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6658"
+NAME="AEN6619"
 ></A
 ><H3
 ><A
@@ -7038,7 +6727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6665"
+NAME="AEN6626"
 ></A
 ><P
 ></P
@@ -7065,7 +6754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7076,7 +6765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6674"
+NAME="AEN6635"
 ></A
 ><H3
 ><A
@@ -7117,7 +6806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6684"
+NAME="AEN6645"
 ></A
 ><P
 ></P
@@ -7144,7 +6833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7161,7 +6850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7178,7 +6867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7196,7 +6885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7207,7 +6896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6705"
+NAME="AEN6666"
 ></A
 ><H3
 ><A
@@ -7248,7 +6937,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6715"
+NAME="AEN6676"
 ></A
 ><P
 ></P
@@ -7275,7 +6964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7292,7 +6981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7309,7 +6998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7327,7 +7016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7338,7 +7027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6736"
+NAME="AEN6697"
 ></A
 ><H3
 ><A
@@ -7383,7 +7072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6747"
+NAME="AEN6708"
 ></A
 ><P
 ></P
@@ -7410,7 +7099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7427,7 +7116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7444,7 +7133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7461,7 +7150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7479,7 +7168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7490,7 +7179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6772"
+NAME="AEN6733"
 ></A
 ><H3
 ><A
@@ -7535,7 +7224,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6783"
+NAME="AEN6744"
 ></A
 ><P
 ></P
@@ -7562,7 +7251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7579,7 +7268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7596,7 +7285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7613,7 +7302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7631,7 +7320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7642,7 +7331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6808"
+NAME="AEN6769"
 ></A
 ><H3
 ><A
@@ -7672,7 +7361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6815"
+NAME="AEN6776"
 ></A
 ><P
 ></P
@@ -7699,7 +7388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first property in the list</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7710,7 +7399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6824"
+NAME="AEN6785"
 ></A
 ><H3
 ><A
@@ -7740,7 +7429,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6831"
+NAME="AEN6792"
 ></A
 ><P
 ></P
@@ -7767,7 +7456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7778,7 +7467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6840"
+NAME="AEN6801"
 ></A
 ><H3
 ><A
@@ -7815,7 +7504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6849"
+NAME="AEN6810"
 ></A
 ><P
 ></P
@@ -7842,7 +7531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attribute will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7859,7 +7548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7877,10 +7566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7891,7 +7577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6867"
+NAME="AEN6827"
 ></A
 ><H3
 ><A
@@ -7928,7 +7614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6876"
+NAME="AEN6836"
 ></A
 ><P
 ></P
@@ -7955,7 +7641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attributes will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7972,7 +7658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7990,10 +7676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8004,7 +7687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6894"
+NAME="AEN6853"
 ></A
 ><H3
 ><A
@@ -8037,7 +7720,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6902"
+NAME="AEN6861"
 ></A
 ><P
 ></P
@@ -8064,7 +7747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the dtd</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8082,10 +7765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLDTDPTR"
->xmlDtdPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8096,7 +7776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6916"
+NAME="AEN6874"
 ></A
 ><H3
 ><A
@@ -8131,7 +7811,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6924"
+NAME="AEN6882"
 ></A
 ><P
 ></P
@@ -8158,7 +7838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8175,7 +7855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8193,10 +7873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8207,7 +7884,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6942"
+NAME="AEN6899"
 ></A
 ><H3
 ><A
@@ -8278,7 +7955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6958"
+NAME="AEN6915"
 ></A
 ><P
 ></P
@@ -8305,7 +7982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8322,7 +7999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8339,7 +8016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8356,7 +8033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8374,7 +8051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8385,7 +8062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6983"
+NAME="AEN6940"
 ></A
 ><H3
 ><A
@@ -8456,7 +8133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6999"
+NAME="AEN6956"
 ></A
 ><P
 ></P
@@ -8483,7 +8160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8500,7 +8177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8517,7 +8194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8534,7 +8211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8552,7 +8229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8563,7 +8240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7024"
+NAME="AEN6981"
 ></A
 ><H3
 ><A
@@ -8619,7 +8296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7037"
+NAME="AEN6994"
 ></A
 ><P
 ></P
@@ -8646,7 +8323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8663,7 +8340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8680,7 +8357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8697,7 +8374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8715,7 +8392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8726,7 +8403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7062"
+NAME="AEN7019"
 ></A
 ><H3
 ><A
@@ -8768,7 +8445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7072"
+NAME="AEN7029"
 ></A
 ><P
 ></P
@@ -8795,7 +8472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8812,7 +8489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8830,7 +8507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8841,7 +8518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7089"
+NAME="AEN7046"
 ></A
 ><H3
 ><A
@@ -8883,7 +8560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7099"
+NAME="AEN7056"
 ></A
 ><P
 ></P
@@ -8910,7 +8587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8927,7 +8604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8945,7 +8622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8956,7 +8633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7116"
+NAME="AEN7073"
 ></A
 ><H3
 ><A
@@ -9033,7 +8710,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7133"
+NAME="AEN7090"
 ></A
 ><P
 ></P
@@ -9060,7 +8737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9077,7 +8754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9094,7 +8771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9111,7 +8788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9129,7 +8806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9140,7 +8817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7158"
+NAME="AEN7115"
 ></A
 ><H3
 ><A
@@ -9202,7 +8879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7172"
+NAME="AEN7129"
 ></A
 ><P
 ></P
@@ -9229,7 +8906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9246,7 +8923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9263,7 +8940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9280,7 +8957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9298,7 +8975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9309,7 +8986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7197"
+NAME="AEN7154"
 ></A
 ><H3
 ><A
@@ -9346,7 +9023,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7206"
+NAME="AEN7163"
 ></A
 ><P
 ></P
@@ -9373,7 +9050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9390,7 +9067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9408,7 +9085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9419,7 +9096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7223"
+NAME="AEN7180"
 ></A
 ><H3
 ><A
@@ -9452,7 +9129,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7231"
+NAME="AEN7188"
 ></A
 ><P
 ></P
@@ -9479,7 +9156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9497,7 +9174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9508,7 +9185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7244"
+NAME="AEN7201"
 ></A
 ><H3
 ><A
@@ -9545,7 +9222,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7253"
+NAME="AEN7210"
 ></A
 ><P
 ></P
@@ -9572,7 +9249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the processing instruction name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9589,7 +9266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the PI content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9607,7 +9284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9618,7 +9295,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7270"
+NAME="AEN7227"
 ></A
 ><H3
 ><A
@@ -9657,7 +9334,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7279"
+NAME="AEN7236"
 ></A
 ><P
 ></P
@@ -9684,7 +9361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9701,7 +9378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9718,7 +9395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9736,7 +9413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9747,7 +9424,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7300"
+NAME="AEN7257"
 ></A
 ><H3
 ><A
@@ -9781,7 +9458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7308"
+NAME="AEN7265"
 ></A
 ><P
 ></P
@@ -9808,7 +9485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9825,7 +9502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9843,7 +9520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9854,7 +9531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7325"
+NAME="AEN7282"
 ></A
 ><H3
 ><A
@@ -9891,7 +9568,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7334"
+NAME="AEN7291"
 ></A
 ><P
 ></P
@@ -9918,7 +9595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9935,7 +9612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9953,7 +9630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9964,7 +9641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7351"
+NAME="AEN7308"
 ></A
 ><H3
 ><A
@@ -9997,7 +9674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7359"
+NAME="AEN7316"
 ></A
 ><P
 ></P
@@ -10024,7 +9701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10042,7 +9719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10053,7 +9730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7372"
+NAME="AEN7329"
 ></A
 ><H3
 ><A
@@ -10091,7 +9768,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7381"
+NAME="AEN7338"
 ></A
 ><P
 ></P
@@ -10118,7 +9795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10135,7 +9812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the CDATA block content content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10152,7 +9829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10170,7 +9847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10181,7 +9858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7402"
+NAME="AEN7359"
 ></A
 ><H3
 ><A
@@ -10218,7 +9895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7411"
+NAME="AEN7368"
 ></A
 ><P
 ></P
@@ -10245,7 +9922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10262,7 +9939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char ref string, starting with # or "&amp;# ... ;"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10280,7 +9957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10291,7 +9968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7428"
+NAME="AEN7385"
 ></A
 ><H3
 ><A
@@ -10328,7 +10005,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7437"
+NAME="AEN7394"
 ></A
 ><P
 ></P
@@ -10355,7 +10032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10372,7 +10049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reference name, or the reference string with &amp; and ;</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10390,7 +10067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10401,7 +10078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7454"
+NAME="AEN7411"
 ></A
 ><H3
 ><A
@@ -10435,7 +10112,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7462"
+NAME="AEN7419"
 ></A
 ><P
 ></P
@@ -10462,7 +10139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10479,7 +10156,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10497,10 +10174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10511,7 +10185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7480"
+NAME="AEN7436"
 ></A
 ><H3
 ><A
@@ -10549,7 +10223,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7489"
+NAME="AEN7445"
 ></A
 ><P
 ></P
@@ -10576,7 +10250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10593,7 +10267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10610,7 +10284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10628,10 +10302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10642,7 +10313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7511"
+NAME="AEN7466"
 ></A
 ><H3
 ><A
@@ -10675,7 +10346,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7519"
+NAME="AEN7474"
 ></A
 ><P
 ></P
@@ -10702,7 +10373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10720,10 +10391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10734,7 +10402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7533"
+NAME="AEN7487"
 ></A
 ><H3
 ><A
@@ -10767,7 +10435,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7541"
+NAME="AEN7495"
 ></A
 ><P
 ></P
@@ -10794,7 +10462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document owning the fragment</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10812,7 +10480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10823,7 +10491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7554"
+NAME="AEN7508"
 ></A
 ><H3
 ><A
@@ -10857,7 +10525,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7562"
+NAME="AEN7516"
 ></A
 ><P
 ></P
@@ -10884,7 +10552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> valid node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10902,7 +10570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the line number if successful, -1 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10913,7 +10581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7575"
+NAME="AEN7529"
 ></A
 ><H3
 ><A
@@ -10946,7 +10614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7583"
+NAME="AEN7537"
 ></A
 ><P
 ></P
@@ -10973,7 +10641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10991,8 +10659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new path or NULL in case of error. The caller must free
-    the returned string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11003,7 +10670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7596"
+NAME="AEN7550"
 ></A
 ><H3
 ><A
@@ -11037,7 +10704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7604"
+NAME="AEN7558"
 ></A
 ><P
 ></P
@@ -11064,7 +10731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11082,10 +10749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> for the root or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11096,7 +10760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7618"
+NAME="AEN7571"
 ></A
 ><H3
 ><A
@@ -11129,7 +10793,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7626"
+NAME="AEN7579"
 ></A
 ><P
 ></P
@@ -11156,7 +10820,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11174,7 +10838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL if none.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11185,7 +10849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7639"
+NAME="AEN7592"
 ></A
 ><H3
 ><A
@@ -11215,7 +10879,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7646"
+NAME="AEN7599"
 ></A
 ><P
 ></P
@@ -11242,7 +10906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11260,7 +10924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11271,7 +10935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7659"
+NAME="AEN7612"
 ></A
 ><H3
 ><A
@@ -11302,7 +10966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7666"
+NAME="AEN7619"
 ></A
 ><P
 ></P
@@ -11329,7 +10993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11347,7 +11011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11358,7 +11022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7679"
+NAME="AEN7632"
 ></A
 ><H3
 ><A
@@ -11396,7 +11060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7688"
+NAME="AEN7641"
 ></A
 ><P
 ></P
@@ -11423,7 +11087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11440,7 +11104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new document root element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11458,7 +11122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the old root element if any was found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11469,7 +11133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7705"
+NAME="AEN7658"
 ></A
 ><H3
 ><A
@@ -11503,7 +11167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7713"
+NAME="AEN7666"
 ></A
 ><P
 ></P
@@ -11530,7 +11194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11547,7 +11211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new tag name</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11558,7 +11222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7726"
+NAME="AEN7679"
 ></A
 ><H3
 ><A
@@ -11608,7 +11272,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7737"
+NAME="AEN7690"
 ></A
 ><P
 ></P
@@ -11635,7 +11299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11652,7 +11316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11670,7 +11334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11681,7 +11345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7754"
+NAME="AEN7707"
 ></A
 ><H3
 ><A
@@ -11724,7 +11388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7764"
+NAME="AEN7717"
 ></A
 ><P
 ></P
@@ -11751,7 +11415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11768,7 +11432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11786,7 +11450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11797,7 +11461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7781"
+NAME="AEN7734"
 ></A
 ><H3
 ><A
@@ -11841,7 +11505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7791"
+NAME="AEN7744"
 ></A
 ><P
 ></P
@@ -11868,7 +11532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the old node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11885,7 +11549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11903,12 +11567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the <TT
-CLASS="PARAMETER"
-><I
->old</I
-></TT
-> node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11919,7 +11578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7809"
+NAME="AEN7761"
 ></A
 ><H3
 ><A
@@ -11974,7 +11633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7821"
+NAME="AEN7773"
 ></A
 ><P
 ></P
@@ -12001,7 +11660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12018,7 +11677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12036,7 +11695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12047,7 +11706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7838"
+NAME="AEN7790"
 ></A
 ><H3
 ><A
@@ -12104,7 +11763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7850"
+NAME="AEN7802"
 ></A
 ><P
 ></P
@@ -12131,7 +11790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12148,7 +11807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12166,7 +11825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new node or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12177,7 +11836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7867"
+NAME="AEN7819"
 ></A
 ><H3
 ><A
@@ -12234,7 +11893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7879"
+NAME="AEN7831"
 ></A
 ><P
 ></P
@@ -12261,7 +11920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12278,7 +11937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12296,7 +11955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new node or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12307,7 +11966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7896"
+NAME="AEN7848"
 ></A
 ><H3
 ><A
@@ -12337,7 +11996,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7903"
+NAME="AEN7855"
 ></A
 ><P
 ></P
@@ -12364,7 +12023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12375,7 +12034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7912"
+NAME="AEN7864"
 ></A
 ><H3
 ><A
@@ -12412,7 +12071,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7921"
+NAME="AEN7873"
 ></A
 ><P
 ></P
@@ -12439,7 +12098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first text node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12456,7 +12115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second text node being merged</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12474,7 +12133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the first text node augmented</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12485,7 +12144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7938"
+NAME="AEN7890"
 ></A
 ><H3
 ><A
@@ -12520,7 +12179,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7946"
+NAME="AEN7898"
 ></A
 ><P
 ></P
@@ -12547,7 +12206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12564,7 +12223,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12581,12 +12240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-> length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12597,7 +12251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7964"
+NAME="AEN7915"
 ></A
 ><H3
 ><A
@@ -12628,7 +12282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7971"
+NAME="AEN7922"
 ></A
 ><P
 ></P
@@ -12655,7 +12309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12666,7 +12320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7980"
+NAME="AEN7931"
 ></A
 ><H3
 ><A
@@ -12700,7 +12354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7988"
+NAME="AEN7939"
 ></A
 ><P
 ></P
@@ -12727,7 +12381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12738,7 +12392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7997"
+NAME="AEN7948"
 ></A
 ><H3
 ><A
@@ -12772,7 +12426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8005"
+NAME="AEN7956"
 ></A
 ><P
 ></P
@@ -12799,7 +12453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the top element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12816,7 +12470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12827,7 +12481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8018"
+NAME="AEN7969"
 ></A
 ><H3
 ><A
@@ -12861,7 +12515,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8026"
+NAME="AEN7977"
 ></A
 ><P
 ></P
@@ -12888,7 +12542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12905,7 +12559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12916,7 +12570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8039"
+NAME="AEN7990"
 ></A
 ><H3
 ><A
@@ -12968,7 +12622,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8050"
+NAME="AEN8001"
 ></A
 ><P
 ></P
@@ -12995,7 +12649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13012,7 +12666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13029,7 +12683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13047,7 +12701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13058,7 +12712,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8071"
+NAME="AEN8022"
 ></A
 ><H3
 ><A
@@ -13100,7 +12754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8081"
+NAME="AEN8032"
 ></A
 ><P
 ></P
@@ -13127,7 +12781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13144,7 +12798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13161,7 +12815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13179,7 +12833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13190,7 +12844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8102"
+NAME="AEN8053"
 ></A
 ><H3
 ><A
@@ -13227,7 +12881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8111"
+NAME="AEN8062"
 ></A
 ><P
 ></P
@@ -13254,7 +12908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13271,7 +12925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13289,12 +12943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an NULL terminated array of all the <A
-HREF="libxml-tree.html#XMLNSPTR"
->xmlNsPtr</A
-> found
-        that need to be freed by the caller or NULL if no
-        namespace if defined</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13305,7 +12954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8129"
+NAME="AEN8079"
 ></A
 ><H3
 ><A
@@ -13339,7 +12988,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8137"
+NAME="AEN8087"
 ></A
 ><P
 ></P
@@ -13366,7 +13015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13383,7 +13032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13394,7 +13043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8150"
+NAME="AEN8100"
 ></A
 ><H3
 ><A
@@ -13427,7 +13076,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8158"
+NAME="AEN8108"
 ></A
 ><P
 ></P
@@ -13454,7 +13103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13472,10 +13121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLNSPTR"
->xmlNsPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13486,7 +13132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8172"
+NAME="AEN8121"
 ></A
 ><H3
 ><A
@@ -13519,7 +13165,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8180"
+NAME="AEN8129"
 ></A
 ><P
 ></P
@@ -13546,7 +13192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13564,10 +13210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new <A
-HREF="libxml-tree.html#XMLNSPTR"
->xmlNsPtr</A
->, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13578,7 +13221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8194"
+NAME="AEN8142"
 ></A
 ><H3
 ><A
@@ -13619,7 +13262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8204"
+NAME="AEN8152"
 ></A
 ><P
 ></P
@@ -13646,7 +13289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13663,7 +13306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13680,7 +13323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13698,7 +13341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13709,7 +13352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8225"
+NAME="AEN8173"
 ></A
 ><H3
 ><A
@@ -13761,7 +13404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8237"
+NAME="AEN8185"
 ></A
 ><P
 ></P
@@ -13788,7 +13431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13805,7 +13448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13823,11 +13466,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 with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13838,7 +13477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8255"
+NAME="AEN8202"
 ></A
 ><H3
 ><A
@@ -13883,7 +13522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8265"
+NAME="AEN8212"
 ></A
 ><P
 ></P
@@ -13910,7 +13549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13927,7 +13566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13945,11 +13584,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 with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13960,7 +13595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8283"
+NAME="AEN8229"
 ></A
 ><H3
 ><A
@@ -14002,7 +13637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8293"
+NAME="AEN8239"
 ></A
 ><P
 ></P
@@ -14029,7 +13664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14046,7 +13681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14064,8 +13699,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
@@ -14076,7 +13710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8310"
+NAME="AEN8256"
 ></A
 ><H3
 ><A
@@ -14124,7 +13758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8321"
+NAME="AEN8267"
 ></A
 ><P
 ></P
@@ -14151,7 +13785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14168,7 +13802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14185,7 +13819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14203,8 +13837,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
@@ -14215,7 +13848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8342"
+NAME="AEN8288"
 ></A
 ><H3
 ><A
@@ -14261,7 +13894,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8353"
+NAME="AEN8299"
 ></A
 ><P
 ></P
@@ -14288,7 +13921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14305,7 +13938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14322,7 +13955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14339,7 +13972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14357,7 +13990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14368,7 +14001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8378"
+NAME="AEN8324"
 ></A
 ><H3
 ><A
@@ -14416,7 +14049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8389"
+NAME="AEN8335"
 ></A
 ><P
 ></P
@@ -14443,7 +14076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14460,7 +14093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14477,7 +14110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14495,11 +14128,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 with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14510,7 +14139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8411"
+NAME="AEN8356"
 ></A
 ><H3
 ><A
@@ -14548,7 +14177,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8420"
+NAME="AEN8365"
 ></A
 ><P
 ></P
@@ -14575,7 +14204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14592,7 +14221,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14610,7 +14239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14621,7 +14250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8437"
+NAME="AEN8382"
 ></A
 ><H3
 ><A
@@ -14660,7 +14289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8446"
+NAME="AEN8391"
 ></A
 ><P
 ></P
@@ -14687,7 +14316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14704,7 +14333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14721,7 +14350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the string value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14739,7 +14368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14750,7 +14379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8467"
+NAME="AEN8412"
 ></A
 ><H3
 ><A
@@ -14789,7 +14418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8476"
+NAME="AEN8421"
 ></A
 ><P
 ></P
@@ -14816,7 +14445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14833,7 +14462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14850,7 +14479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14868,10 +14497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the caller must free it with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14882,7 +14508,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8498"
+NAME="AEN8442"
 ></A
 ><H3
 ><A
@@ -14925,7 +14551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8508"
+NAME="AEN8452"
 ></A
 ><P
 ></P
@@ -14952,7 +14578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14969,7 +14595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14986,7 +14612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15004,10 +14630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the caller must free it with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15018,7 +14641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8530"
+NAME="AEN8473"
 ></A
 ><H3
 ><A
@@ -15052,7 +14675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8538"
+NAME="AEN8481"
 ></A
 ><P
 ></P
@@ -15079,7 +14702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15096,7 +14719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15107,7 +14730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8551"
+NAME="AEN8494"
 ></A
 ><H3
 ><A
@@ -15142,7 +14765,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8559"
+NAME="AEN8502"
 ></A
 ><P
 ></P
@@ -15169,7 +14792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15186,7 +14809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15203,12 +14826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15219,7 +14837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8577"
+NAME="AEN8519"
 ></A
 ><H3
 ><A
@@ -15253,7 +14871,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8585"
+NAME="AEN8527"
 ></A
 ><P
 ></P
@@ -15280,7 +14898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15297,7 +14915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15308,7 +14926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8598"
+NAME="AEN8540"
 ></A
 ><H3
 ><A
@@ -15343,7 +14961,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8606"
+NAME="AEN8548"
 ></A
 ><P
 ></P
@@ -15370,7 +14988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15387,7 +15005,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15404,12 +15022,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15420,7 +15033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8624"
+NAME="AEN8565"
 ></A
 ><H3
 ><A
@@ -15456,7 +15069,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8632"
+NAME="AEN8573"
 ></A
 ><P
 ></P
@@ -15483,7 +15096,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15501,14 +15114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> * or NULL if no content is available.
-    It's up to the caller to free the memory with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15519,7 +15125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8647"
+NAME="AEN8586"
 ></A
 ><H3
 ><A
@@ -15553,7 +15159,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8655"
+NAME="AEN8594"
 ></A
 ><P
 ></P
@@ -15580,7 +15186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15598,11 +15204,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 with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15613,7 +15215,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8669"
+NAME="AEN8607"
 ></A
 ><H3
 ><A
@@ -15648,7 +15250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8677"
+NAME="AEN8615"
 ></A
 ><P
 ></P
@@ -15675,7 +15277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15692,7 +15294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the language description</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15703,7 +15305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8690"
+NAME="AEN8628"
 ></A
 ><H3
 ><A
@@ -15735,7 +15337,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8697"
+NAME="AEN8635"
 ></A
 ><P
 ></P
@@ -15762,7 +15364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15780,7 +15382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if xml:space is not inherited, 0 if "default", 1 if "preserve"</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15791,7 +15393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8710"
+NAME="AEN8648"
 ></A
 ><H3
 ><A
@@ -15823,7 +15425,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8717"
+NAME="AEN8655"
 ></A
 ><P
 ></P
@@ -15850,7 +15452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15867,7 +15469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xml:space value ("0": default, 1: "preserve")</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15878,7 +15480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8730"
+NAME="AEN8668"
 ></A
 ><H3
 ><A
@@ -15925,7 +15527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8740"
+NAME="AEN8678"
 ></A
 ><P
 ></P
@@ -15952,7 +15554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document the node pertains to</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15969,7 +15571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15987,11 +15589,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 with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->().</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16002,7 +15600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8758"
+NAME="AEN8695"
 ></A
 ><H3
 ><A
@@ -16037,7 +15635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8766"
+NAME="AEN8703"
 ></A
 ><P
 ></P
@@ -16064,7 +15662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16081,7 +15679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new base URI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16092,7 +15690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8779"
+NAME="AEN8716"
 ></A
 ><H3
 ><A
@@ -16123,7 +15721,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8786"
+NAME="AEN8723"
 ></A
 ><P
 ></P
@@ -16150,7 +15748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16168,7 +15766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if success and -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16179,7 +15777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8799"
+NAME="AEN8736"
 ></A
 ><H3
 ><A
@@ -16213,7 +15811,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8807"
+NAME="AEN8744"
 ></A
 ><P
 ></P
@@ -16240,7 +15838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16257,7 +15855,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16275,7 +15873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16286,7 +15884,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8824"
+NAME="AEN8761"
 ></A
 ><H3
 ><A
@@ -16324,7 +15922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8833"
+NAME="AEN8770"
 ></A
 ><P
 ></P
@@ -16351,7 +15949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16368,7 +15966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16385,7 +15983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16403,7 +16001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if successful, -1 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16414,7 +16012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8854"
+NAME="AEN8791"
 ></A
 ><H3
 ><A
@@ -16449,7 +16047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8862"
+NAME="AEN8799"
 ></A
 ><P
 ></P
@@ -16476,7 +16074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16493,7 +16091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16504,7 +16102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8875"
+NAME="AEN8812"
 ></A
 ><H3
 ><A
@@ -16536,7 +16134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8882"
+NAME="AEN8819"
 ></A
 ><P
 ></P
@@ -16563,7 +16161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16580,7 +16178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16591,7 +16189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8895"
+NAME="AEN8832"
 ></A
 ><H3
 ><A
@@ -16630,7 +16228,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8904"
+NAME="AEN8841"
 ></A
 ><P
 ></P
@@ -16657,7 +16255,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16674,7 +16272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16685,7 +16283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8917"
+NAME="AEN8854"
 ></A
 ><H3
 ><A
@@ -16730,7 +16328,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8926"
+NAME="AEN8863"
 ></A
 ><P
 ></P
@@ -16757,7 +16355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16774,7 +16372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node defining the subtree to reconciliate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16792,7 +16390,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
@@ -16803,7 +16401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8943"
+NAME="AEN8880"
 ></A
 ><H3
 ><A
@@ -16853,7 +16451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8954"
+NAME="AEN8891"
 ></A
 ><P
 ></P
@@ -16880,7 +16478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16897,7 +16495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16914,7 +16512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -16931,7 +16529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -16942,7 +16540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8975"
+NAME="AEN8912"
 ></A
 ><H3
 ><A
@@ -16984,7 +16582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8985"
+NAME="AEN8922"
 ></A
 ><P
 ></P
@@ -17011,7 +16609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17028,7 +16626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17045,7 +16643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory length</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17056,7 +16654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9002"
+NAME="AEN8939"
 ></A
 ><H3
 ><A
@@ -17097,7 +16695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9011"
+NAME="AEN8948"
 ></A
 ><P
 ></P
@@ -17124,7 +16722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Document to generate XML text from</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17141,7 +16739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Memory pointer for allocated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17158,7 +16756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Length of the generated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17175,7 +16773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Character encoding to use when generating XML text</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17186,7 +16784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9032"
+NAME="AEN8969"
 ></A
 ><H3
 ><A
@@ -17235,7 +16833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9042"
+NAME="AEN8979"
 ></A
 ><P
 ></P
@@ -17262,7 +16860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Document to generate XML text from</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17279,7 +16877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Memory pointer for allocated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17296,7 +16894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Length of the generated XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17313,7 +16911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Character encoding to use when generating XML text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17330,7 +16928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17341,7 +16939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9067"
+NAME="AEN9004"
 ></A
 ><H3
 ><A
@@ -17376,7 +16974,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9075"
+NAME="AEN9012"
 ></A
 ><P
 ></P
@@ -17403,7 +17001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17420,7 +17018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17437,7 +17035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17455,14 +17053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.
-Note that <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> = 1 provide node indenting only if xmlIndentTreeOutput = 1
-or xmlKeepBlanksDefault(0) was called</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17473,7 +17064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9097"
+NAME="AEN9033"
 ></A
 ><H3
 ><A
@@ -17507,7 +17098,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9105"
+NAME="AEN9041"
 ></A
 ><P
 ></P
@@ -17534,7 +17125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17551,7 +17142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17569,7 +17160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17580,7 +17171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9122"
+NAME="AEN9058"
 ></A
 ><H3
 ><A
@@ -17618,7 +17209,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9131"
+NAME="AEN9067"
 ></A
 ><P
 ></P
@@ -17645,7 +17236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17662,7 +17253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17679,7 +17270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17690,7 +17281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9148"
+NAME="AEN9084"
 ></A
 ><H3
 ><A
@@ -17728,7 +17319,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9156"
+NAME="AEN9092"
 ></A
 ><P
 ></P
@@ -17755,7 +17346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17772,7 +17363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17790,7 +17381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17801,7 +17392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9173"
+NAME="AEN9109"
 ></A
 ><H3
 ><A
@@ -17852,7 +17443,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9183"
+NAME="AEN9119"
 ></A
 ><P
 ></P
@@ -17879,7 +17470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17896,7 +17487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17913,7 +17504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -17931,7 +17522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -17942,7 +17533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9204"
+NAME="AEN9140"
 ></A
 ><H3
 ><A
@@ -17989,7 +17580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9214"
+NAME="AEN9150"
 ></A
 ><P
 ></P
@@ -18016,7 +17607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18033,7 +17624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18050,7 +17641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18067,7 +17658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18084,7 +17675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18102,7 +17693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written to the buffer or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18113,7 +17704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9243"
+NAME="AEN9179"
 ></A
 ><H3
 ><A
@@ -18148,7 +17739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9251"
+NAME="AEN9187"
 ></A
 ><P
 ></P
@@ -18175,7 +17766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output I/O buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18192,7 +17783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18209,7 +17800,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
@@ -18227,7 +17818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18238,7 +17829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9272"
+NAME="AEN9208"
 ></A
 ><H3
 ><A
@@ -18274,7 +17865,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9280"
+NAME="AEN9216"
 ></A
 ><P
 ></P
@@ -18301,7 +17892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output I/O buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18318,7 +17909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18335,7 +17926,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
@@ -18352,7 +17943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> should formatting spaces been added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18370,14 +17961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.
-Note that <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> = 1 provide node indenting only if xmlIndentTreeOutput = 1
-or xmlKeepBlanksDefault(0) was called</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18388,7 +17972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9306"
+NAME="AEN9241"
 ></A
 ><H3
 ><A
@@ -18436,7 +18020,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9316"
+NAME="AEN9251"
 ></A
 ><P
 ></P
@@ -18463,7 +18047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18480,7 +18064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18497,7 +18081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18514,7 +18098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the imbrication level for indenting</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18531,7 +18115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> is formatting allowed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18548,7 +18132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18559,7 +18143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9345"
+NAME="AEN9280"
 ></A
 ><H3
 ><A
@@ -18592,7 +18176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9352"
+NAME="AEN9287"
 ></A
 ><P
 ></P
@@ -18619,7 +18203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename or URL to output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18636,7 +18220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document being saved</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18653,7 +18237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the encoding to use or NULL.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18670,7 +18254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should formatting spaces be added.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18688,14 +18272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written or -1 in case of error.
-Note that <TT
-CLASS="PARAMETER"
-><I
->format</I
-></TT
-> = 1 provide node indenting only if xmlIndentTreeOutput = 1
-or xmlKeepBlanksDefault(0) was called</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18706,7 +18283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9378"
+NAME="AEN9312"
 ></A
 ><H3
 ><A
@@ -18738,7 +18315,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9385"
+NAME="AEN9319"
 ></A
 ><P
 ></P
@@ -18765,7 +18342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename (or URL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18782,7 +18359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18799,7 +18376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of an encoding (or NULL)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18817,7 +18394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of bytes written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18828,7 +18405,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9406"
+NAME="AEN9340"
 ></A
 ><H3
 ><A
@@ -18862,7 +18439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9414"
+NAME="AEN9348"
 ></A
 ><P
 ></P
@@ -18889,7 +18466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18906,7 +18483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -18924,7 +18501,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if not and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -18935,7 +18512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9431"
+NAME="AEN9365"
 ></A
 ><H3
 ><A
@@ -18965,7 +18542,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9438"
+NAME="AEN9372"
 ></A
 ><P
 ></P
@@ -18992,7 +18569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -19010,7 +18587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -19021,7 +18598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9451"
+NAME="AEN9385"
 ></A
 ><H3
 ><A
@@ -19053,7 +18630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9458"
+NAME="AEN9392"
 ></A
 ><P
 ></P
@@ -19080,7 +18657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -19097,7 +18674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -19108,7 +18685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9471"
+NAME="AEN9405"
 ></A
 ><H3
 ><A
@@ -19135,7 +18712,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9477"
+NAME="AEN9411"
 ></A
 ><P
 ></P
@@ -19163,7 +18740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -19174,7 +18751,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9486"
+NAME="AEN9420"
 ></A
 ><H3
 ><A
@@ -19202,7 +18779,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9492"
+NAME="AEN9426"
 ></A
 ><P
 ></P
@@ -19229,7 +18806,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 a754e1e..8d0c53f 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12609"
+NAME="AEN12488"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12612"
+NAME="AEN12491"
 ></A
 ><H2
 >Synopsis</H2
@@ -269,7 +269,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12647"
+NAME="AEN12526"
 ></A
 ><H2
 >Description</H2
@@ -279,14 +279,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12650"
+NAME="AEN12529"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12652"
+NAME="AEN12531"
 ></A
 ><H3
 ><A
@@ -326,33 +326,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12658"
+NAME="AEN12537"
 ></A
 ><H3
 ><A
 NAME="XMLURIPTR"
 ></A
 >xmlURIPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlURI *xmlURIPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12663"
+NAME="AEN12541"
 ></A
 ><H3
 ><A
@@ -382,7 +369,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12670"
+NAME="AEN12548"
 ></A
 ><P
 ></P
@@ -410,7 +397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -421,7 +408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12679"
+NAME="AEN12557"
 ></A
 ><H3
 ><A
@@ -463,7 +450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12689"
+NAME="AEN12567"
 ></A
 ><P
 ></P
@@ -490,7 +477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI instance found in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -507,7 +494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the base value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -525,8 +512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new URI string (to be freed by the caller) or NULL in case
-        of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -537,7 +523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12706"
+NAME="AEN12584"
 ></A
 ><H3
 ><A
@@ -569,7 +555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12714"
+NAME="AEN12592"
 ></A
 ><P
 ></P
@@ -596,7 +582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI string to analyze</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -614,7 +600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly build xmlURIPtr or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -625,7 +611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12727"
+NAME="AEN12605"
 ></A
 ><H3
 ><A
@@ -664,7 +650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12736"
+NAME="AEN12614"
 ></A
 ><P
 ></P
@@ -691,7 +677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an URI structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -708,7 +694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to analyze</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -726,7 +712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -737,7 +723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12753"
+NAME="AEN12631"
 ></A
 ><H3
 ><A
@@ -770,7 +756,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12761"
+NAME="AEN12639"
 ></A
 ><P
 ></P
@@ -797,7 +783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -815,7 +801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new string (to be deallocated by caller)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -826,7 +812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12774"
+NAME="AEN12652"
 ></A
 ><H3
 ><A
@@ -865,7 +851,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12783"
+NAME="AEN12661"
 ></A
 ><P
 ></P
@@ -892,7 +878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -909,7 +895,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -920,7 +906,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12796"
+NAME="AEN12674"
 ></A
 ><H3
 ><A
@@ -958,7 +944,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12805"
+NAME="AEN12683"
 ></A
 ><P
 ></P
@@ -985,7 +971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  string to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1002,7 +988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> exception list string of chars not to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1020,7 +1006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new escaped string or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1031,7 +1017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12822"
+NAME="AEN12700"
 ></A
 ><H3
 ><A
@@ -1064,7 +1050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12829"
+NAME="AEN12707"
 ></A
 ><P
 ></P
@@ -1091,7 +1077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to unescape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1108,7 +1094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->   the length in bytes to unescape (or &lt;= 0 to indicate full string)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1125,7 +1111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optional destination buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1143,7 +1129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an copy of the string, but unescaped</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1154,7 +1140,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12850"
+NAME="AEN12728"
 ></A
 ><H3
 ><A
@@ -1184,7 +1170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12857"
+NAME="AEN12735"
 ></A
 ><P
 ></P
@@ -1211,7 +1197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the path string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1229,7 +1215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or an error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1240,7 +1226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12870"
+NAME="AEN12748"
 ></A
 ><H3
 ><A
@@ -1275,7 +1261,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12878"
+NAME="AEN12756"
 ></A
 ><P
 ></P
@@ -1302,7 +1288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string of the URI to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1320,12 +1306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an copy of the string, but escaped
-
-25 May 2001
-Uses xmlParseURI and xmlURIEscapeStr to try to escape correctly
-according to RFC2396.
-  - Carl Douglas</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1336,7 +1317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12891"
+NAME="AEN12769"
 ></A
 ><H3
 ><A
@@ -1366,7 +1347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12898"
+NAME="AEN12776"
 ></A
 ><P
 ></P
@@ -1393,7 +1374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1404,7 +1385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12907"
+NAME="AEN12785"
 ></A
 ><H3
 ><A
@@ -1437,7 +1418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12915"
+NAME="AEN12793"
 ></A
 ><P
 ></P
@@ -1464,7 +1445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the resource locator in a filesystem notation</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1482,10 +1463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new canonic path, or a duplicate of the path parameter if the 
-construction fails. The caller is responsible for freeing the memory occupied
-by the returned string. If there is insufficient memory available, or the 
-argument is NULL, the function returns NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index c00d15d..f8626d6 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9972"
+NAME="AEN9905"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9975"
+NAME="AEN9908"
 ></A
 ><H2
 >Synopsis</H2
@@ -1115,7 +1115,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10237"
+NAME="AEN10170"
 ></A
 ><H2
 >Description</H2
@@ -1125,14 +1125,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10240"
+NAME="AEN10173"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10242"
+NAME="AEN10175"
 ></A
 ><H3
 ><A
@@ -1158,33 +1158,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10247"
+NAME="AEN10180"
 ></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="AEN10252"
+NAME="AEN10184"
 ></A
 ><H3
 ><A
@@ -1214,7 +1201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10258"
+NAME="AEN10190"
 ></A
 ><P
 ></P
@@ -1241,7 +1228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlValidCtxtPtr validity error context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1258,7 +1245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to format *printf like vararg</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1275,7 +1262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  remaining arguments to the format</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1286,7 +1273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10275"
+NAME="AEN10207"
 ></A
 ><H3
 ><A
@@ -1316,7 +1303,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10281"
+NAME="AEN10213"
 ></A
 ><P
 ></P
@@ -1343,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlValidCtxtPtr validity error context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1360,7 +1347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to format *printf like vararg</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1377,7 +1364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  remaining arguments to the format</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1388,7 +1375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10298"
+NAME="AEN10230"
 ></A
 ><H3
 ><A
@@ -1444,163 +1431,85 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10304"
+NAME="AEN10236"
 ></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="AEN10309"
+NAME="AEN10240"
 ></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="AEN10314"
+NAME="AEN10244"
 ></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="AEN10319"
+NAME="AEN10248"
 ></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="AEN10324"
+NAME="AEN10252"
 ></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="AEN10329"
+NAME="AEN10256"
 ></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="AEN10334"
+NAME="AEN10260"
 ></A
 ><H3
 ><A
@@ -1643,7 +1552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10346"
+NAME="AEN10272"
 ></A
 ><P
 ></P
@@ -1670,7 +1579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1687,7 +1596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1705,8 +1614,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
@@ -1717,7 +1625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10363"
+NAME="AEN10289"
 ></A
 ><H3
 ><A
@@ -1766,7 +1674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10375"
+NAME="AEN10301"
 ></A
 ><P
 ></P
@@ -1793,7 +1701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1810,7 +1718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1827,7 +1735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1844,7 +1752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1861,7 +1769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1879,7 +1787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1890,7 +1798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10404"
+NAME="AEN10330"
 ></A
 ><H3
 ><A
@@ -1923,7 +1831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10412"
+NAME="AEN10338"
 ></A
 ><P
 ></P
@@ -1950,7 +1858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1968,7 +1876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlNotationTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1979,7 +1887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10425"
+NAME="AEN10351"
 ></A
 ><H3
 ><A
@@ -2009,7 +1917,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10432"
+NAME="AEN10358"
 ></A
 ><P
 ></P
@@ -2036,7 +1944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An notation table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2047,7 +1955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10441"
+NAME="AEN10367"
 ></A
 ><H3
 ><A
@@ -2081,7 +1989,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10449"
+NAME="AEN10375"
 ></A
 ><P
 ></P
@@ -2108,7 +2016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2125,7 +2033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation declaration</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2136,7 +2044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10462"
+NAME="AEN10388"
 ></A
 ><H3
 ><A
@@ -2170,7 +2078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10470"
+NAME="AEN10396"
 ></A
 ><P
 ></P
@@ -2197,7 +2105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2214,7 +2122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2225,7 +2133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10483"
+NAME="AEN10409"
 ></A
 ><H3
 ><A
@@ -2262,7 +2170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10492"
+NAME="AEN10418"
 ></A
 ><P
 ></P
@@ -2289,7 +2197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the subelement name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2306,7 +2214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of element content decl</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2324,7 +2232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the new element content structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2335,7 +2243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10509"
+NAME="AEN10435"
 ></A
 ><H3
 ><A
@@ -2368,7 +2276,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10517"
+NAME="AEN10443"
 ></A
 ><P
 ></P
@@ -2413,7 +2321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementContentPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2424,7 +2332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10530"
+NAME="AEN10456"
 ></A
 ><H3
 ><A
@@ -2454,7 +2362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10537"
+NAME="AEN10463"
 ></A
 ><P
 ></P
@@ -2481,7 +2389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2492,7 +2400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10546"
+NAME="AEN10472"
 ></A
 ><H3
 ><A
@@ -2526,7 +2434,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10553"
+NAME="AEN10479"
 ></A
 ><P
 ></P
@@ -2553,7 +2461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2570,7 +2478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer size</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2587,7 +2495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2604,7 +2512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 1 if one must print the englobing parenthesis, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2615,7 +2523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10574"
+NAME="AEN10500"
 ></A
 ><H3
 ><A
@@ -2647,7 +2555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10581"
+NAME="AEN10507"
 ></A
 ><P
 ></P
@@ -2674,7 +2582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an output buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2691,7 +2599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2708,7 +2616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 1 if one must print the englobing parenthesis, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2719,7 +2627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10598"
+NAME="AEN10524"
 ></A
 ><H3
 ><A
@@ -2768,7 +2676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10610"
+NAME="AEN10536"
 ></A
 ><P
 ></P
@@ -2795,7 +2703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2812,7 +2720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2829,7 +2737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2846,7 +2754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2863,7 +2771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2881,7 +2789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2892,7 +2800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10639"
+NAME="AEN10565"
 ></A
 ><H3
 ><A
@@ -2925,7 +2833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10647"
+NAME="AEN10573"
 ></A
 ><P
 ></P
@@ -2952,7 +2860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2970,7 +2878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2981,7 +2889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10660"
+NAME="AEN10586"
 ></A
 ><H3
 ><A
@@ -3011,7 +2919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10667"
+NAME="AEN10593"
 ></A
 ><P
 ></P
@@ -3038,7 +2946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3049,7 +2957,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10676"
+NAME="AEN10602"
 ></A
 ><H3
 ><A
@@ -3083,7 +2991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10684"
+NAME="AEN10610"
 ></A
 ><P
 ></P
@@ -3110,7 +3018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3127,7 +3035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3138,7 +3046,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10697"
+NAME="AEN10623"
 ></A
 ><H3
 ><A
@@ -3173,7 +3081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10705"
+NAME="AEN10631"
 ></A
 ><P
 ></P
@@ -3200,7 +3108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3217,7 +3125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3228,7 +3136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10718"
+NAME="AEN10644"
 ></A
 ><H3
 ><A
@@ -3261,7 +3169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10726"
+NAME="AEN10652"
 ></A
 ><P
 ></P
@@ -3288,7 +3196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3306,8 +3214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-               of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3318,7 +3225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10739"
+NAME="AEN10665"
 ></A
 ><H3
 ><A
@@ -3348,7 +3255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10746"
+NAME="AEN10672"
 ></A
 ><P
 ></P
@@ -3375,7 +3282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to free.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3386,7 +3293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10755"
+NAME="AEN10681"
 ></A
 ><H3
 ><A
@@ -3419,7 +3326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10763"
+NAME="AEN10689"
 ></A
 ><P
 ></P
@@ -3446,7 +3353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3464,8 +3371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-               of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3476,7 +3382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10776"
+NAME="AEN10702"
 ></A
 ><H3
 ><A
@@ -3547,7 +3453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10793"
+NAME="AEN10719"
 ></A
 ><P
 ></P
@@ -3574,7 +3480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3591,7 +3497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3608,7 +3514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3625,7 +3531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3642,7 +3548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3659,7 +3565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3676,7 +3582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3693,7 +3599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3710,7 +3616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if it's an enumeration, the associated list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3728,7 +3634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not new, otherwise the attribute decl</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3739,7 +3645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10838"
+NAME="AEN10764"
 ></A
 ><H3
 ><A
@@ -3772,7 +3678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10846"
+NAME="AEN10772"
 ></A
 ><P
 ></P
@@ -3799,7 +3705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3817,7 +3723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlAttributeTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3828,7 +3734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10859"
+NAME="AEN10785"
 ></A
 ><H3
 ><A
@@ -3858,7 +3764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10866"
+NAME="AEN10792"
 ></A
 ><P
 ></P
@@ -3885,7 +3791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3896,7 +3802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10875"
+NAME="AEN10801"
 ></A
 ><H3
 ><A
@@ -3930,7 +3836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10883"
+NAME="AEN10809"
 ></A
 ><P
 ></P
@@ -3957,7 +3863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3974,7 +3880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3985,7 +3891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10896"
+NAME="AEN10822"
 ></A
 ><H3
 ><A
@@ -4020,7 +3926,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10904"
+NAME="AEN10830"
 ></A
 ><P
 ></P
@@ -4047,7 +3953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4064,7 +3970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute declaration</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4075,7 +3981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10917"
+NAME="AEN10843"
 ></A
 ><H3
 ><A
@@ -4120,7 +4026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10928"
+NAME="AEN10854"
 ></A
 ><P
 ></P
@@ -4147,7 +4053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4164,7 +4070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4181,7 +4087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4198,7 +4104,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4216,7 +4122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the new xmlIDPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4227,7 +4133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10953"
+NAME="AEN10879"
 ></A
 ><H3
 ><A
@@ -4257,7 +4163,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10960"
+NAME="AEN10886"
 ></A
 ><P
 ></P
@@ -4284,7 +4190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An id table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4295,7 +4201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10969"
+NAME="AEN10895"
 ></A
 ><H3
 ><A
@@ -4332,7 +4238,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10978"
+NAME="AEN10904"
 ></A
 ><P
 ></P
@@ -4359,7 +4265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4376,7 +4282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4394,7 +4300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4405,7 +4311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10995"
+NAME="AEN10921"
 ></A
 ><H3
 ><A
@@ -4446,7 +4352,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11004"
+NAME="AEN10930"
 ></A
 ><P
 ></P
@@ -4473,7 +4379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4490,7 +4396,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4507,7 +4413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4525,7 +4431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4536,7 +4442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11025"
+NAME="AEN10951"
 ></A
 ><H3
 ><A
@@ -4570,7 +4476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11033"
+NAME="AEN10959"
 ></A
 ><P
 ></P
@@ -4597,7 +4503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4614,7 +4520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4632,7 +4538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4643,7 +4549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11050"
+NAME="AEN10976"
 ></A
 ><H3
 ><A
@@ -4688,7 +4594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11061"
+NAME="AEN10987"
 ></A
 ><P
 ></P
@@ -4715,7 +4621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4732,7 +4638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4749,7 +4655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4766,7 +4672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the Ref</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4784,7 +4690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, otherwise the new xmlRefPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4795,7 +4701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11086"
+NAME="AEN11012"
 ></A
 ><H3
 ><A
@@ -4825,7 +4731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11093"
+NAME="AEN11019"
 ></A
 ><P
 ></P
@@ -4852,7 +4758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An ref table</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4863,7 +4769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11102"
+NAME="AEN11028"
 ></A
 ><H3
 ><A
@@ -4903,7 +4809,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11111"
+NAME="AEN11037"
 ></A
 ><P
 ></P
@@ -4930,7 +4836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4947,7 +4853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4964,7 +4870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4982,7 +4888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4993,7 +4899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11132"
+NAME="AEN11058"
 ></A
 ><H3
 ><A
@@ -5027,7 +4933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11140"
+NAME="AEN11066"
 ></A
 ><P
 ></P
@@ -5054,7 +4960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5071,7 +4977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5089,7 +4995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5100,7 +5006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11157"
+NAME="AEN11083"
 ></A
 ><H3
 ><A
@@ -5137,7 +5043,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11166"
+NAME="AEN11092"
 ></A
 ><P
 ></P
@@ -5164,7 +5070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5181,7 +5087,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5199,7 +5105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise node set for the ID.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5210,7 +5116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11183"
+NAME="AEN11109"
 ></A
 ><H3
 ><A
@@ -5248,7 +5154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11191"
+NAME="AEN11117"
 ></A
 ><P
 ></P
@@ -5275,7 +5181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5292,7 +5198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5310,7 +5216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5321,7 +5227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11208"
+NAME="AEN11134"
 ></A
 ><H3
 ><A
@@ -5364,7 +5270,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11217"
+NAME="AEN11143"
 ></A
 ><P
 ></P
@@ -5391,7 +5297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5408,7 +5314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5425,7 +5331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5443,7 +5349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5454,7 +5360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11238"
+NAME="AEN11164"
 ></A
 ><H3
 ><A
@@ -5514,7 +5420,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11253"
+NAME="AEN11179"
 ></A
 ><P
 ></P
@@ -5541,7 +5447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5558,7 +5464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5575,7 +5481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5592,7 +5498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5610,8 +5516,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
@@ -5622,7 +5527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11278"
+NAME="AEN11204"
 ></A
 ><H3
 ><A
@@ -5690,7 +5595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11295"
+NAME="AEN11221"
 ></A
 ><P
 ></P
@@ -5717,7 +5622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the validation context</TD
+>  the validation context or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -5734,7 +5639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5751,7 +5656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5768,7 +5673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5785,7 +5690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5803,8 +5708,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
@@ -5815,7 +5719,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11324"
+NAME="AEN11250"
 ></A
 ><H3
 ><A
@@ -5860,7 +5764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11334"
+NAME="AEN11260"
 ></A
 ><P
 ></P
@@ -5887,7 +5791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5904,7 +5808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5921,7 +5825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5939,7 +5843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5950,7 +5854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11355"
+NAME="AEN11281"
 ></A
 ><H3
 ><A
@@ -5999,7 +5903,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11367"
+NAME="AEN11293"
 ></A
 ><P
 ></P
@@ -6026,7 +5930,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6043,7 +5947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6061,7 +5965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6072,7 +5976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11384"
+NAME="AEN11310"
 ></A
 ><H3
 ><A
@@ -6114,7 +6018,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11393"
+NAME="AEN11319"
 ></A
 ><P
 ></P
@@ -6141,7 +6045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6158,7 +6062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6175,7 +6079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a notation definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6193,7 +6097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6204,7 +6108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11414"
+NAME="AEN11340"
 ></A
 ><H3
 ><A
@@ -6244,7 +6148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11424"
+NAME="AEN11350"
 ></A
 ><P
 ></P
@@ -6271,7 +6175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6288,7 +6192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6305,7 +6209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a dtd instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6323,7 +6227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6334,7 +6238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11445"
+NAME="AEN11371"
 ></A
 ><H3
 ><A
@@ -6375,7 +6279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11454"
+NAME="AEN11380"
 ></A
 ><P
 ></P
@@ -6402,7 +6306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6419,7 +6323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6437,7 +6341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 if invalid and -1 if not well-formed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6448,7 +6352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11471"
+NAME="AEN11397"
 ></A
 ><H3
 ><A
@@ -6486,7 +6390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11480"
+NAME="AEN11406"
 ></A
 ><P
 ></P
@@ -6513,7 +6417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6530,7 +6434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6548,7 +6452,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6559,7 +6463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11497"
+NAME="AEN11423"
 ></A
 ><H3
 ><A
@@ -6597,7 +6501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11506"
+NAME="AEN11432"
 ></A
 ><P
 ></P
@@ -6624,7 +6528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6641,7 +6545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6658,7 +6562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6676,7 +6580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6687,7 +6591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11527"
+NAME="AEN11453"
 ></A
 ><H3
 ><A
@@ -6735,7 +6639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11538"
+NAME="AEN11464"
 ></A
 ><P
 ></P
@@ -6762,7 +6666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6779,7 +6683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6796,7 +6700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6814,7 +6718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6825,7 +6729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11559"
+NAME="AEN11485"
 ></A
 ><H3
 ><A
@@ -6883,7 +6787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11571"
+NAME="AEN11497"
 ></A
 ><P
 ></P
@@ -6910,7 +6814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6927,7 +6831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6944,7 +6848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6961,7 +6865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6978,7 +6882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value (without entities processing)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6996,7 +6900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7007,7 +6911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11600"
+NAME="AEN11526"
 ></A
 ><H3
 ><A
@@ -7069,7 +6973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11613"
+NAME="AEN11539"
 ></A
 ><P
 ></P
@@ -7096,7 +7000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7113,7 +7017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7130,7 +7034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7147,7 +7051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7164,7 +7068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an namespace declaration instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7181,7 +7085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value (without entities processing)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7199,7 +7103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7210,7 +7114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11646"
+NAME="AEN11572"
 ></A
 ><H3
 ><A
@@ -7249,7 +7153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11656"
+NAME="AEN11582"
 ></A
 ><P
 ></P
@@ -7276,7 +7180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7293,7 +7197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7311,7 +7215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7322,7 +7226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11673"
+NAME="AEN11599"
 ></A
 ><H3
 ><A
@@ -7361,7 +7265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11682"
+NAME="AEN11608"
 ></A
 ><P
 ></P
@@ -7388,7 +7292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7405,7 +7309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7422,7 +7326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7440,7 +7344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7451,7 +7355,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11703"
+NAME="AEN11629"
 ></A
 ><H3
 ><A
@@ -7486,7 +7390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11711"
+NAME="AEN11637"
 ></A
 ><P
 ></P
@@ -7513,7 +7417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7530,7 +7434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7548,7 +7452,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
@@ -7559,7 +7463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11728"
+NAME="AEN11654"
 ></A
 ><H3
 ><A
@@ -7601,7 +7505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11738"
+NAME="AEN11664"
 ></A
 ><P
 ></P
@@ -7628,7 +7532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7645,7 +7549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7662,7 +7566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7680,7 +7584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlAttributePtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7691,7 +7595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11759"
+NAME="AEN11685"
 ></A
 ><H3
 ><A
@@ -7737,7 +7641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11770"
+NAME="AEN11696"
 ></A
 ><P
 ></P
@@ -7764,7 +7668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7781,7 +7685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7798,7 +7702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7815,7 +7719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7833,7 +7737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlAttributePtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7844,7 +7748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11795"
+NAME="AEN11721"
 ></A
 ><H3
 ><A
@@ -7881,7 +7785,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11804"
+NAME="AEN11730"
 ></A
 ><P
 ></P
@@ -7908,7 +7812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7925,7 +7829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7943,7 +7847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNotationPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7954,7 +7858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11821"
+NAME="AEN11747"
 ></A
 ><H3
 ><A
@@ -7995,7 +7899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11831"
+NAME="AEN11757"
 ></A
 ><P
 ></P
@@ -8022,7 +7926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8039,7 +7943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8056,7 +7960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8074,7 +7978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlElementPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8085,7 +7989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11852"
+NAME="AEN11778"
 ></A
 ><H3
 ><A
@@ -8122,7 +8026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11861"
+NAME="AEN11787"
 ></A
 ><P
 ></P
@@ -8149,7 +8053,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8166,7 +8070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8184,7 +8088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlElementPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8195,7 +8099,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11878"
+NAME="AEN11804"
 ></A
 ><H3
 ><A
@@ -8255,7 +8159,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11890"
+NAME="AEN11816"
 ></A
 ><P
 ></P
@@ -8282,7 +8186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert after</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8299,7 +8203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element to insert next</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8316,7 +8220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8333,7 +8237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8351,14 +8255,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
@@ -8369,7 +8266,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11916"
+NAME="AEN11841"
 ></A
 ><H3
 ><A
@@ -8405,7 +8302,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11924"
+NAME="AEN11849"
 ></A
 ><P
 ></P
@@ -8432,7 +8329,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element content tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8449,7 +8346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an array to store the list of child names</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8466,7 +8363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the number of element in the list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8483,7 +8380,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8501,7 +8398,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
@@ -8512,7 +8409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11949"
+NAME="AEN11874"
 ></A
 ><H3
 ><A
@@ -8542,7 +8439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11956"
+NAME="AEN11881"
 ></A
 ><P
 ></P
@@ -8569,7 +8466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Name value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8587,7 +8484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8598,7 +8495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11969"
+NAME="AEN11894"
 ></A
 ><H3
 ><A
@@ -8628,7 +8525,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11976"
+NAME="AEN11901"
 ></A
 ><P
 ></P
@@ -8655,7 +8552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Names value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8673,7 +8570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8684,7 +8581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11989"
+NAME="AEN11914"
 ></A
 ><H3
 ><A
@@ -8716,7 +8613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11997"
+NAME="AEN11922"
 ></A
 ><P
 ></P
@@ -8743,7 +8640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Nmtoken value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8761,7 +8658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8772,7 +8669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12010"
+NAME="AEN11935"
 ></A
 ><H3
 ><A
@@ -8804,7 +8701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12018"
+NAME="AEN11943"
 ></A
 ><P
 ></P
@@ -8831,7 +8728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Nmtokens value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8849,7 +8746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8860,7 +8757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12031"
+NAME="AEN11956"
 ></A
 ><H3
 ><A
@@ -8895,7 +8792,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12039"
+NAME="AEN11964"
 ></A
 ><P
 ></P
@@ -8922,7 +8819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8939,7 +8836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element declaration node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8957,7 +8854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, 0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8968,7 +8865,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12056"
+NAME="AEN11981"
 ></A
 ><H3
 ><A
@@ -9010,7 +8907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12066"
+NAME="AEN11991"
 ></A
 ><P
 ></P
@@ -9037,7 +8934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9054,7 +8951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9071,7 +8968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9088,7 +8985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the qualified name as appearing in the serialization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9106,7 +9003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if no validation problem was found or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9117,7 +9014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12091"
+NAME="AEN12016"
 ></A
 ><H3
 ><A
@@ -9152,7 +9049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12099"
+NAME="AEN12024"
 ></A
 ><P
 ></P
@@ -9179,7 +9076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9196,7 +9093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  some character data read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9213,7 +9110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lenght of the data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9231,7 +9128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if no validation problem was found or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9242,7 +9139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12120"
+NAME="AEN12045"
 ></A
 ><H3
 ><A
@@ -9284,7 +9181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12130"
+NAME="AEN12055"
 ></A
 ><P
 ></P
@@ -9311,7 +9208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9328,7 +9225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9345,7 +9242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9362,7 +9259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the qualified name as appearing in the serialization</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9380,7 +9277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if no validation problem was found or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 654e7ad..64da65c 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19702"
+NAME="AEN19490"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19705"
+NAME="AEN19493"
 ></A
 ><H2
 >Synopsis</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19710"
+NAME="AEN19498"
 ></A
 ><H2
 >Description</H2
@@ -170,14 +170,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19713"
+NAME="AEN19501"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19715"
+NAME="AEN19503"
 ></A
 ><H3
 ><A
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19723"
+NAME="AEN19511"
 ></A
 ><P
 ></P
@@ -239,7 +239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -257,8 +257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no substitution 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-xmlautomata.html b/doc/html/libxml-xmlautomata.html
index d47131f..3396dba 100644
--- a/doc/html/libxml-xmlautomata.html
+++ b/doc/html/libxml-xmlautomata.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN30150"
+NAME="AEN29884"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN30153"
+NAME="AEN29887"
 ></A
 ><H2
 >Synopsis</H2
@@ -392,7 +392,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30218"
+NAME="AEN29952"
 ></A
 ><H2
 >Description</H2
@@ -402,14 +402,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30221"
+NAME="AEN29955"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30223"
+NAME="AEN29957"
 ></A
 ><H3
 ><A
@@ -435,26 +435,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30228"
+NAME="AEN29962"
 ></A
 ><H3
 ><A
 NAME="XMLAUTOMATAPTR"
 ></A
 >xmlAutomataPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAutomata *xmlAutomataPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 >A libxml automata description, It can be compiled into a regexp</P
 ><P
@@ -463,7 +450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30234"
+NAME="AEN29967"
 ></A
 ><H3
 ><A
@@ -489,26 +476,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30239"
+NAME="AEN29972"
 ></A
 ><H3
 ><A
 NAME="XMLAUTOMATASTATEPTR"
 ></A
 >xmlAutomataStatePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAutomataState *xmlAutomataStatePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 >A state int the automata description,</P
 ><P
@@ -517,7 +491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30245"
+NAME="AEN29977"
 ></A
 ><H3
 ><A
@@ -547,7 +521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30252"
+NAME="AEN29984"
 ></A
 ><P
 ></P
@@ -575,7 +549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new object or NULL in case of failure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -586,7 +560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30261"
+NAME="AEN29993"
 ></A
 ><H3
 ><A
@@ -616,7 +590,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30268"
+NAME="AEN30000"
 ></A
 ><P
 ></P
@@ -643,7 +617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -654,7 +628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30277"
+NAME="AEN30009"
 ></A
 ><H3
 ><A
@@ -687,7 +661,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30285"
+NAME="AEN30017"
 ></A
 ><P
 ></P
@@ -714,7 +688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the initial state of the automata</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -743,7 +717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30298"
+NAME="AEN30030"
 ></A
 ><H3
 ><A
@@ -777,7 +751,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30306"
+NAME="AEN30038"
 ></A
 ><P
 ></P
@@ -804,7 +778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -821,7 +795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a state in this automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -839,7 +813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -850,7 +824,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30323"
+NAME="AEN30055"
 ></A
 ><H3
 ><A
@@ -883,7 +857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30331"
+NAME="AEN30063"
 ></A
 ><P
 ></P
@@ -910,7 +884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -928,7 +902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -939,7 +913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30344"
+NAME="AEN30076"
 ></A
 ><H3
 ><A
@@ -1003,7 +977,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30358"
+NAME="AEN30090"
 ></A
 ><P
 ></P
@@ -1030,7 +1004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1047,7 +1021,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1064,7 +1038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1081,7 +1055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the input string associated to that transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1098,7 +1072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> data passed to the callback function if the transition is activated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1116,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1127,7 +1101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30387"
+NAME="AEN30119"
 ></A
 ><H3
 ><A
@@ -1204,7 +1178,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30403"
+NAME="AEN30135"
 ></A
 ><P
 ></P
@@ -1231,7 +1205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1248,7 +1222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1265,7 +1239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1282,7 +1256,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the input string associated to that transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1299,7 +1273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimum successive occurences of token</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1316,7 +1290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the maximum successive occurences of token</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1333,7 +1307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  data associated to the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1351,7 +1325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1362,7 +1336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30440"
+NAME="AEN30172"
 ></A
 ><H3
 ><A
@@ -1439,7 +1413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30456"
+NAME="AEN30188"
 ></A
 ><P
 ></P
@@ -1466,7 +1440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1483,7 +1457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1500,7 +1474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1517,7 +1491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the input string associated to that transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1534,7 +1508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimum successive occurences of token</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1551,7 +1525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the maximum successive occurences of token</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1568,7 +1542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  data associated to the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1586,7 +1560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1597,7 +1571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30493"
+NAME="AEN30225"
 ></A
 ><H3
 ><A
@@ -1657,7 +1631,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30506"
+NAME="AEN30238"
 ></A
 ><P
 ></P
@@ -1684,7 +1658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1701,7 +1675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1718,7 +1692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1735,7 +1709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> allow to transition if not all all transitions have been activated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1753,7 +1727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1764,7 +1738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30531"
+NAME="AEN30263"
 ></A
 ><H3
 ><A
@@ -1817,7 +1791,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30543"
+NAME="AEN30275"
 ></A
 ><P
 ></P
@@ -1844,7 +1818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1861,7 +1835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1878,7 +1852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1896,7 +1870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1907,7 +1881,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30564"
+NAME="AEN30296"
 ></A
 ><H3
 ><A
@@ -1962,7 +1936,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30576"
+NAME="AEN30308"
 ></A
 ><P
 ></P
@@ -1989,7 +1963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2006,7 +1980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2023,7 +1997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2040,7 +2014,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the counter associated to that transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2058,7 +2032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2069,7 +2043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30601"
+NAME="AEN30333"
 ></A
 ><H3
 ><A
@@ -2124,7 +2098,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30613"
+NAME="AEN30345"
 ></A
 ><P
 ></P
@@ -2151,7 +2125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2168,7 +2142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the starting point of the transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2185,7 +2159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the target point of the transition or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2202,7 +2176,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the counter associated to that transition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2220,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the target state or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2231,7 +2205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30638"
+NAME="AEN30370"
 ></A
 ><H3
 ><A
@@ -2263,7 +2237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30645"
+NAME="AEN30377"
 ></A
 ><P
 ></P
@@ -2290,7 +2264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2307,7 +2281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the minimal value on the counter</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2324,7 +2298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the maximal value on the counter</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2342,7 +2316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the counter number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2353,7 +2327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30666"
+NAME="AEN30398"
 ></A
 ><H3
 ><A
@@ -2387,7 +2361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30674"
+NAME="AEN30406"
 ></A
 ><P
 ></P
@@ -2414,7 +2388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2432,7 +2406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the compiled regexp or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2443,7 +2417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30687"
+NAME="AEN30419"
 ></A
 ><H3
 ><A
@@ -2473,7 +2447,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30694"
+NAME="AEN30426"
 ></A
 ><P
 ></P
@@ -2500,7 +2474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an automata</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2518,7 +2492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if not, and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index 4eb8e10..69ffd1c 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12933"
+NAME="AEN12811"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12936"
+NAME="AEN12814"
 ></A
 ><H2
 >Synopsis</H2
@@ -216,7 +216,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12953"
+NAME="AEN12831"
 ></A
 ><H2
 >Description</H2
@@ -226,14 +226,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12956"
+NAME="AEN12834"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12958"
+NAME="AEN12836"
 ></A
 ><H3
 ><A
@@ -388,7 +388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12963"
+NAME="AEN12841"
 ></A
 ><H3
 ><A
@@ -418,7 +418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12969"
+NAME="AEN12847"
 ></A
 ><P
 ></P
@@ -445,7 +445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a parsing context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -462,7 +462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -479,7 +479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the extra arguments of the varags to format the message</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -490,7 +490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12986"
+NAME="AEN12864"
 ></A
 ><H3
 ><A
@@ -552,7 +552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12998"
+NAME="AEN12876"
 ></A
 ><P
 ></P
@@ -579,7 +579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new error handling context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -596,7 +596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new handler function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -607,7 +607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13011"
+NAME="AEN12889"
 ></A
 ><H3
 ><A
@@ -638,7 +638,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13018"
+NAME="AEN12896"
 ></A
 ><P
 ></P
@@ -665,7 +665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the handler</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -676,7 +676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13027"
+NAME="AEN12905"
 ></A
 ><H3
 ><A
@@ -706,7 +706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13033"
+NAME="AEN12911"
 ></A
 ><P
 ></P
@@ -733,7 +733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -750,7 +750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -767,7 +767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -778,7 +778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13050"
+NAME="AEN12928"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13056"
+NAME="AEN12934"
 ></A
 ><P
 ></P
@@ -835,7 +835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -852,7 +852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -869,7 +869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -880,7 +880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13073"
+NAME="AEN12951"
 ></A
 ><H3
 ><A
@@ -910,7 +910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13079"
+NAME="AEN12957"
 ></A
 ><P
 ></P
@@ -937,7 +937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -954,7 +954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -971,7 +971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -982,7 +982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13096"
+NAME="AEN12974"
 ></A
 ><H3
 ><A
@@ -1012,7 +1012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13102"
+NAME="AEN12980"
 ></A
 ><P
 ></P
@@ -1039,7 +1039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1056,7 +1056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1073,7 +1073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1084,7 +1084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13119"
+NAME="AEN12997"
 ></A
 ><H3
 ><A
@@ -1114,7 +1114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13126"
+NAME="AEN13004"
 ></A
 ><P
 ></P
@@ -1141,7 +1141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1152,7 +1152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13135"
+NAME="AEN13013"
 ></A
 ><H3
 ><A
@@ -1182,7 +1182,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13142"
+NAME="AEN13020"
 ></A
 ><P
 ></P
@@ -1209,7 +1209,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 941f643..5afb94e 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20614"
+NAME="AEN20401"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20617"
+NAME="AEN20404"
 ></A
 ><H2
 >Synopsis</H2
@@ -561,7 +561,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20721"
+NAME="AEN20508"
 ></A
 ><H2
 >Description</H2
@@ -571,14 +571,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20724"
+NAME="AEN20511"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20726"
+NAME="AEN20513"
 ></A
 ><H3
 ><A
@@ -606,7 +606,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20732"
+NAME="AEN20519"
 ></A
 ><P
 ></P
@@ -633,7 +633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the filename or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -651,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if yes and 0 if another Input module should be used</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -662,7 +662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20745"
+NAME="AEN20532"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20751"
+NAME="AEN20538"
 ></A
 ><P
 ></P
@@ -716,7 +716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the filename or URI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -727,7 +727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20760"
+NAME="AEN20547"
 ></A
 ><H3
 ><A
@@ -756,7 +756,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20766"
+NAME="AEN20553"
 ></A
 ><P
 ></P
@@ -783,7 +783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Input context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -800,7 +800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to store data read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -817,7 +817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the buffer in bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -835,7 +835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes read or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -846,7 +846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20787"
+NAME="AEN20574"
 ></A
 ><H3
 ><A
@@ -873,7 +873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20793"
+NAME="AEN20580"
 ></A
 ><P
 ></P
@@ -900,7 +900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Input context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -918,7 +918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -929,7 +929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20806"
+NAME="AEN20593"
 ></A
 ><H3
 ><A
@@ -957,7 +957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20812"
+NAME="AEN20599"
 ></A
 ><P
 ></P
@@ -984,7 +984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the filename or URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1002,7 +1002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if yes and 0 if another Output module should be used</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1013,7 +1013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20825"
+NAME="AEN20612"
 ></A
 ><H3
 ><A
@@ -1040,7 +1040,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20831"
+NAME="AEN20618"
 ></A
 ><P
 ></P
@@ -1067,7 +1067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the filename or URI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1078,7 +1078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20840"
+NAME="AEN20627"
 ></A
 ><H3
 ><A
@@ -1107,7 +1107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20846"
+NAME="AEN20633"
 ></A
 ><P
 ></P
@@ -1134,7 +1134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Output context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1151,7 +1151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer of data to write</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1168,7 +1168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the buffer in bytes</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1186,7 +1186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1197,7 +1197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20867"
+NAME="AEN20654"
 ></A
 ><H3
 ><A
@@ -1224,7 +1224,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20873"
+NAME="AEN20660"
 ></A
 ><P
 ></P
@@ -1251,7 +1251,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Output context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1269,7 +1269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1280,7 +1280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20886"
+NAME="AEN20673"
 ></A
 ><H3
 ><A
@@ -1315,7 +1315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20891"
+NAME="AEN20678"
 ></A
 ><H3
 ><A
@@ -1351,7 +1351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20896"
+NAME="AEN20683"
 ></A
 ><H3
 ><A
@@ -1380,7 +1380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20902"
+NAME="AEN20689"
 ></A
 ><H3
 ><A
@@ -1409,7 +1409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20908"
+NAME="AEN20695"
 ></A
 ><H3
 ><A
@@ -1438,7 +1438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20914"
+NAME="AEN20701"
 ></A
 ><H3
 ><A
@@ -1472,7 +1472,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20922"
+NAME="AEN20709"
 ></A
 ><P
 ></P
@@ -1499,7 +1499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1517,7 +1517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1528,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20935"
+NAME="AEN20722"
 ></A
 ><H3
 ><A
@@ -1567,7 +1567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20943"
+NAME="AEN20730"
 ></A
 ><P
 ></P
@@ -1594,7 +1594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1611,7 +1611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1629,7 +1629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1640,7 +1640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20960"
+NAME="AEN20747"
 ></A
 ><H3
 ><A
@@ -1679,7 +1679,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20969"
+NAME="AEN20756"
 ></A
 ><P
 ></P
@@ -1706,7 +1706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1723,7 +1723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1741,7 +1741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1752,7 +1752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20986"
+NAME="AEN20773"
 ></A
 ><H3
 ><A
@@ -1788,7 +1788,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20994"
+NAME="AEN20781"
 ></A
 ><P
 ></P
@@ -1815,7 +1815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1832,7 +1832,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1850,7 +1850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21011"
+NAME="AEN20798"
 ></A
 ><H3
 ><A
@@ -1898,7 +1898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21019"
+NAME="AEN20806"
 ></A
 ><P
 ></P
@@ -1925,7 +1925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the memory input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1942,7 +1942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the memory block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1959,7 +1959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1977,7 +1977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1988,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21040"
+NAME="AEN20827"
 ></A
 ><H3
 ><A
@@ -2032,7 +2032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21050"
+NAME="AEN20837"
 ></A
 ><P
 ></P
@@ -2059,7 +2059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O read function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2076,7 +2076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2093,7 +2093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2110,7 +2110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2128,7 +2128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2139,7 +2139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21075"
+NAME="AEN20862"
 ></A
 ><H3
 ><A
@@ -2172,7 +2172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21082"
+NAME="AEN20869"
 ></A
 ><P
 ></P
@@ -2199,7 +2199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2216,7 +2216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2234,8 +2234,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
@@ -2246,7 +2245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21099"
+NAME="AEN20886"
 ></A
 ><H3
 ><A
@@ -2282,7 +2281,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21107"
+NAME="AEN20894"
 ></A
 ><P
 ></P
@@ -2309,7 +2308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2326,7 +2325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2344,8 +2343,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
@@ -2356,7 +2354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21124"
+NAME="AEN20911"
 ></A
 ><H3
 ><A
@@ -2390,7 +2388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21131"
+NAME="AEN20918"
 ></A
 ><P
 ></P
@@ -2417,7 +2415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2434,7 +2432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2451,7 +2449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2469,8 +2467,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
@@ -2481,7 +2478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21152"
+NAME="AEN20939"
 ></A
 ><H3
 ><A
@@ -2511,7 +2508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21159"
+NAME="AEN20946"
 ></A
 ><P
 ></P
@@ -2538,7 +2535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2549,7 +2546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21168"
+NAME="AEN20955"
 ></A
 ><H3
 ><A
@@ -2576,7 +2573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21174"
+NAME="AEN20961"
 ></A
 ><P
 ></P
@@ -2603,7 +2600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the path to a file</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2621,7 +2618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new allocated string containing the directory, or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2632,7 +2629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21187"
+NAME="AEN20974"
 ></A
 ><H3
 ><A
@@ -2674,7 +2671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21197"
+NAME="AEN20984"
 ></A
 ><P
 ></P
@@ -2701,7 +2698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2718,7 +2715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2735,7 +2732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputReadCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2752,7 +2749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlInputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2770,7 +2767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2781,7 +2778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21222"
+NAME="AEN21009"
 ></A
 ><H3
 ><A
@@ -2810,7 +2807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21228"
+NAME="AEN21015"
 ></A
 ><H3
 ><A
@@ -2843,7 +2840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21236"
+NAME="AEN21023"
 ></A
 ><P
 ></P
@@ -2870,7 +2867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2888,7 +2885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2899,7 +2896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21249"
+NAME="AEN21036"
 ></A
 ><H3
 ><A
@@ -2940,7 +2937,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21257"
+NAME="AEN21044"
 ></A
 ><P
 ></P
@@ -2967,7 +2964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a C string containing the URI or filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2984,7 +2981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3001,7 +2998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ration (0 none, 9 max).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3019,7 +3016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3030,7 +3027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21278"
+NAME="AEN21065"
 ></A
 ><H3
 ><A
@@ -3069,7 +3066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21287"
+NAME="AEN21074"
 ></A
 ><P
 ></P
@@ -3096,7 +3093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3113,7 +3110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3131,7 +3128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3142,7 +3139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21304"
+NAME="AEN21091"
 ></A
 ><H3
 ><A
@@ -3177,7 +3174,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21312"
+NAME="AEN21099"
 ></A
 ><P
 ></P
@@ -3204,7 +3201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3221,7 +3218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the encoding converter or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3239,7 +3236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3250,7 +3247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21329"
+NAME="AEN21116"
 ></A
 ><H3
 ><A
@@ -3293,7 +3290,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21339"
+NAME="AEN21126"
 ></A
 ><P
 ></P
@@ -3320,7 +3317,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O write function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3337,7 +3334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O close function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3354,7 +3351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an I/O handler</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3371,7 +3368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3389,7 +3386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser output or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3400,7 +3397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21364"
+NAME="AEN21151"
 ></A
 ><H3
 ><A
@@ -3435,7 +3432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21371"
+NAME="AEN21158"
 ></A
 ><P
 ></P
@@ -3462,7 +3459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3479,7 +3476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size in bytes of the array.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3496,7 +3493,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3514,8 +3511,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
@@ -3526,7 +3522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21392"
+NAME="AEN21179"
 ></A
 ><H3
 ><A
@@ -3560,7 +3556,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21399"
+NAME="AEN21186"
 ></A
 ><P
 ></P
@@ -3587,7 +3583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3604,7 +3600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a zero terminated C string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3622,8 +3618,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
@@ -3634,7 +3629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21416"
+NAME="AEN21203"
 ></A
 ><H3
 ><A
@@ -3664,7 +3659,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21423"
+NAME="AEN21210"
 ></A
 ><P
 ></P
@@ -3691,7 +3686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3709,7 +3704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3720,7 +3715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21436"
+NAME="AEN21223"
 ></A
 ><H3
 ><A
@@ -3751,7 +3746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21443"
+NAME="AEN21230"
 ></A
 ><P
 ></P
@@ -3778,7 +3773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3796,7 +3791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte written or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3807,7 +3802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21456"
+NAME="AEN21243"
 ></A
 ><H3
 ><A
@@ -3849,7 +3844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21466"
+NAME="AEN21253"
 ></A
 ><P
 ></P
@@ -3876,7 +3871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputMatchCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3893,7 +3888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputOpenCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3910,7 +3905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputWriteCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3927,7 +3922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlOutputCloseCallback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3945,7 +3940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3956,7 +3951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21491"
+NAME="AEN21278"
 ></A
 ><H3
 ><A
@@ -3985,7 +3980,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21497"
+NAME="AEN21284"
 ></A
 ><P
 ></P
@@ -4012,7 +4007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The destination URI for the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4029,7 +4024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The compression desired for the document.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4040,7 +4035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21510"
+NAME="AEN21297"
 ></A
 ><H3
 ><A
@@ -4070,7 +4065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21516"
+NAME="AEN21303"
 ></A
 ><H3
 ><A
@@ -4107,7 +4102,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21524"
+NAME="AEN21311"
 ></A
 ><P
 ></P
@@ -4134,7 +4129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URL for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4151,7 +4146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the System ID for the entity to load</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4168,7 +4163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context in which the entity is called or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4186,7 +4181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new allocated xmlParserInputPtr, or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4197,7 +4192,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21545"
+NAME="AEN21332"
 ></A
 ><H3
 ><A
@@ -4231,7 +4226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21553"
+NAME="AEN21340"
 ></A
 ><P
 ></P
@@ -4287,7 +4282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21566"
+NAME="AEN21353"
 ></A
 ><H3
 ><A
@@ -4325,7 +4320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21574"
+NAME="AEN21361"
 ></A
 ><P
 ></P
@@ -4352,7 +4347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the path to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4370,7 +4365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->2.  otherwise returns 1.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4381,7 +4376,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21587"
+NAME="AEN21374"
 ></A
 ><H3
 ><A
@@ -4408,7 +4403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21593"
+NAME="AEN21380"
 ></A
 ><P
 ></P
@@ -4435,7 +4430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4453,7 +4448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if matches, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4464,7 +4459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21606"
+NAME="AEN21393"
 ></A
 ><H3
 ><A
@@ -4502,7 +4497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21614"
+NAME="AEN21401"
 ></A
 ><P
 ></P
@@ -4529,7 +4524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4540,7 +4535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21623"
+NAME="AEN21410"
 ></A
 ><H3
 ><A
@@ -4579,7 +4574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21631"
+NAME="AEN21418"
 ></A
 ><P
 ></P
@@ -4606,7 +4601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4623,7 +4618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  where to drop data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4640,7 +4635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of bytes to write</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4658,7 +4653,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4669,7 +4664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21652"
+NAME="AEN21439"
 ></A
 ><H3
 ><A
@@ -4696,7 +4691,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21658"
+NAME="AEN21445"
 ></A
 ><P
 ></P
@@ -4723,7 +4718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4741,7 +4736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4752,7 +4747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21671"
+NAME="AEN21458"
 ></A
 ><H3
 ><A
@@ -4779,7 +4774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21677"
+NAME="AEN21464"
 ></A
 ><P
 ></P
@@ -4806,7 +4801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4824,7 +4819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if matches, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4835,7 +4830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21690"
+NAME="AEN21477"
 ></A
 ><H3
 ><A
@@ -4862,7 +4857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21696"
+NAME="AEN21483"
 ></A
 ><P
 ></P
@@ -4889,7 +4884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4900,7 +4895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21705"
+NAME="AEN21492"
 ></A
 ><H3
 ><A
@@ -4939,7 +4934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21713"
+NAME="AEN21500"
 ></A
 ><P
 ></P
@@ -4966,7 +4961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4983,7 +4978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  where to drop data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5000,7 +4995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of bytes to write</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5018,7 +5013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5029,7 +5024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21734"
+NAME="AEN21521"
 ></A
 ><H3
 ><A
@@ -5056,7 +5051,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21740"
+NAME="AEN21527"
 ></A
 ><P
 ></P
@@ -5083,7 +5078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5101,7 +5096,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5112,7 +5107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21753"
+NAME="AEN21540"
 ></A
 ><H3
 ><A
@@ -5139,7 +5134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21759"
+NAME="AEN21546"
 ></A
 ><P
 ></P
@@ -5166,7 +5161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5184,7 +5179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if matches, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5195,7 +5190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21772"
+NAME="AEN21559"
 ></A
 ><H3
 ><A
@@ -5222,7 +5217,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21778"
+NAME="AEN21565"
 ></A
 ><P
 ></P
@@ -5249,7 +5244,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI for matching</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5260,7 +5255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21787"
+NAME="AEN21574"
 ></A
 ><H3
 ><A
@@ -5299,7 +5294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21795"
+NAME="AEN21582"
 ></A
 ><P
 ></P
@@ -5326,7 +5321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5343,7 +5338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  where to drop data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5360,7 +5355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of bytes to write</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5378,7 +5373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of bytes written</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5389,7 +5384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21816"
+NAME="AEN21603"
 ></A
 ><H3
 ><A
@@ -5416,7 +5411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21822"
+NAME="AEN21609"
 ></A
 ><P
 ></P
@@ -5443,7 +5438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the I/O context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5461,7 +5456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 2e3f0d1..7556e18 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN29382"
+NAME="AEN29126"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN29385"
+NAME="AEN29129"
 ></A
 ><H2
 >Synopsis</H2
@@ -305,7 +305,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN29426"
+NAME="AEN29170"
 ></A
 ><H2
 >Description</H2
@@ -315,14 +315,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN29429"
+NAME="AEN29173"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29431"
+NAME="AEN29175"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY</PRE
+>#define     DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -353,7 +353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29437"
+NAME="AEN29181"
 ></A
 ><H3
 ><A
@@ -383,7 +383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29444"
+NAME="AEN29188"
 ></A
 ><P
 ></P
@@ -410,7 +410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an already allocated block of memory</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -421,7 +421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29453"
+NAME="AEN29197"
 ></A
 ><H3
 ><A
@@ -454,7 +454,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29461"
+NAME="AEN29205"
 ></A
 ><P
 ></P
@@ -481,7 +481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size requested in bytes</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -492,7 +492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29470"
+NAME="AEN29214"
 ></A
 ><H3
 ><A
@@ -526,7 +526,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29478"
+NAME="AEN29222"
 ></A
 ><P
 ></P
@@ -553,7 +553,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an already allocated block of memory</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -570,7 +570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new size requested in bytes</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -581,7 +581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29491"
+NAME="AEN29235"
 ></A
 ><H3
 ><A
@@ -611,7 +611,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29498"
+NAME="AEN29242"
 ></A
 ><P
 ></P
@@ -638,7 +638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a zero terminated string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -656,7 +656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the copy of the string or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -667,7 +667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29511"
+NAME="AEN29255"
 ></A
 ><H3
 ><A
@@ -713,7 +713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29522"
+NAME="AEN29266"
 ></A
 ><P
 ></P
@@ -740,10 +740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -760,10 +757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -780,10 +774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -800,10 +791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -821,7 +809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -832,7 +820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29551"
+NAME="AEN29291"
 ></A
 ><H3
 ><A
@@ -874,7 +862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29561"
+NAME="AEN29301"
 ></A
 ><P
 ></P
@@ -901,10 +889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> place to save the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -921,10 +906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> place to save the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -941,10 +923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> place to save the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -961,10 +940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> place to save the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function in use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -982,7 +958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -993,7 +969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29590"
+NAME="AEN29326"
 ></A
 ><H3
 ><A
@@ -1020,7 +996,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29596"
+NAME="AEN29332"
 ></A
 ><P
 ></P
@@ -1048,7 +1024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1059,7 +1035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29605"
+NAME="AEN29341"
 ></A
 ><H3
 ><A
@@ -1086,7 +1062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29611"
+NAME="AEN29347"
 ></A
 ><P
 ></P
@@ -1114,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int representing the amount of memory allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1125,7 +1101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29620"
+NAME="AEN29356"
 ></A
 ><H3
 ><A
@@ -1155,7 +1131,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29627"
+NAME="AEN29363"
 ></A
 ><P
 ></P
@@ -1182,8 +1158,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
@@ -1194,7 +1169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29636"
+NAME="AEN29372"
 ></A
 ><H3
 ><A
@@ -1231,7 +1206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29644"
+NAME="AEN29380"
 ></A
 ><P
 ></P
@@ -1258,7 +1233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1275,7 +1250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of entries to dump</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1286,7 +1261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29657"
+NAME="AEN29393"
 ></A
 ><H3
 ><A
@@ -1314,7 +1289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29663"
+NAME="AEN29399"
 ></A
 ><H3
 ><A
@@ -1347,7 +1322,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29671"
+NAME="AEN29407"
 ></A
 ><P
 ></P
@@ -1374,7 +1349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1385,7 +1360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29680"
+NAME="AEN29416"
 ></A
 ><H3
 ><A
@@ -1419,7 +1394,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29688"
+NAME="AEN29424"
 ></A
 ><P
 ></P
@@ -1446,7 +1421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1463,7 +1438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1474,7 +1449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29701"
+NAME="AEN29437"
 ></A
 ><H3
 ><A
@@ -1504,7 +1479,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29708"
+NAME="AEN29444"
 ></A
 ><P
 ></P
@@ -1531,7 +1506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1542,7 +1517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29717"
+NAME="AEN29453"
 ></A
 ><H3
 ><A
@@ -1572,7 +1547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29724"
+NAME="AEN29460"
 ></A
 ><P
 ></P
@@ -1599,7 +1574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial string pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1617,7 +1592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occurred.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1628,7 +1603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29737"
+NAME="AEN29473"
 ></A
 ><H3
 ><A
@@ -1658,7 +1633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29744"
+NAME="AEN29480"
 ></A
 ><P
 ></P
@@ -1685,7 +1660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of bytes to allocate</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1696,7 +1671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29753"
+NAME="AEN29489"
 ></A
 ><H3
 ><A
@@ -1726,7 +1701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29760"
+NAME="AEN29496"
 ></A
 ><P
 ></P
@@ -1753,7 +1728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the existing allocated area</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1770,7 +1745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of bytes to allocate</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1781,7 +1756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29773"
+NAME="AEN29509"
 ></A
 ><H3
 ><A
@@ -1814,7 +1789,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29781"
+NAME="AEN29517"
 ></A
 ><P
 ></P
@@ -1841,7 +1816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the existing string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1852,7 +1827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29790"
+NAME="AEN29526"
 ></A
 ><H3
 ><A
@@ -1887,7 +1862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29798"
+NAME="AEN29534"
 ></A
 ><P
 ></P
@@ -1914,7 +1889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1931,7 +1906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1948,7 +1923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1959,7 +1934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29815"
+NAME="AEN29551"
 ></A
 ><H3
 ><A
@@ -1995,7 +1970,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29823"
+NAME="AEN29559"
 ></A
 ><P
 ></P
@@ -2022,7 +1997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2039,7 +2014,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2056,7 +2031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2073,7 +2048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2084,7 +2059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29844"
+NAME="AEN29580"
 ></A
 ><H3
 ><A
@@ -2116,7 +2091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29851"
+NAME="AEN29587"
 ></A
 ><P
 ></P
@@ -2143,7 +2118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial string pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2160,7 +2135,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2177,7 +2152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2195,7 +2170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occurred.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html
index 0cb02e5..734ea90 100644
--- a/doc/html/libxml-xmlreader.html
+++ b/doc/html/libxml-xmlreader.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2927"
+NAME="AEN2920"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2930"
+NAME="AEN2923"
 ></A
 ><H2
 >Synopsis</H2
@@ -605,7 +605,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3059"
+NAME="AEN3052"
 ></A
 ><H2
 >Description</H2
@@ -615,14 +615,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3062"
+NAME="AEN3055"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3064"
+NAME="AEN3057"
 ></A
 ><H3
 ><A
@@ -653,7 +653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3069"
+NAME="AEN3062"
 ></A
 ><H3
 ><A
@@ -684,7 +684,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3074"
+NAME="AEN3067"
 ></A
 ><H3
 ><A
@@ -710,33 +710,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3079"
+NAME="AEN3072"
 ></A
 ><H3
 ><A
 NAME="XMLTEXTREADERPTR"
 ></A
 >xmlTextReaderPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlTextReader *xmlTextReaderPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3084"
+NAME="AEN3076"
 ></A
 ><H3
 ><A
@@ -775,7 +762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3093"
+NAME="AEN3085"
 ></A
 ><P
 ></P
@@ -802,7 +789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the xmlParserInputBufferPtr used to read data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -819,7 +806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URI information for the source if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -837,7 +824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlTextReaderPtr or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -848,7 +835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3110"
+NAME="AEN3102"
 ></A
 ><H3
 ><A
@@ -883,7 +870,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3118"
+NAME="AEN3110"
 ></A
 ><P
 ></P
@@ -910,7 +897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URI of the resource to process</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -928,7 +915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlTextReaderPtr or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -939,7 +926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3131"
+NAME="AEN3123"
 ></A
 ><H3
 ><A
@@ -969,7 +956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3138"
+NAME="AEN3130"
 ></A
 ><P
 ></P
@@ -996,7 +983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1007,7 +994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3147"
+NAME="AEN3139"
 ></A
 ><H3
 ><A
@@ -1038,7 +1025,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3154"
+NAME="AEN3146"
 ></A
 ><P
 ></P
@@ -1065,7 +1052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1083,8 +1070,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the node was read successfully, 0 if there is no more
-         nodes to read, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1095,7 +1081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3167"
+NAME="AEN3159"
 ></A
 ><H3
 ><A
@@ -1128,7 +1114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3175"
+NAME="AEN3167"
 ></A
 ><P
 ></P
@@ -1155,7 +1141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1173,9 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the XML content, or NULL if the current node
-        is neither an element nor attribute, or has no child nodes. The 
-        string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1186,7 +1170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3188"
+NAME="AEN3180"
 ></A
 ><H3
 ><A
@@ -1219,7 +1203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3196"
+NAME="AEN3188"
 ></A
 ><P
 ></P
@@ -1246,7 +1230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1264,9 +1248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the XML content, or NULL if the current node
-        is neither an element nor attribute, or has no child nodes. The 
-        string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1277,7 +1259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3209"
+NAME="AEN3201"
 ></A
 ><H3
 ><A
@@ -1310,7 +1292,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3217"
+NAME="AEN3209"
 ></A
 ><P
 ></P
@@ -1337,7 +1319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1355,9 +1337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the contents of the Element or Text node,
-        or NULL if the reader is positioned on any other type of node.
-        The string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1368,7 +1348,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3230"
+NAME="AEN3222"
 ></A
 ><H3
 ><A
@@ -1398,7 +1378,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3237"
+NAME="AEN3229"
 ></A
 ><P
 ></P
@@ -1425,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1443,9 +1423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, 0 if the reader was not positionned on an
-        ttribute node or all the attribute values have been read, or -1
-        in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1456,7 +1434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3250"
+NAME="AEN3242"
 ></A
 ><H3
 ><A
@@ -1486,7 +1464,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3257"
+NAME="AEN3249"
 ></A
 ><P
 ></P
@@ -1513,7 +1491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1531,7 +1509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 i no attributes, -1 in case of error or the attribute count</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1542,7 +1520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3270"
+NAME="AEN3262"
 ></A
 ><H3
 ><A
@@ -1575,7 +1553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3278"
+NAME="AEN3270"
 ></A
 ><P
 ></P
@@ -1602,7 +1580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1620,7 +1598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the base URI or NULL if not available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1631,7 +1609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3291"
+NAME="AEN3283"
 ></A
 ><H3
 ><A
@@ -1661,7 +1639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3298"
+NAME="AEN3290"
 ></A
 ><P
 ></P
@@ -1688,7 +1666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1706,7 +1684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the depth or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1717,7 +1695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3311"
+NAME="AEN3303"
 ></A
 ><H3
 ><A
@@ -1747,7 +1725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3318"
+NAME="AEN3310"
 ></A
 ><P
 ></P
@@ -1774,7 +1752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1792,7 +1770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if false, and -1 in case or error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1803,7 +1781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3331"
+NAME="AEN3323"
 ></A
 ><H3
 ><A
@@ -1833,7 +1811,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3338"
+NAME="AEN3330"
 ></A
 ><P
 ></P
@@ -1860,7 +1838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1878,7 +1856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if false, and -1 in case or error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1889,7 +1867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3351"
+NAME="AEN3343"
 ></A
 ><H3
 ><A
@@ -1920,7 +1898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3358"
+NAME="AEN3350"
 ></A
 ><P
 ></P
@@ -1947,7 +1925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1965,7 +1943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if not defaulted, 1 if defaulted, and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1976,7 +1954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3371"
+NAME="AEN3363"
 ></A
 ><H3
 ><A
@@ -2006,7 +1984,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3378"
+NAME="AEN3370"
 ></A
 ><P
 ></P
@@ -2033,7 +2011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2051,7 +2029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if empty, 0 if not and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2062,7 +2040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3391"
+NAME="AEN3383"
 ></A
 ><H3
 ><A
@@ -2095,7 +2073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3399"
+NAME="AEN3391"
 ></A
 ><P
 ></P
@@ -2122,7 +2100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2140,7 +2118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local name or NULL if not available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2151,7 +2129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3412"
+NAME="AEN3404"
 ></A
 ><H3
 ><A
@@ -2184,7 +2162,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3420"
+NAME="AEN3412"
 ></A
 ><P
 ></P
@@ -2211,7 +2189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2229,7 +2207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local name or NULL if not available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2240,7 +2218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3433"
+NAME="AEN3425"
 ></A
 ><H3
 ><A
@@ -2273,7 +2251,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3441"
+NAME="AEN3433"
 ></A
 ><P
 ></P
@@ -2300,7 +2278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2318,7 +2296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace URI or NULL if not available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2329,7 +2307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3454"
+NAME="AEN3446"
 ></A
 ><H3
 ><A
@@ -2361,7 +2339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3461"
+NAME="AEN3453"
 ></A
 ><P
 ></P
@@ -2388,7 +2366,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2406,7 +2384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNodeType of the current node or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2417,7 +2395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3474"
+NAME="AEN3466"
 ></A
 ><H3
 ><A
@@ -2450,7 +2428,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3482"
+NAME="AEN3474"
 ></A
 ><P
 ></P
@@ -2477,7 +2455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2495,7 +2473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the prefix or NULL if not available</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2506,7 +2484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3495"
+NAME="AEN3487"
 ></A
 ><H3
 ><A
@@ -2536,7 +2514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3502"
+NAME="AEN3494"
 ></A
 ><P
 ></P
@@ -2563,7 +2541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2581,7 +2559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->" or ' and -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2592,7 +2570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3515"
+NAME="AEN3507"
 ></A
 ><H3
 ><A
@@ -2625,7 +2603,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3523"
+NAME="AEN3515"
 ></A
 ><P
 ></P
@@ -2652,7 +2630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2670,11 +2648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string or NULL if not available. The retsult must be deallocated
-    with <A
-HREF="libxml-globals.html#XMLFREE"
->xmlFree</A
->()</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2685,7 +2659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3537"
+NAME="AEN3528"
 ></A
 ><H3
 ><A
@@ -2718,7 +2692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3545"
+NAME="AEN3536"
 ></A
 ><P
 ></P
@@ -2745,7 +2719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2763,7 +2737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xml:lang value or NULL if none exists.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2774,7 +2748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3558"
+NAME="AEN3549"
 ></A
 ><H3
 ><A
@@ -2804,7 +2778,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3565"
+NAME="AEN3556"
 ></A
 ><P
 ></P
@@ -2831,7 +2805,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2849,7 +2823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the state value, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2860,7 +2834,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3578"
+NAME="AEN3569"
 ></A
 ><H3
 ><A
@@ -2891,7 +2865,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3585"
+NAME="AEN3576"
 ></A
 ><P
 ></P
@@ -2918,7 +2892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2936,7 +2910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2947,7 +2921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3598"
+NAME="AEN3589"
 ></A
 ><H3
 ><A
@@ -2982,7 +2956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3606"
+NAME="AEN3597"
 ></A
 ><P
 ></P
@@ -3009,7 +2983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3026,7 +3000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the zero-based index of the attribute relative to the containing element</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3044,8 +3018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the value of the specified attribute, or NULL
-   in case of error. The string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3056,7 +3029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3623"
+NAME="AEN3614"
 ></A
 ><H3
 ><A
@@ -3093,7 +3066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3632"
+NAME="AEN3623"
 ></A
 ><P
 ></P
@@ -3120,7 +3093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3137,7 +3110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the qualified name of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3155,8 +3128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the value of the specified attribute, or NULL
-   in case of error. The string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3167,7 +3139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3649"
+NAME="AEN3640"
 ></A
 ><H3
 ><A
@@ -3208,7 +3180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3659"
+NAME="AEN3650"
 ></A
 ><P
 ></P
@@ -3235,7 +3207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3252,7 +3224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the local name of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3269,7 +3241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the namespace URI of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3287,8 +3259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the value of the specified attribute, or NULL
-   in case of error. The string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3299,7 +3270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3680"
+NAME="AEN3671"
 ></A
 ><H3
 ><A
@@ -3335,7 +3306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3688"
+NAME="AEN3679"
 ></A
 ><P
 ></P
@@ -3362,7 +3333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3380,8 +3351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlParserInputBufferPtr attached to the XML or NULL
-   in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3392,7 +3362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3701"
+NAME="AEN3692"
 ></A
 ><H3
 ><A
@@ -3429,7 +3399,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3710"
+NAME="AEN3701"
 ></A
 ><P
 ></P
@@ -3456,7 +3426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3473,8 +3443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the prefix whose namespace URI is to be resolved. To return
-         the default namespace, specify NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3492,8 +3461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a string containing the namespace URI to which the prefix maps
-   or NULL in case of error. The string must be deallocated by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3504,7 +3472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3727"
+NAME="AEN3718"
 ></A
 ><H3
 ><A
@@ -3536,7 +3504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3734"
+NAME="AEN3725"
 ></A
 ><P
 ></P
@@ -3563,7 +3531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3580,8 +3548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the zero-based index of the attribute relative to the containing
-     element.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3599,7 +3566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3610,7 +3577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3751"
+NAME="AEN3742"
 ></A
 ><H3
 ><A
@@ -3645,7 +3612,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3759"
+NAME="AEN3750"
 ></A
 ><P
 ></P
@@ -3672,7 +3639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3689,7 +3656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the qualified name of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3707,7 +3674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3718,7 +3685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3776"
+NAME="AEN3767"
 ></A
 ><H3
 ><A
@@ -3757,7 +3724,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3785"
+NAME="AEN3776"
 ></A
 ><P
 ></P
@@ -3784,7 +3751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3801,7 +3768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the local name of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3818,7 +3785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace URI of the attribute.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3836,7 +3803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3847,7 +3814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3806"
+NAME="AEN3797"
 ></A
 ><H3
 ><A
@@ -3879,7 +3846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3813"
+NAME="AEN3804"
 ></A
 ><P
 ></P
@@ -3906,7 +3873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3924,7 +3891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3935,7 +3902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3826"
+NAME="AEN3817"
 ></A
 ><H3
 ><A
@@ -3967,7 +3934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3833"
+NAME="AEN3824"
 ></A
 ><P
 ></P
@@ -3994,7 +3961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4012,7 +3979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4023,7 +3990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3846"
+NAME="AEN3837"
 ></A
 ><H3
 ><A
@@ -4054,7 +4021,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3853"
+NAME="AEN3844"
 ></A
 ><P
 ></P
@@ -4081,7 +4048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4099,7 +4066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 in case of success, -1 in case of error, 0 if not moved</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4110,7 +4077,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3866"
+NAME="AEN3857"
 ></A
 ><H3
 ><A
@@ -4147,7 +4114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3874"
+NAME="AEN3865"
 ></A
 ><P
 ></P
@@ -4174,7 +4141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4192,7 +4159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4203,7 +4170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3887"
+NAME="AEN3878"
 ></A
 ><H3
 ><A
@@ -4237,7 +4204,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3894"
+NAME="AEN3885"
 ></A
 ><P
 ></P
@@ -4264,7 +4231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4281,7 +4248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlParserProperties to set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4298,7 +4265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  usually 0 or 1 to (de)activate it</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4316,7 +4283,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the call was successful, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4327,7 +4294,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3915"
+NAME="AEN3906"
 ></A
 ><H3
 ><A
@@ -4358,7 +4325,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3922"
+NAME="AEN3913"
 ></A
 ><P
 ></P
@@ -4385,7 +4352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4402,7 +4369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlParserProperties to get</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4420,7 +4387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value, usually 0 or 1, or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4431,7 +4398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3939"
+NAME="AEN3930"
 ></A
 ><H3
 ><A
@@ -4466,7 +4433,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3947"
+NAME="AEN3938"
 ></A
 ><P
 ></P
@@ -4493,7 +4460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4511,7 +4478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNodePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4522,7 +4489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3960"
+NAME="AEN3951"
 ></A
 ><H3
 ><A
@@ -4557,7 +4524,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3968"
+NAME="AEN3959"
 ></A
 ><P
 ></P
@@ -4584,7 +4551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4602,7 +4569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlDocPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4613,33 +4580,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3981"
+NAME="AEN3972"
 ></A
 ><H3
 ><A
 NAME="XMLTEXTREADERLOCATORPTR"
 ></A
 >xmlTextReaderLocatorPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef void *  xmlTextReaderLocatorPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3986"
+NAME="AEN3976"
 ></A
 ><H3
 ><A
@@ -4673,7 +4627,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3993"
+NAME="AEN3983"
 ></A
 ><P
 ></P
@@ -4762,7 +4716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4014"
+NAME="AEN4004"
 ></A
 ><H3
 ><A
@@ -4792,7 +4746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4021"
+NAME="AEN4011"
 ></A
 ><P
 ></P
@@ -4819,7 +4773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the xmlTextReaderLocatorPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4837,7 +4791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the line number or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4848,7 +4802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4034"
+NAME="AEN4024"
 ></A
 ><H3
 ><A
@@ -4881,7 +4835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4042"
+NAME="AEN4032"
 ></A
 ><P
 ></P
@@ -4908,7 +4862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the xmlTextReaderLocatorPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4926,7 +4880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the base URI or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4937,7 +4891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4055"
+NAME="AEN4045"
 ></A
 ><H3
 ><A
@@ -4979,7 +4933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4065"
+NAME="AEN4055"
 ></A
 ><P
 ></P
@@ -5006,7 +4960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5023,7 +4977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	the callback function to call on error and warnings</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5040,7 +4994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->    a user argument to pass to the callback function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5051,7 +5005,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4082"
+NAME="AEN4072"
 ></A
 ><H3
 ><A
@@ -5086,7 +5040,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4090"
+NAME="AEN4080"
 ></A
 ><P
 ></P
@@ -5113,7 +5067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlTextReaderPtr used</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5130,7 +5084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->	the callback function or NULL is no callback has been registered</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5147,7 +5101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->    a user argument</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlregexp.html b/doc/html/libxml-xmlregexp.html
index 736aca7..89dbde2 100644
--- a/doc/html/libxml-xmlregexp.html
+++ b/doc/html/libxml-xmlregexp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN29877"
+NAME="AEN29613"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN29880"
+NAME="AEN29616"
 ></A
 ><H2
 >Synopsis</H2
@@ -262,7 +262,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN29912"
+NAME="AEN29648"
 ></A
 ><H2
 >Description</H2
@@ -272,14 +272,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN29915"
+NAME="AEN29651"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29917"
+NAME="AEN29653"
 ></A
 ><H3
 ><A
@@ -305,26 +305,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29922"
+NAME="AEN29658"
 ></A
 ><H3
 ><A
 NAME="XMLREGEXPPTR"
 ></A
 >xmlRegexpPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRegexp *xmlRegexpPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 >A libxml regular expression, they can actually be far more complex
 thank the POSIX regex expressions.</P
@@ -334,7 +321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29928"
+NAME="AEN29663"
 ></A
 ><H3
 ><A
@@ -360,26 +347,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29933"
+NAME="AEN29668"
 ></A
 ><H3
 ><A
 NAME="XMLREGEXECCTXTPTR"
 ></A
 >xmlRegExecCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 >A libxml progressive regular expression evaluation context</P
 ><P
@@ -388,7 +362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29939"
+NAME="AEN29673"
 ></A
 ><H3
 ><A
@@ -423,7 +397,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29947"
+NAME="AEN29681"
 ></A
 ><P
 ></P
@@ -450,7 +424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a regular expression string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -468,7 +442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the compiled expression or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -479,7 +453,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29960"
+NAME="AEN29694"
 ></A
 ><H3
 ><A
@@ -509,7 +483,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29967"
+NAME="AEN29701"
 ></A
 ><P
 ></P
@@ -536,7 +510,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the regexp</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -547,7 +521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN29976"
+NAME="AEN29710"
 ></A
 ><H3
 ><A
@@ -581,7 +555,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN29984"
+NAME="AEN29718"
 ></A
 ><P
 ></P
@@ -608,7 +582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compiled regular expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -643,7 +617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if it matches, 0 if not and a negativa value in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -654,7 +628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30001"
+NAME="AEN29735"
 ></A
 ><H3
 ><A
@@ -688,7 +662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30009"
+NAME="AEN29743"
 ></A
 ><P
 ></P
@@ -715,7 +689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the file for the output debug</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the compiled regexp</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -743,7 +717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30022"
+NAME="AEN29756"
 ></A
 ><H3
 ><A
@@ -773,7 +747,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30029"
+NAME="AEN29763"
 ></A
 ><P
 ></P
@@ -800,7 +774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compiled regular expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -818,7 +792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if it yes, 0 if not and a negativa value in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -829,7 +803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30042"
+NAME="AEN29776"
 ></A
 ><H3
 ><A
@@ -863,7 +837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30049"
+NAME="AEN29783"
 ></A
 ><P
 ></P
@@ -952,7 +926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30070"
+NAME="AEN29804"
 ></A
 ><H3
 ><A
@@ -990,7 +964,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30079"
+NAME="AEN29813"
 ></A
 ><P
 ></P
@@ -1017,7 +991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a precompiled regular expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1034,8 +1008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a callback function used for handling progresses in the
-           automata matching phase</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1052,7 +1025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the context data associated to the callback in this context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1070,7 +1043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1081,7 +1054,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30100"
+NAME="AEN29834"
 ></A
 ><H3
 ><A
@@ -1111,7 +1084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30107"
+NAME="AEN29841"
 ></A
 ><P
 ></P
@@ -1138,7 +1111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a regular expression evaulation context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1149,7 +1122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30116"
+NAME="AEN29850"
 ></A
 ><H3
 ><A
@@ -1184,7 +1157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30124"
+NAME="AEN29858"
 ></A
 ><P
 ></P
@@ -1211,7 +1184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a regexp execution context or NULL to indicate the end</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1228,7 +1201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a string token input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1245,7 +1218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> data associated to the token to reuse in callbacks</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1263,8 +1236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> 1 if the regexp reached a final state, 0 if non-final, and
-    a negative value in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlschemas.html b/doc/html/libxml-xmlschemas.html
index 1908151..50d6442 100644
--- a/doc/html/libxml-xmlschemas.html
+++ b/doc/html/libxml-xmlschemas.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN33416"
+NAME="AEN33148"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN33419"
+NAME="AEN33151"
 ></A
 ><H2
 >Synopsis</H2
@@ -325,7 +325,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33466"
+NAME="AEN33198"
 ></A
 ><H2
 >Description</H2
@@ -335,14 +335,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33469"
+NAME="AEN33201"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33471"
+NAME="AEN33203"
 ></A
 ><H3
 ><A
@@ -393,7 +393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33476"
+NAME="AEN33208"
 ></A
 ><H3
 ><A
@@ -437,33 +437,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33481"
+NAME="AEN33213"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAPTR"
 ></A
 >xmlSchemaPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchema *xmlSchemaPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33486"
+NAME="AEN33217"
 ></A
 ><H3
 ><A
@@ -490,7 +477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33491"
+NAME="AEN33222"
 ></A
 ><P
 ></P
@@ -562,7 +549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33508"
+NAME="AEN33239"
 ></A
 ><H3
 ><A
@@ -589,7 +576,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33513"
+NAME="AEN33244"
 ></A
 ><P
 ></P
@@ -661,7 +648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33530"
+NAME="AEN33261"
 ></A
 ><H3
 ><A
@@ -687,33 +674,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33535"
+NAME="AEN33266"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAPARSERCTXTPTR"
 ></A
 >xmlSchemaParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaParserCtxt *xmlSchemaParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33540"
+NAME="AEN33270"
 ></A
 ><H3
 ><A
@@ -741,33 +715,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33546"
+NAME="AEN33276"
 ></A
 ><H3
 ><A
 NAME="XMLSCHEMAVALIDCTXTPTR"
 ></A
 >xmlSchemaValidCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSchemaValidCtxt *xmlSchemaValidCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33551"
+NAME="AEN33280"
 ></A
 ><H3
 ><A
@@ -799,7 +760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33558"
+NAME="AEN33287"
 ></A
 ><P
 ></P
@@ -826,7 +787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the location of the schema</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -844,7 +805,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the parser context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -855,7 +816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33571"
+NAME="AEN33300"
 ></A
 ><H3
 ><A
@@ -888,7 +849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33578"
+NAME="AEN33307"
 ></A
 ><P
 ></P
@@ -915,7 +876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a char array containing the schemas</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -932,7 +893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -950,7 +911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the parser context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -961,7 +922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33595"
+NAME="AEN33324"
 ></A
 ><H3
 ><A
@@ -991,7 +952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33602"
+NAME="AEN33331"
 ></A
 ><P
 ></P
@@ -1018,7 +979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1029,7 +990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33611"
+NAME="AEN33340"
 ></A
 ><H3
 ><A
@@ -1068,7 +1029,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33620"
+NAME="AEN33349"
 ></A
 ><P
 ></P
@@ -1095,7 +1056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1112,7 +1073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1129,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the warning callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1146,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  contextual data for the callbacks</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1157,7 +1118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33641"
+NAME="AEN33370"
 ></A
 ><H3
 ><A
@@ -1192,7 +1153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33649"
+NAME="AEN33378"
 ></A
 ><P
 ></P
@@ -1219,7 +1180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1237,8 +1198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the internal XML Schema structure built from the resource or
-        NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1249,7 +1209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33662"
+NAME="AEN33391"
 ></A
 ><H3
 ><A
@@ -1279,7 +1239,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33669"
+NAME="AEN33398"
 ></A
 ><P
 ></P
@@ -1306,7 +1266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1317,7 +1277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33678"
+NAME="AEN33407"
 ></A
 ><H3
 ><A
@@ -1351,7 +1311,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33686"
+NAME="AEN33415"
 ></A
 ><P
 ></P
@@ -1378,7 +1338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1395,7 +1355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1406,7 +1366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33699"
+NAME="AEN33428"
 ></A
 ><H3
 ><A
@@ -1445,7 +1405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33708"
+NAME="AEN33437"
 ></A
 ><P
 ></P
@@ -1472,7 +1432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1489,7 +1449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1506,7 +1466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the warning function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1523,7 +1483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the functions context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1534,7 +1494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33729"
+NAME="AEN33458"
 ></A
 ><H3
 ><A
@@ -1567,7 +1527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33737"
+NAME="AEN33466"
 ></A
 ><P
 ></P
@@ -1594,7 +1554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a precompiled XML Schemas</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1612,7 +1572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the validation context or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1623,7 +1583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33750"
+NAME="AEN33479"
 ></A
 ><H3
 ><A
@@ -1653,7 +1613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33757"
+NAME="AEN33486"
 ></A
 ><P
 ></P
@@ -1680,7 +1640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema validation context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1691,7 +1651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33766"
+NAME="AEN33495"
 ></A
 ><H3
 ><A
@@ -1725,7 +1685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33774"
+NAME="AEN33503"
 ></A
 ><P
 ></P
@@ -1752,7 +1712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1787,8 +1747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the document is schemas valid, a positive error code
-    number otherwise and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1799,7 +1758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33791"
+NAME="AEN33520"
 ></A
 ><H3
 ><A
@@ -1842,7 +1801,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33801"
+NAME="AEN33530"
 ></A
 ><P
 ></P
@@ -1869,7 +1828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1886,7 +1845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input to use for reading the data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1903,7 +1862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an optional encoding information</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1920,7 +1879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a SAX handler for the resulting events</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1937,7 +1896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to provide to the SAX handler.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1955,8 +1914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the document is schemas valid, a positive error code
-    number otherwise and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlschemastypes.html b/doc/html/libxml-xmlschemastypes.html
index 09a33f7..c6346d7 100644
--- a/doc/html/libxml-xmlschemastypes.html
+++ b/doc/html/libxml-xmlschemastypes.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN33835"
+NAME="AEN33564"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN33838"
+NAME="AEN33567"
 ></A
 ><H2
 >Synopsis</H2
@@ -268,7 +268,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33872"
+NAME="AEN33601"
 ></A
 ><H2
 >Description</H2
@@ -278,14 +278,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33875"
+NAME="AEN33604"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33877"
+NAME="AEN33606"
 ></A
 ><H3
 ><A
@@ -311,7 +311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33882"
+NAME="AEN33611"
 ></A
 ><H3
 ><A
@@ -339,7 +339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33888"
+NAME="AEN33617"
 ></A
 ><H3
 ><A
@@ -376,7 +376,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33897"
+NAME="AEN33626"
 ></A
 ><P
 ></P
@@ -403,7 +403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the type name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -420,7 +420,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI of the namespace usually "http://www.w3.org/2001/XMLSchema"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -438,7 +438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the type if found, NULL otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -449,7 +449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33914"
+NAME="AEN33643"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33924"
+NAME="AEN33653"
 ></A
 ><P
 ></P
@@ -520,7 +520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the predefined type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -537,7 +537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -554,7 +554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return computed value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -572,8 +572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -584,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33945"
+NAME="AEN33674"
 ></A
 ><H3
 ><A
@@ -632,7 +631,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33956"
+NAME="AEN33685"
 ></A
 ><P
 ></P
@@ -659,7 +658,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the predefined type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -676,7 +675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the value to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -693,7 +692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the return computed value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -710,7 +709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node containing the value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -728,8 +727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if this validates, a positive error code number otherwise
-        and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -740,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33981"
+NAME="AEN33710"
 ></A
 ><H3
 ><A
@@ -782,7 +780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33991"
+NAME="AEN33720"
 ></A
 ><P
 ></P
@@ -809,7 +807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the base type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -826,7 +824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the facet to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -843,7 +841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lexical repr of the value to validate</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -860,7 +858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the precomputed value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -878,8 +876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if the element is schemas valid, a positive error code
-    number otherwise and -1 in case of internal or API error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -890,7 +887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34016"
+NAME="AEN33745"
 ></A
 ><H3
 ><A
@@ -920,7 +917,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN34023"
+NAME="AEN33752"
 ></A
 ><P
 ></P
@@ -958,7 +955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34032"
+NAME="AEN33761"
 ></A
 ><H3
 ><A
@@ -988,7 +985,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN34039"
+NAME="AEN33768"
 ></A
 ><P
 ></P
@@ -1016,7 +1013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly allocated structure or NULL in case or error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1027,7 +1024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34048"
+NAME="AEN33777"
 ></A
 ><H3
 ><A
@@ -1069,7 +1066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN34058"
+NAME="AEN33787"
 ></A
 ><P
 ></P
@@ -1096,7 +1093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the facet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1113,7 +1110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema type definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1130,7 +1127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the schema parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1147,7 +1144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> name of the type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1165,7 +1162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if okay or -1 in cae of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1176,7 +1173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN34083"
+NAME="AEN33812"
 ></A
 ><H3
 ><A
@@ -1206,7 +1203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN34090"
+NAME="AEN33819"
 ></A
 ><P
 ></P
@@ -1233,7 +1230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a schema facet structure</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlunicode.html b/doc/html/libxml-xmlunicode.html
index 833d852..eb9df8f 100644
--- a/doc/html/libxml-xmlunicode.html
+++ b/doc/html/libxml-xmlunicode.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN30712"
+NAME="AEN30444"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN30715"
+NAME="AEN30447"
 ></A
 ><H2
 >Synopsis</H2
@@ -709,7 +709,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30852"
+NAME="AEN30584"
 ></A
 ><H2
 >Description</H2
@@ -719,14 +719,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN30855"
+NAME="AEN30587"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30857"
+NAME="AEN30589"
 ></A
 ><H3
 ><A
@@ -754,7 +754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30863"
+NAME="AEN30595"
 ></A
 ><P
 ></P
@@ -781,7 +781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -799,7 +799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -810,7 +810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30876"
+NAME="AEN30608"
 ></A
 ><H3
 ><A
@@ -837,7 +837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30882"
+NAME="AEN30614"
 ></A
 ><P
 ></P
@@ -864,7 +864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -882,7 +882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -893,7 +893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30895"
+NAME="AEN30627"
 ></A
 ><H3
 ><A
@@ -921,7 +921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30901"
+NAME="AEN30633"
 ></A
 ><P
 ></P
@@ -948,7 +948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -966,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -977,7 +977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30914"
+NAME="AEN30646"
 ></A
 ><H3
 ><A
@@ -1005,7 +1005,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30920"
+NAME="AEN30652"
 ></A
 ><P
 ></P
@@ -1032,7 +1032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1050,7 +1050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1061,7 +1061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30933"
+NAME="AEN30665"
 ></A
 ><H3
 ><A
@@ -1088,7 +1088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30939"
+NAME="AEN30671"
 ></A
 ><P
 ></P
@@ -1115,7 +1115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1133,7 +1133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1144,7 +1144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30952"
+NAME="AEN30684"
 ></A
 ><H3
 ><A
@@ -1171,7 +1171,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30958"
+NAME="AEN30690"
 ></A
 ><P
 ></P
@@ -1198,7 +1198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1216,7 +1216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1227,7 +1227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30971"
+NAME="AEN30703"
 ></A
 ><H3
 ><A
@@ -1254,7 +1254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30977"
+NAME="AEN30709"
 ></A
 ><P
 ></P
@@ -1281,7 +1281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1299,7 +1299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1310,7 +1310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN30990"
+NAME="AEN30722"
 ></A
 ><H3
 ><A
@@ -1337,7 +1337,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN30996"
+NAME="AEN30728"
 ></A
 ><P
 ></P
@@ -1364,7 +1364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1382,7 +1382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1393,7 +1393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31009"
+NAME="AEN30741"
 ></A
 ><H3
 ><A
@@ -1420,7 +1420,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31015"
+NAME="AEN30747"
 ></A
 ><P
 ></P
@@ -1447,7 +1447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1465,7 +1465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1476,7 +1476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31028"
+NAME="AEN30760"
 ></A
 ><H3
 ><A
@@ -1503,7 +1503,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31034"
+NAME="AEN30766"
 ></A
 ><P
 ></P
@@ -1530,7 +1530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1548,7 +1548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1559,7 +1559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31047"
+NAME="AEN30779"
 ></A
 ><H3
 ><A
@@ -1586,7 +1586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31053"
+NAME="AEN30785"
 ></A
 ><P
 ></P
@@ -1613,7 +1613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1631,7 +1631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1642,7 +1642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31066"
+NAME="AEN30798"
 ></A
 ><H3
 ><A
@@ -1669,7 +1669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31072"
+NAME="AEN30804"
 ></A
 ><P
 ></P
@@ -1696,7 +1696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1714,7 +1714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1725,7 +1725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31085"
+NAME="AEN30817"
 ></A
 ><H3
 ><A
@@ -1752,7 +1752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31091"
+NAME="AEN30823"
 ></A
 ><P
 ></P
@@ -1779,7 +1779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1797,7 +1797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1808,7 +1808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31104"
+NAME="AEN30836"
 ></A
 ><H3
 ><A
@@ -1835,7 +1835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31110"
+NAME="AEN30842"
 ></A
 ><P
 ></P
@@ -1862,7 +1862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1880,7 +1880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1891,7 +1891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31123"
+NAME="AEN30855"
 ></A
 ><H3
 ><A
@@ -1918,7 +1918,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31129"
+NAME="AEN30861"
 ></A
 ><P
 ></P
@@ -1945,7 +1945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1963,7 +1963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1974,7 +1974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31142"
+NAME="AEN30874"
 ></A
 ><H3
 ><A
@@ -2001,7 +2001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31148"
+NAME="AEN30880"
 ></A
 ><P
 ></P
@@ -2028,7 +2028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2046,7 +2046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2057,7 +2057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31161"
+NAME="AEN30893"
 ></A
 ><H3
 ><A
@@ -2085,7 +2085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31167"
+NAME="AEN30899"
 ></A
 ><P
 ></P
@@ -2112,7 +2112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2130,7 +2130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2141,7 +2141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31180"
+NAME="AEN30912"
 ></A
 ><H3
 ><A
@@ -2169,7 +2169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31186"
+NAME="AEN30918"
 ></A
 ><P
 ></P
@@ -2196,7 +2196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2214,7 +2214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2225,7 +2225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31199"
+NAME="AEN30931"
 ></A
 ><H3
 ><A
@@ -2252,7 +2252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31205"
+NAME="AEN30937"
 ></A
 ><P
 ></P
@@ -2279,7 +2279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2297,7 +2297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2308,7 +2308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31218"
+NAME="AEN30950"
 ></A
 ><H3
 ><A
@@ -2336,7 +2336,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31224"
+NAME="AEN30956"
 ></A
 ><P
 ></P
@@ -2363,7 +2363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2381,7 +2381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2392,7 +2392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31237"
+NAME="AEN30969"
 ></A
 ><H3
 ><A
@@ -2419,7 +2419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31243"
+NAME="AEN30975"
 ></A
 ><P
 ></P
@@ -2446,7 +2446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2464,7 +2464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2475,7 +2475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31256"
+NAME="AEN30988"
 ></A
 ><H3
 ><A
@@ -2503,7 +2503,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31262"
+NAME="AEN30994"
 ></A
 ><P
 ></P
@@ -2530,7 +2530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2548,7 +2548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2559,7 +2559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31275"
+NAME="AEN31007"
 ></A
 ><H3
 ><A
@@ -2587,7 +2587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31281"
+NAME="AEN31013"
 ></A
 ><P
 ></P
@@ -2614,7 +2614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2632,7 +2632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2643,7 +2643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31294"
+NAME="AEN31026"
 ></A
 ><H3
 ><A
@@ -2670,7 +2670,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31300"
+NAME="AEN31032"
 ></A
 ><P
 ></P
@@ -2697,7 +2697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2715,7 +2715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2726,7 +2726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31313"
+NAME="AEN31045"
 ></A
 ><H3
 ><A
@@ -2754,7 +2754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31319"
+NAME="AEN31051"
 ></A
 ><P
 ></P
@@ -2781,7 +2781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2799,7 +2799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2810,7 +2810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31332"
+NAME="AEN31064"
 ></A
 ><H3
 ><A
@@ -2837,7 +2837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31338"
+NAME="AEN31070"
 ></A
 ><P
 ></P
@@ -2864,7 +2864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2882,7 +2882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2893,7 +2893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31351"
+NAME="AEN31083"
 ></A
 ><H3
 ><A
@@ -2921,7 +2921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31357"
+NAME="AEN31089"
 ></A
 ><P
 ></P
@@ -2948,7 +2948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2966,7 +2966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2977,7 +2977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31370"
+NAME="AEN31102"
 ></A
 ><H3
 ><A
@@ -3004,7 +3004,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31376"
+NAME="AEN31108"
 ></A
 ><P
 ></P
@@ -3031,7 +3031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3049,7 +3049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3060,7 +3060,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31389"
+NAME="AEN31121"
 ></A
 ><H3
 ><A
@@ -3087,7 +3087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31395"
+NAME="AEN31127"
 ></A
 ><P
 ></P
@@ -3114,7 +3114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3132,7 +3132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3143,7 +3143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31408"
+NAME="AEN31140"
 ></A
 ><H3
 ><A
@@ -3170,7 +3170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31414"
+NAME="AEN31146"
 ></A
 ><P
 ></P
@@ -3197,7 +3197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3215,7 +3215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3226,7 +3226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31427"
+NAME="AEN31159"
 ></A
 ><H3
 ><A
@@ -3253,7 +3253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31433"
+NAME="AEN31165"
 ></A
 ><P
 ></P
@@ -3280,7 +3280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3298,7 +3298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3309,7 +3309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31446"
+NAME="AEN31178"
 ></A
 ><H3
 ><A
@@ -3336,7 +3336,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31452"
+NAME="AEN31184"
 ></A
 ><P
 ></P
@@ -3363,7 +3363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3381,7 +3381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3392,7 +3392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31465"
+NAME="AEN31197"
 ></A
 ><H3
 ><A
@@ -3419,7 +3419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31471"
+NAME="AEN31203"
 ></A
 ><P
 ></P
@@ -3446,7 +3446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3464,7 +3464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3475,7 +3475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31484"
+NAME="AEN31216"
 ></A
 ><H3
 ><A
@@ -3502,7 +3502,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31490"
+NAME="AEN31222"
 ></A
 ><P
 ></P
@@ -3529,7 +3529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3547,7 +3547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3558,7 +3558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31503"
+NAME="AEN31235"
 ></A
 ><H3
 ><A
@@ -3586,7 +3586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31509"
+NAME="AEN31241"
 ></A
 ><P
 ></P
@@ -3613,7 +3613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3631,7 +3631,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3642,7 +3642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31522"
+NAME="AEN31254"
 ></A
 ><H3
 ><A
@@ -3669,7 +3669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31528"
+NAME="AEN31260"
 ></A
 ><P
 ></P
@@ -3696,7 +3696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3714,7 +3714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3725,7 +3725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31541"
+NAME="AEN31273"
 ></A
 ><H3
 ><A
@@ -3752,7 +3752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31547"
+NAME="AEN31279"
 ></A
 ><P
 ></P
@@ -3779,7 +3779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3797,7 +3797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3808,7 +3808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31560"
+NAME="AEN31292"
 ></A
 ><H3
 ><A
@@ -3835,7 +3835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31566"
+NAME="AEN31298"
 ></A
 ><P
 ></P
@@ -3862,7 +3862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3880,7 +3880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3891,7 +3891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31579"
+NAME="AEN31311"
 ></A
 ><H3
 ><A
@@ -3918,7 +3918,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31585"
+NAME="AEN31317"
 ></A
 ><P
 ></P
@@ -3945,7 +3945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3963,7 +3963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3974,7 +3974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31598"
+NAME="AEN31330"
 ></A
 ><H3
 ><A
@@ -4001,7 +4001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31604"
+NAME="AEN31336"
 ></A
 ><P
 ></P
@@ -4028,7 +4028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4046,7 +4046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4057,7 +4057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31617"
+NAME="AEN31349"
 ></A
 ><H3
 ><A
@@ -4084,7 +4084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31623"
+NAME="AEN31355"
 ></A
 ><P
 ></P
@@ -4111,7 +4111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4129,7 +4129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4140,7 +4140,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31636"
+NAME="AEN31368"
 ></A
 ><H3
 ><A
@@ -4167,7 +4167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31642"
+NAME="AEN31374"
 ></A
 ><P
 ></P
@@ -4194,7 +4194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4212,7 +4212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4223,7 +4223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31655"
+NAME="AEN31387"
 ></A
 ><H3
 ><A
@@ -4250,7 +4250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31661"
+NAME="AEN31393"
 ></A
 ><P
 ></P
@@ -4277,7 +4277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4295,7 +4295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4306,7 +4306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31674"
+NAME="AEN31406"
 ></A
 ><H3
 ><A
@@ -4333,7 +4333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31680"
+NAME="AEN31412"
 ></A
 ><P
 ></P
@@ -4360,7 +4360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4378,7 +4378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4389,7 +4389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31693"
+NAME="AEN31425"
 ></A
 ><H3
 ><A
@@ -4417,7 +4417,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31699"
+NAME="AEN31431"
 ></A
 ><P
 ></P
@@ -4444,7 +4444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4462,7 +4462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4473,7 +4473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31712"
+NAME="AEN31444"
 ></A
 ><H3
 ><A
@@ -4500,7 +4500,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31718"
+NAME="AEN31450"
 ></A
 ><P
 ></P
@@ -4527,7 +4527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4545,7 +4545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4556,7 +4556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31731"
+NAME="AEN31463"
 ></A
 ><H3
 ><A
@@ -4583,7 +4583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31737"
+NAME="AEN31469"
 ></A
 ><P
 ></P
@@ -4610,7 +4610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4628,7 +4628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4639,7 +4639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31750"
+NAME="AEN31482"
 ></A
 ><H3
 ><A
@@ -4666,7 +4666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31756"
+NAME="AEN31488"
 ></A
 ><P
 ></P
@@ -4693,7 +4693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4711,7 +4711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4722,7 +4722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31769"
+NAME="AEN31501"
 ></A
 ><H3
 ><A
@@ -4749,7 +4749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31775"
+NAME="AEN31507"
 ></A
 ><P
 ></P
@@ -4776,7 +4776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4794,7 +4794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4805,7 +4805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31788"
+NAME="AEN31520"
 ></A
 ><H3
 ><A
@@ -4833,7 +4833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31794"
+NAME="AEN31526"
 ></A
 ><P
 ></P
@@ -4860,7 +4860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4878,7 +4878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4889,7 +4889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31807"
+NAME="AEN31539"
 ></A
 ><H3
 ><A
@@ -4916,7 +4916,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31813"
+NAME="AEN31545"
 ></A
 ><P
 ></P
@@ -4943,7 +4943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4961,7 +4961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4972,7 +4972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31826"
+NAME="AEN31558"
 ></A
 ><H3
 ><A
@@ -4999,7 +4999,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31832"
+NAME="AEN31564"
 ></A
 ><P
 ></P
@@ -5026,7 +5026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5044,7 +5044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5055,7 +5055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31845"
+NAME="AEN31577"
 ></A
 ><H3
 ><A
@@ -5082,7 +5082,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31851"
+NAME="AEN31583"
 ></A
 ><P
 ></P
@@ -5109,7 +5109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5127,7 +5127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5138,7 +5138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31864"
+NAME="AEN31596"
 ></A
 ><H3
 ><A
@@ -5166,7 +5166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31870"
+NAME="AEN31602"
 ></A
 ><P
 ></P
@@ -5193,7 +5193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5211,7 +5211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5222,7 +5222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31883"
+NAME="AEN31615"
 ></A
 ><H3
 ><A
@@ -5249,7 +5249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31889"
+NAME="AEN31621"
 ></A
 ><P
 ></P
@@ -5276,7 +5276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5294,7 +5294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5305,7 +5305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31902"
+NAME="AEN31634"
 ></A
 ><H3
 ><A
@@ -5332,7 +5332,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31908"
+NAME="AEN31640"
 ></A
 ><P
 ></P
@@ -5359,7 +5359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5377,7 +5377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5388,7 +5388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31921"
+NAME="AEN31653"
 ></A
 ><H3
 ><A
@@ -5415,7 +5415,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31927"
+NAME="AEN31659"
 ></A
 ><P
 ></P
@@ -5442,7 +5442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5460,7 +5460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5471,7 +5471,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31940"
+NAME="AEN31672"
 ></A
 ><H3
 ><A
@@ -5498,7 +5498,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31946"
+NAME="AEN31678"
 ></A
 ><P
 ></P
@@ -5525,7 +5525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5543,7 +5543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5554,7 +5554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31959"
+NAME="AEN31691"
 ></A
 ><H3
 ><A
@@ -5581,7 +5581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31965"
+NAME="AEN31697"
 ></A
 ><P
 ></P
@@ -5608,7 +5608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5626,7 +5626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5637,7 +5637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31978"
+NAME="AEN31710"
 ></A
 ><H3
 ><A
@@ -5664,7 +5664,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN31984"
+NAME="AEN31716"
 ></A
 ><P
 ></P
@@ -5691,7 +5691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5709,7 +5709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5720,7 +5720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN31997"
+NAME="AEN31729"
 ></A
 ><H3
 ><A
@@ -5747,7 +5747,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32003"
+NAME="AEN31735"
 ></A
 ><P
 ></P
@@ -5774,7 +5774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5792,7 +5792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5803,7 +5803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32016"
+NAME="AEN31748"
 ></A
 ><H3
 ><A
@@ -5830,7 +5830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32022"
+NAME="AEN31754"
 ></A
 ><P
 ></P
@@ -5857,7 +5857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5875,7 +5875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5886,7 +5886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32035"
+NAME="AEN31767"
 ></A
 ><H3
 ><A
@@ -5913,7 +5913,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32041"
+NAME="AEN31773"
 ></A
 ><P
 ></P
@@ -5940,7 +5940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5958,7 +5958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5969,7 +5969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32054"
+NAME="AEN31786"
 ></A
 ><H3
 ><A
@@ -5996,7 +5996,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32060"
+NAME="AEN31792"
 ></A
 ><P
 ></P
@@ -6023,7 +6023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6041,7 +6041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6052,7 +6052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32073"
+NAME="AEN31805"
 ></A
 ><H3
 ><A
@@ -6079,7 +6079,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32079"
+NAME="AEN31811"
 ></A
 ><P
 ></P
@@ -6106,7 +6106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6124,7 +6124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6135,7 +6135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32092"
+NAME="AEN31824"
 ></A
 ><H3
 ><A
@@ -6162,7 +6162,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32098"
+NAME="AEN31830"
 ></A
 ><P
 ></P
@@ -6189,7 +6189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6207,7 +6207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6218,7 +6218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32111"
+NAME="AEN31843"
 ></A
 ><H3
 ><A
@@ -6245,7 +6245,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32117"
+NAME="AEN31849"
 ></A
 ><P
 ></P
@@ -6272,7 +6272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6290,7 +6290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6301,7 +6301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32130"
+NAME="AEN31862"
 ></A
 ><H3
 ><A
@@ -6329,7 +6329,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32136"
+NAME="AEN31868"
 ></A
 ><P
 ></P
@@ -6356,7 +6356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6374,7 +6374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6385,7 +6385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32149"
+NAME="AEN31881"
 ></A
 ><H3
 ><A
@@ -6412,7 +6412,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32155"
+NAME="AEN31887"
 ></A
 ><P
 ></P
@@ -6439,7 +6439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6457,7 +6457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6468,7 +6468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32168"
+NAME="AEN31900"
 ></A
 ><H3
 ><A
@@ -6495,7 +6495,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32174"
+NAME="AEN31906"
 ></A
 ><P
 ></P
@@ -6522,7 +6522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6540,7 +6540,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6551,7 +6551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32187"
+NAME="AEN31919"
 ></A
 ><H3
 ><A
@@ -6578,7 +6578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32193"
+NAME="AEN31925"
 ></A
 ><P
 ></P
@@ -6605,7 +6605,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6623,7 +6623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6634,7 +6634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32206"
+NAME="AEN31938"
 ></A
 ><H3
 ><A
@@ -6661,7 +6661,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32212"
+NAME="AEN31944"
 ></A
 ><P
 ></P
@@ -6688,7 +6688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6706,7 +6706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6717,7 +6717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32225"
+NAME="AEN31957"
 ></A
 ><H3
 ><A
@@ -6744,7 +6744,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32231"
+NAME="AEN31963"
 ></A
 ><P
 ></P
@@ -6771,7 +6771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6789,7 +6789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6800,7 +6800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32244"
+NAME="AEN31976"
 ></A
 ><H3
 ><A
@@ -6827,7 +6827,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32250"
+NAME="AEN31982"
 ></A
 ><P
 ></P
@@ -6854,7 +6854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6872,7 +6872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6883,7 +6883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32263"
+NAME="AEN31995"
 ></A
 ><H3
 ><A
@@ -6910,7 +6910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32269"
+NAME="AEN32001"
 ></A
 ><P
 ></P
@@ -6937,7 +6937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6955,7 +6955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6966,7 +6966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32282"
+NAME="AEN32014"
 ></A
 ><H3
 ><A
@@ -6993,7 +6993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32288"
+NAME="AEN32020"
 ></A
 ><P
 ></P
@@ -7020,7 +7020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7038,7 +7038,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7049,7 +7049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32301"
+NAME="AEN32033"
 ></A
 ><H3
 ><A
@@ -7076,7 +7076,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32307"
+NAME="AEN32039"
 ></A
 ><P
 ></P
@@ -7103,7 +7103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7121,7 +7121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7132,7 +7132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32320"
+NAME="AEN32052"
 ></A
 ><H3
 ><A
@@ -7160,7 +7160,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32326"
+NAME="AEN32058"
 ></A
 ><P
 ></P
@@ -7187,7 +7187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7205,7 +7205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7216,7 +7216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32339"
+NAME="AEN32071"
 ></A
 ><H3
 ><A
@@ -7243,7 +7243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32345"
+NAME="AEN32077"
 ></A
 ><P
 ></P
@@ -7270,7 +7270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7288,7 +7288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7299,7 +7299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32358"
+NAME="AEN32090"
 ></A
 ><H3
 ><A
@@ -7326,7 +7326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32364"
+NAME="AEN32096"
 ></A
 ><P
 ></P
@@ -7353,7 +7353,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7371,7 +7371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7382,7 +7382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32377"
+NAME="AEN32109"
 ></A
 ><H3
 ><A
@@ -7409,7 +7409,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32383"
+NAME="AEN32115"
 ></A
 ><P
 ></P
@@ -7436,7 +7436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7454,7 +7454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7465,7 +7465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32396"
+NAME="AEN32128"
 ></A
 ><H3
 ><A
@@ -7492,7 +7492,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32402"
+NAME="AEN32134"
 ></A
 ><P
 ></P
@@ -7519,7 +7519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7537,7 +7537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7548,7 +7548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32415"
+NAME="AEN32147"
 ></A
 ><H3
 ><A
@@ -7575,7 +7575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32421"
+NAME="AEN32153"
 ></A
 ><P
 ></P
@@ -7602,7 +7602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7620,7 +7620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7631,7 +7631,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32434"
+NAME="AEN32166"
 ></A
 ><H3
 ><A
@@ -7658,7 +7658,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32440"
+NAME="AEN32172"
 ></A
 ><P
 ></P
@@ -7685,7 +7685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7703,7 +7703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7714,7 +7714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32453"
+NAME="AEN32185"
 ></A
 ><H3
 ><A
@@ -7741,7 +7741,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32459"
+NAME="AEN32191"
 ></A
 ><P
 ></P
@@ -7768,7 +7768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7786,7 +7786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7797,7 +7797,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32472"
+NAME="AEN32204"
 ></A
 ><H3
 ><A
@@ -7825,7 +7825,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32478"
+NAME="AEN32210"
 ></A
 ><P
 ></P
@@ -7852,7 +7852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7870,7 +7870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7881,7 +7881,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32491"
+NAME="AEN32223"
 ></A
 ><H3
 ><A
@@ -7908,7 +7908,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32497"
+NAME="AEN32229"
 ></A
 ><P
 ></P
@@ -7935,7 +7935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7953,7 +7953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7964,7 +7964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32510"
+NAME="AEN32242"
 ></A
 ><H3
 ><A
@@ -7991,7 +7991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32516"
+NAME="AEN32248"
 ></A
 ><P
 ></P
@@ -8018,7 +8018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8036,7 +8036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8047,7 +8047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32529"
+NAME="AEN32261"
 ></A
 ><H3
 ><A
@@ -8074,7 +8074,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32535"
+NAME="AEN32267"
 ></A
 ><P
 ></P
@@ -8101,7 +8101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8119,7 +8119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8130,7 +8130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32548"
+NAME="AEN32280"
 ></A
 ><H3
 ><A
@@ -8157,7 +8157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32554"
+NAME="AEN32286"
 ></A
 ><P
 ></P
@@ -8184,7 +8184,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8202,7 +8202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8213,7 +8213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32567"
+NAME="AEN32299"
 ></A
 ><H3
 ><A
@@ -8240,7 +8240,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32573"
+NAME="AEN32305"
 ></A
 ><P
 ></P
@@ -8267,7 +8267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8285,7 +8285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8296,7 +8296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32586"
+NAME="AEN32318"
 ></A
 ><H3
 ><A
@@ -8323,7 +8323,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32592"
+NAME="AEN32324"
 ></A
 ><P
 ></P
@@ -8350,7 +8350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8368,7 +8368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8379,7 +8379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32605"
+NAME="AEN32337"
 ></A
 ><H3
 ><A
@@ -8406,7 +8406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32611"
+NAME="AEN32343"
 ></A
 ><P
 ></P
@@ -8433,7 +8433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8451,7 +8451,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8462,7 +8462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32624"
+NAME="AEN32356"
 ></A
 ><H3
 ><A
@@ -8490,7 +8490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32630"
+NAME="AEN32362"
 ></A
 ><P
 ></P
@@ -8517,7 +8517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8535,7 +8535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8546,7 +8546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32643"
+NAME="AEN32375"
 ></A
 ><H3
 ><A
@@ -8573,7 +8573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32649"
+NAME="AEN32381"
 ></A
 ><P
 ></P
@@ -8600,7 +8600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8618,7 +8618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8629,7 +8629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32662"
+NAME="AEN32394"
 ></A
 ><H3
 ><A
@@ -8656,7 +8656,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32668"
+NAME="AEN32400"
 ></A
 ><P
 ></P
@@ -8683,7 +8683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8701,7 +8701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8712,7 +8712,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32681"
+NAME="AEN32413"
 ></A
 ><H3
 ><A
@@ -8740,7 +8740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32687"
+NAME="AEN32419"
 ></A
 ><P
 ></P
@@ -8767,7 +8767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8784,7 +8784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS block name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8802,7 +8802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if false and -1 on unknown block</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8813,7 +8813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32704"
+NAME="AEN32436"
 ></A
 ><H3
 ><A
@@ -8840,7 +8840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32710"
+NAME="AEN32442"
 ></A
 ><P
 ></P
@@ -8867,7 +8867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8885,7 +8885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8896,7 +8896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32723"
+NAME="AEN32455"
 ></A
 ><H3
 ><A
@@ -8923,7 +8923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32729"
+NAME="AEN32461"
 ></A
 ><P
 ></P
@@ -8950,7 +8950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8968,7 +8968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8979,7 +8979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32742"
+NAME="AEN32474"
 ></A
 ><H3
 ><A
@@ -9006,7 +9006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32748"
+NAME="AEN32480"
 ></A
 ><P
 ></P
@@ -9033,7 +9033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9051,7 +9051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9062,7 +9062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32761"
+NAME="AEN32493"
 ></A
 ><H3
 ><A
@@ -9089,7 +9089,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32767"
+NAME="AEN32499"
 ></A
 ><P
 ></P
@@ -9116,7 +9116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9134,7 +9134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9145,7 +9145,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32780"
+NAME="AEN32512"
 ></A
 ><H3
 ><A
@@ -9172,7 +9172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32786"
+NAME="AEN32518"
 ></A
 ><P
 ></P
@@ -9199,7 +9199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9217,7 +9217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9228,7 +9228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32799"
+NAME="AEN32531"
 ></A
 ><H3
 ><A
@@ -9255,7 +9255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32805"
+NAME="AEN32537"
 ></A
 ><P
 ></P
@@ -9282,7 +9282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9300,7 +9300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9311,7 +9311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32818"
+NAME="AEN32550"
 ></A
 ><H3
 ><A
@@ -9338,7 +9338,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32824"
+NAME="AEN32556"
 ></A
 ><P
 ></P
@@ -9365,7 +9365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9383,7 +9383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9394,7 +9394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32837"
+NAME="AEN32569"
 ></A
 ><H3
 ><A
@@ -9421,7 +9421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32843"
+NAME="AEN32575"
 ></A
 ><P
 ></P
@@ -9448,7 +9448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9466,7 +9466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9477,7 +9477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32856"
+NAME="AEN32588"
 ></A
 ><H3
 ><A
@@ -9504,7 +9504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32862"
+NAME="AEN32594"
 ></A
 ><P
 ></P
@@ -9531,7 +9531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9549,7 +9549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9560,7 +9560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32875"
+NAME="AEN32607"
 ></A
 ><H3
 ><A
@@ -9587,7 +9587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32881"
+NAME="AEN32613"
 ></A
 ><P
 ></P
@@ -9614,7 +9614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9632,7 +9632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9643,7 +9643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32894"
+NAME="AEN32626"
 ></A
 ><H3
 ><A
@@ -9670,7 +9670,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32900"
+NAME="AEN32632"
 ></A
 ><P
 ></P
@@ -9697,7 +9697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9715,7 +9715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9726,7 +9726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32913"
+NAME="AEN32645"
 ></A
 ><H3
 ><A
@@ -9753,7 +9753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32919"
+NAME="AEN32651"
 ></A
 ><P
 ></P
@@ -9780,7 +9780,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9798,7 +9798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9809,7 +9809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32932"
+NAME="AEN32664"
 ></A
 ><H3
 ><A
@@ -9836,7 +9836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32938"
+NAME="AEN32670"
 ></A
 ><P
 ></P
@@ -9863,7 +9863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9881,7 +9881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9892,7 +9892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32951"
+NAME="AEN32683"
 ></A
 ><H3
 ><A
@@ -9919,7 +9919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32957"
+NAME="AEN32689"
 ></A
 ><P
 ></P
@@ -9946,7 +9946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9964,7 +9964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9975,7 +9975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32970"
+NAME="AEN32702"
 ></A
 ><H3
 ><A
@@ -10002,7 +10002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32976"
+NAME="AEN32708"
 ></A
 ><P
 ></P
@@ -10029,7 +10029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10047,7 +10047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10058,7 +10058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN32989"
+NAME="AEN32721"
 ></A
 ><H3
 ><A
@@ -10085,7 +10085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN32995"
+NAME="AEN32727"
 ></A
 ><P
 ></P
@@ -10112,7 +10112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10130,7 +10130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10141,7 +10141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33008"
+NAME="AEN32740"
 ></A
 ><H3
 ><A
@@ -10168,7 +10168,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33014"
+NAME="AEN32746"
 ></A
 ><P
 ></P
@@ -10195,7 +10195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10213,7 +10213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10224,7 +10224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33027"
+NAME="AEN32759"
 ></A
 ><H3
 ><A
@@ -10251,7 +10251,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33033"
+NAME="AEN32765"
 ></A
 ><P
 ></P
@@ -10278,7 +10278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10296,7 +10296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10307,7 +10307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33046"
+NAME="AEN32778"
 ></A
 ><H3
 ><A
@@ -10334,7 +10334,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33052"
+NAME="AEN32784"
 ></A
 ><P
 ></P
@@ -10361,7 +10361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10379,7 +10379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10390,7 +10390,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33065"
+NAME="AEN32797"
 ></A
 ><H3
 ><A
@@ -10417,7 +10417,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33071"
+NAME="AEN32803"
 ></A
 ><P
 ></P
@@ -10444,7 +10444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10462,7 +10462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10473,7 +10473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33084"
+NAME="AEN32816"
 ></A
 ><H3
 ><A
@@ -10500,7 +10500,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33090"
+NAME="AEN32822"
 ></A
 ><P
 ></P
@@ -10527,7 +10527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10545,7 +10545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10556,7 +10556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33103"
+NAME="AEN32835"
 ></A
 ><H3
 ><A
@@ -10583,7 +10583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33109"
+NAME="AEN32841"
 ></A
 ><P
 ></P
@@ -10610,7 +10610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10628,7 +10628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10639,7 +10639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33122"
+NAME="AEN32854"
 ></A
 ><H3
 ><A
@@ -10666,7 +10666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33128"
+NAME="AEN32860"
 ></A
 ><P
 ></P
@@ -10693,7 +10693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10711,7 +10711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10722,7 +10722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33141"
+NAME="AEN32873"
 ></A
 ><H3
 ><A
@@ -10749,7 +10749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33147"
+NAME="AEN32879"
 ></A
 ><P
 ></P
@@ -10776,7 +10776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10794,7 +10794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10805,7 +10805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33160"
+NAME="AEN32892"
 ></A
 ><H3
 ><A
@@ -10832,7 +10832,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33166"
+NAME="AEN32898"
 ></A
 ><P
 ></P
@@ -10859,7 +10859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10877,7 +10877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10888,7 +10888,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33179"
+NAME="AEN32911"
 ></A
 ><H3
 ><A
@@ -10915,7 +10915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33185"
+NAME="AEN32917"
 ></A
 ><P
 ></P
@@ -10942,7 +10942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10960,7 +10960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10971,7 +10971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33198"
+NAME="AEN32930"
 ></A
 ><H3
 ><A
@@ -10998,7 +10998,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33204"
+NAME="AEN32936"
 ></A
 ><P
 ></P
@@ -11025,7 +11025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11043,7 +11043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11054,7 +11054,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33217"
+NAME="AEN32949"
 ></A
 ><H3
 ><A
@@ -11081,7 +11081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33223"
+NAME="AEN32955"
 ></A
 ><P
 ></P
@@ -11108,7 +11108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11126,7 +11126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11137,7 +11137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33236"
+NAME="AEN32968"
 ></A
 ><H3
 ><A
@@ -11164,7 +11164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33242"
+NAME="AEN32974"
 ></A
 ><P
 ></P
@@ -11191,7 +11191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11209,7 +11209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11220,7 +11220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33255"
+NAME="AEN32987"
 ></A
 ><H3
 ><A
@@ -11247,7 +11247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33261"
+NAME="AEN32993"
 ></A
 ><P
 ></P
@@ -11274,7 +11274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11292,7 +11292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11303,7 +11303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33274"
+NAME="AEN33006"
 ></A
 ><H3
 ><A
@@ -11330,7 +11330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33280"
+NAME="AEN33012"
 ></A
 ><P
 ></P
@@ -11357,7 +11357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11375,7 +11375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11386,7 +11386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33293"
+NAME="AEN33025"
 ></A
 ><H3
 ><A
@@ -11413,7 +11413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33299"
+NAME="AEN33031"
 ></A
 ><P
 ></P
@@ -11440,7 +11440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11458,7 +11458,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11469,7 +11469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33312"
+NAME="AEN33044"
 ></A
 ><H3
 ><A
@@ -11496,7 +11496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33318"
+NAME="AEN33050"
 ></A
 ><P
 ></P
@@ -11523,7 +11523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11541,7 +11541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11552,7 +11552,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33331"
+NAME="AEN33063"
 ></A
 ><H3
 ><A
@@ -11579,7 +11579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33337"
+NAME="AEN33069"
 ></A
 ><P
 ></P
@@ -11606,7 +11606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11624,7 +11624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11635,7 +11635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33350"
+NAME="AEN33082"
 ></A
 ><H3
 ><A
@@ -11662,7 +11662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33356"
+NAME="AEN33088"
 ></A
 ><P
 ></P
@@ -11689,7 +11689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11707,7 +11707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11718,7 +11718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33369"
+NAME="AEN33101"
 ></A
 ><H3
 ><A
@@ -11745,7 +11745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33375"
+NAME="AEN33107"
 ></A
 ><P
 ></P
@@ -11772,7 +11772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11790,7 +11790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11801,7 +11801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN33388"
+NAME="AEN33120"
 ></A
 ><H3
 ><A
@@ -11829,7 +11829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN33394"
+NAME="AEN33126"
 ></A
 ><P
 ></P
@@ -11856,7 +11856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS code point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11873,7 +11873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> UCS Category name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11891,7 +11891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true, 0 if false and -1 on unknown category</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 6c0eda2..4a90c88 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14399"
+NAME="AEN14258"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14402"
+NAME="AEN14261"
 ></A
 ><H2
 >Synopsis</H2
@@ -592,7 +592,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14528"
+NAME="AEN14387"
 ></A
 ><H2
 >Description</H2
@@ -602,14 +602,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14531"
+NAME="AEN14390"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14533"
+NAME="AEN14392"
 ></A
 ><H3
 ><A
@@ -698,33 +698,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14539"
+NAME="AEN14398"
 ></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="AEN14544"
+NAME="AEN14402"
 ></A
 ><H3
 ><A
@@ -768,33 +755,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14550"
+NAME="AEN14408"
 ></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="AEN14555"
+NAME="AEN14412"
 ></A
 ><H3
 ><A
@@ -843,7 +817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14560"
+NAME="AEN14417"
 ></A
 ><H3
 ><A
@@ -874,33 +848,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14565"
+NAME="AEN14422"
 ></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="AEN14570"
+NAME="AEN14426"
 ></A
 ><H3
 ><A
@@ -937,7 +898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14575"
+NAME="AEN14431"
 ></A
 ><H3
 ><A
@@ -973,33 +934,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14580"
+NAME="AEN14436"
 ></A
 ><H3
 ><A
 NAME="XMLXPATHOBJECTPTR"
 ></A
 >xmlXPathObjectPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathObject *xmlXPathObjectPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14585"
+NAME="AEN14440"
 ></A
 ><H3
 ><A
@@ -1031,7 +979,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14592"
+NAME="AEN14447"
 ></A
 ><P
 ></P
@@ -1058,7 +1006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1075,7 +1023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of the target type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1093,7 +1041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1104,7 +1052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14609"
+NAME="AEN14464"
 ></A
 ><H3
 ><A
@@ -1133,33 +1081,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14614"
+NAME="AEN14469"
 ></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="AEN14619"
+NAME="AEN14473"
 ></A
 ><H3
 ><A
@@ -1188,33 +1123,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14624"
+NAME="AEN14478"
 ></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="AEN14629"
+NAME="AEN14482"
 ></A
 ><H3
 ><A
@@ -1245,7 +1167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14636"
+NAME="AEN14489"
 ></A
 ><P
 ></P
@@ -1272,7 +1194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1289,7 +1211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of arguments passed to the function</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1300,7 +1222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14649"
+NAME="AEN14502"
 ></A
 ><H3
 ><A
@@ -1329,33 +1251,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14654"
+NAME="AEN14507"
 ></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="AEN14659"
+NAME="AEN14511"
 ></A
 ><H3
 ><A
@@ -1394,7 +1303,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14668"
+NAME="AEN14520"
 ></A
 ><P
 ></P
@@ -1421,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath interpreter context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1438,7 +1347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the previous node being explored on that axis</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1456,7 +1365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next node in that axis or NULL if at the end of the axis.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1467,7 +1376,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14685"
+NAME="AEN14537"
 ></A
 ><H3
 ><A
@@ -1496,33 +1405,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14690"
+NAME="AEN14542"
 ></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="AEN14695"
+NAME="AEN14546"
 ></A
 ><H3
 ><A
@@ -1548,33 +1444,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14700"
+NAME="AEN14551"
 ></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="AEN14705"
+NAME="AEN14555"
 ></A
 ><H3
 ><A
@@ -1607,7 +1490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14712"
+NAME="AEN14562"
 ></A
 ><P
 ></P
@@ -1634,7 +1517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath interprestation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1651,7 +1534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1662,7 +1545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14725"
+NAME="AEN14575"
 ></A
 ><H3
 ><A
@@ -1697,7 +1580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14733"
+NAME="AEN14583"
 ></A
 ><P
 ></P
@@ -1724,7 +1607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a double value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1742,7 +1625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the value is a NaN, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1753,7 +1636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14746"
+NAME="AEN14596"
 ></A
 ><H3
 ><A
@@ -1788,7 +1671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14754"
+NAME="AEN14604"
 ></A
 ><P
 ></P
@@ -1815,7 +1698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a double value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1833,7 +1716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 vi the value is +Infinite, -1 if -Infinite, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1844,7 +1727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14767"
+NAME="AEN14617"
 ></A
 ><H3
 ><A
@@ -1860,7 +1743,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)-&gt;nodeNr : 0)</PRE
+>#define     xmlXPathNodeSetGetLength(ns)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1871,7 +1754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14773"
+NAME="AEN14623"
 ></A
 ><P
 ></P
@@ -1898,7 +1781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1909,7 +1792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14782"
+NAME="AEN14632"
 ></A
 ><H3
 ><A
@@ -1939,7 +1822,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14789"
+NAME="AEN14639"
 ></A
 ><P
 ></P
@@ -1966,7 +1849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1983,7 +1866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  index of a node in the set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1994,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14802"
+NAME="AEN14652"
 ></A
 ><H3
 ><A
@@ -2026,7 +1909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14809"
+NAME="AEN14659"
 ></A
 ><P
 ></P
@@ -2053,7 +1936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node-set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2064,7 +1947,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14818"
+NAME="AEN14668"
 ></A
 ><H3
 ><A
@@ -2094,7 +1977,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14825"
+NAME="AEN14675"
 ></A
 ><P
 ></P
@@ -2121,7 +2004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2132,7 +2015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14834"
+NAME="AEN14684"
 ></A
 ><H3
 ><A
@@ -2170,7 +2053,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14843"
+NAME="AEN14693"
 ></A
 ><P
 ></P
@@ -2197,7 +2080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an initial xmlNodePtr, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2215,7 +2098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2226,7 +2109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14856"
+NAME="AEN14706"
 ></A
 ><H3
 ><A
@@ -2265,7 +2148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14865"
+NAME="AEN14715"
 ></A
 ><P
 ></P
@@ -2292,7 +2175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing NodeSetList object</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2303,7 +2186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14874"
+NAME="AEN14724"
 ></A
 ><H3
 ><A
@@ -2333,7 +2216,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14881"
+NAME="AEN14731"
 ></A
 ><P
 ></P
@@ -2360,7 +2243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlNodeSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2371,7 +2254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14890"
+NAME="AEN14740"
 ></A
 ><H3
 ><A
@@ -2404,7 +2287,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14898"
+NAME="AEN14748"
 ></A
 ><P
 ></P
@@ -2431,7 +2314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2449,7 +2332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2460,7 +2343,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14911"
+NAME="AEN14761"
 ></A
 ><H3
 ><A
@@ -2494,7 +2377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14919"
+NAME="AEN14769"
 ></A
 ><P
 ></P
@@ -2521,7 +2404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2538,7 +2421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2556,8 +2439,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
@@ -2568,7 +2450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14936"
+NAME="AEN14786"
 ></A
 ><H3
 ><A
@@ -2598,7 +2480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14943"
+NAME="AEN14793"
 ></A
 ><P
 ></P
@@ -2625,7 +2507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2643,7 +2525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2654,7 +2536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14956"
+NAME="AEN14806"
 ></A
 ><H3
 ><A
@@ -2684,7 +2566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14963"
+NAME="AEN14813"
 ></A
 ><P
 ></P
@@ -2711,7 +2593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2729,7 +2611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2740,7 +2622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14976"
+NAME="AEN14826"
 ></A
 ><H3
 ><A
@@ -2770,7 +2652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14983"
+NAME="AEN14833"
 ></A
 ><P
 ></P
@@ -2797,7 +2679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2815,7 +2697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2826,7 +2708,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14996"
+NAME="AEN14846"
 ></A
 ><H3
 ><A
@@ -2856,7 +2738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15003"
+NAME="AEN14853"
 ></A
 ><P
 ></P
@@ -2883,7 +2765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2901,7 +2783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2912,7 +2794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15016"
+NAME="AEN14866"
 ></A
 ><H3
 ><A
@@ -2942,7 +2824,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15023"
+NAME="AEN14873"
 ></A
 ><P
 ></P
@@ -2969,7 +2851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a boolean</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2987,7 +2869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2998,7 +2880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15036"
+NAME="AEN14886"
 ></A
 ><H3
 ><A
@@ -3031,7 +2913,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15044"
+NAME="AEN14894"
 ></A
 ><P
 ></P
@@ -3058,7 +2940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3076,7 +2958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3087,7 +2969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15057"
+NAME="AEN14907"
 ></A
 ><H3
 ><A
@@ -3120,7 +3002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15065"
+NAME="AEN14915"
 ></A
 ><P
 ></P
@@ -3147,7 +3029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3165,7 +3047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3176,7 +3058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15078"
+NAME="AEN14928"
 ></A
 ><H3
 ><A
@@ -3209,7 +3091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15086"
+NAME="AEN14936"
 ></A
 ><P
 ></P
@@ -3236,7 +3118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3254,7 +3136,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3265,7 +3147,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15099"
+NAME="AEN14949"
 ></A
 ><H3
 ><A
@@ -3298,7 +3180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15107"
+NAME="AEN14957"
 ></A
 ><P
 ></P
@@ -3325,7 +3207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3343,7 +3225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number value</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3354,7 +3236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15120"
+NAME="AEN14970"
 ></A
 ><H3
 ><A
@@ -3384,7 +3266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15127"
+NAME="AEN14977"
 ></A
 ><P
 ></P
@@ -3411,7 +3293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a boolean</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3429,7 +3311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3440,7 +3322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15140"
+NAME="AEN14990"
 ></A
 ><H3
 ><A
@@ -3473,7 +3355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15148"
+NAME="AEN14998"
 ></A
 ><P
 ></P
@@ -3500,7 +3382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3518,7 +3400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3529,7 +3411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15161"
+NAME="AEN15011"
 ></A
 ><H3
 ><A
@@ -3562,7 +3444,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15169"
+NAME="AEN15019"
 ></A
 ><P
 ></P
@@ -3589,7 +3471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3607,7 +3489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3618,7 +3500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15182"
+NAME="AEN15032"
 ></A
 ><H3
 ><A
@@ -3651,7 +3533,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15190"
+NAME="AEN15040"
 ></A
 ><P
 ></P
@@ -3678,7 +3560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3696,7 +3578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly allocated string.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3707,7 +3589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15203"
+NAME="AEN15053"
 ></A
 ><H3
 ><A
@@ -3743,7 +3625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15212"
+NAME="AEN15062"
 ></A
 ><P
 ></P
@@ -3770,7 +3652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3788,14 +3670,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 (<TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-> isn't a
-        string object).</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3806,7 +3681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15226"
+NAME="AEN15075"
 ></A
 ><H3
 ><A
@@ -3842,7 +3717,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15235"
+NAME="AEN15084"
 ></A
 ><P
 ></P
@@ -3869,7 +3744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3887,13 +3762,7 @@
 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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3904,7 +3773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15249"
+NAME="AEN15097"
 ></A
 ><H3
 ><A
@@ -3940,7 +3809,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15258"
+NAME="AEN15106"
 ></A
 ><P
 ></P
@@ -3967,7 +3836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3985,13 +3854,7 @@
 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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4002,7 +3865,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15272"
+NAME="AEN15119"
 ></A
 ><H3
 ><A
@@ -4038,7 +3901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15281"
+NAME="AEN15128"
 ></A
 ><P
 ></P
@@ -4065,7 +3928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4083,13 +3946,7 @@
 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
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4100,7 +3957,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15295"
+NAME="AEN15141"
 ></A
 ><H3
 ><A
@@ -4128,7 +3985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15301"
+NAME="AEN15147"
 ></A
 ><H3
 ><A
@@ -4161,7 +4018,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15309"
+NAME="AEN15155"
 ></A
 ><P
 ></P
@@ -4188,7 +4045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4206,7 +4063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated. The caller will need to free it.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4217,7 +4074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15322"
+NAME="AEN15168"
 ></A
 ><H3
 ><A
@@ -4247,7 +4104,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15329"
+NAME="AEN15175"
 ></A
 ><P
 ></P
@@ -4274,7 +4131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4285,7 +4142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15338"
+NAME="AEN15184"
 ></A
 ><H3
 ><A
@@ -4322,7 +4179,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15347"
+NAME="AEN15193"
 ></A
 ><P
 ></P
@@ -4349,7 +4206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4366,7 +4223,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4384,8 +4241,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
@@ -4396,7 +4252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15364"
+NAME="AEN15210"
 ></A
 ><H3
 ><A
@@ -4433,7 +4289,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15373"
+NAME="AEN15219"
 ></A
 ><P
 ></P
@@ -4460,7 +4316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4477,7 +4333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4495,8 +4351,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
@@ -4507,7 +4362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15390"
+NAME="AEN15236"
 ></A
 ><H3
 ><A
@@ -4548,7 +4403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15398"
+NAME="AEN15244"
 ></A
 ><P
 ></P
@@ -4575,7 +4430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4592,7 +4447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Predicate Expression evaluation result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4610,7 +4465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if predicate is true, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4621,7 +4476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15415"
+NAME="AEN15261"
 ></A
 ><H3
 ><A
@@ -4654,7 +4509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15423"
+NAME="AEN15269"
 ></A
 ><P
 ></P
@@ -4681,7 +4536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4699,8 +4554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathCompExprPtr resulting from the compilation or NULL.
-        the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4711,7 +4565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15436"
+NAME="AEN15282"
 ></A
 ><H3
 ><A
@@ -4748,7 +4602,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15445"
+NAME="AEN15291"
 ></A
 ><P
 ></P
@@ -4775,7 +4629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compiled XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4792,7 +4646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4810,8 +4664,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
@@ -4822,7 +4675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15462"
+NAME="AEN15308"
 ></A
 ><H3
 ><A
@@ -4857,7 +4710,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15470"
+NAME="AEN15316"
 ></A
 ><P
 ></P
@@ -4884,7 +4737,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 936556f..37a5339 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15484"
+NAME="AEN15330"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15487"
+NAME="AEN15333"
 ></A
 ><H2
 >Synopsis</H2
@@ -1516,7 +1516,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15862"
+NAME="AEN15708"
 ></A
 ><H2
 >Description</H2
@@ -1526,14 +1526,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15865"
+NAME="AEN15711"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15867"
+NAME="AEN15713"
 ></A
 ><H3
 ><A
@@ -1560,7 +1560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15873"
+NAME="AEN15719"
 ></A
 ><P
 ></P
@@ -1587,7 +1587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1604,7 +1604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlXPathError code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1615,7 +1615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15886"
+NAME="AEN15732"
 ></A
 ><H3
 ><A
@@ -1642,7 +1642,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15892"
+NAME="AEN15738"
 ></A
 ><P
 ></P
@@ -1669,7 +1669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1680,7 +1680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15901"
+NAME="AEN15747"
 ></A
 ><H3
 ><A
@@ -1707,7 +1707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15907"
+NAME="AEN15753"
 ></A
 ><P
 ></P
@@ -1734,7 +1734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1745,7 +1745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15916"
+NAME="AEN15762"
 ></A
 ><H3
 ><A
@@ -1761,7 +1761,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathGetError(ctxt)	  ((ctxt)-&gt;error)</PRE
+>#define     xmlXPathGetError(ctxt)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1772,7 +1772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15922"
+NAME="AEN15768"
 ></A
 ><P
 ></P
@@ -1799,7 +1799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1810,7 +1810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15931"
+NAME="AEN15777"
 ></A
 ><H3
 ><A
@@ -1826,7 +1826,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathCheckError(ctxt)  ((ctxt)-&gt;error != XPATH_EXPRESSION_OK)</PRE
+>#define     xmlXPathCheckError(ctxt)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1837,7 +1837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15937"
+NAME="AEN15783"
 ></A
 ><P
 ></P
@@ -1864,7 +1864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1875,7 +1875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15946"
+NAME="AEN15792"
 ></A
 ><H3
 ><A
@@ -1891,7 +1891,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathGetDocument(ctxt)	((ctxt)-&gt;context-&gt;doc)</PRE
+>#define     xmlXPathGetDocument(ctxt)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1902,7 +1902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15952"
+NAME="AEN15798"
 ></A
 ><P
 ></P
@@ -1929,7 +1929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1940,7 +1940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15961"
+NAME="AEN15807"
 ></A
 ><H3
 ><A
@@ -1956,7 +1956,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathGetContextNode(ctxt)	((ctxt)-&gt;context-&gt;node)</PRE
+>#define     xmlXPathGetContextNode(ctxt)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1967,7 +1967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15967"
+NAME="AEN15813"
 ></A
 ><P
 ></P
@@ -1994,7 +1994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2005,7 +2005,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15976"
+NAME="AEN15822"
 ></A
 ><H3
 ><A
@@ -2039,7 +2039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15984"
+NAME="AEN15830"
 ></A
 ><P
 ></P
@@ -2066,7 +2066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2084,7 +2084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the boolean</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2095,7 +2095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15997"
+NAME="AEN15843"
 ></A
 ><H3
 ><A
@@ -2132,7 +2132,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16006"
+NAME="AEN15852"
 ></A
 ><P
 ></P
@@ -2159,7 +2159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2177,7 +2177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2188,7 +2188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16019"
+NAME="AEN15865"
 ></A
 ><H3
 ><A
@@ -2225,7 +2225,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16028"
+NAME="AEN15874"
 ></A
 ><P
 ></P
@@ -2252,7 +2252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2270,7 +2270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2281,7 +2281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16041"
+NAME="AEN15887"
 ></A
 ><H3
 ><A
@@ -2318,7 +2318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16050"
+NAME="AEN15896"
 ></A
 ><P
 ></P
@@ -2345,7 +2345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2363,7 +2363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the node-set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2374,7 +2374,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16063"
+NAME="AEN15909"
 ></A
 ><H3
 ><A
@@ -2408,7 +2408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16071"
+NAME="AEN15917"
 ></A
 ><P
 ></P
@@ -2435,7 +2435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2446,7 +2446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16080"
+NAME="AEN15926"
 ></A
 ><H3
 ><A
@@ -2478,7 +2478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16087"
+NAME="AEN15933"
 ></A
 ><P
 ></P
@@ -2505,7 +2505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2522,7 +2522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a boolean</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2533,7 +2533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16100"
+NAME="AEN15946"
 ></A
 ><H3
 ><A
@@ -2549,7 +2549,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlXPathReturnTrue(ctxt)   xmlXPathReturnBoolean((ctxt), 1)</PRE
+>#define     xmlXPathReturnTrue(ctxt)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2560,6 +2560,676 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
+NAME="AEN15952"
+></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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15961"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNFALSE"
+></A
+>xmlXPathReturnFalse()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnFalse(ctxt)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes false on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15967"
+></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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15976"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNNUMBER"
+></A
+>xmlXPathReturnNumber()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnNumber(ctxt, val)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes the double <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+> on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15983"
+></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
+>val</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="AEN15996"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNSTRING"
+></A
+>xmlXPathReturnString()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnString(ctxt, str)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes the string <TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+> on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16003"
+></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
+>str</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="AEN16016"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNEMPTYSTRING"
+></A
+>xmlXPathReturnEmptyString()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnEmptyString(ctxt)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes an empty string on the stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16022"
+></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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN16031"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNNODESET"
+></A
+>xmlXPathReturnNodeSet()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnNodeSet(ctxt, ns)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes the node-set <TT
+CLASS="PARAMETER"
+><I
+>ns</I
+></TT
+> on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16038"
+></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
+>ns</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="AEN16051"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNEMPTYNODESET"
+></A
+>xmlXPathReturnEmptyNodeSet()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnEmptyNodeSet(ctxt)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes an empty node-set on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16057"
+></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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN16066"
+></A
+><H3
+><A
+NAME="XMLXPATHRETURNEXTERNAL"
+></A
+>xmlXPathReturnExternal()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathReturnExternal(ctxt, val)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Pushes user data on the context stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16072"
+></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
+>val</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="AEN16085"
+></A
+><H3
+><A
+NAME="XMLXPATHSTACKISNODESET"
+></A
+>xmlXPathStackIsNodeSet()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathStackIsNodeSet(ctxt)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Check if the current value on the XPath stack is a node set or
+an XSLT value tree.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN16091"
+></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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN16100"
+></A
+><H3
+><A
+NAME="XMLXPATHSTACKISEXTERNAL"
+></A
+>xmlXPathStackIsExternal()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     xmlXPathStackIsExternal(ctxt)</PRE
+></TD
+></TR
+></TABLE
+><P
+>Checks if the current value on the XPath stack is an external
+object.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
 NAME="AEN16106"
 ></A
 ><P
@@ -2587,7 +3257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2602,676 +3272,6 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHRETURNFALSE"
-></A
->xmlXPathReturnFalse()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define xmlXPathReturnFalse(ctxt)  xmlXPathReturnBoolean((ctxt), 0)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes false on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16121"
-></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 XPath parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16130"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNNUMBER"
-></A
->xmlXPathReturnNumber()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnNumber(ctxt, val)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes the double <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-> on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16137"
-></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 XPath parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a double</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16150"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNSTRING"
-></A
->xmlXPathReturnString()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnString(ctxt, str)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes the string <TT
-CLASS="PARAMETER"
-><I
->str</I
-></TT
-> on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16157"
-></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 XPath parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->str</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a string</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16170"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNEMPTYSTRING"
-></A
->xmlXPathReturnEmptyString()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnEmptyString(ctxt)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes an empty string on the stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16176"
-></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 XPath parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16185"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNNODESET"
-></A
->xmlXPathReturnNodeSet()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnNodeSet(ctxt, ns)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes the node-set <TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
-> on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16192"
-></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 XPath parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a node-set</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16205"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNEMPTYNODESET"
-></A
->xmlXPathReturnEmptyNodeSet()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnEmptyNodeSet(ctxt)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes an empty node-set on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16211"
-></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 XPath parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16220"
-></A
-><H3
-><A
-NAME="XMLXPATHRETURNEXTERNAL"
-></A
->xmlXPathReturnExternal()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathReturnExternal(ctxt, val)</PRE
-></TD
-></TR
-></TABLE
-><P
->Pushes user data on the context stack.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16226"
-></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 XPath parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  user data</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16239"
-></A
-><H3
-><A
-NAME="XMLXPATHSTACKISNODESET"
-></A
->xmlXPathStackIsNodeSet()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathStackIsNodeSet(ctxt)</PRE
-></TD
-></TR
-></TABLE
-><P
->Check if the current value on the XPath stack is a node set or
-an XSLT value tree.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16245"
-></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 XPath parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16254"
-></A
-><H3
-><A
-NAME="XMLXPATHSTACKISEXTERNAL"
-></A
->xmlXPathStackIsExternal()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define     xmlXPathStackIsExternal(ctxt)</PRE
-></TD
-></TR
-></TABLE
-><P
->Checks if the current value on the XPath stack is an external
-object.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN16260"
-></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 XPath parser context</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN16269"
-></A
-><H3
-><A
 NAME="XMLXPATHEMPTYNODESET"
 ></A
 >xmlXPathEmptyNodeSet()</H3
@@ -3295,7 +3295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16275"
+NAME="AEN16121"
 ></A
 ><P
 ></P
@@ -3322,7 +3322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3333,7 +3333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16284"
+NAME="AEN16130"
 ></A
 ><H3
 ><A
@@ -3361,7 +3361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16290"
+NAME="AEN16136"
 ></A
 ><H3
 ><A
@@ -3389,7 +3389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16296"
+NAME="AEN16142"
 ></A
 ><H3
 ><A
@@ -3416,7 +3416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16302"
+NAME="AEN16148"
 ></A
 ><P
 ></P
@@ -3443,7 +3443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3454,7 +3454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16311"
+NAME="AEN16157"
 ></A
 ><H3
 ><A
@@ -3481,7 +3481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16317"
+NAME="AEN16163"
 ></A
 ><P
 ></P
@@ -3508,7 +3508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3519,7 +3519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16326"
+NAME="AEN16172"
 ></A
 ><H3
 ><A
@@ -3547,7 +3547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16332"
+NAME="AEN16178"
 ></A
 ><P
 ></P
@@ -3574,7 +3574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath type</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3585,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16341"
+NAME="AEN16187"
 ></A
 ><H3
 ><A
@@ -3613,7 +3613,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16347"
+NAME="AEN16193"
 ></A
 ><P
 ></P
@@ -3640,7 +3640,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath type</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3651,7 +3651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16356"
+NAME="AEN16202"
 ></A
 ><H3
 ><A
@@ -3678,7 +3678,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16362"
+NAME="AEN16208"
 ></A
 ><P
 ></P
@@ -3705,7 +3705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of expected args</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3716,7 +3716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16371"
+NAME="AEN16217"
 ></A
 ><H3
 ><A
@@ -3744,7 +3744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16377"
+NAME="AEN16223"
 ></A
 ><H3
 ><A
@@ -3772,7 +3772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16383"
+NAME="AEN16229"
 ></A
 ><H3
 ><A
@@ -3800,7 +3800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16389"
+NAME="AEN16235"
 ></A
 ><H3
 ><A
@@ -3840,7 +3840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16398"
+NAME="AEN16244"
 ></A
 ><P
 ></P
@@ -3867,7 +3867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3884,7 +3884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  name of the variable</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3901,7 +3901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace name hosting this variable</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3919,7 +3919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the XPath object value or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3930,7 +3930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16419"
+NAME="AEN16265"
 ></A
 ><H3
 ><A
@@ -3965,7 +3965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16427"
+NAME="AEN16273"
 ></A
 ><P
 ></P
@@ -3992,7 +3992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4009,7 +4009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lookup function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4026,7 +4026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lookup data</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4037,7 +4037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16444"
+NAME="AEN16290"
 ></A
 ><H3
 ><A
@@ -4076,7 +4076,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16453"
+NAME="AEN16299"
 ></A
 ><P
 ></P
@@ -4103,7 +4103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4120,7 +4120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  name of the function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4137,7 +4137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace name hosting this function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4155,7 +4155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the XPath function or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4166,7 +4166,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16474"
+NAME="AEN16320"
 ></A
 ><H3
 ><A
@@ -4201,7 +4201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16482"
+NAME="AEN16328"
 ></A
 ><P
 ></P
@@ -4228,7 +4228,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4245,7 +4245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lookup function</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4262,7 +4262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the lookup data</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4273,7 +4273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16499"
+NAME="AEN16345"
 ></A
 ><H3
 ><A
@@ -4306,7 +4306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16506"
+NAME="AEN16352"
 ></A
 ><P
 ></P
@@ -4333,7 +4333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4350,7 +4350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4367,7 +4367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the line number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4384,7 +4384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the error number</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4395,7 +4395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16527"
+NAME="AEN16373"
 ></A
 ><H3
 ><A
@@ -4430,7 +4430,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16535"
+NAME="AEN16381"
 ></A
 ><P
 ></P
@@ -4457,7 +4457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * to dump the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4474,7 +4474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to inspect</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4491,7 +4491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indentation level</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4502,7 +4502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16552"
+NAME="AEN16398"
 ></A
 ><H3
 ><A
@@ -4537,7 +4537,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16560"
+NAME="AEN16406"
 ></A
 ><P
 ></P
@@ -4564,7 +4564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE * for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4581,7 +4581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the precompiled XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4598,7 +4598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the indentation level.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4609,7 +4609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16577"
+NAME="AEN16423"
 ></A
 ><H3
 ><A
@@ -4653,7 +4653,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16587"
+NAME="AEN16433"
 ></A
 ><P
 ></P
@@ -4680,7 +4680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4697,7 +4697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4715,17 +4715,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->true (1) if <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-> contains <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->, false (0) otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4736,7 +4726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16606"
+NAME="AEN16450"
 ></A
 ><H3
 ><A
@@ -4777,7 +4767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16616"
+NAME="AEN16460"
 ></A
 ><P
 ></P
@@ -4804,7 +4794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4821,7 +4811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4839,8 +4829,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the difference between the two node sets, or nodes1 if
-        nodes2 is empty</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4851,7 +4840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16633"
+NAME="AEN16477"
 ></A
 ><H3
 ><A
@@ -4892,7 +4881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16643"
+NAME="AEN16487"
 ></A
 ><P
 ></P
@@ -4919,7 +4908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4936,7 +4925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4954,8 +4943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a node set comprising the nodes that are within both the
-        node sets passed as arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4966,7 +4954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16660"
+NAME="AEN16504"
 ></A
 ><H3
 ><A
@@ -5003,7 +4991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16669"
+NAME="AEN16513"
 ></A
 ><P
 ></P
@@ -5030,7 +5018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5048,18 +5036,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a subset of the nodes contained in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->, or <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if
-        it is empty</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5070,7 +5047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16684"
+NAME="AEN16526"
 ></A
 ><H3
 ><A
@@ -5117,7 +5094,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16695"
+NAME="AEN16537"
 ></A
 ><P
 ></P
@@ -5144,7 +5121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5162,18 +5139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a subset of the nodes contained in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->, or <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if
-        it is empty</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5184,7 +5150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16710"
+NAME="AEN16550"
 ></A
 ><H3
 ><A
@@ -5219,7 +5185,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16718"
+NAME="AEN16558"
 ></A
 ><P
 ></P
@@ -5246,7 +5212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5263,7 +5229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5281,18 +5247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->true (1) if <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> shares any node with <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
->, false (0)
-        otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5303,7 +5258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16737"
+NAME="AEN16575"
 ></A
 ><H3
 ><A
@@ -5344,7 +5299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16747"
+NAME="AEN16585"
 ></A
 ><P
 ></P
@@ -5371,7 +5326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5388,7 +5343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5406,39 +5361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> that precede <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> in document order,
-        <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> is NULL or an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->
-        doesn't contain <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5449,7 +5372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16770"
+NAME="AEN16602"
 ></A
 ><H3
 ><A
@@ -5490,7 +5413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16780"
+NAME="AEN16612"
 ></A
 ><P
 ></P
@@ -5517,7 +5440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5534,7 +5457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5552,39 +5475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> that precede the first node in <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
->
-        in document order, <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-> is NULL or empty or
-        an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> doesn't contain <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5595,7 +5486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16803"
+NAME="AEN16629"
 ></A
 ><H3
 ><A
@@ -5646,7 +5537,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16815"
+NAME="AEN16641"
 ></A
 ><P
 ></P
@@ -5673,7 +5564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5690,7 +5581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5708,39 +5599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> that precede <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> in document order,
-        <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> is NULL or an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->
-        doesn't contain <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5751,7 +5610,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16838"
+NAME="AEN16658"
 ></A
 ><H3
 ><A
@@ -5807,7 +5666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16851"
+NAME="AEN16671"
 ></A
 ><P
 ></P
@@ -5834,7 +5693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5851,7 +5710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5869,39 +5728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> that precede the first node in <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
->
-        in document order, <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-> is NULL or empty or
-        an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> doesn't contain <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5912,7 +5739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16874"
+NAME="AEN16688"
 ></A
 ><H3
 ><A
@@ -5953,7 +5780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16884"
+NAME="AEN16698"
 ></A
 ><P
 ></P
@@ -5980,7 +5807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5997,7 +5824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6015,39 +5842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> that follow <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> in document order,
-        <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> is NULL or an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->
-        doesn't contain <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6058,7 +5853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16907"
+NAME="AEN16715"
 ></A
 ><H3
 ><A
@@ -6099,7 +5894,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16917"
+NAME="AEN16725"
 ></A
 ><P
 ></P
@@ -6126,7 +5921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6143,7 +5938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set, sorted by document order</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6161,39 +5956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> that follow the first node in <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
->
-        in document order, <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-> is NULL or empty or
-        an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> doesn't contain <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6204,7 +5967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16940"
+NAME="AEN16742"
 ></A
 ><H3
 ><A
@@ -6255,7 +6018,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16952"
+NAME="AEN16754"
 ></A
 ><P
 ></P
@@ -6282,7 +6045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6299,7 +6062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6317,39 +6080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> that follow <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> in document order,
-        <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-> is NULL or an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes</I
-></TT
->
-        doesn't contain <TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6360,7 +6091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16975"
+NAME="AEN16771"
 ></A
 ><H3
 ><A
@@ -6416,7 +6147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16988"
+NAME="AEN16784"
 ></A
 ><P
 ></P
@@ -6443,7 +6174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6460,7 +6191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node-set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6478,39 +6209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the nodes in <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> that follow the first node in <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
->
-        in document order, <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> if <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-> is NULL or empty or
-        an empty node-set if <TT
-CLASS="PARAMETER"
-><I
->nodes1</I
-></TT
-> doesn't contain <TT
-CLASS="PARAMETER"
-><I
->nodes2</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6521,7 +6220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17011"
+NAME="AEN16801"
 ></A
 ><H3
 ><A
@@ -6565,7 +6264,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17021"
+NAME="AEN16811"
 ></A
 ><P
 ></P
@@ -6592,7 +6291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6609,7 +6308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6626,7 +6325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6644,7 +6343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6655,7 +6354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17042"
+NAME="AEN16832"
 ></A
 ><H3
 ><A
@@ -6693,7 +6392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17051"
+NAME="AEN16841"
 ></A
 ><P
 ></P
@@ -6720,7 +6419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6737,7 +6436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace prefix value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6755,7 +6454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6766,7 +6465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17068"
+NAME="AEN16858"
 ></A
 ><H3
 ><A
@@ -6796,7 +6495,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17075"
+NAME="AEN16865"
 ></A
 ><P
 ></P
@@ -6823,7 +6522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6834,7 +6533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17084"
+NAME="AEN16874"
 ></A
 ><H3
 ><A
@@ -6877,7 +6576,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17094"
+NAME="AEN16884"
 ></A
 ><P
 ></P
@@ -6904,7 +6603,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6921,7 +6620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6938,7 +6637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function implementation or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6956,7 +6655,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6967,7 +6666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17115"
+NAME="AEN16905"
 ></A
 ><H3
 ><A
@@ -7014,7 +6713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17126"
+NAME="AEN16916"
 ></A
 ><P
 ></P
@@ -7041,7 +6740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7058,7 +6757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7075,7 +6774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7092,7 +6791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function implementation or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7110,7 +6809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7121,7 +6820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17151"
+NAME="AEN16941"
 ></A
 ><H3
 ><A
@@ -7165,7 +6864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17161"
+NAME="AEN16951"
 ></A
 ><P
 ></P
@@ -7192,7 +6891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7209,7 +6908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7226,7 +6925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7244,7 +6943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7255,7 +6954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17182"
+NAME="AEN16972"
 ></A
 ><H3
 ><A
@@ -7303,7 +7002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17193"
+NAME="AEN16983"
 ></A
 ><P
 ></P
@@ -7330,7 +7029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7347,7 +7046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7364,7 +7063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7381,7 +7080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7399,7 +7098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 in case of success, -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7410,7 +7109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17218"
+NAME="AEN17008"
 ></A
 ><H3
 ><A
@@ -7448,7 +7147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17227"
+NAME="AEN17017"
 ></A
 ><P
 ></P
@@ -7475,7 +7174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7492,7 +7191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7510,7 +7209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathFunction or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7521,7 +7220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17244"
+NAME="AEN17034"
 ></A
 ><H3
 ><A
@@ -7563,7 +7262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17254"
+NAME="AEN17044"
 ></A
 ><P
 ></P
@@ -7590,7 +7289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7607,7 +7306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7624,7 +7323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the function namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7642,7 +7341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathFunction or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7653,7 +7352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17275"
+NAME="AEN17065"
 ></A
 ><H3
 ><A
@@ -7683,7 +7382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17282"
+NAME="AEN17072"
 ></A
 ><P
 ></P
@@ -7710,7 +7409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7721,7 +7420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17291"
+NAME="AEN17081"
 ></A
 ><H3
 ><A
@@ -7759,7 +7458,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17300"
+NAME="AEN17090"
 ></A
 ><P
 ></P
@@ -7786,7 +7485,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7803,7 +7502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7821,7 +7520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a copy of the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7832,7 +7531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17317"
+NAME="AEN17107"
 ></A
 ><H3
 ><A
@@ -7874,7 +7573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17327"
+NAME="AEN17117"
 ></A
 ><P
 ></P
@@ -7901,7 +7600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7918,7 +7617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7935,7 +7634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the variable namespace URI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7953,7 +7652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the a copy of the value or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7964,7 +7663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17348"
+NAME="AEN17138"
 ></A
 ><H3
 ><A
@@ -7995,7 +7694,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17355"
+NAME="AEN17145"
 ></A
 ><P
 ></P
@@ -8022,7 +7721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8033,7 +7732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17364"
+NAME="AEN17154"
 ></A
 ><H3
 ><A
@@ -8071,7 +7770,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17373"
+NAME="AEN17163"
 ></A
 ><P
 ></P
@@ -8098,7 +7797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8115,7 +7814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8133,7 +7832,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathParserContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8144,7 +7843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17390"
+NAME="AEN17180"
 ></A
 ><H3
 ><A
@@ -8174,7 +7873,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17397"
+NAME="AEN17187"
 ></A
 ><P
 ></P
@@ -8201,7 +7900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8212,7 +7911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17406"
+NAME="AEN17196"
 ></A
 ><H3
 ><A
@@ -8245,7 +7944,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17414"
+NAME="AEN17204"
 ></A
 ><P
 ></P
@@ -8272,7 +7971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an XPath evaluation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8290,7 +7989,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the XPath object just removed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8301,7 +8000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17427"
+NAME="AEN17217"
 ></A
 ><H3
 ><A
@@ -8335,7 +8034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17435"
+NAME="AEN17225"
 ></A
 ><P
 ></P
@@ -8362,7 +8061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XPath evaluation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8379,7 +8078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8397,7 +8096,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of items on the value stack</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8408,7 +8107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17452"
+NAME="AEN17242"
 ></A
 ><H3
 ><A
@@ -8446,7 +8145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17461"
+NAME="AEN17251"
 ></A
 ><P
 ></P
@@ -8473,7 +8172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8491,7 +8190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8502,7 +8201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17474"
+NAME="AEN17264"
 ></A
 ><H3
 ><A
@@ -8537,7 +8236,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17482"
+NAME="AEN17272"
 ></A
 ><P
 ></P
@@ -8564,7 +8263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8582,7 +8281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8593,7 +8292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17495"
+NAME="AEN17285"
 ></A
 ><H3
 ><A
@@ -8631,7 +8330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17504"
+NAME="AEN17294"
 ></A
 ><P
 ></P
@@ -8658,7 +8357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8676,7 +8375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8687,7 +8386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17517"
+NAME="AEN17307"
 ></A
 ><H3
 ><A
@@ -8717,7 +8416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17524"
+NAME="AEN17314"
 ></A
 ><P
 ></P
@@ -8744,7 +8443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the char * value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8762,7 +8461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8773,7 +8472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17537"
+NAME="AEN17327"
 ></A
 ><H3
 ><A
@@ -8811,7 +8510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17546"
+NAME="AEN17336"
 ></A
 ><P
 ></P
@@ -8838,7 +8537,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the double value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8856,7 +8555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8867,7 +8566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17559"
+NAME="AEN17349"
 ></A
 ><H3
 ><A
@@ -8902,7 +8601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17567"
+NAME="AEN17357"
 ></A
 ><P
 ></P
@@ -8929,7 +8628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the boolean value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8947,7 +8646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8958,7 +8657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17580"
+NAME="AEN17370"
 ></A
 ><H3
 ><A
@@ -8997,7 +8696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17589"
+NAME="AEN17379"
 ></A
 ><P
 ></P
@@ -9024,7 +8723,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9042,7 +8741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9053,7 +8752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17602"
+NAME="AEN17392"
 ></A
 ><H3
 ><A
@@ -9092,7 +8791,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17611"
+NAME="AEN17401"
 ></A
 ><P
 ></P
@@ -9119,7 +8818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9137,7 +8836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9148,7 +8847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17624"
+NAME="AEN17414"
 ></A
 ><H3
 ><A
@@ -9182,7 +8881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17632"
+NAME="AEN17422"
 ></A
 ><P
 ></P
@@ -9209,7 +8908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9226,7 +8925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9237,7 +8936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17645"
+NAME="AEN17435"
 ></A
 ><H3
 ><A
@@ -9272,7 +8971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17653"
+NAME="AEN17443"
 ></A
 ><P
 ></P
@@ -9299,7 +8998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9316,7 +9015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9327,7 +9026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17666"
+NAME="AEN17456"
 ></A
 ><H3
 ><A
@@ -9365,7 +9064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17675"
+NAME="AEN17465"
 ></A
 ><P
 ></P
@@ -9392,7 +9091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9409,7 +9108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the hosting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9426,7 +9125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a the namespace node</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9437,7 +9136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17692"
+NAME="AEN17482"
 ></A
 ><H3
 ><A
@@ -9467,7 +9166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17699"
+NAME="AEN17489"
 ></A
 ><P
 ></P
@@ -9494,7 +9193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node set</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9505,7 +9204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17708"
+NAME="AEN17498"
 ></A
 ><H3
 ><A
@@ -9535,7 +9234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17715"
+NAME="AEN17505"
 ></A
 ><P
 ></P
@@ -9562,7 +9261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9573,7 +9272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17724"
+NAME="AEN17514"
 ></A
 ><H3
 ><A
@@ -9604,7 +9303,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17731"
+NAME="AEN17521"
 ></A
 ><P
 ></P
@@ -9631,7 +9330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9642,7 +9341,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17740"
+NAME="AEN17530"
 ></A
 ><H3
 ><A
@@ -9680,7 +9379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17750"
+NAME="AEN17540"
 ></A
 ><P
 ></P
@@ -9707,7 +9406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9725,7 +9424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9736,7 +9435,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17763"
+NAME="AEN17553"
 ></A
 ><H3
 ><A
@@ -9774,7 +9473,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17773"
+NAME="AEN17563"
 ></A
 ><P
 ></P
@@ -9801,7 +9500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9819,7 +9518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9830,7 +9529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17786"
+NAME="AEN17576"
 ></A
 ><H3
 ><A
@@ -9871,7 +9570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17796"
+NAME="AEN17586"
 ></A
 ><P
 ></P
@@ -9898,7 +9597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to scan</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9916,7 +9615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the double value.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9927,7 +9626,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17809"
+NAME="AEN17599"
 ></A
 ><H3
 ><A
@@ -9968,7 +9667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17817"
+NAME="AEN17607"
 ></A
 ><P
 ></P
@@ -9995,7 +9694,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10012,7 +9711,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Predicate Expression evaluation result</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10030,7 +9729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if predicate is true, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10041,7 +9740,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17834"
+NAME="AEN17624"
 ></A
 ><H3
 ><A
@@ -10071,7 +9770,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17841"
+NAME="AEN17631"
 ></A
 ><P
 ></P
@@ -10098,7 +9797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10109,7 +9808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17850"
+NAME="AEN17640"
 ></A
 ><H3
 ><A
@@ -10167,7 +9866,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17863"
+NAME="AEN17653"
 ></A
 ><P
 ></P
@@ -10194,7 +9893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first NodeSet or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10211,7 +9910,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second NodeSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10229,12 +9928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val1</I
-></TT
-> once extended or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10245,7 +9939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17881"
+NAME="AEN17670"
 ></A
 ><H3
 ><A
@@ -10279,7 +9973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17889"
+NAME="AEN17678"
 ></A
 ><P
 ></P
@@ -10306,7 +10000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10323,7 +10017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlNodePtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10334,7 +10028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17902"
+NAME="AEN17691"
 ></A
 ><H3
 ><A
@@ -10365,7 +10059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17909"
+NAME="AEN17698"
 ></A
 ><P
 ></P
@@ -10392,7 +10086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10409,7 +10103,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index to remove</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10420,7 +10114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17922"
+NAME="AEN17711"
 ></A
 ><H3
 ><A
@@ -10459,7 +10153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17931"
+NAME="AEN17720"
 ></A
 ><P
 ></P
@@ -10486,7 +10180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an existing NodeSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10504,7 +10198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10515,7 +10209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17944"
+NAME="AEN17733"
 ></A
 ><H3
 ><A
@@ -10553,7 +10247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17953"
+NAME="AEN17742"
 ></A
 ><P
 ></P
@@ -10580,7 +10274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10598,7 +10292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10609,7 +10303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17966"
+NAME="AEN17755"
 ></A
 ><H3
 ><A
@@ -10644,7 +10338,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17974"
+NAME="AEN17763"
 ></A
 ><P
 ></P
@@ -10671,7 +10365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10689,7 +10383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10700,7 +10394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17987"
+NAME="AEN17776"
 ></A
 ><H3
 ><A
@@ -10740,7 +10434,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17996"
+NAME="AEN17785"
 ></A
 ><P
 ></P
@@ -10767,7 +10461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10785,7 +10479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the results of the test.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10796,7 +10490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18009"
+NAME="AEN17798"
 ></A
 ><H3
 ><A
@@ -10836,7 +10530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18018"
+NAME="AEN17807"
 ></A
 ><P
 ></P
@@ -10863,7 +10557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10881,7 +10575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the results of the test.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10892,7 +10586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18031"
+NAME="AEN17820"
 ></A
 ><H3
 ><A
@@ -10978,7 +10672,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18047"
+NAME="AEN17836"
 ></A
 ><P
 ></P
@@ -11005,7 +10699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11022,7 +10716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  less than (1) or greater than (0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11039,7 +10733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  is the comparison strict</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11057,7 +10751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if the comparison succeeded, 0 if it failed</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11068,7 +10762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18068"
+NAME="AEN17857"
 ></A
 ><H3
 ><A
@@ -11100,7 +10794,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18075"
+NAME="AEN17864"
 ></A
 ><P
 ></P
@@ -11127,7 +10821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11138,7 +10832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18084"
+NAME="AEN17873"
 ></A
 ><H3
 ><A
@@ -11170,7 +10864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18091"
+NAME="AEN17880"
 ></A
 ><P
 ></P
@@ -11197,7 +10891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11208,7 +10902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18100"
+NAME="AEN17889"
 ></A
 ><H3
 ><A
@@ -11240,7 +10934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18107"
+NAME="AEN17896"
 ></A
 ><P
 ></P
@@ -11267,7 +10961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11278,7 +10972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18116"
+NAME="AEN17905"
 ></A
 ><H3
 ><A
@@ -11310,7 +11004,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18123"
+NAME="AEN17912"
 ></A
 ><P
 ></P
@@ -11337,7 +11031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11348,7 +11042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18132"
+NAME="AEN17921"
 ></A
 ><H3
 ><A
@@ -11390,7 +11084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18141"
+NAME="AEN17930"
 ></A
 ><P
 ></P
@@ -11417,7 +11111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11428,7 +11122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18150"
+NAME="AEN17939"
 ></A
 ><H3
 ><A
@@ -11470,7 +11164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18159"
+NAME="AEN17948"
 ></A
 ><P
 ></P
@@ -11497,7 +11191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11508,7 +11202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18168"
+NAME="AEN17957"
 ></A
 ><H3
 ><A
@@ -11543,7 +11237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18176"
+NAME="AEN17965"
 ></A
 ><P
 ></P
@@ -11570,7 +11264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a name string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11588,7 +11282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if true 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11599,7 +11293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18189"
+NAME="AEN17978"
 ></A
 ><H3
 ><A
@@ -11637,7 +11331,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18198"
+NAME="AEN17987"
 ></A
 ><P
 ></P
@@ -11664,7 +11358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11681,7 +11375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11699,7 +11393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11710,7 +11404,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18215"
+NAME="AEN18004"
 ></A
 ><H3
 ><A
@@ -11748,7 +11442,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18224"
+NAME="AEN18013"
 ></A
 ><P
 ></P
@@ -11775,7 +11469,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11792,7 +11486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11810,7 +11504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11821,7 +11515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18241"
+NAME="AEN18030"
 ></A
 ><H3
 ><A
@@ -11860,7 +11554,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18250"
+NAME="AEN18039"
 ></A
 ><P
 ></P
@@ -11887,7 +11581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11904,7 +11598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11922,7 +11616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11933,7 +11627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18267"
+NAME="AEN18056"
 ></A
 ><H3
 ><A
@@ -11974,7 +11668,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18276"
+NAME="AEN18065"
 ></A
 ><P
 ></P
@@ -12001,7 +11695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12018,7 +11712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12036,7 +11730,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12047,7 +11741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18293"
+NAME="AEN18082"
 ></A
 ><H3
 ><A
@@ -12085,7 +11779,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18302"
+NAME="AEN18091"
 ></A
 ><P
 ></P
@@ -12112,7 +11806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12129,7 +11823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12147,7 +11841,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12158,7 +11852,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18319"
+NAME="AEN18108"
 ></A
 ><H3
 ><A
@@ -12199,7 +11893,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18328"
+NAME="AEN18117"
 ></A
 ><P
 ></P
@@ -12226,7 +11920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12243,7 +11937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12261,7 +11955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12272,7 +11966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18345"
+NAME="AEN18134"
 ></A
 ><H3
 ><A
@@ -12311,7 +12005,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18354"
+NAME="AEN18143"
 ></A
 ><P
 ></P
@@ -12338,7 +12032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12355,7 +12049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12373,7 +12067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12384,7 +12078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18371"
+NAME="AEN18160"
 ></A
 ><H3
 ><A
@@ -12425,7 +12119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18380"
+NAME="AEN18169"
 ></A
 ><P
 ></P
@@ -12452,7 +12146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12469,7 +12163,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12487,7 +12181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12498,7 +12192,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18397"
+NAME="AEN18186"
 ></A
 ><H3
 ><A
@@ -12540,7 +12234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18407"
+NAME="AEN18196"
 ></A
 ><P
 ></P
@@ -12567,7 +12261,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12584,7 +12278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current attribute in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12602,7 +12296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12613,7 +12307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18424"
+NAME="AEN18213"
 ></A
 ><H3
 ><A
@@ -12651,7 +12345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18433"
+NAME="AEN18222"
 ></A
 ><P
 ></P
@@ -12678,7 +12372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12695,7 +12389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current attribute in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12713,7 +12407,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12724,7 +12418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18450"
+NAME="AEN18239"
 ></A
 ><H3
 ><A
@@ -12765,7 +12459,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18459"
+NAME="AEN18248"
 ></A
 ><P
 ></P
@@ -12792,7 +12486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12809,7 +12503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12827,7 +12521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12838,7 +12532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18476"
+NAME="AEN18265"
 ></A
 ><H3
 ><A
@@ -12880,7 +12574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18485"
+NAME="AEN18274"
 ></A
 ><P
 ></P
@@ -12907,7 +12601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12924,7 +12618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12942,7 +12636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12953,7 +12647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18502"
+NAME="AEN18291"
 ></A
 ><H3
 ><A
@@ -12993,7 +12687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18511"
+NAME="AEN18300"
 ></A
 ><P
 ></P
@@ -13020,7 +12714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13037,7 +12731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13055,7 +12749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the next element following that axis</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13066,7 +12760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18528"
+NAME="AEN18317"
 ></A
 ><H3
 ><A
@@ -13105,7 +12799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18537"
+NAME="AEN18326"
 ></A
 ><P
 ></P
@@ -13132,7 +12826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13149,7 +12843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13160,7 +12854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18550"
+NAME="AEN18339"
 ></A
 ><H3
 ><A
@@ -13204,7 +12898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18560"
+NAME="AEN18349"
 ></A
 ><P
 ></P
@@ -13231,7 +12925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13248,7 +12942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13259,7 +12953,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18573"
+NAME="AEN18362"
 ></A
 ><H3
 ><A
@@ -13294,7 +12988,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18581"
+NAME="AEN18370"
 ></A
 ><P
 ></P
@@ -13321,7 +13015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13338,7 +13032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13349,7 +13043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18594"
+NAME="AEN18383"
 ></A
 ><H3
 ><A
@@ -13394,7 +13088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18602"
+NAME="AEN18391"
 ></A
 ><P
 ></P
@@ -13421,7 +13115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13438,7 +13132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13449,7 +13143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18615"
+NAME="AEN18404"
 ></A
 ><H3
 ><A
@@ -13489,7 +13183,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18623"
+NAME="AEN18412"
 ></A
 ><P
 ></P
@@ -13516,7 +13210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13533,7 +13227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13544,7 +13238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18636"
+NAME="AEN18425"
 ></A
 ><H3
 ><A
@@ -13585,7 +13279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18644"
+NAME="AEN18433"
 ></A
 ><P
 ></P
@@ -13612,7 +13306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13629,7 +13323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13640,7 +13334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18657"
+NAME="AEN18446"
 ></A
 ><H3
 ><A
@@ -13703,7 +13397,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18666"
+NAME="AEN18455"
 ></A
 ><P
 ></P
@@ -13730,7 +13424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13747,7 +13441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13758,7 +13452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18679"
+NAME="AEN18468"
 ></A
 ><H3
 ><A
@@ -13797,7 +13491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18687"
+NAME="AEN18476"
 ></A
 ><P
 ></P
@@ -13824,7 +13518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13841,7 +13535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13852,7 +13546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18700"
+NAME="AEN18489"
 ></A
 ><H3
 ><A
@@ -13888,7 +13582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18708"
+NAME="AEN18497"
 ></A
 ><P
 ></P
@@ -13915,7 +13609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -13932,7 +13626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13943,7 +13637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18721"
+NAME="AEN18510"
 ></A
 ><H3
 ><A
@@ -13980,7 +13674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18729"
+NAME="AEN18518"
 ></A
 ><P
 ></P
@@ -14007,7 +13701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14024,7 +13718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14035,7 +13729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18742"
+NAME="AEN18531"
 ></A
 ><H3
 ><A
@@ -14072,7 +13766,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18750"
+NAME="AEN18539"
 ></A
 ><P
 ></P
@@ -14099,7 +13793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14116,7 +13810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14127,7 +13821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18763"
+NAME="AEN18552"
 ></A
 ><H3
 ><A
@@ -14182,7 +13876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18771"
+NAME="AEN18560"
 ></A
 ><P
 ></P
@@ -14209,7 +13903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14226,7 +13920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14237,7 +13931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18784"
+NAME="AEN18573"
 ></A
 ><H3
 ><A
@@ -14277,7 +13971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18792"
+NAME="AEN18581"
 ></A
 ><P
 ></P
@@ -14304,7 +13998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14321,7 +14015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14332,7 +14026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18805"
+NAME="AEN18594"
 ></A
 ><H3
 ><A
@@ -14373,7 +14067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18813"
+NAME="AEN18602"
 ></A
 ><P
 ></P
@@ -14400,7 +14094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14417,7 +14111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14428,7 +14122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18826"
+NAME="AEN18615"
 ></A
 ><H3
 ><A
@@ -14469,7 +14163,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18834"
+NAME="AEN18623"
 ></A
 ><P
 ></P
@@ -14496,7 +14190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14513,7 +14207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14524,7 +14218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18847"
+NAME="AEN18636"
 ></A
 ><H3
 ><A
@@ -14568,7 +14262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18855"
+NAME="AEN18644"
 ></A
 ><P
 ></P
@@ -14595,7 +14289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14612,7 +14306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14623,7 +14317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18868"
+NAME="AEN18657"
 ></A
 ><H3
 ><A
@@ -14660,7 +14354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18876"
+NAME="AEN18665"
 ></A
 ><P
 ></P
@@ -14687,7 +14381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14704,7 +14398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14715,7 +14409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18889"
+NAME="AEN18678"
 ></A
 ><H3
 ><A
@@ -14753,7 +14447,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18898"
+NAME="AEN18687"
 ></A
 ><P
 ></P
@@ -14780,7 +14474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14797,7 +14491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14808,7 +14502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18911"
+NAME="AEN18700"
 ></A
 ><H3
 ><A
@@ -14846,7 +14540,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18920"
+NAME="AEN18709"
 ></A
 ><P
 ></P
@@ -14873,7 +14567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14890,7 +14584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14901,7 +14595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18933"
+NAME="AEN18722"
 ></A
 ><H3
 ><A
@@ -14944,7 +14638,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18941"
+NAME="AEN18730"
 ></A
 ><P
 ></P
@@ -14971,7 +14665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -14988,7 +14682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14999,7 +14693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18954"
+NAME="AEN18743"
 ></A
 ><H3
 ><A
@@ -15034,7 +14728,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18962"
+NAME="AEN18751"
 ></A
 ><P
 ></P
@@ -15061,7 +14755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15078,7 +14772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15089,7 +14783,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18975"
+NAME="AEN18764"
 ></A
 ><H3
 ><A
@@ -15126,7 +14820,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18983"
+NAME="AEN18772"
 ></A
 ><P
 ></P
@@ -15153,7 +14847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15170,7 +14864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15181,7 +14875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18996"
+NAME="AEN18785"
 ></A
 ><H3
 ><A
@@ -15218,7 +14912,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19004"
+NAME="AEN18793"
 ></A
 ><P
 ></P
@@ -15245,7 +14939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15262,7 +14956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15273,7 +14967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19017"
+NAME="AEN18806"
 ></A
 ><H3
 ><A
@@ -15310,7 +15004,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19025"
+NAME="AEN18814"
 ></A
 ><P
 ></P
@@ -15337,7 +15031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15354,7 +15048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15365,7 +15059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19038"
+NAME="AEN18827"
 ></A
 ><H3
 ><A
@@ -15403,7 +15097,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19046"
+NAME="AEN18835"
 ></A
 ><P
 ></P
@@ -15430,7 +15124,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15447,7 +15141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15458,7 +15152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19059"
+NAME="AEN18848"
 ></A
 ><H3
 ><A
@@ -15498,7 +15192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19067"
+NAME="AEN18856"
 ></A
 ><P
 ></P
@@ -15525,7 +15219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -15542,7 +15236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of arguments</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15553,7 +15247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19080"
+NAME="AEN18869"
 ></A
 ><H3
 ><A
@@ -15585,7 +15279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19087"
+NAME="AEN18876"
 ></A
 ><P
 ></P
@@ -15612,7 +15306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath namespace node found in a nodeset.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index dc1cf9e..94ad055 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19101"
+NAME="AEN18890"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19104"
+NAME="AEN18893"
 ></A
 ><H2
 >Synopsis</H2
@@ -411,7 +411,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19179"
+NAME="AEN18968"
 ></A
 ><H2
 >Description</H2
@@ -421,14 +421,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19182"
+NAME="AEN18971"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19184"
+NAME="AEN18973"
 ></A
 ><H3
 ><A
@@ -458,33 +458,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19189"
+NAME="AEN18978"
 ></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="AEN19194"
+NAME="AEN18982"
 ></A
 ><H3
 ><A
@@ -522,7 +509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19203"
+NAME="AEN18991"
 ></A
 ><P
 ></P
@@ -549,7 +536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an initial xmlXPathObjectPtr, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -567,7 +554,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -578,7 +565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19216"
+NAME="AEN19004"
 ></A
 ><H3
 ><A
@@ -608,7 +595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19223"
+NAME="AEN19011"
 ></A
 ><P
 ></P
@@ -635,7 +622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlLocationSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -646,7 +633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19232"
+NAME="AEN19020"
 ></A
 ><H3
 ><A
@@ -693,7 +680,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19243"
+NAME="AEN19031"
 ></A
 ><P
 ></P
@@ -720,7 +707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first LocationSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -737,7 +724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second LocationSet</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -755,7 +742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->val1 once extended or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -766,7 +753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19260"
+NAME="AEN19048"
 ></A
 ><H3
 ><A
@@ -805,7 +792,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19269"
+NAME="AEN19057"
 ></A
 ><P
 ></P
@@ -832,7 +819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -849,7 +836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the start index</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -866,7 +853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -883,7 +870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending index</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -901,7 +888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -912,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19294"
+NAME="AEN19082"
 ></A
 ><H3
 ><A
@@ -949,7 +936,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19303"
+NAME="AEN19091"
 ></A
 ><P
 ></P
@@ -976,7 +963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -993,7 +980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1011,7 +998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1022,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19320"
+NAME="AEN19108"
 ></A
 ><H3
 ><A
@@ -1059,7 +1046,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19329"
+NAME="AEN19117"
 ></A
 ><P
 ></P
@@ -1086,7 +1073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1103,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1121,7 +1108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1132,7 +1119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19346"
+NAME="AEN19134"
 ></A
 ><H3
 ><A
@@ -1169,7 +1156,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19355"
+NAME="AEN19143"
 ></A
 ><P
 ></P
@@ -1196,7 +1183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting point</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1231,7 +1218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1242,7 +1229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19372"
+NAME="AEN19160"
 ></A
 ><H3
 ><A
@@ -1279,7 +1266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19381"
+NAME="AEN19169"
 ></A
 ><P
 ></P
@@ -1306,7 +1293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1323,7 +1310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1341,7 +1328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1352,7 +1339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19398"
+NAME="AEN19186"
 ></A
 ><H3
 ><A
@@ -1401,7 +1388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19409"
+NAME="AEN19197"
 ></A
 ><P
 ></P
@@ -1428,7 +1415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the start NodePtr value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1445,7 +1432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the end NodePtr value or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1463,7 +1450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1474,7 +1461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19426"
+NAME="AEN19214"
 ></A
 ><H3
 ><A
@@ -1514,7 +1501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19435"
+NAME="AEN19223"
 ></A
 ><P
 ></P
@@ -1541,7 +1528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1559,7 +1546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1570,7 +1557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19448"
+NAME="AEN19236"
 ></A
 ><H3
 ><A
@@ -1607,7 +1594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19457"
+NAME="AEN19245"
 ></A
 ><P
 ></P
@@ -1634,7 +1621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1651,7 +1638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ending object</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1669,7 +1656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1680,7 +1667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19474"
+NAME="AEN19262"
 ></A
 ><H3
 ><A
@@ -1713,7 +1700,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19482"
+NAME="AEN19270"
 ></A
 ><P
 ></P
@@ -1740,7 +1727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the starting and ending node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1758,7 +1745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1769,7 +1756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19495"
+NAME="AEN19283"
 ></A
 ><H3
 ><A
@@ -1809,7 +1796,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19504"
+NAME="AEN19292"
 ></A
 ><P
 ></P
@@ -1836,7 +1823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1853,7 +1840,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a new xmlXPathObjectPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1864,7 +1851,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19517"
+NAME="AEN19305"
 ></A
 ><H3
 ><A
@@ -1902,7 +1889,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19526"
+NAME="AEN19314"
 ></A
 ><P
 ></P
@@ -1929,7 +1916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the LocationSet value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1947,7 +1934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the newly created object.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1958,7 +1945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19539"
+NAME="AEN19327"
 ></A
 ><H3
 ><A
@@ -1992,7 +1979,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19547"
+NAME="AEN19335"
 ></A
 ><P
 ></P
@@ -2019,7 +2006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2036,7 +2023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlXPathObjectPtr</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2047,7 +2034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19560"
+NAME="AEN19348"
 ></A
 ><H3
 ><A
@@ -2078,7 +2065,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19567"
+NAME="AEN19355"
 ></A
 ><P
 ></P
@@ -2105,7 +2092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial range set</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2122,7 +2109,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index to remove</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2133,7 +2120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19580"
+NAME="AEN19368"
 ></A
 ><H3
 ><A
@@ -2174,7 +2161,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19590"
+NAME="AEN19378"
 ></A
 ><P
 ></P
@@ -2201,7 +2188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2218,7 +2205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node that directly contains the XPointer being evaluated or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2235,8 +2222,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
@@ -2254,7 +2240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2265,7 +2251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19611"
+NAME="AEN19399"
 ></A
 ><H3
 ><A
@@ -2302,7 +2288,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19620"
+NAME="AEN19408"
 ></A
 ><P
 ></P
@@ -2329,7 +2315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2346,7 +2332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2364,8 +2350,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
@@ -2376,7 +2361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19637"
+NAME="AEN19425"
 ></A
 ><H3
 ><A
@@ -2410,7 +2395,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19645"
+NAME="AEN19433"
 ></A
 ><P
 ></P
@@ -2437,7 +2422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer Parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2454,7 +2439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of args</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2465,7 +2450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19658"
+NAME="AEN19446"
 ></A
 ><H3
 ><A
@@ -2499,7 +2484,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19666"
+NAME="AEN19454"
 ></A
 ><P
 ></P
@@ -2526,7 +2511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer result from the evaluation.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2544,8 +2529,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
@@ -2556,7 +2540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19679"
+NAME="AEN19467"
 ></A
 ><H3
 ><A
@@ -2593,7 +2577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19688"
+NAME="AEN19476"
 ></A
 ><P
 ></P
@@ -2620,7 +2604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPointer Parser context</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 59403ed..6a6cfa1 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1224,7 +1224,6 @@
      <exports symbol='xmlRelaxNGValidCtxtPtr'/>
      <exports symbol='xmlRelaxNGValidErr'/>
      <exports symbol='xmlRelaxNGValidateDoc'/>
-     <exports symbol='xmlRelaxNGValidateStream'/>
      <exports symbol='xmlRelaxNGValidityErrorFunc'/>
      <exports symbol='xmlRelaxNGValidityWarningFunc'/>
     </file>
@@ -7689,15 +7688,6 @@
       <arg name='ctxt' type='xmlRelaxNGValidCtxtPtr' info='a Relax-NG validation context'/>
       <arg name='doc' type='xmlDocPtr' info='a parsed document tree'/>
     </function>
-    <function name='xmlRelaxNGValidateStream' file='relaxng'>
-      <info></info>
-      <return type='int' info=''/>
-      <arg name='ctxt' type='xmlRelaxNGValidCtxtPtr' info=''/>
-      <arg name='input' type='xmlParserInputBufferPtr' info=''/>
-      <arg name='enc' type='xmlCharEncoding' info=''/>
-      <arg name='sax' type='xmlSAXHandlerPtr' info=''/>
-      <arg name='user_data' type='void *' info=''/>
-    </function>
     <functype name='xmlRelaxNGValidityErrorFunc' file='relaxng'>
       <info></info>
       <return type='void'/>
diff --git a/doc/news.html b/doc/news.html
index 3ed114f..89b0d78 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -105,6 +105,17 @@
   Schemas</a>
 </li>
 </ul>
+<p>2.5.5: Mar 24 2003</p>
+<ul>
+<li>Lot of fixes on the Relax NG implementation. More testing including
+    DocBook and TEI examples.</li>
+  <li>Increased the support for W3C XML Schemas datatype</li>
+  <li>Several bug fixes in the URI handling layer</li>
+  <li>Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding
+    conversion, line counting in the parser.</li>
+  <li>Added support for $XMLLINT_INDENT environment variable, FTP delete</li>
+  <li>Fixed the RPM spec file name</li>
+</ul>
 <h3>2.5.4: Feb 20 2003</h3>
 <ul>
 <li>Conformance testing and lot of fixes on Relax NG and XInclude
diff --git a/doc/xml.html b/doc/xml.html
index 87ffa70..5812826 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -106,7 +106,9 @@
 <p>Results of the <a
 href="http://xmlbench.sourceforge.net/results/benchmark/index.html">xmlbench
 benchmark</a> on sourceforge 19 March 2003 (smaller is better):</p>
-<p align="center"><img src="benchmark.gif" alt="benchmark results for Expat Xerces libxml2 Oracle and Sun toolkits"></p>
+
+<p align="center"><img src="benchmark.gif"
+alt="benchmark results for Expat Xerces libxml2 Oracle and Sun toolkits"></p>
 
 <p>Logo designed by <a href="mailto:liyanage@access.ch">Marc Liyanage</a>.</p>
 
@@ -615,6 +617,18 @@
   Schemas</a></li>
 </ul>
 
+<p>2.5.5: Mar 24 2003</p>
+<ul>
+  <li>Lot of fixes on the Relax NG implementation. More testing including
+    DocBook and TEI examples.</li>
+  <li>Increased the support for W3C XML Schemas datatype</li>
+  <li>Several bug fixes in the URI handling layer</li>
+  <li>Bug fixes: HTML parser, xmlReader, DTD validation, XPath, encoding
+    conversion, line counting in the parser.</li>
+  <li>Added support for $XMLLINT_INDENT environment variable, FTP delete</li>
+  <li>Fixed the RPM spec file name</li>
+</ul>
+
 <h3>2.5.4: Feb 20 2003</h3>
 <ul>
   <li>Conformance testing and lot of fixes on Relax NG and XInclude
@@ -2882,6 +2896,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document:
diff --git a/doc/xmlio.html b/doc/xmlio.html
index a43cf50..a49f179 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -268,6 +268,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document: