Rebuilt docs for 2.2.5, added XPointer, Daniel
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aaf6530..47ec1c7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,7 +18,8 @@
 
 scan:
 	@(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
-	@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
+	@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/include ; fi)
+	@(if [ -L $(DOC_SOURCE_DIR)/include/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/include/libxml ; fi)
 	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
 
 templates: scan
diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml
index 29e3098..2712ae5 100644
--- a/doc/gnome-xml.sgml
+++ b/doc/gnome-xml.sgml
@@ -11,6 +11,7 @@
 <!entity tree SYSTEM "sgml/tree.sgml">
 <!entity uri SYSTEM "sgml/uri.sgml">
 <!entity xpath SYSTEM "sgml/xpath.sgml">
+<!entity xpointer SYSTEM "sgml/xpointer.sgml">
 <!entity xmlIO SYSTEM "sgml/xmlIO.sgml">
 <!entity xmlmemory SYSTEM "sgml/xmlmemory.sgml">
 <!entity nanohttp SYSTEM "sgml/nanohttp.sgml">
@@ -84,6 +85,7 @@
     &HTMLparser;
     &HTMLtree;
     &xpath;
+    &xpointer;
     &nanohttp;
     &nanoftp;
     &xmlIO;
diff --git a/doc/html/book1.html b/doc/html/book1.html
index e066da6..481367a 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -163,6 +163,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="gnome-xml-xpointer.html"
+>xpointer</A
+> &#8212; </DT
+><DT
+><A
 HREF="gnome-xml-nanohttp.html"
 >nanohttp</A
 > &#8212; </DT
diff --git a/doc/html/gnome-xml-debugxml.html b/doc/html/gnome-xml-debugxml.html
index d950dab..cee98a6 100644
--- a/doc/html/gnome-xml-debugxml.html
+++ b/doc/html/gnome-xml-debugxml.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15895"
+NAME="AEN16363"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15898"
+NAME="AEN16366"
 ></A
 ><H2
 >Synopsis</H2
@@ -315,7 +315,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15945"
+NAME="AEN16413"
 ></A
 ><H2
 >Description</H2
@@ -325,14 +325,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15948"
+NAME="AEN16416"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15950"
+NAME="AEN16418"
 ></A
 ><H3
 ><A
@@ -414,7 +414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15970"
+NAME="AEN16438"
 ></A
 ><H3
 ><A
@@ -514,7 +514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15994"
+NAME="AEN16462"
 ></A
 ><H3
 ><A
@@ -614,7 +614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16018"
+NAME="AEN16486"
 ></A
 ><H3
 ><A
@@ -714,7 +714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16042"
+NAME="AEN16510"
 ></A
 ><H3
 ><A
@@ -814,7 +814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16066"
+NAME="AEN16534"
 ></A
 ><H3
 ><A
@@ -914,7 +914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16090"
+NAME="AEN16558"
 ></A
 ><H3
 ><A
@@ -996,7 +996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16110"
+NAME="AEN16578"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16130"
+NAME="AEN16598"
 ></A
 ><H3
 ><A
@@ -1160,7 +1160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16150"
+NAME="AEN16618"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16170"
+NAME="AEN16638"
 ></A
 ><H3
 ><A
@@ -1324,7 +1324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16190"
+NAME="AEN16658"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16208"
+NAME="AEN16676"
 ></A
 ><H3
 ><A
@@ -1431,20 +1431,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16213"
+NAME="AEN16681"
 ></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="AEN16217"
+NAME="AEN16686"
 ></A
 ><H3
 ><A
@@ -1580,7 +1593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16250"
+NAME="AEN16719"
 ></A
 ><H3
 ><A
@@ -1644,7 +1657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial document</TD
 ></TR
 ><TR
 ><TD
@@ -1661,7 +1674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the output buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1678,7 +1691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line reading function</TD
 ></TR
 ><TR
 ><TD
@@ -1695,7 +1708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the output FILE*</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index 4965c1c..cd9201e 100644
--- a/doc/html/gnome-xml-encoding.html
+++ b/doc/html/gnome-xml-encoding.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15431"
+NAME="AEN15897"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15434"
+NAME="AEN15900"
 ></A
 ><H2
 >Synopsis</H2
@@ -300,7 +300,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15476"
+NAME="AEN15942"
 ></A
 ><H2
 >Description</H2
@@ -310,14 +310,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15479"
+NAME="AEN15945"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15481"
+NAME="AEN15947"
 ></A
 ><H3
 ><A
@@ -368,7 +368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15486"
+NAME="AEN15952"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15516"
+NAME="AEN15982"
 ></A
 ><H3
 ><A
@@ -622,7 +622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15546"
+NAME="AEN16012"
 ></A
 ><H3
 ><A
@@ -656,20 +656,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15551"
+NAME="AEN16017"
 ></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="AEN15555"
+NAME="AEN16022"
 ></A
 ><H3
 ><A
@@ -700,7 +713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15561"
+NAME="AEN16028"
 ></A
 ><H3
 ><A
@@ -729,7 +742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15567"
+NAME="AEN16034"
 ></A
 ><H3
 ><A
@@ -782,7 +795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlCharEncodingHandlerPtr handler block</TD
 ></TR
 ></TABLE
 ><P
@@ -792,7 +805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15583"
+NAME="AEN16050"
 ></A
 ><H3
 ><A
@@ -849,7 +862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string describing the char encoding.</TD
 ></TR
 ><TR
 ><TD
@@ -864,7 +877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the handler or NULL if not found</TD
 ></TR
 ></TABLE
 ><P
@@ -874,7 +887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15604"
+NAME="AEN16071"
 ></A
 ><H3
 ><A
@@ -951,7 +964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15623"
+NAME="AEN16090"
 ></A
 ><H3
 ><A
@@ -1013,7 +1026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1030,7 +1043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1045,7 +1058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -1055,7 +1068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15648"
+NAME="AEN16115"
 ></A
 ><H3
 ><A
@@ -1110,7 +1123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1125,7 +1138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -1135,7 +1148,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15668"
+NAME="AEN16135"
 ></A
 ><H3
 ><A
@@ -1185,7 +1198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the alias name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1200,7 +1213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not found the original name otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1210,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15687"
+NAME="AEN16154"
 ></A
 ><H3
 ><A
@@ -1238,7 +1251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15693"
+NAME="AEN16160"
 ></A
 ><H3
 ><A
@@ -1293,7 +1306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
 ></TR
 ><TR
 ><TD
@@ -1308,7 +1321,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE
+if not recognized.</TD
 ></TR
 ></TABLE
 ><P
@@ -1318,7 +1332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15713"
+NAME="AEN16180"
 ></A
 ><H3
 ><A
@@ -1376,7 +1390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding</TD
 ></TR
 ><TR
 ><TD
@@ -1391,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the canonical name for the given encoding</TD
 ></TR
 ></TABLE
 ><P
@@ -1401,7 +1415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15734"
+NAME="AEN16201"
 ></A
 ><H3
 ><A
@@ -1456,7 +1470,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the first bytes of the XML entity, must be at least
+4 bytes long.</TD
 ></TR
 ><TR
 ><TD
@@ -1473,7 +1488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1488,7 +1503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>one of the XML_CHAR_ENCODING_... values.</TD
 ></TR
 ></TABLE
 ><P
@@ -1498,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15758"
+NAME="AEN16225"
 ></A
 ><H3
 ><A
@@ -1563,7 +1578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> Pointer to putative utf-8 encoded string.</TD
 ></TR
 ><TR
 ><TD
@@ -1578,7 +1593,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> true if <TT
+CLASS="PARAMETER"
+><I
+>utf</I
+></TT
+> is valid.</TD
 ></TR
 ></TABLE
 ><P
@@ -1588,7 +1608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15779"
+NAME="AEN16247"
 ></A
 ><H3
 ><A
@@ -1659,7 +1679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1676,7 +1696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -1693,7 +1713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1708,7 +1728,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TABLE
 ><P
@@ -1718,7 +1741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15810"
+NAME="AEN16278"
 ></A
 ><H3
 ><A
@@ -1779,7 +1802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1796,7 +1819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -1813,7 +1836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1828,7 +1851,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TABLE
 ><P
@@ -1838,7 +1864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15840"
+NAME="AEN16308"
 ></A
 ><H3
 ><A
@@ -1900,7 +1926,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -1917,7 +1943,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the output.</TD
 ></TR
 ><TR
 ><TD
@@ -1934,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlBuffer for the input</TD
 ></TR
 ><TR
 ><TD
@@ -1949,7 +1975,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written if success, or 
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TABLE
 ><P
@@ -1959,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15870"
+NAME="AEN16338"
 ></A
 ><H3
 ><A
@@ -2012,7 +2041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>	char enconding transformation data structure</TD
 ></TR
 ><TR
 ><TD
@@ -2027,7 +2056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index dc174b5..43369cd 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN6837"
+NAME="AEN6896"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6840"
+NAME="AEN6899"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6908"
+NAME="AEN6967"
 ></A
 ><H2
 >Description</H2
@@ -392,14 +392,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6911"
+NAME="AEN6970"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6913"
+NAME="AEN6972"
 ></A
 ><H3
 ><A
@@ -432,7 +432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6918"
+NAME="AEN6977"
 ></A
 ><H3
 ><A
@@ -488,20 +488,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6923"
+NAME="AEN6982"
 ></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="AEN6927"
+NAME="AEN6987"
 ></A
 ><H3
 ><A
@@ -517,7 +530,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_ENTITIES_TABLE</PRE
+>#define XML_MIN_ENTITIES_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -527,7 +540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6932"
+NAME="AEN6992"
 ></A
 ><H3
 ><A
@@ -557,20 +570,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6937"
+NAME="AEN6997"
 ></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="AEN6941"
+NAME="AEN7002"
 ></A
 ><H3
 ><A
@@ -598,7 +624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6947"
+NAME="AEN7008"
 ></A
 ><H3
 ><A
@@ -671,7 +697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -688,7 +714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -705,7 +731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -722,7 +748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -739,7 +765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -756,7 +782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ><TR
 ><TD
@@ -771,7 +797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the entity or NULL in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -781,7 +807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6992"
+NAME="AEN7053"
 ></A
 ><H3
 ><A
@@ -854,7 +880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -871,7 +897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -888,7 +914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -905,7 +931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -922,7 +948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -939,7 +965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ><TR
 ><TD
@@ -954,7 +980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the entity or NULL in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -964,7 +990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7037"
+NAME="AEN7098"
 ></A
 ><H3
 ><A
@@ -1020,7 +1046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1035,7 +1061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TABLE
 ><P
@@ -1045,7 +1071,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7058"
+NAME="AEN7119"
 ></A
 ><H3
 ><A
@@ -1107,7 +1133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1124,7 +1150,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1139,7 +1165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1149,7 +1175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7084"
+NAME="AEN7145"
 ></A
 ><H3
 ><A
@@ -1210,7 +1236,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1227,7 +1253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1242,7 +1268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1252,7 +1278,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7110"
+NAME="AEN7171"
 ></A
 ><H3
 ><A
@@ -1313,7 +1339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1330,7 +1356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1345,7 +1371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1355,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7136"
+NAME="AEN7197"
 ></A
 ><H3
 ><A
@@ -1422,7 +1448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1439,7 +1465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1454,7 +1480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TABLE
 ><P
@@ -1464,7 +1490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7164"
+NAME="AEN7225"
 ></A
 ><H3
 ><A
@@ -1527,7 +1553,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1544,7 +1570,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1559,7 +1585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TABLE
 ><P
@@ -1569,7 +1595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7190"
+NAME="AEN7251"
 ></A
 ><H3
 ><A
@@ -1630,7 +1656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1647,7 +1673,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1662,7 +1688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TABLE
 ><P
@@ -1672,7 +1698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7216"
+NAME="AEN7277"
 ></A
 ><H3
 ><A
@@ -1723,7 +1749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntitiesTablePtr just created or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1733,7 +1759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7232"
+NAME="AEN7293"
 ></A
 ><H3
 ><A
@@ -1789,7 +1815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ><TR
 ><TD
@@ -1804,7 +1830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlEntitiesTablePtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1814,7 +1840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7253"
+NAME="AEN7314"
 ></A
 ><H3
 ><A
@@ -1867,7 +1893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TABLE
 ><P
@@ -1877,7 +1903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7269"
+NAME="AEN7330"
 ></A
 ><H3
 ><A
@@ -1934,7 +1960,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An XML buffer.</TD
 ></TR
 ><TR
 ><TD
@@ -1951,7 +1977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TABLE
 ><P
@@ -1961,7 +1987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7290"
+NAME="AEN7351"
 ></A
 ><H3
 ><A
@@ -2018,7 +2044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An XML buffer.</TD
 ></TR
 ><TR
 ><TD
@@ -2035,7 +2061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TABLE
 ><P
@@ -2045,7 +2071,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7311"
+NAME="AEN7372"
 ></A
 ><H3
 ><A
@@ -2073,7 +2099,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7317"
+NAME="AEN7378"
 ></A
 ><H3
 ><A
@@ -2132,7 +2158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an existing entity</TD
 ></TR
 ><TR
 ><TD
@@ -2149,7 +2175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name it's referencing</TD
 ></TR
 ><TR
 ><TD
@@ -2164,7 +2190,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> 0 if Okay, -1 in case of general error, 1 in case of loop 
+detection.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index ce38b23..c187341 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9508"
+NAME="AEN9577"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9511"
+NAME="AEN9580"
 ></A
 ><H2
 >Synopsis</H2
@@ -376,7 +376,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9572"
+NAME="AEN9641"
 ></A
 ><H2
 >Description</H2
@@ -386,131 +386,248 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9575"
+NAME="AEN9644"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9577"
+NAME="AEN9646"
 ></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="AEN9581"
+NAME="AEN9651"
 ></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="AEN9585"
+NAME="AEN9656"
 ></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="AEN9589"
+NAME="AEN9661"
 ></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="AEN9593"
+NAME="AEN9666"
 ></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="AEN9597"
+NAME="AEN9671"
 ></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="AEN9601"
+NAME="AEN9676"
 ></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="AEN9605"
+NAME="AEN9681"
 ></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="AEN9609"
+NAME="AEN9686"
 ></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="AEN9613"
+NAME="AEN9691"
 ></A
 ><H3
 ><A
@@ -544,20 +661,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9618"
+NAME="AEN9696"
 ></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="AEN9622"
+NAME="AEN9701"
 ></A
 ><H3
 ><A
@@ -587,20 +717,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9627"
+NAME="AEN9706"
 ></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="AEN9631"
+NAME="AEN9711"
 ></A
 ><H3
 ><A
@@ -656,7 +799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The tag name in lowercase</TD
 ></TR
 ><TR
 ><TD
@@ -671,7 +814,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the related htmlElemDescPtr or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -681,7 +824,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9652"
+NAME="AEN9732"
 ></A
 ><H3
 ><A
@@ -739,7 +882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -754,7 +897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
 ></TR
 ></TABLE
 ><P
@@ -764,7 +907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9674"
+NAME="AEN9754"
 ></A
 ><H3
 ><A
@@ -819,7 +962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity's unicode value</TD
 ></TR
 ><TR
 ><TD
@@ -834,7 +977,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, NULL otherwise.</TD
 ></TR
 ></TABLE
 ><P
@@ -844,7 +987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9695"
+NAME="AEN9775"
 ></A
 ><H3
 ><A
@@ -903,7 +1046,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML document</TD
 ></TR
 ><TR
 ><TD
@@ -920,7 +1063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML element</TD
 ></TR
 ><TR
 ><TD
@@ -935,7 +1078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if autoclosed, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -945,7 +1088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9720"
+NAME="AEN9800"
 ></A
 ><H3
 ><A
@@ -1009,7 +1152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML document</TD
 ></TR
 ><TR
 ><TD
@@ -1026,7 +1169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The tag name</TD
 ></TR
 ><TR
 ><TD
@@ -1043,7 +1186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML element</TD
 ></TR
 ><TR
 ><TD
@@ -1058,7 +1201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if autoclose, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1068,7 +1211,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9750"
+NAME="AEN9830"
 ></A
 ><H3
 ><A
@@ -1130,7 +1273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1147,7 +1290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  location to store the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1162,7 +1305,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the associated htmlEntityDescPtr if found, or NULL otherwise,
+if non-NULL *str will have to be freed by the caller.</TD
 ></TR
 ></TABLE
 ><P
@@ -1172,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9777"
+NAME="AEN9857"
 ></A
 ><H3
 ><A
@@ -1231,7 +1375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1246,7 +1390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the value parsed (as an int)</TD
 ></TR
 ></TABLE
 ><P
@@ -1256,7 +1400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9799"
+NAME="AEN9879"
 ></A
 ><H3
 ><A
@@ -1313,7 +1457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -1323,7 +1467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9817"
+NAME="AEN9897"
 ></A
 ><H3
 ><A
@@ -1387,7 +1531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -1404,7 +1548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1421,7 +1565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -1438,7 +1582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -1453,7 +1597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -1463,7 +1607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9851"
+NAME="AEN9931"
 ></A
 ><H3
 ><A
@@ -1520,7 +1664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -1537,7 +1681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1552,7 +1696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -1562,7 +1706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9876"
+NAME="AEN9956"
 ></A
 ><H3
 ><A
@@ -1624,7 +1768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1641,7 +1785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1658,7 +1802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -1675,7 +1819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if using SAX, this pointer will be provided on callbacks. </TD
 ></TR
 ><TR
 ><TD
@@ -1690,7 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -1700,7 +1844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9909"
+NAME="AEN9989"
 ></A
 ><H3
 ><A
@@ -1755,7 +1899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1772,7 +1916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a free form C string describing the HTML document encoding, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1787,7 +1931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -1797,7 +1941,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9933"
+NAME="AEN10013"
 ></A
 ><H3
 ><A
@@ -1851,7 +1995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -1868,7 +2012,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -1885,7 +2034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -1902,7 +2051,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -1917,7 +2071,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of octets consumed.</TD
 ></TR
 ></TABLE
 ><P
@@ -1927,7 +2094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9964"
+NAME="AEN10048"
 ></A
 ><H3
 ><A
@@ -1982,7 +2149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -1999,7 +2166,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2016,7 +2188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -2033,7 +2205,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -2050,7 +2227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the quote character to escape (' or ") or zero.</TD
 ></TR
 ><TR
 ><TD
@@ -2065,7 +2242,20 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success, -2 if the transcoding fails, or -1 otherwise
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of octets consumed.</TD
 ></TR
 ></TABLE
 ><P
@@ -2075,7 +2265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9999"
+NAME="AEN10087"
 ></A
 ><H3
 ><A
@@ -2129,7 +2319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an HTML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -2139,7 +2329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10015"
+NAME="AEN10103"
 ></A
 ><H3
 ><A
@@ -2216,7 +2406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -2233,7 +2423,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -2250,7 +2440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of chars</TD
 ></TR
 ><TR
 ><TD
@@ -2267,7 +2457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of chars in the array</TD
 ></TR
 ><TR
 ><TD
@@ -2284,7 +2474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional file name or URI</TD
 ></TR
 ><TR
 ><TD
@@ -2301,7 +2491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding</TD
 ></TR
 ><TR
 ><TD
@@ -2316,7 +2506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2326,7 +2516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10059"
+NAME="AEN10147"
 ></A
 ><H3
 ><A
@@ -2382,7 +2572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2399,7 +2589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -2416,7 +2606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in byte of the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -2433,7 +2623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  last chunk indicator</TD
 ></TR
 ><TR
 ><TD
@@ -2448,7 +2638,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>zero if no error, the xmlParserErrors otherwise.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index 84e9282..47f420a 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10096"
+NAME="AEN10184"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10099"
+NAME="AEN10187"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,6 +150,10 @@
 HREF="gnome-xml-htmltree.html#HTML-COMMENT-NODE"
 >HTML_COMMENT_NODE</A
 >
+#define     <A
+HREF="gnome-xml-htmltree.html#HTML-PRESERVE-NODE"
+>HTML_PRESERVE_NODE</A
+>
 <A
 HREF="gnome-xml-htmlparser.html#HTMLDOCPTR"
 >htmlDocPtr</A
@@ -276,7 +280,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10137"
+NAME="AEN10226"
 ></A
 ><H2
 >Description</H2
@@ -286,14 +290,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10140"
+NAME="AEN10229"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10142"
+NAME="AEN10231"
 ></A
 ><H3
 ><A
@@ -309,7 +313,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_TEXT_NODE</PRE
+>#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -319,7 +323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10147"
+NAME="AEN10236"
 ></A
 ><H3
 ><A
@@ -335,7 +339,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_ENTITY_REF_NODE</PRE
+>#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -345,7 +349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10152"
+NAME="AEN10241"
 ></A
 ><H3
 ><A
@@ -361,7 +365,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     HTML_COMMENT_NODE</PRE
+>#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -371,7 +375,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10157"
+NAME="AEN10246"
+></A
+><H3
+><A
+NAME="HTML-PRESERVE-NODE"
+></A
+>HTML_PRESERVE_NODE</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10251"
 ></A
 ><H3
 ><A
@@ -431,7 +461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  URI for the dtd, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -448,7 +478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID of the DTD, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -463,7 +493,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document</TD
 ></TR
 ></TABLE
 ><P
@@ -473,7 +503,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10183"
+NAME="AEN10277"
 ></A
 ><H3
 ><A
@@ -533,7 +563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  URI for the dtd, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -550,7 +580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID of the DTD, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -565,7 +595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document, do not intialize the DTD if not provided</TD
 ></TR
 ></TABLE
 ><P
@@ -575,7 +605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10209"
+NAME="AEN10303"
 ></A
 ><H3
 ><A
@@ -631,7 +661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -646,7 +676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current encoding as flagged in the HTML source</TD
 ></TR
 ></TABLE
 ><P
@@ -656,7 +686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10230"
+NAME="AEN10324"
 ></A
 ><H3
 ><A
@@ -715,7 +745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding string</TD
 ></TR
 ><TR
 ><TD
@@ -747,7 +777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success and -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -757,7 +787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10255"
+NAME="AEN10349"
 ></A
 ><H3
 ><A
@@ -816,7 +846,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -833,7 +863,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -850,7 +880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -860,7 +890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10280"
+NAME="AEN10374"
 ></A
 ><H3
 ><A
@@ -917,7 +947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE*</TD
 ></TR
 ><TR
 ><TD
@@ -934,7 +964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -949,7 +979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -959,7 +989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10305"
+NAME="AEN10399"
 ></A
 ><H3
 ><A
@@ -1019,7 +1049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -1036,7 +1066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1051,7 +1081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -1061,7 +1091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10330"
+NAME="AEN10424"
 ></A
 ><H3
 ><A
@@ -1122,7 +1152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -1139,7 +1169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1156,7 +1186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TABLE
 ><P
@@ -1166,7 +1196,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10356"
+NAME="AEN10450"
 ></A
 ><H3
 ><A
@@ -1227,7 +1257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE pointer</TD
 ></TR
 ><TR
 ><TD
@@ -1244,7 +1274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1261,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TABLE
 ><P
@@ -1271,7 +1301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10382"
+NAME="AEN10476"
 ></A
 ><H3
 ><A
@@ -1326,7 +1356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -1343,7 +1373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -1375,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index ec19e6f..3a96a07 100644
--- a/doc/html/gnome-xml-nanoftp.html
+++ b/doc/html/gnome-xml-nanoftp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11306"
+NAME="AEN11769"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11309"
+NAME="AEN11772"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11338"
+NAME="AEN11801"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +285,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11341"
+NAME="AEN11804"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11343"
+NAME="AEN11806"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11402"
+NAME="AEN11865"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11424"
+NAME="AEN11887"
 ></A
 ><H3
 ><A
@@ -675,7 +675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11430"
+NAME="AEN11893"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11435"
+NAME="AEN11898"
 ></A
 ><H3
 ><A
@@ -751,7 +751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL used to initialize the context</TD
 ></TR
 ></TABLE
 ><P
@@ -761,7 +761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11450"
+NAME="AEN11913"
 ></A
 ><H3
 ><A
@@ -811,7 +811,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ></TABLE
 ><P
@@ -821,7 +821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11465"
+NAME="AEN11928"
 ></A
 ><H3
 ><A
@@ -872,7 +872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP server name</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the port (use 21 if 0)</TD
 ></TR
 ></TABLE
 ><P
@@ -899,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11484"
+NAME="AEN11947"
 ></A
 ><H3
 ><A
@@ -949,7 +949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the URL to the resource</TD
 ></TR
 ></TABLE
 ><P
@@ -959,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11499"
+NAME="AEN11962"
 ></A
 ><H3
 ><A
@@ -1009,7 +1009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1024,7 +1024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1034,7 +1034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11518"
+NAME="AEN11981"
 ></A
 ><H3
 ><A
@@ -1084,7 +1084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1099,7 +1099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11537"
+NAME="AEN12000"
 ></A
 ><H3
 ><A
@@ -1159,7 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1174,7 +1174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1184,7 +1184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11556"
+NAME="AEN12019"
 ></A
 ><H3
 ><A
@@ -1237,7 +1237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The proxy URL used to initialize the proxy context</TD
 ></TR
 ></TABLE
 ><P
@@ -1247,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11571"
+NAME="AEN12034"
 ></A
 ><H3
 ><A
@@ -1303,7 +1303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy host name</TD
 ></TR
 ><TR
 ><TD
@@ -1320,7 +1320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy port</TD
 ></TR
 ><TR
 ><TD
@@ -1337,7 +1337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy user name</TD
 ></TR
 ><TR
 ><TD
@@ -1354,7 +1354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the proxy password</TD
 ></TR
 ><TR
 ><TD
@@ -1371,7 +1371,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of proxy 1 for using SITE, 2 for USER a<TT
+CLASS="PARAMETER"
+><I
+>b</I
+></TT
+></TD
 ></TR
 ></TABLE
 ><P
@@ -1381,7 +1386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11602"
+NAME="AEN12066"
 ></A
 ><H3
 ><A
@@ -1436,7 +1441,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1453,7 +1458,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL used to update the context</TD
 ></TR
 ><TR
 ><TD
@@ -1468,7 +1473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if Ok, -1 in case of error (other host).</TD
 ></TR
 ></TABLE
 ><P
@@ -1478,7 +1483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11625"
+NAME="AEN12089"
 ></A
 ><H3
 ><A
@@ -1528,7 +1533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1543,7 +1548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the code number</TD
 ></TR
 ></TABLE
 ><P
@@ -1553,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11644"
+NAME="AEN12108"
 ></A
 ><H3
 ><A
@@ -1603,7 +1608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1618,7 +1623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the code number, or 0</TD
 ></TR
 ></TABLE
 ><P
@@ -1628,7 +1633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11663"
+NAME="AEN12127"
 ></A
 ><H3
 ><A
@@ -1679,7 +1684,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1696,7 +1701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a directory on the server</TD
 ></TR
 ><TR
 ><TD
@@ -1711,7 +1716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 1 if CWD worked, 0 if it failed</TD
 ></TR
 ></TABLE
 ><P
@@ -1721,7 +1726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11686"
+NAME="AEN12150"
 ></A
 ><H3
 ><A
@@ -1772,7 +1777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1787,7 +1792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1797,7 +1802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11705"
+NAME="AEN12169"
 ></A
 ><H3
 ><A
@@ -1847,7 +1852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1862,7 +1867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -1872,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11724"
+NAME="AEN12188"
 ></A
 ><H3
 ><A
@@ -1929,7 +1934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1946,7 +1951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback</TD
 ></TR
 ><TR
 ><TD
@@ -1963,7 +1968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback data</TD
 ></TR
 ><TR
 ><TD
@@ -1980,7 +1985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  optional files to list</TD
 ></TR
 ><TR
 ><TD
@@ -1995,7 +2000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2005,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11756"
+NAME="AEN12220"
 ></A
 ><H3
 ><A
@@ -2056,7 +2061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2073,7 +2078,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file to retrieve (or NULL if path is in context).</TD
 ></TR
 ><TR
 ><TD
@@ -2088,7 +2093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the socket for the data connection, or &lt;0 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -2098,7 +2103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11779"
+NAME="AEN12243"
 ></A
 ><H3
 ><A
@@ -2155,7 +2160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2172,7 +2177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback</TD
 ></TR
 ><TR
 ><TD
@@ -2189,7 +2194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user callback data</TD
 ></TR
 ><TR
 ><TD
@@ -2206,7 +2211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file to retrieve</TD
 ></TR
 ><TR
 ><TD
@@ -2221,7 +2226,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 incase of error, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2231,7 +2236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11811"
+NAME="AEN12275"
 ></A
 ><H3
 ><A
@@ -2294,7 +2299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -2311,7 +2316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffer</TD
 ></TR
 ><TR
 ><TD
@@ -2328,7 +2333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer length</TD
 ></TR
 ><TR
 ><TD
@@ -2343,7 +2348,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte read. 0 is an indication of an end of connection.
+-1 indicates a parameter error.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 78317b5..78b64a2 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -12,8 +12,8 @@
 TITLE="Libxml Library Reference"
 HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
-TITLE="xpath"
-HREF="gnome-xml-xpath.html"><LINK
+TITLE="xpointer"
+HREF="gnome-xml-xpointer.html"><LINK
 REL="NEXT"
 TITLE="nanoftp"
 HREF="gnome-xml-nanoftp.html"></HEAD
@@ -44,7 +44,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="gnome-xml-xpath.html"
+HREF="gnome-xml-xpointer.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11090"
+NAME="AEN11553"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11093"
+NAME="AEN11556"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11106"
+NAME="AEN11569"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +205,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11109"
+NAME="AEN11572"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11111"
+NAME="AEN11574"
 ></A
 ><H3
 ><A
@@ -241,7 +241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11117"
+NAME="AEN11580"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11122"
+NAME="AEN11585"
 ></A
 ><H3
 ><A
@@ -320,7 +320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The proxy URL used to initialize the proxy context</TD
 ></TR
 ></TABLE
 ><P
@@ -330,7 +330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11137"
+NAME="AEN11600"
 ></A
 ><H3
 ><A
@@ -383,7 +383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -400,7 +400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -417,7 +417,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -432,7 +433,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success. The contentType,
+if provided must be freed by the caller</TD
 ></TR
 ></TABLE
 ><P
@@ -442,7 +444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11164"
+NAME="AEN11627"
 ></A
 ><H3
 ><A
@@ -503,7 +505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -520,7 +522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP method to use</TD
 ></TR
 ><TR
 ><TD
@@ -537,7 +539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string if any</TD
 ></TR
 ><TR
 ><TD
@@ -554,7 +556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Content-Type information IN and OUT</TD
 ></TR
 ><TR
 ><TD
@@ -571,7 +573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra headers</TD
 ></TR
 ></TABLE
 ><P
@@ -581,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11196"
+NAME="AEN11659"
 ></A
 ><H3
 ><A
@@ -633,7 +635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -650,7 +652,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ></TABLE
 ><P
@@ -660,7 +663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11215"
+NAME="AEN11678"
 ></A
 ><H3
 ><A
@@ -710,7 +713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -725,7 +728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the HTTP return code for the request.</TD
 ></TR
 ></TABLE
 ><P
@@ -735,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11234"
+NAME="AEN11697"
 ></A
 ><H3
 ><A
@@ -798,7 +801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -815,7 +818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffer</TD
 ></TR
 ><TR
 ><TD
@@ -832,7 +835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer length</TD
 ></TR
 ><TR
 ><TD
@@ -847,7 +850,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte read. 0 is an indication of an end of connection.
+-1 indicates a parameter error.</TD
 ></TR
 ></TABLE
 ><P
@@ -857,7 +861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11263"
+NAME="AEN11726"
 ></A
 ><H3
 ><A
@@ -909,7 +913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -926,7 +930,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -941,7 +945,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success.</TD
 ></TR
 ></TABLE
 ><P
@@ -951,7 +955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11286"
+NAME="AEN11749"
 ></A
 ><H3
 ><A
@@ -1002,7 +1006,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ></TABLE
 ><P
@@ -1025,7 +1029,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="gnome-xml-xpath.html"
+HREF="gnome-xml-xpointer.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -1097,7 +1101,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->xpath</B
+>xpointer</B
 ></FONT
 ></TD
 ><TD
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index d420d66..16bba33 100644
--- a/doc/html/gnome-xml-parser.html
+++ b/doc/html/gnome-xml-parser.html
@@ -1246,7 +1246,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_DEFAULT_VERSION</PRE
+>#define XML_DEFAULT_VERSION	"1.0"</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1366,13 +1366,26 @@
 NAME="XMLPARSERINPUTPTR"
 ></A
 >xmlParserInputPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInput *xmlParserInputPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN344"
+NAME="AEN345"
 ></A
 ><H3
 ><A
@@ -1405,20 +1418,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN349"
+NAME="AEN350"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOPTR"
 ></A
 >xmlParserNodeInfoPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN353"
+NAME="AEN355"
 ></A
 ><H3
 ><A
@@ -1448,20 +1474,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN358"
+NAME="AEN360"
 ></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="AEN362"
+NAME="AEN365"
 ></A
 ><H3
 ><A
@@ -1504,7 +1543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN367"
+NAME="AEN370"
 ></A
 ><H3
 ><A
@@ -1600,20 +1639,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN372"
+NAME="AEN375"
 ></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="AEN376"
+NAME="AEN380"
 ></A
 ><H3
 ><A
@@ -1644,20 +1696,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN381"
+NAME="AEN385"
 ></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="AEN385"
+NAME="AEN390"
 ></A
 ><H3
 ><A
@@ -1775,7 +1840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN414"
+NAME="AEN419"
 ></A
 ><H3
 ><A
@@ -1896,7 +1961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN443"
+NAME="AEN448"
 ></A
 ><H3
 ><A
@@ -2017,7 +2082,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN472"
+NAME="AEN477"
 ></A
 ><H3
 ><A
@@ -2114,7 +2179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN496"
+NAME="AEN501"
 ></A
 ><H3
 ><A
@@ -2211,7 +2276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN520"
+NAME="AEN525"
 ></A
 ><H3
 ><A
@@ -2371,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN558"
+NAME="AEN563"
 ></A
 ><H3
 ><A
@@ -2492,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN587"
+NAME="AEN592"
 ></A
 ><H3
 ><A
@@ -2670,7 +2735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN629"
+NAME="AEN634"
 ></A
 ><H3
 ><A
@@ -2788,7 +2853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN657"
+NAME="AEN662"
 ></A
 ><H3
 ><A
@@ -2930,7 +2995,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN691"
+NAME="AEN696"
 ></A
 ><H3
 ><A
@@ -3009,7 +3074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN710"
+NAME="AEN715"
 ></A
 ><H3
 ><A
@@ -3067,7 +3132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN724"
+NAME="AEN729"
 ></A
 ><H3
 ><A
@@ -3125,7 +3190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN738"
+NAME="AEN743"
 ></A
 ><H3
 ><A
@@ -3225,7 +3290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN762"
+NAME="AEN767"
 ></A
 ><H3
 ><A
@@ -3304,7 +3369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN781"
+NAME="AEN786"
 ></A
 ><H3
 ><A
@@ -3404,7 +3469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN805"
+NAME="AEN810"
 ></A
 ><H3
 ><A
@@ -3483,7 +3548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN824"
+NAME="AEN829"
 ></A
 ><H3
 ><A
@@ -3580,7 +3645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN847"
+NAME="AEN852"
 ></A
 ><H3
 ><A
@@ -3677,7 +3742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN870"
+NAME="AEN875"
 ></A
 ><H3
 ><A
@@ -3777,7 +3842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN894"
+NAME="AEN899"
 ></A
 ><H3
 ><A
@@ -3856,7 +3921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN913"
+NAME="AEN918"
 ></A
 ><H3
 ><A
@@ -3953,7 +4018,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN936"
+NAME="AEN941"
 ></A
 ><H3
 ><A
@@ -4047,7 +4112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN958"
+NAME="AEN963"
 ></A
 ><H3
 ><A
@@ -4141,7 +4206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN980"
+NAME="AEN985"
 ></A
 ><H3
 ><A
@@ -4235,7 +4300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1002"
+NAME="AEN1007"
 ></A
 ><H3
 ><A
@@ -4308,7 +4373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1020"
+NAME="AEN1025"
 ></A
 ><H3
 ><A
@@ -4381,7 +4446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1038"
+NAME="AEN1043"
 ></A
 ><H3
 ><A
@@ -4454,7 +4519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1056"
+NAME="AEN1061"
 ></A
 ><H3
 ><A
@@ -4508,20 +4573,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1061"
+NAME="AEN1066"
 ></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="AEN1065"
+NAME="AEN1071"
 ></A
 ><H3
 ><A
@@ -4637,7 +4715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1093"
+NAME="AEN1099"
 ></A
 ><H3
 ><A
@@ -4663,7 +4741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1098"
+NAME="AEN1104"
 ></A
 ><H3
 ><A
@@ -4689,7 +4767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1103"
+NAME="AEN1109"
 ></A
 ><H3
 ><A
@@ -4715,7 +4793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1108"
+NAME="AEN1114"
 ></A
 ><H3
 ><A
@@ -4741,7 +4819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1113"
+NAME="AEN1119"
 ></A
 ><H3
 ><A
@@ -4767,7 +4845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1118"
+NAME="AEN1124"
 ></A
 ><H3
 ><A
@@ -4793,7 +4871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1123"
+NAME="AEN1129"
 ></A
 ><H3
 ><A
@@ -4819,7 +4897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1128"
+NAME="AEN1134"
 ></A
 ><H3
 ><A
@@ -4849,7 +4927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1140"
 ></A
 ><H3
 ><A
@@ -4880,7 +4958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1140"
+NAME="AEN1146"
 ></A
 ><H3
 ><A
@@ -4935,7 +5013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ><TR
 ><TD
@@ -4952,7 +5030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an indicative size for the lookahead</TD
 ></TR
 ><TR
 ><TD
@@ -4967,7 +5045,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
 ></TR
 ></TABLE
 ><P
@@ -4977,7 +5056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1164"
+NAME="AEN1170"
 ></A
 ><H3
 ><A
@@ -5032,7 +5111,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ><TR
 ><TD
@@ -5049,7 +5128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an indicative size for the lookahead</TD
 ></TR
 ><TR
 ><TD
@@ -5064,7 +5143,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChars read, or -1 in case of error, 0 indicate the
+end of this entity</TD
 ></TR
 ></TABLE
 ><P
@@ -5074,7 +5154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1188"
+NAME="AEN1194"
 ></A
 ><H3
 ><A
@@ -5132,7 +5212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5147,7 +5227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -5157,7 +5237,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1209"
+NAME="AEN1215"
 ></A
 ><H3
 ><A
@@ -5214,7 +5294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5231,7 +5311,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len of <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -5246,7 +5331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -5256,7 +5341,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1234"
+NAME="AEN1241"
 ></A
 ><H3
 ><A
@@ -5314,7 +5399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5331,7 +5416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the index of the first char (zero based)</TD
 ></TR
 ><TR
 ><TD
@@ -5348,7 +5433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the substring</TD
 ></TR
 ><TR
 ><TD
@@ -5363,7 +5448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -5373,7 +5458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1263"
+NAME="AEN1270"
 ></A
 ><H3
 ><A
@@ -5433,7 +5518,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -5450,7 +5535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search</TD
 ></TR
 ><TR
 ><TD
@@ -5465,7 +5550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -5475,7 +5560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1289"
+NAME="AEN1296"
 ></A
 ><H3
 ><A
@@ -5535,7 +5620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5552,7 +5637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search (needle)</TD
 ></TR
 ><TR
 ><TD
@@ -5567,7 +5652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -5577,7 +5662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1315"
+NAME="AEN1322"
 ></A
 ><H3
 ><A
@@ -5637,7 +5722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array (haystack)</TD
 ></TR
 ><TR
 ><TD
@@ -5654,7 +5739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar to search (needle)</TD
 ></TR
 ><TR
 ><TD
@@ -5669,7 +5754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlChar * for the first occurence or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -5679,7 +5764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1341"
+NAME="AEN1348"
 ></A
 ><H3
 ><A
@@ -5736,7 +5821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5753,7 +5838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5768,7 +5853,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TABLE
 ><P
@@ -5778,7 +5863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1366"
+NAME="AEN1373"
 ></A
 ><H3
 ><A
@@ -5836,7 +5921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5853,7 +5938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5870,7 +5955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the max comparison length</TD
 ></TR
 ><TR
 ><TD
@@ -5885,7 +5970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TABLE
 ><P
@@ -5895,7 +5980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1395"
+NAME="AEN1402"
 ></A
 ><H3
 ><A
@@ -5952,7 +6037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5969,7 +6054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -5984,7 +6069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TABLE
 ><P
@@ -5994,7 +6079,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1420"
+NAME="AEN1427"
 ></A
 ><H3
 ><A
@@ -6052,7 +6137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6069,7 +6154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6086,7 +6171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the max comparison length</TD
 ></TR
 ><TR
 ><TD
@@ -6101,7 +6186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the integer result of the comparison</TD
 ></TR
 ></TABLE
 ><P
@@ -6111,7 +6196,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1449"
+NAME="AEN1456"
 ></A
 ><H3
 ><A
@@ -6172,7 +6257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6189,7 +6274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second xmlChar *</TD
 ></TR
 ><TR
 ><TD
@@ -6204,7 +6289,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if they are equal, 0 if they are different</TD
 ></TR
 ></TABLE
 ><P
@@ -6214,7 +6299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1475"
+NAME="AEN1482"
 ></A
 ><H3
 ><A
@@ -6267,7 +6352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6282,7 +6367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar contained in the ARRAY.</TD
 ></TR
 ></TABLE
 ><P
@@ -6292,7 +6377,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1495"
+NAME="AEN1502"
 ></A
 ><H3
 ><A
@@ -6354,7 +6439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the original xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6371,7 +6456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array added</TD
 ></TR
 ><TR
 ><TD
@@ -6386,7 +6471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * containing the concatenated string.</TD
 ></TR
 ></TABLE
 ><P
@@ -6396,7 +6481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1521"
+NAME="AEN1528"
 ></A
 ><H3
 ><A
@@ -6457,7 +6542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the original xmlChar * array</TD
 ></TR
 ><TR
 ><TD
@@ -6474,7 +6559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * array added</TD
 ></TR
 ><TR
 ><TD
@@ -6491,7 +6576,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of <TT
+CLASS="PARAMETER"
+><I
+>add</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -6506,7 +6596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * containing the concatenated string.</TD
 ></TR
 ></TABLE
 ><P
@@ -6516,7 +6606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1551"
+NAME="AEN1559"
 ></A
 ><H3
 ><A
@@ -6572,7 +6662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -6587,7 +6677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -6597,7 +6687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1572"
+NAME="AEN1580"
 ></A
 ><H3
 ><A
@@ -6651,7 +6741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -6668,7 +6758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -6683,7 +6773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -6693,7 +6783,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1596"
+NAME="AEN1604"
 ></A
 ><H3
 ><A
@@ -6747,7 +6837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -6762,7 +6852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -6772,7 +6862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1616"
+NAME="AEN1624"
 ></A
 ><H3
 ><A
@@ -6830,7 +6920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -6845,7 +6935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TABLE
 ><P
@@ -6855,7 +6945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1636"
+NAME="AEN1644"
 ></A
 ><H3
 ><A
@@ -6932,7 +7022,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -6947,7 +7037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TABLE
 ><P
@@ -6957,7 +7047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1659"
+NAME="AEN1667"
 ></A
 ><H3
 ><A
@@ -7010,7 +7100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7020,7 +7110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1675"
+NAME="AEN1683"
 ></A
 ><H3
 ><A
@@ -7070,7 +7160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int 0 or 1 </TD
 ></TR
 ><TR
 ><TD
@@ -7085,7 +7175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TABLE
 ><P
@@ -7095,7 +7185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1694"
+NAME="AEN1702"
 ></A
 ><H3
 ><A
@@ -7152,7 +7242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -7167,7 +7257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -7177,7 +7267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1715"
+NAME="AEN1723"
 ></A
 ><H3
 ><A
@@ -7232,7 +7322,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -7249,7 +7339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7264,7 +7354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -7274,7 +7364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1739"
+NAME="AEN1747"
 ></A
 ><H3
 ><A
@@ -7329,7 +7419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -7344,7 +7434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -7354,7 +7444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1759"
+NAME="AEN1767"
 ></A
 ><H3
 ><A
@@ -7412,7 +7502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7427,7 +7517,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
 ></TR
 ></TABLE
 ><P
@@ -7437,7 +7528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1781"
+NAME="AEN1789"
 ></A
 ><H3
 ><A
@@ -7494,7 +7585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7509,7 +7600,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0, -1 in case of error. the parser context is augmented
+as a result of the parsing.</TD
 ></TR
 ></TABLE
 ><P
@@ -7519,7 +7611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1802"
+NAME="AEN1810"
 ></A
 ><H3
 ><A
@@ -7582,7 +7674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -7599,7 +7691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -7616,7 +7708,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -7631,7 +7724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -7641,7 +7734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1832"
+NAME="AEN1840"
 ></A
 ><H3
 ><A
@@ -7697,7 +7790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -7714,7 +7807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -7731,7 +7824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file name</TD
 ></TR
 ><TR
 ><TD
@@ -7746,7 +7839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success or a error number otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -7756,7 +7849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1860"
+NAME="AEN1868"
 ></A
 ><H3
 ><A
@@ -7813,7 +7906,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -7830,7 +7923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -7847,7 +7940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an in-memory XML document input</TD
 ></TR
 ><TR
 ><TD
@@ -7864,7 +7957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the XML document in bytes</TD
 ></TR
 ><TR
 ><TD
@@ -7879,7 +7972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success or a error number otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -7889,7 +7982,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1892"
+NAME="AEN1900"
 ></A
 ><H3
 ><A
@@ -7950,7 +8043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -7967,7 +8060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -7984,7 +8077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -8001,7 +8094,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read not Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8016,7 +8110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -8026,7 +8120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1925"
+NAME="AEN1933"
 ></A
 ><H3
 ><A
@@ -8087,7 +8181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8104,7 +8198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8121,7 +8215,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  work in recovery mode, i.e. tries to read no Well Formed
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8136,7 +8231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -8146,7 +8241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1954"
+NAME="AEN1962"
 ></A
 ><H3
 ><A
@@ -8209,7 +8304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8226,7 +8321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8241,7 +8336,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -8251,7 +8346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1981"
+NAME="AEN1989"
 ></A
 ><H3
 ><A
@@ -8308,7 +8403,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -8323,7 +8418,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting document tree</TD
 ></TR
 ></TABLE
 ><P
@@ -8333,7 +8428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2003"
+NAME="AEN2011"
 ></A
 ><H3
 ><A
@@ -8393,7 +8488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the External ID of the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8410,7 +8505,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the URL to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8425,7 +8520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8435,7 +8530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2029"
+NAME="AEN2037"
 ></A
 ><H3
 ><A
@@ -8499,7 +8594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler block</TD
 ></TR
 ><TR
 ><TD
@@ -8516,7 +8611,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the External ID of the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8533,7 +8628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a NAME* containing the URL to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -8548,7 +8643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the resulting xmlDtdPtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8558,7 +8653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2060"
+NAME="AEN2068"
 ></A
 ><H3
 ><A
@@ -8733,7 +8828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2102"
+NAME="AEN2110"
 ></A
 ><H3
 ><A
@@ -8808,7 +8903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the chunk pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -8825,7 +8920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SAX handler bloc (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -8842,7 +8937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks (possibly NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -8859,7 +8954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Used for loop detection, use 0</TD
 ></TR
 ><TR
 ><TD
@@ -8876,7 +8971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URL for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -8893,7 +8988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the System ID for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -8910,7 +9005,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the return value for the set of parsed nodes</TD
 ></TR
 ><TR
 ><TD
@@ -8925,7 +9020,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if the entity is well formed, -1 in case of args problem and
+the parser error code otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -8935,7 +9031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2151"
+NAME="AEN2159"
 ></A
 ><H3
 ><A
@@ -9004,7 +9100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the existing parsing context</TD
 ></TR
 ><TR
 ><TD
@@ -9021,7 +9117,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URL for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9038,7 +9134,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the System ID for the entity to load</TD
 ></TR
 ><TR
 ><TD
@@ -9055,7 +9151,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the return value for the set of parsed nodes</TD
 ></TR
 ><TR
 ><TD
@@ -9070,7 +9166,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if the entity is well formed, -1 in case of args problem and
+the parser error code otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -9080,7 +9177,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2187"
+NAME="AEN2195"
 ></A
 ><H3
 ><A
@@ -9108,7 +9205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2193"
+NAME="AEN2201"
 ></A
 ><H3
 ><A
@@ -9136,7 +9233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2199"
+NAME="AEN2207"
 ></A
 ><H3
 ><A
@@ -9189,7 +9286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -9199,7 +9296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2215"
+NAME="AEN2223"
 ></A
 ><H3
 ><A
@@ -9252,7 +9349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -9262,7 +9359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2231"
+NAME="AEN2239"
 ></A
 ><H3
 ><A
@@ -9316,7 +9413,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -9326,7 +9423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2247"
+NAME="AEN2255"
 ></A
 ><H3
 ><A
@@ -9386,7 +9483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9403,7 +9500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar * buffer</TD
 ></TR
 ><TR
 ><TD
@@ -9420,7 +9517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file name</TD
 ></TR
 ></TABLE
 ><P
@@ -9430,7 +9527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2272"
+NAME="AEN2280"
 ></A
 ><H3
 ><A
@@ -9486,7 +9583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of xmlChar</TD
 ></TR
 ><TR
 ><TD
@@ -9501,7 +9598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -9511,7 +9608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2293"
+NAME="AEN2301"
 ></A
 ><H3
 ><A
@@ -9602,7 +9699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2315"
+NAME="AEN2323"
 ></A
 ><H3
 ><A
@@ -9714,7 +9811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2342"
+NAME="AEN2350"
 ></A
 ><H3
 ><A
@@ -9826,7 +9923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2369"
+NAME="AEN2377"
 ></A
 ><H3
 ><A
@@ -9899,7 +9996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -9916,7 +10013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -9933,7 +10030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to an array of chars</TD
 ></TR
 ><TR
 ><TD
@@ -9950,7 +10047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of chars in the array</TD
 ></TR
 ><TR
 ><TD
@@ -9967,7 +10064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional file name or URI</TD
 ></TR
 ><TR
 ><TD
@@ -9982,7 +10079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -9992,7 +10089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2408"
+NAME="AEN2416"
 ></A
 ><H3
 ><A
@@ -10048,7 +10145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10065,7 +10162,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -10082,7 +10179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in byte of the chunk</TD
 ></TR
 ><TR
 ><TD
@@ -10099,7 +10196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  last chunk indicator</TD
 ></TR
 ><TR
 ><TD
@@ -10114,7 +10211,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>zero if no error, the xmlParserErrors otherwise.</TD
 ></TR
 ></TABLE
 ><P
@@ -10124,7 +10221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2440"
+NAME="AEN2448"
 ></A
 ><H3
 ><A
@@ -10195,7 +10292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a SAX handler</TD
 ></TR
 ><TR
 ><TD
@@ -10212,7 +10309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The user data returned on SAX callbacks</TD
 ></TR
 ><TR
 ><TD
@@ -10229,7 +10326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O read function</TD
 ></TR
 ><TR
 ><TD
@@ -10246,7 +10343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -10263,7 +10360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -10280,7 +10377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -10295,7 +10392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -10305,7 +10402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2484"
+NAME="AEN2492"
 ></A
 ><H3
 ><A
@@ -10375,7 +10472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10392,7 +10489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O Input</TD
 ></TR
 ><TR
 ><TD
@@ -10409,7 +10506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -10424,7 +10521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -10434,7 +10531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2516"
+NAME="AEN2524"
 ></A
 ><H3
 ><A
@@ -10495,7 +10592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10512,7 +10609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML node within the tree</TD
 ></TR
 ><TR
 ><TD
@@ -10527,7 +10624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an xmlParserNodeInfo block pointer or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -10537,7 +10634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2542"
+NAME="AEN2550"
 ></A
 ><H3
 ><A
@@ -10590,7 +10687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TABLE
 ><P
@@ -10600,7 +10697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2558"
+NAME="AEN2566"
 ></A
 ><H3
 ><A
@@ -10654,7 +10751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TABLE
 ><P
@@ -10664,7 +10761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2574"
+NAME="AEN2582"
 ></A
 ><H3
 ><A
@@ -10725,7 +10822,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ><TR
 ><TD
@@ -10742,7 +10839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML node pointer</TD
 ></TR
 ><TR
 ><TD
@@ -10757,7 +10854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a long indicating the position of the record</TD
 ></TR
 ></TABLE
 ><P
@@ -10767,7 +10864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2600"
+NAME="AEN2608"
 ></A
 ><H3
 ><A
@@ -10824,7 +10921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10841,7 +10938,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node info sequence pointer</TD
 ></TR
 ></TABLE
 ><P
@@ -10851,7 +10948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2621"
+NAME="AEN2629"
 ></A
 ><H3
 ><A
@@ -10912,7 +11009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2636"
+NAME="AEN2644"
 ></A
 ><H3
 ><A
@@ -10972,7 +11069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2651"
+NAME="AEN2659"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index 8870745..eb3865e 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12759"
+NAME="AEN13225"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12762"
+NAME="AEN13228"
 ></A
 ><H2
 >Synopsis</H2
@@ -1096,7 +1096,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13029"
+NAME="AEN13495"
 ></A
 ><H2
 >Description</H2
@@ -1106,14 +1106,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13032"
+NAME="AEN13498"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13034"
+NAME="AEN13500"
 ></A
 ><H3
 ><A
@@ -1129,7 +1129,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MAX_NAMELEN</PRE
+>#define XML_MAX_NAMELEN 100</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1139,7 +1139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13039"
+NAME="AEN13505"
 ></A
 ><H3
 ><A
@@ -1155,7 +1155,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     INPUT_CHUNK</PRE
+>#define INPUT_CHUNK	250</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1165,7 +1165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13044"
+NAME="AEN13510"
 ></A
 ><H3
 ><A
@@ -1223,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13058"
+NAME="AEN13524"
 ></A
 ><H3
 ><A
@@ -1281,7 +1281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13072"
+NAME="AEN13538"
 ></A
 ><H3
 ><A
@@ -1297,7 +1297,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_BASECHAR(c)</PRE
+>#define IS_BASECHAR(c) xmlIsBaseChar(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1339,7 +1339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13086"
+NAME="AEN13552"
 ></A
 ><H3
 ><A
@@ -1355,7 +1355,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_DIGIT(c)</PRE
+>#define IS_DIGIT(c) xmlIsDigit(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13100"
+NAME="AEN13566"
 ></A
 ><H3
 ><A
@@ -1413,7 +1413,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_COMBINING(c)</PRE
+>#define IS_COMBINING(c) xmlIsCombining(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1455,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13114"
+NAME="AEN13580"
 ></A
 ><H3
 ><A
@@ -1471,7 +1471,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_EXTENDER(c)</PRE
+>#define IS_EXTENDER(c) xmlIsExtender(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1513,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13128"
+NAME="AEN13594"
 ></A
 ><H3
 ><A
@@ -1529,7 +1529,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_IDEOGRAPHIC(c)</PRE
+>#define IS_IDEOGRAPHIC(c) xmlIsIdeographic(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1571,7 +1571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13142"
+NAME="AEN13608"
 ></A
 ><H3
 ><A
@@ -1587,7 +1587,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_LETTER(c)</PRE
+>#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1629,7 +1629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13156"
+NAME="AEN13622"
 ></A
 ><H3
 ><A
@@ -1645,7 +1645,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     IS_PUBIDCHAR(c)</PRE
+>#define IS_PUBIDCHAR(c)	xmlIsPubidChar(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1687,7 +1687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13170"
+NAME="AEN13636"
 ></A
 ><H3
 ><A
@@ -1745,7 +1745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13184"
+NAME="AEN13650"
 ></A
 ><H3
 ><A
@@ -1803,7 +1803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13198"
+NAME="AEN13664"
 ></A
 ><H3
 ><A
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13212"
+NAME="AEN13678"
 ></A
 ><H3
 ><A
@@ -1887,7 +1887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13217"
+NAME="AEN13683"
 ></A
 ><H3
 ><A
@@ -1913,7 +1913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13222"
+NAME="AEN13688"
 ></A
 ><H3
 ><A
@@ -1939,7 +1939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13227"
+NAME="AEN13693"
 ></A
 ><H3
 ><A
@@ -1965,7 +1965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13232"
+NAME="AEN13698"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13237"
+NAME="AEN13703"
 ></A
 ><H3
 ><A
@@ -2017,7 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13242"
+NAME="AEN13708"
 ></A
 ><H3
 ><A
@@ -2082,7 +2082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2097,7 +2097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2107,7 +2107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13265"
+NAME="AEN13731"
 ></A
 ><H3
 ><A
@@ -2174,7 +2174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2189,7 +2189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2199,7 +2199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13289"
+NAME="AEN13755"
 ></A
 ><H3
 ><A
@@ -2259,7 +2259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2274,7 +2274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2284,7 +2284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13311"
+NAME="AEN13777"
 ></A
 ><H3
 ><A
@@ -2335,7 +2335,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2350,7 +2350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2360,7 +2360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13330"
+NAME="AEN13796"
 ></A
 ><H3
 ><A
@@ -2411,7 +2411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2426,7 +2426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2436,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13349"
+NAME="AEN13815"
 ></A
 ><H3
 ><A
@@ -2502,7 +2502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2517,7 +2517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2527,7 +2527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13373"
+NAME="AEN13839"
 ></A
 ><H3
 ><A
@@ -2578,7 +2578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2593,7 +2593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2603,7 +2603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13392"
+NAME="AEN13858"
 ></A
 ><H3
 ><A
@@ -2698,7 +2698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2713,7 +2713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2723,7 +2723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13425"
+NAME="AEN13891"
 ></A
 ><H3
 ><A
@@ -2807,7 +2807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an unicode character (int)</TD
 ></TR
 ><TR
 ><TD
@@ -2822,7 +2822,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if not, non-zero otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2832,7 +2832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13454"
+NAME="AEN13920"
 ></A
 ><H3
 ><A
@@ -2913,7 +2913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13475"
+NAME="AEN13941"
 ></A
 ><H3
 ><A
@@ -2968,7 +2968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename</TD
 ></TR
 ><TR
 ><TD
@@ -2983,7 +2983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2993,7 +2993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13495"
+NAME="AEN13961"
 ></A
 ><H3
 ><A
@@ -3047,7 +3047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to a char array</TD
 ></TR
 ><TR
 ><TD
@@ -3064,7 +3064,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -3079,7 +3079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -3089,7 +3089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13519"
+NAME="AEN13985"
 ></A
 ><H3
 ><A
@@ -3140,7 +3140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlParserCtxtPtr or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -3150,7 +3150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13535"
+NAME="AEN14001"
 ></A
 ><H3
 ><A
@@ -3216,7 +3216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity URL</TD
 ></TR
 ><TR
 ><TD
@@ -3233,7 +3233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity PUBLIC ID</TD
 ></TR
 ><TR
 ><TD
@@ -3250,7 +3250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a posible base for the target URI</TD
 ></TR
 ><TR
 ><TD
@@ -3265,7 +3265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser context or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -3275,7 +3275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13566"
+NAME="AEN14032"
 ></A
 ><H3
 ><A
@@ -3333,7 +3333,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3350,7 +3350,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding value (number)</TD
 ></TR
 ><TR
 ><TD
@@ -3365,7 +3365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -3375,7 +3375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13591"
+NAME="AEN14057"
 ></A
 ><H3
 ><A
@@ -3433,7 +3433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3450,7 +3450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding handler</TD
 ></TR
 ><TR
 ><TD
@@ -3465,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of success, -1 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -3475,7 +3475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13616"
+NAME="AEN14082"
 ></A
 ><H3
 ><A
@@ -3539,7 +3539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13632"
+NAME="AEN14098"
 ></A
 ><H3
 ><A
@@ -3599,7 +3599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3616,7 +3616,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML entity pointer.</TD
 ></TR
 ></TABLE
 ><P
@@ -3626,7 +3626,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13654"
+NAME="AEN14120"
 ></A
 ><H3
 ><A
@@ -3686,7 +3686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3703,7 +3703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an Entity pointer</TD
 ></TR
 ><TR
 ><TD
@@ -3718,7 +3718,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -3728,7 +3728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13680"
+NAME="AEN14146"
 ></A
 ><H3
 ><A
@@ -3786,7 +3786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3803,7 +3803,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input fragment (entity, XML fragment ...).</TD
 ></TR
 ></TABLE
 ><P
@@ -3813,7 +3813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13701"
+NAME="AEN14167"
 ></A
 ><H3
 ><A
@@ -3870,7 +3870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3885,7 +3885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current xmlChar in the parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -3895,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13722"
+NAME="AEN14188"
 ></A
 ><H3
 ><A
@@ -3948,7 +3948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlParserInputPtr</TD
 ></TR
 ></TABLE
 ><P
@@ -3958,7 +3958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13738"
+NAME="AEN14204"
 ></A
 ><H3
 ><A
@@ -4015,7 +4015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4032,7 +4032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename to use as entity</TD
 ></TR
 ><TR
 ><TD
@@ -4047,7 +4047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -4057,7 +4057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13763"
+NAME="AEN14229"
 ></A
 ><H3
 ><A
@@ -4113,7 +4113,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4128,7 +4128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new input stream or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4138,7 +4138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13784"
+NAME="AEN14250"
 ></A
 ><H3
 ><A
@@ -4208,7 +4208,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4225,7 +4225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4242,7 +4242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** </TD
 ></TR
 ><TR
 ><TD
@@ -4257,7 +4257,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the local part, and prefix is updated
+to get the Prefix if any.</TD
 ></TR
 ></TABLE
 ><P
@@ -4267,7 +4268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13818"
+NAME="AEN14284"
 ></A
 ><H3
 ><A
@@ -4331,7 +4332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4346,7 +4347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4356,7 +4357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13842"
+NAME="AEN14308"
 ></A
 ><H3
 ><A
@@ -4425,7 +4426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4442,7 +4443,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** </TD
 ></TR
 ><TR
 ><TD
@@ -4457,7 +4458,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the local part, and prefix is updated
+to get the Prefix if any.</TD
 ></TR
 ></TABLE
 ><P
@@ -4467,7 +4469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13872"
+NAME="AEN14338"
 ></A
 ><H3
 ><A
@@ -4530,7 +4532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4545,7 +4547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace name</TD
 ></TR
 ></TABLE
 ><P
@@ -4555,7 +4557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13896"
+NAME="AEN14362"
 ></A
 ><H3
 ><A
@@ -4613,7 +4615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4628,7 +4630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the string parser or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -4638,7 +4640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13918"
+NAME="AEN14384"
 ></A
 ><H3
 ><A
@@ -4699,7 +4701,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -4709,7 +4711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13937"
+NAME="AEN14403"
 ></A
 ><H3
 ><A
@@ -4776,7 +4778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4791,7 +4793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Name parsed or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4801,7 +4803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13962"
+NAME="AEN14428"
 ></A
 ><H3
 ><A
@@ -4864,7 +4866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4879,7 +4881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Name parsed or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4889,7 +4891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13986"
+NAME="AEN14452"
 ></A
 ><H3
 ><A
@@ -4949,7 +4951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -4964,7 +4966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the Nmtoken parsed or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4974,7 +4976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14009"
+NAME="AEN14475"
 ></A
 ><H3
 ><A
@@ -5037,7 +5039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5054,7 +5056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if non-NULL store a copy of the original entity value</TD
 ></TR
 ><TR
 ><TD
@@ -5069,7 +5071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the EntityValue parsed with reference substitued or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -5079,7 +5081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14036"
+NAME="AEN14502"
 ></A
 ><H3
 ><A
@@ -5192,7 +5194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5207,7 +5209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the AttValue parsed or NULL. The value has to be freed by the caller.</TD
 ></TR
 ></TABLE
 ><P
@@ -5217,7 +5219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14070"
+NAME="AEN14536"
 ></A
 ><H3
 ><A
@@ -5275,7 +5277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5290,7 +5292,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the SystemLiteral parsed or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -5300,7 +5302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14092"
+NAME="AEN14558"
 ></A
 ><H3
 ><A
@@ -5358,7 +5360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5373,7 +5375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the PubidLiteral parsed or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -5383,7 +5385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14114"
+NAME="AEN14580"
 ></A
 ><H3
 ><A
@@ -5445,7 +5447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5462,7 +5464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  int indicating whether we are within a CDATA section</TD
 ></TR
 ></TABLE
 ><P
@@ -5472,7 +5474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14136"
+NAME="AEN14602"
 ></A
 ><H3
 ><A
@@ -5541,7 +5543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5558,7 +5560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar** receiving PubidLiteral</TD
 ></TR
 ><TR
 ><TD
@@ -5575,7 +5577,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> indicate whether we should restrict parsing to only
+production [75], see NOTE below</TD
 ></TR
 ><TR
 ><TD
@@ -5590,7 +5593,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the function returns SystemLiteral and in the second
+case publicID receives PubidLiteral, is strict is off
+it is possible to return NULL and have publicID set.</TD
 ></TR
 ></TABLE
 ><P
@@ -5600,7 +5605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14169"
+NAME="AEN14635"
 ></A
 ><H3
 ><A
@@ -5657,7 +5662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -5667,7 +5672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14186"
+NAME="AEN14652"
 ></A
 ><H3
 ><A
@@ -5725,7 +5730,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -5740,7 +5745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the PITarget name or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -5750,7 +5755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14208"
+NAME="AEN14674"
 ></A
 ><H3
 ><A
@@ -5807,7 +5812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -5817,7 +5822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14226"
+NAME="AEN14692"
 ></A
 ><H3
 ><A
@@ -5882,7 +5887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -5892,7 +5897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14246"
+NAME="AEN14712"
 ></A
 ><H3
 ><A
@@ -5960,7 +5965,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -5970,7 +5975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14269"
+NAME="AEN14735"
 ></A
 ><H3
 ><A
@@ -6066,7 +6071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6083,7 +6088,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Receive a possible fixed default value for the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6098,7 +6103,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
+or XML_ATTRIBUTE_FIXED. </TD
 ></TR
 ></TABLE
 ><P
@@ -6108,7 +6114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14306"
+NAME="AEN14772"
 ></A
 ><H3
 ><A
@@ -6172,7 +6178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6187,7 +6193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the notation attribute tree built while parsing</TD
 ></TR
 ></TABLE
 ><P
@@ -6197,7 +6203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14330"
+NAME="AEN14796"
 ></A
 ><H3
 ><A
@@ -6259,7 +6265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6274,7 +6280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the enumeration attribute tree built while parsing</TD
 ></TR
 ></TABLE
 ><P
@@ -6284,7 +6290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14353"
+NAME="AEN14819"
 ></A
 ><H3
 ><A
@@ -6345,7 +6351,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6362,7 +6368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration tree built while parsing</TD
 ></TR
 ><TR
 ><TD
@@ -6377,7 +6383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
 ></TR
 ></TABLE
 ><P
@@ -6387,7 +6393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14380"
+NAME="AEN14846"
 ></A
 ><H3
 ><A
@@ -6489,7 +6495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6506,7 +6512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration tree built while parsing</TD
 ></TR
 ><TR
 ><TD
@@ -6521,7 +6527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute type</TD
 ></TR
 ></TABLE
 ><P
@@ -6531,7 +6537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14418"
+NAME="AEN14884"
 ></A
 ><H3
 ><A
@@ -6588,7 +6594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -6598,7 +6604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14436"
+NAME="AEN14902"
 ></A
 ><H3
 ><A
@@ -6671,7 +6677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6686,7 +6692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the list of the xmlElementContentPtr describing the element choices</TD
 ></TR
 ></TABLE
 ><P
@@ -6696,7 +6702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14462"
+NAME="AEN14928"
 ></A
 ><H3
 ><A
@@ -6773,7 +6779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6788,7 +6794,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the tree of xmlElementContentPtr describing the element 
+hierarchy.</TD
 ></TR
 ></TABLE
 ><P
@@ -6798,7 +6805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14488"
+NAME="AEN14954"
 ></A
 ><H3
 ><A
@@ -6862,7 +6869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6879,7 +6886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the element being defined.</TD
 ></TR
 ><TR
 ><TD
@@ -6896,7 +6903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Element Content pointer will be stored here if any</TD
 ></TR
 ><TR
 ><TD
@@ -6911,7 +6918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the type of element content XML_ELEMENT_TYPE_xxx</TD
 ></TR
 ></TABLE
 ><P
@@ -6921,7 +6928,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14519"
+NAME="AEN14985"
 ></A
 ><H3
 ><A
@@ -6979,7 +6986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -6994,7 +7001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the type of the element, or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -7004,7 +7011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14541"
+NAME="AEN15007"
 ></A
 ><H3
 ><A
@@ -7073,7 +7080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7083,7 +7090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14560"
+NAME="AEN15026"
 ></A
 ><H3
 ><A
@@ -7146,7 +7153,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7161,7 +7168,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the value parsed (as an int), 0 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -7171,7 +7178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14583"
+NAME="AEN15049"
 ></A
 ><H3
 ><A
@@ -7247,7 +7254,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7262,7 +7269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found, or NULL otherwise.</TD
 ></TR
 ></TABLE
 ><P
@@ -7272,7 +7279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14607"
+NAME="AEN15073"
 ></A
 ><H3
 ><A
@@ -7336,7 +7343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7346,7 +7353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14626"
+NAME="AEN15092"
 ></A
 ><H3
 ><A
@@ -7422,7 +7429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7432,7 +7439,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14647"
+NAME="AEN15113"
 ></A
 ><H3
 ><A
@@ -7492,7 +7499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7502,7 +7509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14665"
+NAME="AEN15131"
 ></A
 ><H3
 ><A
@@ -7585,7 +7592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7602,7 +7609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar ** used to store the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -7617,7 +7624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute name, and the value in *value.</TD
 ></TR
 ></TABLE
 ><P
@@ -7627,7 +7634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14699"
+NAME="AEN15165"
 ></A
 ><H3
 ><A
@@ -7702,7 +7709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -7717,7 +7724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the element name parsed</TD
 ></TR
 ></TABLE
 ><P
@@ -7727,7 +7734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14727"
+NAME="AEN15193"
 ></A
 ><H3
 ><A
@@ -7786,7 +7793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7796,7 +7803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14746"
+NAME="AEN15212"
 ></A
 ><H3
 ><A
@@ -7857,7 +7864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7867,7 +7874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14766"
+NAME="AEN15232"
 ></A
 ><H3
 ><A
@@ -7922,7 +7929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7932,7 +7939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14783"
+NAME="AEN15249"
 ></A
 ><H3
 ><A
@@ -8004,7 +8011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -8014,7 +8021,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14802"
+NAME="AEN15268"
 ></A
 ><H3
 ><A
@@ -8072,7 +8079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8087,7 +8094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the string giving the XML version number, or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -8097,7 +8104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14824"
+NAME="AEN15290"
 ></A
 ><H3
 ><A
@@ -8157,7 +8164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8172,7 +8179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the version string, e.g. "1.0"</TD
 ></TR
 ></TABLE
 ><P
@@ -8182,7 +8189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14847"
+NAME="AEN15313"
 ></A
 ><H3
 ><A
@@ -8240,7 +8247,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8255,7 +8262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the encoding name value or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -8265,7 +8272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14869"
+NAME="AEN15335"
 ></A
 ><H3
 ><A
@@ -8325,7 +8332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8340,7 +8347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the encoding value or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -8350,7 +8357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14892"
+NAME="AEN15358"
 ></A
 ><H3
 ><A
@@ -8420,7 +8427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8435,7 +8442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if standalone, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -8445,7 +8452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14914"
+NAME="AEN15380"
 ></A
 ><H3
 ><A
@@ -8500,7 +8507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -8510,7 +8517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14931"
+NAME="AEN15397"
 ></A
 ><H3
 ><A
@@ -8567,7 +8574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -8577,7 +8584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14949"
+NAME="AEN15415"
 ></A
 ><H3
 ><A
@@ -8632,7 +8639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -8642,7 +8649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14966"
+NAME="AEN15432"
 ></A
 ><H3
 ><A
@@ -8707,7 +8714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8724,7 +8731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the external identifier</TD
 ></TR
 ><TR
 ><TD
@@ -8741,7 +8748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the system identifier (or URL)</TD
 ></TR
 ></TABLE
 ><P
@@ -8751,7 +8758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14994"
+NAME="AEN15460"
 ></A
 ><H3
 ><A
@@ -8767,7 +8774,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_NONE</PRE
+>#define XML_SUBSTITUTE_NONE	0</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8777,7 +8784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14999"
+NAME="AEN15465"
 ></A
 ><H3
 ><A
@@ -8793,7 +8800,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_REF</PRE
+>#define XML_SUBSTITUTE_REF	1</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8803,7 +8810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15004"
+NAME="AEN15470"
 ></A
 ><H3
 ><A
@@ -8819,7 +8826,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_PEREF</PRE
+>#define XML_SUBSTITUTE_PEREF	2</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8829,7 +8836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15009"
+NAME="AEN15475"
 ></A
 ><H3
 ><A
@@ -8845,7 +8852,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_SUBSTITUTE_BOTH</PRE
+>#define XML_SUBSTITUTE_BOTH 	3</PRE
 ></TD
 ></TR
 ></TABLE
@@ -8855,7 +8862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15014"
+NAME="AEN15480"
 ></A
 ><H3
 ><A
@@ -8932,7 +8939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -8949,7 +8956,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the len to decode (in bytes !), -1 for no size limit</TD
 ></TR
 ><TR
 ><TD
@@ -8966,7 +8973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
 ></TR
 ><TR
 ><TD
@@ -8983,7 +8990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9000,7 +9007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9017,7 +9024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9032,7 +9039,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done. The caller
+must deallocate it !</TD
 ></TR
 ></TABLE
 ><P
@@ -9042,7 +9050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15061"
+NAME="AEN15527"
 ></A
 ><H3
 ><A
@@ -9119,7 +9127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9136,7 +9144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string</TD
 ></TR
 ><TR
 ><TD
@@ -9153,7 +9161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
 ></TR
 ><TR
 ><TD
@@ -9170,7 +9178,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9187,7 +9195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9204,7 +9212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an end marker xmlChar, 0 if none</TD
 ></TR
 ><TR
 ><TD
@@ -9219,7 +9227,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done. The caller
+must deallocate it !</TD
 ></TR
 ></TABLE
 ><P
@@ -9229,7 +9238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15108"
+NAME="AEN15574"
 ></A
 ><H3
 ><A
@@ -9326,7 +9335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15132"
+NAME="AEN15598"
 ></A
 ><H3
 ><A
@@ -9405,7 +9414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15152"
+NAME="AEN15618"
 ></A
 ><H3
 ><A
@@ -9502,7 +9511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15176"
+NAME="AEN15642"
 ></A
 ><H3
 ><A
@@ -9581,7 +9590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15196"
+NAME="AEN15662"
 ></A
 ><H3
 ><A
@@ -9635,7 +9644,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9650,7 +9659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of space chars skipped</TD
 ></TR
 ></TABLE
 ><P
@@ -9660,7 +9669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15216"
+NAME="AEN15682"
 ></A
 ><H3
 ><A
@@ -9719,7 +9728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -9736,7 +9745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the beginning of the char</TD
 ></TR
 ><TR
 ><TD
@@ -9753,7 +9762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the char read</TD
 ></TR
 ><TR
 ><TD
@@ -9768,7 +9777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current char value and its lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -9778,7 +9787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15245"
+NAME="AEN15711"
 ></A
 ><H3
 ><A
@@ -9860,7 +9869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -9870,7 +9879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15267"
+NAME="AEN15733"
 ></A
 ><H3
 ><A
@@ -9950,7 +9959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -9960,7 +9969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15291"
+NAME="AEN15757"
 ></A
 ><H3
 ><A
@@ -10039,7 +10048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15311"
+NAME="AEN15777"
 ></A
 ><H3
 ><A
@@ -10115,7 +10124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15330"
+NAME="AEN15796"
 ></A
 ><H3
 ><A
@@ -10192,7 +10201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ><TR
 ><TD
@@ -10209,7 +10218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the char read</TD
 ></TR
 ><TR
 ><TD
@@ -10224,7 +10233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current char value and its lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -10234,7 +10243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15359"
+NAME="AEN15825"
 ></A
 ><H3
 ><A
@@ -10289,7 +10298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the length of the char read (or zero)</TD
 ></TR
 ><TR
 ><TD
@@ -10323,7 +10332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char value</TD
 ></TR
 ><TR
 ><TD
@@ -10338,7 +10347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TABLE
 ><P
@@ -10348,7 +10357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15387"
+NAME="AEN15853"
 ></A
 ><H3
 ><A
@@ -10401,7 +10410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -10411,7 +10420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15403"
+NAME="AEN15869"
 ></A
 ><H3
 ><A
@@ -10464,7 +10473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XML parser input</TD
 ></TR
 ></TABLE
 ><P
@@ -10474,7 +10483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15419"
+NAME="AEN15885"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-sax.html b/doc/html/gnome-xml-sax.html
index aa58efd..ccc8d36 100644
--- a/doc/html/gnome-xml-sax.html
+++ b/doc/html/gnome-xml-sax.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2684"
+NAME="AEN2692"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2687"
+NAME="AEN2695"
 ></A
 ><H2
 >Synopsis</H2
@@ -196,6 +196,22 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *SystemID);
+void        <A
+HREF="gnome-xml-sax.html#EXTERNALSUBSET"
+>externalSubset</A
+>                  (void *ctx,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *ExternalID,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *SystemID);
 <A
 HREF="gnome-xml-entities.html#XMLENTITYPTR"
 >xmlEntityPtr</A
@@ -486,7 +502,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2775"
+NAME="AEN2787"
 ></A
 ><H2
 >Description</H2
@@ -496,14 +512,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2778"
+NAME="AEN2790"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2780"
+NAME="AEN2792"
 ></A
 ><H3
 ><A
@@ -556,7 +572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -571,7 +587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a xmlChar *</TD
 ></TR
 ></TABLE
 ><P
@@ -581,7 +597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2800"
+NAME="AEN2812"
 ></A
 ><H3
 ><A
@@ -635,7 +651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -650,7 +666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a xmlChar *</TD
 ></TR
 ></TABLE
 ><P
@@ -660,7 +676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2820"
+NAME="AEN2832"
 ></A
 ><H3
 ><A
@@ -715,7 +731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -732,7 +748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> A SAX Locator</TD
 ></TR
 ></TABLE
 ><P
@@ -742,7 +758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2840"
+NAME="AEN2852"
 ></A
 ><H3
 ><A
@@ -792,7 +808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -807,7 +823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int</TD
 ></TR
 ></TABLE
 ><P
@@ -817,7 +833,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2859"
+NAME="AEN2871"
 ></A
 ><H3
 ><A
@@ -867,7 +883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -882,7 +898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int</TD
 ></TR
 ></TABLE
 ><P
@@ -892,7 +908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2878"
+NAME="AEN2890"
 ></A
 ><H3
 ><A
@@ -942,7 +958,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TABLE
 ><P
@@ -967,7 +983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2897"
+NAME="AEN2909"
 ></A
 ><H3
 ><A
@@ -1017,7 +1033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1032,7 +1048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TABLE
 ><P
@@ -1042,7 +1058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2916"
+NAME="AEN2928"
 ></A
 ><H3
 ><A
@@ -1092,7 +1108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1107,7 +1123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true</TD
 ></TR
 ></TABLE
 ><P
@@ -1117,7 +1133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2935"
+NAME="AEN2947"
 ></A
 ><H3
 ><A
@@ -1179,7 +1195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1196,7 +1212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the root element name</TD
 ></TR
 ><TR
 ><TD
@@ -1213,7 +1229,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -1230,7 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the SYSTEM ID (e.g. filename or URL)</TD
 ></TR
 ></TABLE
 ><P
@@ -1240,7 +1256,130 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2965"
+NAME="AEN2977"
+></A
+><H3
+><A
+NAME="EXTERNALSUBSET"
+></A
+>externalSubset ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        externalSubset                  (void *ctx,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *ExternalID,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *SystemID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Callback on external subset declaration.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctx</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the user data (XML parser context)</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the root element name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ExternalID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the external ID</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>SystemID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the SYSTEM ID (e.g. filename or URL)</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3007"
 ></A
 ><H3
 ><A
@@ -1297,7 +1436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1314,7 +1453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1329,7 +1468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1339,7 +1478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2990"
+NAME="AEN3032"
 ></A
 ><H3
 ><A
@@ -1396,7 +1535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1413,7 +1552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1428,7 +1567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntityPtr if found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1438,7 +1577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3015"
+NAME="AEN3057"
 ></A
 ><H3
 ><A
@@ -1509,7 +1648,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1526,7 +1665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1543,7 +1682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1558,7 +1697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlParserInputPtr if inlined or NULL for DOM behaviour.</TD
 ></TR
 ></TABLE
 ><P
@@ -1568,7 +1707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3047"
+NAME="AEN3089"
 ></A
 ><H3
 ><A
@@ -1635,7 +1774,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1652,7 +1791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name </TD
 ></TR
 ><TR
 ><TD
@@ -1669,7 +1808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type </TD
 ></TR
 ><TR
 ><TD
@@ -1686,7 +1825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1703,7 +1842,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1720,7 +1859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the entity value (without processing).</TD
 ></TR
 ></TABLE
 ><P
@@ -1730,7 +1869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3086"
+NAME="AEN3128"
 ></A
 ><H3
 ><A
@@ -1798,7 +1937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1815,7 +1954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the element</TD
 ></TR
 ><TR
 ><TD
@@ -1849,7 +1988,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute type </TD
 ></TR
 ><TR
 ><TD
@@ -1866,7 +2005,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of default value</TD
 ></TR
 ><TR
 ><TD
@@ -1883,7 +2022,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the attribute default value</TD
 ></TR
 ><TR
 ><TD
@@ -1900,7 +2039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree of enumerated value set</TD
 ></TR
 ></TABLE
 ><P
@@ -1910,7 +2049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3129"
+NAME="AEN3171"
 ></A
 ><H3
 ><A
@@ -1969,7 +2108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -1986,7 +2125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name </TD
 ></TR
 ><TR
 ><TD
@@ -2003,7 +2142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element type </TD
 ></TR
 ><TR
 ><TD
@@ -2020,7 +2159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the element value tree</TD
 ></TR
 ></TABLE
 ><P
@@ -2030,7 +2169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3158"
+NAME="AEN3200"
 ></A
 ><H3
 ><A
@@ -2092,7 +2231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2109,7 +2248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the notation</TD
 ></TR
 ><TR
 ><TD
@@ -2126,7 +2265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2143,7 +2282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ></TABLE
 ><P
@@ -2153,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3188"
+NAME="AEN3230"
 ></A
 ><H3
 ><A
@@ -2219,7 +2358,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2236,7 +2375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The name of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2253,7 +2392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The public ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2270,7 +2409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The system ID of the entity</TD
 ></TR
 ><TR
 ><TD
@@ -2287,7 +2426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the name of the notation</TD
 ></TR
 ></TABLE
 ><P
@@ -2297,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3223"
+NAME="AEN3265"
 ></A
 ><H3
 ><A
@@ -2347,7 +2486,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ></TABLE
 ><P
@@ -2357,7 +2496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3238"
+NAME="AEN3280"
 ></A
 ><H3
 ><A
@@ -2407,7 +2546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ></TABLE
 ><P
@@ -2417,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3253"
+NAME="AEN3295"
 ></A
 ><H3
 ><A
@@ -2478,7 +2617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2495,7 +2634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -2512,7 +2651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The attribute value</TD
 ></TR
 ></TABLE
 ><P
@@ -2522,7 +2661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3278"
+NAME="AEN3320"
 ></A
 ><H3
 ><A
@@ -2580,7 +2719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2597,7 +2736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name, including namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -2614,7 +2753,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An array of name/value attributes pairs, NULL terminated</TD
 ></TR
 ></TABLE
 ><P
@@ -2624,7 +2763,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3303"
+NAME="AEN3345"
 ></A
 ><H3
 ><A
@@ -2678,7 +2817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2695,7 +2834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The element name</TD
 ></TR
 ></TABLE
 ><P
@@ -2705,7 +2844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3323"
+NAME="AEN3365"
 ></A
 ><H3
 ><A
@@ -2759,7 +2898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2776,7 +2915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The entity name</TD
 ></TR
 ></TABLE
 ><P
@@ -2786,7 +2925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3343"
+NAME="AEN3385"
 ></A
 ><H3
 ><A
@@ -2842,7 +2981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2859,7 +2998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -2876,7 +3015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TABLE
 ><P
@@ -2886,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3367"
+NAME="AEN3409"
 ></A
 ><H3
 ><A
@@ -2942,7 +3081,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -2959,7 +3098,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -2976,7 +3115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of xmlChar</TD
 ></TR
 ></TABLE
 ><P
@@ -2986,7 +3125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3391"
+NAME="AEN3433"
 ></A
 ><H3
 ><A
@@ -3044,7 +3183,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3061,7 +3200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the target name</TD
 ></TR
 ><TR
 ><TD
@@ -3078,7 +3217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the PI data's</TD
 ></TR
 ></TABLE
 ><P
@@ -3088,7 +3227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3416"
+NAME="AEN3458"
 ></A
 ><H3
 ><A
@@ -3146,7 +3285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3163,7 +3302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace associated URN</TD
 ></TR
 ><TR
 ><TD
@@ -3180,7 +3319,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace prefix</TD
 ></TR
 ></TABLE
 ><P
@@ -3190,7 +3329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3441"
+NAME="AEN3483"
 ></A
 ><H3
 ><A
@@ -3244,7 +3383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3261,7 +3400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix</TD
 ></TR
 ></TABLE
 ><P
@@ -3271,7 +3410,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3461"
+NAME="AEN3503"
 ></A
 ><H3
 ><A
@@ -3324,7 +3463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3339,7 +3478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNsPtr or NULL if none</TD
 ></TR
 ></TABLE
 ><P
@@ -3349,7 +3488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3481"
+NAME="AEN3523"
 ></A
 ><H3
 ><A
@@ -3404,7 +3543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3421,7 +3560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace to check against</TD
 ></TR
 ><TR
 ><TD
@@ -3436,7 +3575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if true 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -3446,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3505"
+NAME="AEN3547"
 ></A
 ><H3
 ><A
@@ -3504,7 +3643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3521,7 +3660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace associated URN</TD
 ></TR
 ><TR
 ><TD
@@ -3538,7 +3677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the namespace prefix</TD
 ></TR
 ></TABLE
 ><P
@@ -3548,7 +3687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3530"
+NAME="AEN3572"
 ></A
 ><H3
 ><A
@@ -3602,7 +3741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3619,7 +3758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ></TABLE
 ><P
@@ -3629,7 +3768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3550"
+NAME="AEN3592"
 ></A
 ><H3
 ><A
@@ -3684,7 +3823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user data (XML parser context)</TD
 ></TR
 ><TR
 ><TD
@@ -3701,7 +3840,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The pcdata content</TD
 ></TR
 ><TR
 ><TD
@@ -3718,7 +3857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the block length</TD
 ></TR
 ></TABLE
 ><P
@@ -3728,7 +3867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3574"
+NAME="AEN3616"
 ></A
 ><H3
 ><A
@@ -3756,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3580"
+NAME="AEN3622"
 ></A
 ><H3
 ><A
@@ -3784,7 +3923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3586"
+NAME="AEN3628"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index e89893e..c67ae10 100644
--- a/doc/html/gnome-xml-tree.html
+++ b/doc/html/gnome-xml-tree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3597"
+NAME="AEN3639"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3600"
+NAME="AEN3642"
 ></A
 ><H2
 >Synopsis</H2
@@ -1605,7 +1605,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4003"
+NAME="AEN4045"
 ></A
 ><H2
 >Description</H2
@@ -1615,14 +1615,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4006"
+NAME="AEN4048"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4008"
+NAME="AEN4050"
 ></A
 ><H3
 ><A
@@ -1671,20 +1671,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4013"
+NAME="AEN4055"
 ></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
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4017"
+NAME="AEN4060"
 ></A
 ><H3
 ><A
@@ -1700,7 +1713,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     CHAR</PRE
+>#define CHAR xmlChar</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1710,7 +1723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4022"
+NAME="AEN4065"
 ></A
 ><H3
 ><A
@@ -1726,7 +1739,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     BAD_CAST</PRE
+>#define BAD_CAST (xmlChar *)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1736,7 +1749,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4027"
+NAME="AEN4070"
 ></A
 ><H3
 ><A
@@ -1766,20 +1779,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4032"
+NAME="AEN4075"
 ></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="AEN4036"
+NAME="AEN4080"
 ></A
 ><H3
 ><A
@@ -1816,7 +1842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4041"
+NAME="AEN4085"
 ></A
 ><H3
 ><A
@@ -1847,7 +1873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4046"
+NAME="AEN4090"
 ></A
 ><H3
 ><A
@@ -1876,20 +1902,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4051"
+NAME="AEN4095"
 ></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="AEN4055"
+NAME="AEN4100"
 ></A
 ><H3
 ><A
@@ -1935,20 +1974,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4060"
+NAME="AEN4105"
 ></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="AEN4064"
+NAME="AEN4110"
 ></A
 ><H3
 ><A
@@ -1979,7 +2031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4069"
+NAME="AEN4115"
 ></A
 ><H3
 ><A
@@ -2010,7 +2062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4074"
+NAME="AEN4120"
 ></A
 ><H3
 ><A
@@ -2042,20 +2094,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4079"
+NAME="AEN4125"
 ></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="AEN4083"
+NAME="AEN4130"
 ></A
 ><H3
 ><A
@@ -2086,7 +2151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4088"
+NAME="AEN4135"
 ></A
 ><H3
 ><A
@@ -2129,20 +2194,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4093"
+NAME="AEN4140"
 ></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="AEN4097"
+NAME="AEN4145"
 ></A
 ><H3
 ><A
@@ -2171,7 +2249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4102"
+NAME="AEN4150"
 ></A
 ><H3
 ><A
@@ -2202,20 +2280,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4107"
+NAME="AEN4155"
 ></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="AEN4111"
+NAME="AEN4160"
 ></A
 ><H3
 ><A
@@ -2261,20 +2352,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4116"
+NAME="AEN4165"
 ></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="AEN4120"
+NAME="AEN4170"
 ></A
 ><H3
 ><A
@@ -2314,20 +2418,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4125"
+NAME="AEN4175"
 ></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="AEN4129"
+NAME="AEN4180"
 ></A
 ><H3
 ><A
@@ -2357,20 +2474,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4134"
+NAME="AEN4185"
 ></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="AEN4138"
+NAME="AEN4190"
 ></A
 ><H3
 ><A
@@ -2400,20 +2530,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4143"
+NAME="AEN4195"
 ></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="AEN4147"
+NAME="AEN4200"
 ></A
 ><H3
 ><A
@@ -2442,7 +2585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4152"
+NAME="AEN4205"
 ></A
 ><H3
 ><A
@@ -2473,20 +2616,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4157"
+NAME="AEN4210"
 ></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="AEN4161"
+NAME="AEN4215"
 ></A
 ><H3
 ><A
@@ -2534,20 +2690,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4166"
+NAME="AEN4220"
 ></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="AEN4170"
+NAME="AEN4225"
 ></A
 ><H3
 ><A
@@ -2599,20 +2768,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4175"
+NAME="AEN4230"
 ></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="AEN4179"
+NAME="AEN4235"
 ></A
 ><H3
 ><A
@@ -2628,7 +2810,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlChildrenNode</PRE
+>#define xmlChildrenNode children</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2638,7 +2820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4184"
+NAME="AEN4240"
 ></A
 ><H3
 ><A
@@ -2654,7 +2836,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlRootNode</PRE
+>#define xmlRootNode children</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2664,7 +2846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4189"
+NAME="AEN4245"
 ></A
 ><H3
 ><A
@@ -2690,7 +2872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4194"
+NAME="AEN4250"
 ></A
 ><H3
 ><A
@@ -2716,7 +2898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4199"
+NAME="AEN4255"
 ></A
 ><H3
 ><A
@@ -2742,7 +2924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4204"
+NAME="AEN4260"
 ></A
 ><H3
 ><A
@@ -2768,7 +2950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4209"
+NAME="AEN4265"
 ></A
 ><H3
 ><A
@@ -2794,7 +2976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4214"
+NAME="AEN4270"
 ></A
 ><H3
 ><A
@@ -2845,7 +3027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TABLE
 ><P
@@ -2855,7 +3037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4230"
+NAME="AEN4286"
 ></A
 ><H3
 ><A
@@ -2911,7 +3093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> initial size of buffer</TD
 ></TR
 ><TR
 ><TD
@@ -2926,7 +3108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TABLE
 ><P
@@ -2936,7 +3118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4251"
+NAME="AEN4307"
 ></A
 ><H3
 ><A
@@ -2989,7 +3171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ></TABLE
 ><P
@@ -2999,7 +3181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4267"
+NAME="AEN4323"
 ></A
 ><H3
 ><A
@@ -3056,7 +3238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file output</TD
 ></TR
 ><TR
 ><TD
@@ -3073,7 +3255,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3088,7 +3270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TABLE
 ><P
@@ -3098,7 +3280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4292"
+NAME="AEN4348"
 ></A
 ><H3
 ><A
@@ -3157,7 +3339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3174,7 +3356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3191,7 +3373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TABLE
 ><P
@@ -3201,7 +3383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4317"
+NAME="AEN4373"
 ></A
 ><H3
 ><A
@@ -3265,7 +3447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3282,7 +3464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3299,7 +3481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TABLE
 ><P
@@ -3309,7 +3491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4343"
+NAME="AEN4399"
 ></A
 ><H3
 ><A
@@ -3366,7 +3548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3383,7 +3565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ></TABLE
 ><P
@@ -3393,7 +3575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4364"
+NAME="AEN4420"
 ></A
 ><H3
 ><A
@@ -3447,7 +3629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3464,7 +3646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the C char string</TD
 ></TR
 ></TABLE
 ><P
@@ -3474,7 +3656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4384"
+NAME="AEN4440"
 ></A
 ><H3
 ><A
@@ -3528,7 +3710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3545,7 +3727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to remove</TD
 ></TR
 ><TR
 ><TD
@@ -3560,7 +3742,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar removed, or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -3570,7 +3752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4408"
+NAME="AEN4464"
 ></A
 ><H3
 ><A
@@ -3624,7 +3806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3641,7 +3823,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the minimum free sie to allocate</TD
 ></TR
 ><TR
 ><TD
@@ -3656,7 +3838,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new available space or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -3666,7 +3848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4432"
+NAME="AEN4488"
 ></A
 ><H3
 ><A
@@ -3719,7 +3901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ></TABLE
 ><P
@@ -3729,7 +3911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4448"
+NAME="AEN4504"
 ></A
 ><H3
 ><A
@@ -3785,7 +3967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to resize</TD
 ></TR
 ><TR
 ><TD
@@ -3800,7 +3982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the internal content</TD
 ></TR
 ></TABLE
 ><P
@@ -3810,7 +3992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4469"
+NAME="AEN4525"
 ></A
 ><H3
 ><A
@@ -3886,7 +4068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4488"
+NAME="AEN4544"
 ></A
 ><H3
 ><A
@@ -3943,7 +4125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ><TR
 ><TD
@@ -3960,7 +4142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  allocation scheme to use</TD
 ></TR
 ></TABLE
 ><P
@@ -3970,7 +4152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4509"
+NAME="AEN4565"
 ></A
 ><H3
 ><A
@@ -4023,7 +4205,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer </TD
 ></TR
 ><TR
 ><TD
@@ -4038,7 +4220,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the length of data in the internal content</TD
 ></TR
 ></TABLE
 ><P
@@ -4048,7 +4230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4529"
+NAME="AEN4585"
 ></A
 ><H3
 ><A
@@ -4116,7 +4298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4133,7 +4315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4150,7 +4332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -4167,7 +4349,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4182,7 +4364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TABLE
 ><P
@@ -4192,7 +4374,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4565"
+NAME="AEN4621"
 ></A
 ><H3
 ><A
@@ -4264,7 +4446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4281,7 +4463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4298,7 +4480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -4315,7 +4497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4330,7 +4512,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TABLE
 ><P
@@ -4340,7 +4522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4602"
+NAME="AEN4658"
 ></A
 ><H3
 ><A
@@ -4396,7 +4578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4411,7 +4593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the DTD structure or NULL if not found</TD
 ></TR
 ></TABLE
 ><P
@@ -4421,7 +4603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4623"
+NAME="AEN4679"
 ></A
 ><H3
 ><A
@@ -4474,7 +4656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD structure to free up</TD
 ></TR
 ></TABLE
 ><P
@@ -4484,7 +4666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4639"
+NAME="AEN4695"
 ></A
 ><H3
 ><A
@@ -4550,7 +4732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -4567,7 +4749,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -4584,7 +4766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -4599,7 +4781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL this functionnality had been removed</TD
 ></TR
 ></TABLE
 ><P
@@ -4609,7 +4791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4670"
+NAME="AEN4726"
 ></A
 ><H3
 ><A
@@ -4677,7 +4859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -4694,7 +4876,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -4711,7 +4893,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -4726,7 +4908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>returns a new namespace pointer or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -4736,7 +4918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4701"
+NAME="AEN4757"
 ></A
 ><H3
 ><A
@@ -4789,7 +4971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace pointer</TD
 ></TR
 ></TABLE
 ><P
@@ -4799,7 +4981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4717"
+NAME="AEN4773"
 ></A
 ><H3
 ><A
@@ -4855,7 +5037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  xmlChar string giving the version of XML "1.0"</TD
 ></TR
 ><TR
 ><TD
@@ -4870,7 +5052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document</TD
 ></TR
 ></TABLE
 ><P
@@ -4880,7 +5062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4738"
+NAME="AEN4794"
 ></A
 ><H3
 ><A
@@ -4933,7 +5115,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document
+@:  </TD
 ></TR
 ></TABLE
 ><P
@@ -4943,7 +5126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4754"
+NAME="AEN4810"
 ></A
 ><H3
 ><A
@@ -5007,7 +5190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5024,7 +5207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5041,7 +5224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5056,7 +5239,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TABLE
 ><P
@@ -5066,7 +5249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4785"
+NAME="AEN4841"
 ></A
 ><H3
 ><A
@@ -5130,7 +5313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5147,7 +5330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5164,7 +5347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5179,7 +5362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TABLE
 ><P
@@ -5189,7 +5372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4816"
+NAME="AEN4872"
 ></A
 ><H3
 ><A
@@ -5257,7 +5440,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5274,7 +5457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5291,7 +5474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5308,7 +5491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5323,7 +5506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TABLE
 ><P
@@ -5333,7 +5516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4852"
+NAME="AEN4908"
 ></A
 ><H3
 ><A
@@ -5386,7 +5569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first property in the list</TD
 ></TR
 ></TABLE
 ><P
@@ -5396,7 +5579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4868"
+NAME="AEN4924"
 ></A
 ><H3
 ><A
@@ -5449,7 +5632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute</TD
 ></TR
 ></TABLE
 ><P
@@ -5459,7 +5642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4884"
+NAME="AEN4940"
 ></A
 ><H3
 ><A
@@ -5519,7 +5702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attribute will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -5536,7 +5719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5551,7 +5734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -5561,7 +5744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4910"
+NAME="AEN4966"
 ></A
 ><H3
 ><A
@@ -5621,7 +5804,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attributes will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -5638,7 +5821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5653,7 +5836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -5663,7 +5846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4936"
+NAME="AEN4992"
 ></A
 ><H3
 ><A
@@ -5719,7 +5902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the dtd</TD
 ></TR
 ><TR
 ><TD
@@ -5734,7 +5917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDtdPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -5744,7 +5927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4957"
+NAME="AEN5013"
 ></A
 ><H3
 ><A
@@ -5802,7 +5985,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5819,7 +6002,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -5834,7 +6017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDocPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -5844,7 +6027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4982"
+NAME="AEN5038"
 ></A
 ><H3
 ><A
@@ -5938,7 +6121,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5955,7 +6138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -5972,7 +6155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -5989,7 +6172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6004,7 +6187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6014,7 +6197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5023"
+NAME="AEN5079"
 ></A
 ><H3
 ><A
@@ -6093,7 +6276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6110,7 +6293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6127,7 +6310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6144,7 +6327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6159,7 +6342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6169,7 +6352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5061"
+NAME="AEN5117"
 ></A
 ><H3
 ><A
@@ -6234,7 +6417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6251,7 +6434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6266,7 +6449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6276,7 +6459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5088"
+NAME="AEN5144"
 ></A
 ><H3
 ><A
@@ -6376,7 +6559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -6393,7 +6576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6410,7 +6593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -6427,7 +6610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -6442,7 +6625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6452,7 +6635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5130"
+NAME="AEN5186"
 ></A
 ><H3
 ><A
@@ -6537,7 +6720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -6554,7 +6737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6571,7 +6754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -6588,7 +6771,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -6603,7 +6786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6613,7 +6796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5169"
+NAME="AEN5225"
 ></A
 ><H3
 ><A
@@ -6673,7 +6856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -6690,7 +6873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -6705,7 +6888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6715,7 +6898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5195"
+NAME="AEN5251"
 ></A
 ><H3
 ><A
@@ -6771,7 +6954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -6786,7 +6969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6796,7 +6979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5216"
+NAME="AEN5272"
 ></A
 ><H3
 ><A
@@ -6856,7 +7039,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the processing instruction name</TD
 ></TR
 ><TR
 ><TD
@@ -6873,7 +7056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the PI content</TD
 ></TR
 ><TR
 ><TD
@@ -6888,7 +7071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -6898,7 +7081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5242"
+NAME="AEN5298"
 ></A
 ><H3
 ><A
@@ -6960,7 +7143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -6977,7 +7160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -6994,7 +7177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7009,7 +7192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7019,7 +7202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5272"
+NAME="AEN5328"
 ></A
 ><H3
 ><A
@@ -7076,7 +7259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7093,7 +7276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7108,7 +7291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7118,7 +7301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5297"
+NAME="AEN5353"
 ></A
 ><H3
 ><A
@@ -7178,7 +7361,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -7195,7 +7378,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7210,7 +7393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7220,7 +7403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5323"
+NAME="AEN5379"
 ></A
 ><H3
 ><A
@@ -7276,7 +7459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7291,7 +7474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7301,7 +7484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5344"
+NAME="AEN5400"
 ></A
 ><H3
 ><A
@@ -7362,7 +7545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -7379,7 +7562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the CData block content content</TD
 ></TR
 ><TR
 ><TD
@@ -7396,7 +7579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the block</TD
 ></TR
 ><TR
 ><TD
@@ -7411,7 +7594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7421,7 +7604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5374"
+NAME="AEN5430"
 ></A
 ><H3
 ><A
@@ -7481,7 +7664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7498,7 +7681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char ref string, starting with # or "&amp;# ... ;"</TD
 ></TR
 ><TR
 ><TD
@@ -7513,7 +7696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7523,7 +7706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5400"
+NAME="AEN5456"
 ></A
 ><H3
 ><A
@@ -7583,7 +7766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7600,7 +7783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the reference name, or the reference string with &amp; and ;</TD
 ></TR
 ><TR
 ><TD
@@ -7615,7 +7798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7625,7 +7808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5426"
+NAME="AEN5482"
 ></A
 ><H3
 ><A
@@ -7682,7 +7865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -7699,7 +7882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -7714,7 +7897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -7724,7 +7907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5451"
+NAME="AEN5507"
 ></A
 ><H3
 ><A
@@ -7780,7 +7963,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list.</TD
 ></TR
 ><TR
 ><TD
@@ -7795,7 +7978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -7805,7 +7988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5472"
+NAME="AEN5528"
 ></A
 ><H3
 ><A
@@ -7861,7 +8044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document owning the fragment</TD
 ></TR
 ><TR
 ><TD
@@ -7876,7 +8059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TABLE
 ><P
@@ -7886,7 +8069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5493"
+NAME="AEN5549"
 ></A
 ><H3
 ><A
@@ -7943,7 +8126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -7958,7 +8141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNodePtr for the root or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -7968,7 +8151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5514"
+NAME="AEN5570"
 ></A
 ><H3
 ><A
@@ -8024,7 +8207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -8039,7 +8222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL if none.</TD
 ></TR
 ></TABLE
 ><P
@@ -8049,7 +8232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5535"
+NAME="AEN5591"
 ></A
 ><H3
 ><A
@@ -8102,7 +8285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8117,7 +8300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TABLE
 ><P
@@ -8127,7 +8310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5555"
+NAME="AEN5611"
 ></A
 ><H3
 ><A
@@ -8181,7 +8364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8196,7 +8379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TABLE
 ><P
@@ -8206,7 +8389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5575"
+NAME="AEN5631"
 ></A
 ><H3
 ><A
@@ -8267,7 +8450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -8284,7 +8467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new document root element</TD
 ></TR
 ><TR
 ><TD
@@ -8299,7 +8482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old root element if any was found</TD
 ></TR
 ></TABLE
 ><P
@@ -8309,7 +8492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5601"
+NAME="AEN5657"
 ></A
 ><H3
 ><A
@@ -8367,7 +8550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -8384,7 +8567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new tag name</TD
 ></TR
 ></TABLE
 ><P
@@ -8394,7 +8577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5622"
+NAME="AEN5678"
 ></A
 ><H3
 ><A
@@ -8459,7 +8642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -8476,7 +8659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -8491,7 +8674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the child or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8501,7 +8684,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5649"
+NAME="AEN5705"
 ></A
 ><H3
 ><A
@@ -8561,7 +8744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -8578,7 +8761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ><TR
 ><TD
@@ -8593,7 +8776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8603,7 +8786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5675"
+NAME="AEN5731"
 ></A
 ><H3
 ><A
@@ -8665,7 +8848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the old node</TD
 ></TR
 ><TR
 ><TD
@@ -8682,7 +8865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8697,7 +8880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old node</TD
 ></TR
 ></TABLE
 ><P
@@ -8707,7 +8890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5701"
+NAME="AEN5757"
 ></A
 ><H3
 ><A
@@ -8779,7 +8962,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -8796,7 +8979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -8811,7 +8994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8821,7 +9004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5729"
+NAME="AEN5785"
 ></A
 ><H3
 ><A
@@ -8893,7 +9076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -8910,7 +9093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -8925,7 +9108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -8935,7 +9118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5757"
+NAME="AEN5813"
 ></A
 ><H3
 ><A
@@ -9007,7 +9190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9024,7 +9207,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9039,7 +9222,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -9049,7 +9232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5785"
+NAME="AEN5841"
 ></A
 ><H3
 ><A
@@ -9102,7 +9285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TABLE
 ><P
@@ -9112,7 +9295,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5801"
+NAME="AEN5857"
 ></A
 ><H3
 ><A
@@ -9172,7 +9355,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first text node</TD
 ></TR
 ><TR
 ><TD
@@ -9189,7 +9372,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second text node being merged</TD
 ></TR
 ><TR
 ><TD
@@ -9204,7 +9387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the first text node augmented</TD
 ></TR
 ></TABLE
 ><P
@@ -9214,7 +9397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5827"
+NAME="AEN5883"
 ></A
 ><H3
 ><A
@@ -9272,7 +9455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -9289,7 +9472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the content</TD
 ></TR
 ><TR
 ><TD
@@ -9306,7 +9489,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+> lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -9316,7 +9504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5852"
+NAME="AEN5909"
 ></A
 ><H3
 ><A
@@ -9370,7 +9558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ></TABLE
 ><P
@@ -9380,7 +9568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5868"
+NAME="AEN5925"
 ></A
 ><H3
 ><A
@@ -9437,7 +9625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TABLE
 ><P
@@ -9447,7 +9635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5885"
+NAME="AEN5942"
 ></A
 ><H3
 ><A
@@ -9522,7 +9710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9539,7 +9727,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -9556,7 +9744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace string</TD
 ></TR
 ><TR
 ><TD
@@ -9571,7 +9759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -9581,7 +9769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5917"
+NAME="AEN5974"
 ></A
 ><H3
 ><A
@@ -9646,7 +9834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9663,7 +9851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -9680,7 +9868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace value</TD
 ></TR
 ><TR
 ><TD
@@ -9695,7 +9883,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TABLE
 ><P
@@ -9705,7 +9893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5948"
+NAME="AEN6005"
 ></A
 ><H3
 ><A
@@ -9765,7 +9953,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9782,7 +9970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -9797,7 +9985,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an NULL terminated array of all the xmlNsPtr found
+that need to be freed by the caller or NULL if no
+namespace if defined</TD
 ></TR
 ></TABLE
 ><P
@@ -9807,7 +9997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5974"
+NAME="AEN6031"
 ></A
 ><H3
 ><A
@@ -9864,7 +10054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node in the document</TD
 ></TR
 ><TR
 ><TD
@@ -9881,7 +10071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace pointer</TD
 ></TR
 ></TABLE
 ><P
@@ -9891,7 +10081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5995"
+NAME="AEN6052"
 ></A
 ><H3
 ><A
@@ -9947,7 +10137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -9962,7 +10152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -9972,7 +10162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6016"
+NAME="AEN6073"
 ></A
 ><H3
 ><A
@@ -10028,7 +10218,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first namespace</TD
 ></TR
 ><TR
 ><TD
@@ -10043,7 +10233,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -10053,7 +10243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6037"
+NAME="AEN6094"
 ></A
 ><H3
 ><A
@@ -10117,7 +10307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10134,7 +10324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -10151,7 +10341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -10166,7 +10356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute pointer.</TD
 ></TR
 ></TABLE
 ><P
@@ -10176,7 +10366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6068"
+NAME="AEN6125"
 ></A
 ><H3
 ><A
@@ -10242,7 +10432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10259,7 +10449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -10274,7 +10464,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TABLE
 ><P
@@ -10284,7 +10475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6095"
+NAME="AEN6152"
 ></A
 ><H3
 ><A
@@ -10349,7 +10540,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10366,7 +10557,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -10381,7 +10572,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute or the attribute declaration or NULL if 
+neither was found.</TD
 ></TR
 ></TABLE
 ><P
@@ -10391,7 +10583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6122"
+NAME="AEN6179"
 ></A
 ><H3
 ><A
@@ -10462,7 +10654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10479,7 +10671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -10496,7 +10688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI of the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -10511,7 +10703,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TABLE
 ><P
@@ -10521,7 +10714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6154"
+NAME="AEN6211"
 ></A
 ><H3
 ><A
@@ -10582,7 +10775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10599,7 +10792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -10614,7 +10807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TABLE
 ><P
@@ -10624,7 +10817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6180"
+NAME="AEN6237"
 ></A
 ><H3
 ><A
@@ -10686,7 +10879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10703,7 +10896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the text</TD
 ></TR
 ><TR
 ><TD
@@ -10720,7 +10913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the string value</TD
 ></TR
 ><TR
 ><TD
@@ -10735,7 +10928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TABLE
 ><P
@@ -10745,7 +10938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6210"
+NAME="AEN6267"
 ></A
 ><H3
 ><A
@@ -10807,7 +11000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10824,7 +11017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -10841,7 +11034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -10856,7 +11049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TABLE
 ><P
@@ -10866,7 +11059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6240"
+NAME="AEN6297"
 ></A
 ><H3
 ><A
@@ -10932,7 +11125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10949,7 +11142,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -10966,7 +11159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -10981,7 +11174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TABLE
 ><P
@@ -10991,7 +11184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6271"
+NAME="AEN6328"
 ></A
 ><H3
 ><A
@@ -11048,7 +11241,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -11065,7 +11258,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ></TABLE
 ><P
@@ -11075,7 +11268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6292"
+NAME="AEN6349"
 ></A
 ><H3
 ><A
@@ -11133,7 +11326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -11150,7 +11343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ><TR
 ><TD
@@ -11167,7 +11360,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TABLE
 ><P
@@ -11177,7 +11375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6317"
+NAME="AEN6375"
 ></A
 ><H3
 ><A
@@ -11234,7 +11432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -11251,7 +11449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ></TABLE
 ><P
@@ -11261,7 +11459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6338"
+NAME="AEN6396"
 ></A
 ><H3
 ><A
@@ -11319,7 +11517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -11336,7 +11534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ><TR
 ><TD
@@ -11353,7 +11551,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TABLE
 ><P
@@ -11363,7 +11566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6363"
+NAME="AEN6422"
 ></A
 ><H3
 ><A
@@ -11422,7 +11625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being read</TD
 ></TR
 ><TR
 ><TD
@@ -11437,7 +11640,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL if no content is available.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TABLE
 ><P
@@ -11447,7 +11651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6384"
+NAME="AEN6443"
 ></A
 ><H3
 ><A
@@ -11504,7 +11708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -11519,7 +11723,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the lang value, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TABLE
 ><P
@@ -11529,7 +11734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6405"
+NAME="AEN6464"
 ></A
 ><H3
 ><A
@@ -11587,7 +11792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -11604,7 +11809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the langage description</TD
 ></TR
 ></TABLE
 ><P
@@ -11614,7 +11819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6426"
+NAME="AEN6485"
 ></A
 ><H3
 ><A
@@ -11668,7 +11873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -11683,7 +11888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
 ></TR
 ></TABLE
 ><P
@@ -11693,7 +11898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6446"
+NAME="AEN6505"
 ></A
 ><H3
 ><A
@@ -11754,7 +11959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the node pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -11771,7 +11976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -11786,7 +11991,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the base URL, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TABLE
 ><P
@@ -11796,7 +12002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6472"
+NAME="AEN6531"
 ></A
 ><H3
 ><A
@@ -11865,7 +12071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success and -1 in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -11875,7 +12081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6492"
+NAME="AEN6551"
 ></A
 ><H3
 ><A
@@ -11951,7 +12157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6511"
+NAME="AEN6570"
 ></A
 ><H3
 ><A
@@ -12009,7 +12215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer</TD
 ></TR
 ><TR
 ><TD
@@ -12026,7 +12232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TABLE
 ><P
@@ -12036,7 +12242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6532"
+NAME="AEN6591"
 ></A
 ><H3
 ><A
@@ -12091,7 +12297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -12108,7 +12314,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TABLE
 ><P
@@ -12118,7 +12324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6552"
+NAME="AEN6611"
 ></A
 ><H3
 ><A
@@ -12177,7 +12383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -12194,7 +12400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TABLE
 ><P
@@ -12204,7 +12410,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6573"
+NAME="AEN6632"
 ></A
 ><H3
 ><A
@@ -12272,7 +12478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12289,7 +12495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node defining the subtree to reconciliate</TD
 ></TR
 ><TR
 ><TD
@@ -12304,7 +12510,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of namespace declarations created or -1 in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -12314,7 +12520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6599"
+NAME="AEN6658"
 ></A
 ><H3
 ><A
@@ -12373,7 +12579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12390,7 +12596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -12407,7 +12613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory lenght</TD
 ></TR
 ></TABLE
 ><P
@@ -12417,7 +12623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6624"
+NAME="AEN6683"
 ></A
 ><H3
 ><A
@@ -12474,7 +12680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE*</TD
 ></TR
 ><TR
 ><TD
@@ -12491,7 +12697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12506,7 +12712,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -12516,7 +12722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6649"
+NAME="AEN6708"
 ></A
 ><H3
 ><A
@@ -12577,7 +12783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE * for the output</TD
 ></TR
 ><TR
 ><TD
@@ -12594,7 +12800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12611,7 +12817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TABLE
 ><P
@@ -12621,7 +12827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6675"
+NAME="AEN6734"
 ></A
 ><H3
 ><A
@@ -12682,7 +12888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -12699,7 +12905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12714,7 +12920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -12724,7 +12930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6700"
+NAME="AEN6759"
 ></A
 ><H3
 ><A
@@ -12787,7 +12993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -12804,7 +13010,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12821,7 +13027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -12838,7 +13044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -12855,7 +13061,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ></TABLE
 ><P
@@ -12865,7 +13071,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6734"
+NAME="AEN6793"
 ></A
 ><H3
 ><A
@@ -12920,7 +13126,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -12937,7 +13143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12954,7 +13160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of an encoding (or NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -12969,7 +13175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -12979,7 +13185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6762"
+NAME="AEN6821"
 ></A
 ><H3
 ><A
@@ -13032,7 +13238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -13047,7 +13253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TABLE
 ><P
@@ -13057,7 +13263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6782"
+NAME="AEN6841"
 ></A
 ><H3
 ><A
@@ -13112,7 +13318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -13129,7 +13335,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TABLE
 ><P
@@ -13139,7 +13345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6802"
+NAME="AEN6861"
 ></A
 ><H3
 ><A
@@ -13187,7 +13393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TABLE
 ><P
@@ -13197,7 +13403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6817"
+NAME="AEN6876"
 ></A
 ><H3
 ><A
@@ -13248,7 +13454,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-uri.html b/doc/html/gnome-xml-uri.html
new file mode 100644
index 0000000..8900f63
--- /dev/null
+++ b/doc/html/gnome-xml-uri.html
@@ -0,0 +1,1189 @@
+<HTML
+><HEAD
+><TITLE
+>uri</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+REL="HOME"
+TITLE="Gnome XML Library Reference Manual"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
+REL="PREVIOUS"
+TITLE="valid"
+HREF="gnome-xml-valid.html"><LINK
+REL="NEXT"
+TITLE="xml-error"
+HREF="gnome-xml-xml-error.html"></HEAD
+><BODY
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+BGCOLOR="#000000"
+CELLPADDING="1"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="5"
+>Gnome XML Library Reference Manual</FONT
+></TH
+></TR
+><TR
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="left"
+><A
+HREF="gnome-xml-valid.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>&#60;&#60;&#60; Previous Page</B
+></FONT
+></A
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#0000C0"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="book1.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Home</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#00C000"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="libxml-lib.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Up</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="right"
+><A
+HREF="gnome-xml-xml-error.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page &#62;&#62;&#62;</B
+></FONT
+></A
+></TD
+></TR
+></TABLE
+></DIV
+><H1
+>uri</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN9179"
+></A
+><H2
+>Name</H2
+>uri &#8212; </DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN9182"
+></A
+><H2
+>Synopsis</H2
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="SYNOPSIS"
+>&#13;
+
+struct      <A
+HREF="gnome-xml-uri.html#XMLURI"
+>xmlURI</A
+>;
+typedef     <A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+>;
+<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+>   <A
+HREF="gnome-xml-uri.html#XMLCREATEURI"
+>xmlCreateURI</A
+>                    (void);
+<A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="gnome-xml-uri.html#XMLBUILDURI"
+>xmlBuildURI</A
+>                     (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *base);
+<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+>   <A
+HREF="gnome-xml-uri.html#XMLPARSEURI"
+>xmlParseURI</A
+>                     (const char *URI);
+int         <A
+HREF="gnome-xml-uri.html#XMLPARSEURIREFERENCE"
+>xmlParseURIReference</A
+>            (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri,
+                                             const char *str);
+<A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="gnome-xml-uri.html#XMLSAVEURI"
+>xmlSaveUri</A
+>                      (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);
+void        <A
+HREF="gnome-xml-uri.html#XMLPRINTURI"
+>xmlPrintURI</A
+>                     (<GTKDOCLINK
+HREF="FILE"
+>FILE</GTKDOCLINK
+> *stream,
+                                             <A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);
+char*       <A
+HREF="gnome-xml-uri.html#XMLURIUNESCAPESTRING"
+>xmlURIUnescapeString</A
+>            (const char *str,
+                                             int len,
+                                             char *target);
+int         <A
+HREF="gnome-xml-uri.html#XMLNORMALIZEURIPATH"
+>xmlNormalizeURIPath</A
+>             (char *path);
+void        <A
+HREF="gnome-xml-uri.html#XMLFREEURI"
+>xmlFreeURI</A
+>                      (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);</PRE
+></TD
+></TR
+></TABLE
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN9207"
+></A
+><H2
+>Description</H2
+><P
+></P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN9210"
+></A
+><H2
+>Details</H2
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9212"
+></A
+><H3
+><A
+NAME="XMLURI"
+></A
+>struct xmlURI</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlURI {
+    char *scheme;
+    char *opaque;
+    char *authority;
+    char *server;
+    char *user;
+    int port;
+    char *path;
+    char *query;
+    char *fragment;
+};</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9217"
+></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="AEN9222"
+></A
+><H3
+><A
+NAME="XMLCREATEURI"
+></A
+>xmlCreateURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+>   xmlCreateURI                    (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Simply creates an empty xmlURI</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the new structure or NULL in case of error</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9238"
+></A
+><H3
+><A
+NAME="XMLBUILDURI"
+></A
+>xmlBuildURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlBuildURI                     (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *base);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Computes he final URI of the reference done by checking that
+the given URI is valid, and building the final URI using the
+base URI. This is processed according to section 5.2 of the 
+RFC 2396</P
+><P
+>5.2. Resolving Relative References to Absolute Form</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>URI</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the URI instance found in the document</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>base</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the base value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>a new URI string (to be freed by the caller) or NULL in case
+of error.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9265"
+></A
+><H3
+><A
+NAME="XMLPARSEURI"
+></A
+>xmlParseURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+>   xmlParseURI                     (const char *URI);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Parse an URI </P
+><P
+>URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>URI</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>a newly build xmlURIPtr or NULL in case of error</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9286"
+></A
+><H3
+><A
+NAME="XMLPARSEURIREFERENCE"
+></A
+>xmlParseURIReference ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlParseURIReference            (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri,
+                                             const char *str);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Parse an URI reference string and fills in the appropriate fields
+of the <TT
+CLASS="PARAMETER"
+><I
+>uri</I
+></TT
+> structure</P
+><P
+>URI-reference = [ absoluteURI | relativeURI ] [ "#" fragment ]</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>uri</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to an URI structure</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"
+>  the string to analyze</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or the error code</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9312"
+></A
+><H3
+><A
+NAME="XMLSAVEURI"
+></A
+>xmlSaveUri ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlSaveUri                      (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Save the URI as an escaped string</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>uri</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to an xmlURI</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>a new string (to be deallocated by caller)</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9333"
+></A
+><H3
+><A
+NAME="XMLPRINTURI"
+></A
+>xmlPrintURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlPrintURI                     (<GTKDOCLINK
+HREF="FILE"
+>FILE</GTKDOCLINK
+> *stream,
+                                             <A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Prints the URI in the stream <TT
+CLASS="PARAMETER"
+><I
+>steam</I
+></TT
+>.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>stream</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a FILE* for the output</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>uri</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to an xmlURI</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9355"
+></A
+><H3
+><A
+NAME="XMLURIUNESCAPESTRING"
+></A
+>xmlURIUnescapeString ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>char*       xmlURIUnescapeString            (const char *str,
+                                             int len,
+                                             char *target);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Unescaping routine, does not do validity checks !
+Output is direct unsigned char translation of <TT
+CLASS="LITERAL"
+>XX</TT
+> values (no encoding)</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the string to unescape</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>   the lenght in bytes to unescape (or &lt;= 0 to indicate full string)</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>target</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  optionnal destination buffer</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>an copy of the string, but unescaped</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9383"
+></A
+><H3
+><A
+NAME="XMLNORMALIZEURIPATH"
+></A
+>xmlNormalizeURIPath ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlNormalizeURIPath             (char *path);</PRE
+></TD
+></TR
+></TABLE
+><P
+>applies the 5 normalization steps to a path string
+Normalization occurs directly on the string, no new allocation is done</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>path</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to the path string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or an error code</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9402"
+></A
+><H3
+><A
+NAME="XMLFREEURI"
+></A
+>xmlFreeURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlFreeURI                      (<A
+HREF="gnome-xml-uri.html#XMLURIPTR"
+>xmlURIPtr</A
+> uri);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free up the xmlURI struct</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>uri</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  pointer to an xmlURI</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><BR
+CLEAR="all"><BR><TABLE
+WIDTH="100%"
+BORDER="0"
+BGCOLOR="#000000"
+CELLPADDING="1"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="left"
+><A
+HREF="gnome-xml-valid.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>&#60;&#60;&#60; Previous Page</B
+></FONT
+></A
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#0000C0"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="book1.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Home</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#00C000"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="libxml-lib.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Up</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="right"
+><A
+HREF="gnome-xml-xml-error.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page &#62;&#62;&#62;</B
+></FONT
+></A
+></TD
+></TR
+><TR
+><TD
+COLSPAN="2"
+ALIGN="left"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>valid</B
+></FONT
+></TD
+><TD
+COLSPAN="2"
+ALIGN="right"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>xml-error</B
+></FONT
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index a6b0607..8517123 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7347"
+NAME="AEN7408"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7350"
+NAME="AEN7411"
 ></A
 ><H2
 >Synopsis</H2
@@ -938,7 +938,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7567"
+NAME="AEN7628"
 ></A
 ><H2
 >Description</H2
@@ -948,14 +948,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7570"
+NAME="AEN7631"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7572"
+NAME="AEN7633"
 ></A
 ><H3
 ><A
@@ -1049,7 +1049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7594"
+NAME="AEN7655"
 ></A
 ><H3
 ><A
@@ -1143,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7616"
+NAME="AEN7677"
 ></A
 ><H3
 ><A
@@ -1181,20 +1181,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7621"
+NAME="AEN7682"
 ></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="AEN7625"
+NAME="AEN7687"
 ></A
 ><H3
 ><A
@@ -1210,7 +1223,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_NOTATION_TABLE</PRE
+>#define XML_MIN_NOTATION_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1220,7 +1233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7630"
+NAME="AEN7692"
 ></A
 ><H3
 ><A
@@ -1250,20 +1263,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7635"
+NAME="AEN7697"
 ></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="AEN7639"
+NAME="AEN7702"
 ></A
 ><H3
 ><A
@@ -1279,7 +1305,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_ELEMENT_TABLE</PRE
+>#define XML_MIN_ELEMENT_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1289,7 +1315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7644"
+NAME="AEN7707"
 ></A
 ><H3
 ><A
@@ -1320,20 +1346,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7649"
+NAME="AEN7712"
 ></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="AEN7653"
+NAME="AEN7717"
 ></A
 ><H3
 ><A
@@ -1349,7 +1388,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_ATTRIBUTE_TABLE</PRE
+>#define XML_MIN_ATTRIBUTE_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1359,7 +1398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7658"
+NAME="AEN7722"
 ></A
 ><H3
 ><A
@@ -1389,20 +1428,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7663"
+NAME="AEN7727"
 ></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="AEN7667"
+NAME="AEN7732"
 ></A
 ><H3
 ><A
@@ -1418,7 +1470,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_ID_TABLE</PRE
+>#define XML_MIN_ID_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1428,7 +1480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7672"
+NAME="AEN7737"
 ></A
 ><H3
 ><A
@@ -1458,20 +1510,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7677"
+NAME="AEN7742"
 ></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="AEN7681"
+NAME="AEN7747"
 ></A
 ><H3
 ><A
@@ -1487,7 +1552,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_REF_TABLE</PRE
+>#define XML_MIN_REF_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1497,7 +1562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7686"
+NAME="AEN7752"
 ></A
 ><H3
 ><A
@@ -1527,20 +1592,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7691"
+NAME="AEN7757"
 ></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="AEN7695"
+NAME="AEN7762"
 ></A
 ><H3
 ><A
@@ -1612,7 +1690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -1629,7 +1707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -1646,7 +1724,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1663,7 +1741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the public identifier or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1680,7 +1758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system identifier or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1695,7 +1773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TABLE
 ><P
@@ -1705,7 +1783,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7736"
+NAME="AEN7803"
 ></A
 ><H3
 ><A
@@ -1761,7 +1839,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation table</TD
 ></TR
 ><TR
 ><TD
@@ -1776,7 +1854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlNotationTablePtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1786,7 +1864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7757"
+NAME="AEN7824"
 ></A
 ><H3
 ><A
@@ -1839,7 +1917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An notation table</TD
 ></TR
 ></TABLE
 ><P
@@ -1849,7 +1927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7773"
+NAME="AEN7840"
 ></A
 ><H3
 ><A
@@ -1906,7 +1984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -1923,7 +2001,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation declaration</TD
 ></TR
 ></TABLE
 ><P
@@ -1933,7 +2011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7794"
+NAME="AEN7861"
 ></A
 ><H3
 ><A
@@ -1990,7 +2068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -2007,7 +2085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A notation table</TD
 ></TR
 ></TABLE
 ><P
@@ -2017,7 +2095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7815"
+NAME="AEN7882"
 ></A
 ><H3
 ><A
@@ -2077,7 +2155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the subelement name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2094,7 +2172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the type of element content decl</TD
 ></TR
 ><TR
 ><TD
@@ -2109,7 +2187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new element content structure</TD
 ></TR
 ></TABLE
 ><P
@@ -2119,7 +2197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7841"
+NAME="AEN7908"
 ></A
 ><H3
 ><A
@@ -2175,7 +2253,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element content pointer.</TD
 ></TR
 ><TR
 ><TD
@@ -2190,7 +2268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlElementContentPtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -2200,7 +2278,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7862"
+NAME="AEN7929"
 ></A
 ><H3
 ><A
@@ -2253,7 +2331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element content tree to free</TD
 ></TR
 ></TABLE
 ><P
@@ -2263,7 +2341,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7878"
+NAME="AEN7945"
 ></A
 ><H3
 ><A
@@ -2319,7 +2397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output buffer</TD
 ></TR
 ><TR
 ><TD
@@ -2336,7 +2414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ><TR
 ><TD
@@ -2353,7 +2431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> 1 if one must print the englobing parenthesis, 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -2363,7 +2441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7902"
+NAME="AEN7969"
 ></A
 ><H3
 ><A
@@ -2435,7 +2513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -2452,7 +2530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -2469,7 +2547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -2486,7 +2564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element type</TD
 ></TR
 ><TR
 ><TD
@@ -2503,7 +2581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element content tree or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2518,7 +2596,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TABLE
 ><P
@@ -2528,7 +2606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7943"
+NAME="AEN8010"
 ></A
 ><H3
 ><A
@@ -2584,7 +2662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ><TR
 ><TD
@@ -2599,7 +2677,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlElementTablePtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -2609,7 +2687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7964"
+NAME="AEN8031"
 ></A
 ><H3
 ><A
@@ -2662,7 +2740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TABLE
 ><P
@@ -2672,7 +2750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7980"
+NAME="AEN8047"
 ></A
 ><H3
 ><A
@@ -2729,7 +2807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -2746,7 +2824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TABLE
 ><P
@@ -2756,7 +2834,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8001"
+NAME="AEN8068"
 ></A
 ><H3
 ><A
@@ -2814,7 +2892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -2831,7 +2909,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An element table</TD
 ></TR
 ></TABLE
 ><P
@@ -2841,7 +2919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8022"
+NAME="AEN8089"
 ></A
 ><H3
 ><A
@@ -2897,7 +2975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the enumeration name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2912,7 +2990,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -2922,7 +3001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8043"
+NAME="AEN8110"
 ></A
 ><H3
 ><A
@@ -2975,7 +3054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree to free.</TD
 ></TR
 ></TABLE
 ><P
@@ -2985,7 +3064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8059"
+NAME="AEN8126"
 ></A
 ><H3
 ><A
@@ -3041,7 +3120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the tree to copy.</TD
 ></TR
 ><TR
 ><TD
@@ -3056,7 +3135,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEnumerationPtr just created or NULL in case
+of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3066,7 +3146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8080"
+NAME="AEN8147"
 ></A
 ><H3
 ><A
@@ -3160,7 +3240,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -3177,7 +3257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the DTD</TD
 ></TR
 ><TR
 ><TD
@@ -3194,7 +3274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -3211,7 +3291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -3228,7 +3308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -3245,7 +3325,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute type</TD
 ></TR
 ><TR
 ><TD
@@ -3262,7 +3342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute default type</TD
 ></TR
 ><TR
 ><TD
@@ -3279,7 +3359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute default value</TD
 ></TR
 ><TR
 ><TD
@@ -3296,7 +3376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if it's an enumeration, the associated list</TD
 ></TR
 ><TR
 ><TD
@@ -3311,7 +3391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not new, othervise the attribute decl</TD
 ></TR
 ></TABLE
 ><P
@@ -3321,7 +3401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8142"
+NAME="AEN8209"
 ></A
 ><H3
 ><A
@@ -3377,7 +3457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ><TR
 ><TD
@@ -3392,7 +3472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlAttributeTablePtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3402,7 +3482,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8163"
+NAME="AEN8230"
 ></A
 ><H3
 ><A
@@ -3455,7 +3535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ></TABLE
 ><P
@@ -3465,7 +3545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8179"
+NAME="AEN8246"
 ></A
 ><H3
 ><A
@@ -3522,7 +3602,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -3539,7 +3619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute table</TD
 ></TR
 ></TABLE
 ><P
@@ -3549,7 +3629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8200"
+NAME="AEN8267"
 ></A
 ><H3
 ><A
@@ -3607,7 +3687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -3624,7 +3704,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An attribute declaration</TD
 ></TR
 ></TABLE
 ><P
@@ -3634,7 +3714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8221"
+NAME="AEN8288"
 ></A
 ><H3
 ><A
@@ -3702,7 +3782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -3719,7 +3799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -3736,7 +3816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value name</TD
 ></TR
 ><TR
 ><TD
@@ -3753,7 +3833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute holding the ID</TD
 ></TR
 ><TR
 ><TD
@@ -3768,7 +3848,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new xmlIDPtr</TD
 ></TR
 ></TABLE
 ><P
@@ -3778,7 +3858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8257"
+NAME="AEN8324"
 ></A
 ><H3
 ><A
@@ -3857,7 +3937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8277"
+NAME="AEN8344"
 ></A
 ><H3
 ><A
@@ -3910,7 +3990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An id table</TD
 ></TR
 ></TABLE
 ><P
@@ -3920,7 +4000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8293"
+NAME="AEN8360"
 ></A
 ><H3
 ><A
@@ -3980,7 +4060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -3997,7 +4077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the ID value</TD
 ></TR
 ><TR
 ><TD
@@ -4012,7 +4092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
 ></TR
 ></TABLE
 ><P
@@ -4022,7 +4102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8319"
+NAME="AEN8386"
 ></A
 ><H3
 ><A
@@ -4085,7 +4165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4102,7 +4182,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4119,7 +4199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4134,7 +4214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or 1 depending on the lookup result</TD
 ></TR
 ></TABLE
 ><P
@@ -4144,7 +4224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8349"
+NAME="AEN8416"
 ></A
 ><H3
 ><A
@@ -4201,7 +4281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4218,7 +4298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4233,7 +4313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if the lookup failed and 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -4243,7 +4323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8374"
+NAME="AEN8441"
 ></A
 ><H3
 ><A
@@ -4311,7 +4391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -4328,7 +4408,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document</TD
 ></TR
 ><TR
 ><TD
@@ -4345,7 +4425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value name</TD
 ></TR
 ><TR
 ><TD
@@ -4362,7 +4442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute holding the Ref</TD
 ></TR
 ><TR
 ><TD
@@ -4377,7 +4457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the new xmlRefPtr</TD
 ></TR
 ></TABLE
 ><P
@@ -4387,7 +4467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8410"
+NAME="AEN8477"
 ></A
 ><H3
 ><A
@@ -4466,7 +4546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8430"
+NAME="AEN8497"
 ></A
 ><H3
 ><A
@@ -4519,7 +4599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An ref table</TD
 ></TR
 ></TABLE
 ><P
@@ -4529,7 +4609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8446"
+NAME="AEN8513"
 ></A
 ><H3
 ><A
@@ -4592,7 +4672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4609,7 +4689,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4626,7 +4706,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4641,7 +4721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 or 1 depending on the lookup result</TD
 ></TR
 ></TABLE
 ><P
@@ -4651,7 +4731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8476"
+NAME="AEN8543"
 ></A
 ><H3
 ><A
@@ -4708,7 +4788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4725,7 +4805,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -4740,7 +4820,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if the lookup failed and 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -4750,7 +4830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8501"
+NAME="AEN8568"
 ></A
 ><H3
 ><A
@@ -4811,7 +4891,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -4828,7 +4908,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -4843,7 +4923,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -4853,7 +4933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8526"
+NAME="AEN8593"
 ></A
 ><H3
 ><A
@@ -4919,7 +4999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -4936,7 +5016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -4953,7 +5033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element definition</TD
 ></TR
 ><TR
 ><TD
@@ -4968,7 +5048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -4978,7 +5058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8556"
+NAME="AEN8623"
 ></A
 ><H3
 ><A
@@ -5061,7 +5141,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5078,7 +5158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent</TD
 ></TR
 ><TR
 ><TD
@@ -5095,7 +5175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -5112,7 +5192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -5127,7 +5207,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new normalized string if normalization is needed, NULL otherwise
+the caller must free the returned value.</TD
 ></TR
 ></TABLE
 ><P
@@ -5137,7 +5218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8596"
+NAME="AEN8663"
 ></A
 ><H3
 ><A
@@ -5205,7 +5286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5222,7 +5303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5239,7 +5320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute definition</TD
 ></TR
 ><TR
 ><TD
@@ -5254,7 +5335,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5264,7 +5345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8627"
+NAME="AEN8694"
 ></A
 ><H3
 ><A
@@ -5336,7 +5417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute type</TD
 ></TR
 ><TR
 ><TD
@@ -5353,7 +5434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -5368,7 +5449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5378,7 +5459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8656"
+NAME="AEN8723"
 ></A
 ><H3
 ><A
@@ -5443,7 +5524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5460,7 +5541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5477,7 +5558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a notation definition</TD
 ></TR
 ><TR
 ><TD
@@ -5492,7 +5573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5502,7 +5583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8686"
+NAME="AEN8753"
 ></A
 ><H3
 ><A
@@ -5565,7 +5646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5582,7 +5663,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5599,7 +5680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a dtd instance</TD
 ></TR
 ><TR
 ><TD
@@ -5614,7 +5695,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5624,7 +5705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8717"
+NAME="AEN8784"
 ></A
 ><H3
 ><A
@@ -5688,7 +5769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5705,7 +5786,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5720,7 +5801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5730,7 +5811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8743"
+NAME="AEN8810"
 ></A
 ><H3
 ><A
@@ -5791,7 +5872,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5808,7 +5889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5823,7 +5904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5833,7 +5914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8769"
+NAME="AEN8836"
 ></A
 ><H3
 ><A
@@ -5894,7 +5975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -5911,7 +5992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -5928,7 +6009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -5943,7 +6024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -5953,7 +6034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8799"
+NAME="AEN8866"
 ></A
 ><H3
 ><A
@@ -6024,7 +6105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6041,7 +6122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6058,7 +6139,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -6073,7 +6154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -6083,7 +6164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8831"
+NAME="AEN8898"
 ></A
 ><H3
 ><A
@@ -6164,7 +6245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6181,7 +6262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6198,7 +6279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element instance</TD
 ></TR
 ><TR
 ><TD
@@ -6215,7 +6296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute instance</TD
 ></TR
 ><TR
 ><TD
@@ -6232,7 +6313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value (without entities processing)</TD
 ></TR
 ><TR
 ><TD
@@ -6247,7 +6328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -6257,7 +6338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8872"
+NAME="AEN8939"
 ></A
 ><H3
 ><A
@@ -6317,7 +6398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6334,7 +6415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a document instance</TD
 ></TR
 ><TR
 ><TD
@@ -6349,7 +6430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -6359,7 +6440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8898"
+NAME="AEN8965"
 ></A
 ><H3
 ><A
@@ -6421,7 +6502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the validation context</TD
 ></TR
 ><TR
 ><TD
@@ -6438,7 +6519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6455,7 +6536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the notation name to check</TD
 ></TR
 ><TR
 ><TD
@@ -6470,7 +6551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if valid or 0 otherwise</TD
 ></TR
 ></TABLE
 ><P
@@ -6480,7 +6561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8928"
+NAME="AEN8995"
 ></A
 ><H3
 ><A
@@ -6538,7 +6619,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6555,7 +6636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -6570,7 +6651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if no, 1 if yes, and -1 if no element description is available</TD
 ></TR
 ></TABLE
 ><P
@@ -6580,7 +6661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8953"
+NAME="AEN9020"
 ></A
 ><H3
 ><A
@@ -6645,7 +6726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -6662,7 +6743,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -6679,7 +6760,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -6694,7 +6775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlAttributePtr if found or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -6704,7 +6785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8984"
+NAME="AEN9051"
 ></A
 ><H3
 ><A
@@ -6764,7 +6845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -6781,7 +6862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the notation name</TD
 ></TR
 ><TR
 ><TD
@@ -6796,7 +6877,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNotationPtr if found or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -6806,7 +6887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9010"
+NAME="AEN9077"
 ></A
 ><H3
 ><A
@@ -6866,7 +6947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the DtD to search</TD
 ></TR
 ><TR
 ><TD
@@ -6883,7 +6964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element name</TD
 ></TR
 ><TR
 ><TD
@@ -6898,7 +6979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlElementPtr if found or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -6908,7 +6989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9036"
+NAME="AEN9103"
 ></A
 ><H3
 ><A
@@ -6991,7 +7072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element to insert after</TD
 ></TR
 ><TR
 ><TD
@@ -7008,7 +7089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element to insert next</TD
 ></TR
 ><TR
 ><TD
@@ -7025,7 +7106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an array to store the list of child names</TD
 ></TR
 ><TR
 ><TD
@@ -7042,7 +7123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7057,7 +7138,14 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of element in the list, or -1 in case of error. If
+the function returns the value <TT
+CLASS="PARAMETER"
+><I
+>max</I
+></TT
+> the caller is invited to grow the
+receiving array and retry.</TD
 ></TR
 ></TABLE
 ><P
@@ -7067,7 +7155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9073"
+NAME="AEN9141"
 ></A
 ><H3
 ><A
@@ -7126,7 +7214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an element content tree</TD
 ></TR
 ><TR
 ><TD
@@ -7143,7 +7231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an array to store the list of child names</TD
 ></TR
 ><TR
 ><TD
@@ -7160,7 +7248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer to the number of element in the list</TD
 ></TR
 ><TR
 ><TD
@@ -7177,7 +7265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of the array</TD
 ></TR
 ><TR
 ><TD
@@ -7192,7 +7280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of element in the list, or -1 in case of error.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index a8fb726..3b10e87 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9354"
+NAME="AEN9423"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9357"
+NAME="AEN9426"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9369"
+NAME="AEN9438"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +197,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9372"
+NAME="AEN9441"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9374"
+NAME="AEN9443"
 ></A
 ><H3
 ><A
@@ -357,7 +357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9379"
+NAME="AEN9448"
 ></A
 ><H3
 ><A
@@ -454,7 +454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9402"
+NAME="AEN9471"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9425"
+NAME="AEN9494"
 ></A
 ><H3
 ><A
@@ -648,7 +648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9448"
+NAME="AEN9517"
 ></A
 ><H3
 ><A
@@ -745,7 +745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9471"
+NAME="AEN9540"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9487"
+NAME="AEN9556"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index 2c75f40..7b929c8 100644
--- a/doc/html/gnome-xml-xmlio.html
+++ b/doc/html/gnome-xml-xmlio.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11845"
+NAME="AEN12309"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11848"
+NAME="AEN12312"
 ></A
 ><H2
 >Synopsis</H2
@@ -493,7 +493,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11938"
+NAME="AEN12402"
 ></A
 ><H2
 >Description</H2
@@ -503,14 +503,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11941"
+NAME="AEN12405"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11943"
+NAME="AEN12407"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11961"
+NAME="AEN12425"
 ></A
 ><H3
 ><A
@@ -641,7 +641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11975"
+NAME="AEN12439"
 ></A
 ><H3
 ><A
@@ -750,7 +750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12001"
+NAME="AEN12465"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12015"
+NAME="AEN12479"
 ></A
 ><H3
 ><A
@@ -843,20 +843,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12020"
+NAME="AEN12484"
 ></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="AEN12024"
+NAME="AEN12489"
 ></A
 ><H3
 ><A
@@ -929,7 +942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12042"
+NAME="AEN12507"
 ></A
 ><H3
 ><A
@@ -987,7 +1000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12056"
+NAME="AEN12521"
 ></A
 ><H3
 ><A
@@ -1096,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12082"
+NAME="AEN12547"
 ></A
 ><H3
 ><A
@@ -1154,7 +1167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12096"
+NAME="AEN12561"
 ></A
 ><H3
 ><A
@@ -1190,20 +1203,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12101"
+NAME="AEN12566"
 ></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="AEN12105"
+NAME="AEN12571"
 ></A
 ><H3
 ><A
@@ -1232,7 +1258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12111"
+NAME="AEN12577"
 ></A
 ><H3
 ><A
@@ -1289,7 +1315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1304,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1314,7 +1340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12132"
+NAME="AEN12598"
 ></A
 ><H3
 ><A
@@ -1376,7 +1402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -1393,7 +1419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1408,7 +1434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1418,7 +1444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12157"
+NAME="AEN12623"
 ></A
 ><H3
 ><A
@@ -1480,7 +1506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -1497,7 +1523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1512,7 +1538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1522,7 +1548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12183"
+NAME="AEN12649"
 ></A
 ><H3
 ><A
@@ -1581,7 +1607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -1598,7 +1624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1613,7 +1639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1623,7 +1649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12208"
+NAME="AEN12674"
 ></A
 ><H3
 ><A
@@ -1683,7 +1709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the memory input</TD
 ></TR
 ><TR
 ><TD
@@ -1700,7 +1726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the memory block</TD
 ></TR
 ><TR
 ><TD
@@ -1717,7 +1743,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1732,7 +1758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1742,7 +1768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12237"
+NAME="AEN12703"
 ></A
 ><H3
 ><A
@@ -1809,7 +1835,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O read function</TD
 ></TR
 ><TR
 ><TD
@@ -1826,7 +1852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -1843,7 +1869,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -1860,7 +1886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1875,7 +1901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -1885,7 +1911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12272"
+NAME="AEN12738"
 ></A
 ><H3
 ><A
@@ -1941,7 +1967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -1958,7 +1984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -1973,7 +1999,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1983,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12296"
+NAME="AEN12762"
 ></A
 ><H3
 ><A
@@ -2042,7 +2069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2059,7 +2086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -2074,7 +2101,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -2084,7 +2112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12321"
+NAME="AEN12787"
 ></A
 ><H3
 ><A
@@ -2141,7 +2169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2158,7 +2186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -2175,7 +2203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -2190,7 +2218,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -2200,7 +2229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12349"
+NAME="AEN12815"
 ></A
 ><H3
 ><A
@@ -2253,7 +2282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ></TABLE
 ><P
@@ -2263,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12365"
+NAME="AEN12831"
 ></A
 ><H3
 ><A
@@ -2336,7 +2365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12383"
+NAME="AEN12849"
 ></A
 ><H3
 ><A
@@ -2401,7 +2430,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2418,7 +2447,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2435,7 +2464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputReadCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2452,7 +2481,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2467,7 +2496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -2477,7 +2506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12418"
+NAME="AEN12884"
 ></A
 ><H3
 ><A
@@ -2506,7 +2535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12424"
+NAME="AEN12890"
 ></A
 ><H3
 ><A
@@ -2562,7 +2591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2577,7 +2606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2587,7 +2616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12445"
+NAME="AEN12911"
 ></A
 ><H3
 ><A
@@ -2651,7 +2680,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -2668,7 +2697,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2685,7 +2714,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ration (0 none, 9 max).</TD
 ></TR
 ><TR
 ><TD
@@ -2700,7 +2729,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new output or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2710,7 +2739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12474"
+NAME="AEN12940"
 ></A
 ><H3
 ><A
@@ -2772,7 +2801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -2789,7 +2818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2804,7 +2833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2814,7 +2843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12500"
+NAME="AEN12966"
 ></A
 ><H3
 ><A
@@ -2872,7 +2901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -2889,7 +2918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2904,7 +2933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -2914,7 +2943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12525"
+NAME="AEN12991"
 ></A
 ><H3
 ><A
@@ -2980,7 +3009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O write function</TD
 ></TR
 ><TR
 ><TD
@@ -2997,7 +3026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -3014,7 +3043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -3046,7 +3075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TABLE
 ><P
@@ -3056,7 +3085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12560"
+NAME="AEN13026"
 ></A
 ><H3
 ><A
@@ -3114,7 +3143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3131,7 +3160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -3148,7 +3177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -3163,7 +3192,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3173,7 +3203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12588"
+NAME="AEN13054"
 ></A
 ><H3
 ><A
@@ -3230,7 +3260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3247,7 +3277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a zero terminated C string</TD
 ></TR
 ><TR
 ><TD
@@ -3262,7 +3292,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3272,7 +3303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12612"
+NAME="AEN13078"
 ></A
 ><H3
 ><A
@@ -3325,7 +3356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3340,7 +3371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3350,7 +3381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12632"
+NAME="AEN13098"
 ></A
 ><H3
 ><A
@@ -3404,7 +3435,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3419,7 +3450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -3429,7 +3460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12652"
+NAME="AEN13118"
 ></A
 ><H3
 ><A
@@ -3494,7 +3525,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3511,7 +3542,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3528,7 +3559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputWriteCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3545,7 +3576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3560,7 +3591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TABLE
 ><P
@@ -3570,7 +3601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12687"
+NAME="AEN13153"
 ></A
 ><H3
 ><A
@@ -3628,7 +3659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output I/O buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3645,7 +3676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -3662,7 +3693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding if any assuming the i/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -3677,7 +3708,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TABLE
 ><P
@@ -3687,7 +3718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12716"
+NAME="AEN13182"
 ></A
 ><H3
 ><A
@@ -3751,7 +3782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -3768,7 +3799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -3785,7 +3816,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -3802,7 +3833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -3819,7 +3850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ><TR
 ><TD
@@ -3836,7 +3867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding string</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index 248f70c..14a210d 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16285"
+NAME="AEN16754"
 ></A
 ><H2
 >Name</H2
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16288"
+NAME="AEN16757"
 ></A
 ><H2
 >Synopsis</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16321"
+NAME="AEN16790"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16324"
+NAME="AEN16793"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16326"
+NAME="AEN16795"
 ></A
 ><H3
 ><A
@@ -291,7 +291,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     DEBUG_MEMORY</PRE
+>#define DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -301,7 +301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16331"
+NAME="AEN16800"
 ></A
 ><H3
 ><A
@@ -317,7 +317,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     MEM_LIST</PRE
+>#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
 ></TD
 ></TR
 ></TABLE
@@ -327,7 +327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16336"
+NAME="AEN16805"
 ></A
 ><H3
 ><A
@@ -385,7 +385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16350"
+NAME="AEN16819"
 ></A
 ><H3
 ><A
@@ -443,7 +443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16364"
+NAME="AEN16833"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16382"
+NAME="AEN16851"
 ></A
 ><H3
 ><A
@@ -592,7 +592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16400"
+NAME="AEN16869"
 ></A
 ><H3
 ><A
@@ -618,7 +618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16405"
+NAME="AEN16874"
 ></A
 ><H3
 ><A
@@ -644,7 +644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16410"
+NAME="AEN16879"
 ></A
 ><H3
 ><A
@@ -670,7 +670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16415"
+NAME="AEN16884"
 ></A
 ><H3
 ><A
@@ -696,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16420"
+NAME="AEN16889"
 ></A
 ><H3
 ><A
@@ -765,7 +765,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -782,7 +785,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -799,7 +805,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -816,7 +825,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function to use</TD
 ></TR
 ><TR
 ><TD
@@ -831,7 +843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TABLE
 ><P
@@ -841,7 +853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16456"
+NAME="AEN16929"
 ></A
 ><H3
 ><A
@@ -906,7 +918,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -923,7 +938,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -940,7 +958,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -957,7 +978,10 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function in use</TD
 ></TR
 ><TR
 ><TD
@@ -972,7 +996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TABLE
 ><P
@@ -982,7 +1006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16491"
+NAME="AEN16968"
 ></A
 ><H3
 ><A
@@ -1030,7 +1054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 on success</TD
 ></TR
 ></TABLE
 ><P
@@ -1040,7 +1064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16506"
+NAME="AEN16983"
 ></A
 ><H3
 ><A
@@ -1088,7 +1112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int representing the amount of memory allocated.</TD
 ></TR
 ></TABLE
 ><P
@@ -1098,7 +1122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16521"
+NAME="AEN16998"
 ></A
 ><H3
 ><A
@@ -1151,7 +1175,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE descriptor used as the output file, if NULL, the result is
+written to the file .memorylist</TD
 ></TR
 ></TABLE
 ><P
@@ -1161,7 +1186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16537"
+NAME="AEN17014"
 ></A
 ><H3
 ><A
@@ -1221,7 +1246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE descriptor used as the output file</TD
 ></TR
 ><TR
 ><TD
@@ -1238,7 +1263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of entries to dump</TD
 ></TR
 ></TABLE
 ><P
@@ -1248,7 +1273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16558"
+NAME="AEN17035"
 ></A
 ><H3
 ><A
@@ -1276,7 +1301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16564"
+NAME="AEN17041"
 ></A
 ><H3
 ><A
@@ -1331,7 +1356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an int specifying the size in byte to allocate.</TD
 ></TR
 ><TR
 ><TD
@@ -1348,7 +1373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1365,7 +1390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ></TABLE
 ><P
@@ -1375,7 +1400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16588"
+NAME="AEN17065"
 ></A
 ><H3
 ><A
@@ -1431,7 +1456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial memory block pointer</TD
 ></TR
 ><TR
 ><TD
@@ -1448,7 +1473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an int specifying the size in byte to allocate.</TD
 ></TR
 ><TR
 ><TD
@@ -1465,7 +1490,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1482,7 +1507,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ></TABLE
 ><P
@@ -1492,7 +1517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16616"
+NAME="AEN17093"
 ></A
 ><H3
 ><A
@@ -1564,7 +1589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -1581,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the line number</TD
 ></TR
 ><TR
 ><TD
@@ -1596,7 +1621,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new string or NULL if allocation error occured.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index 6c89066..75b1a01 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -15,8 +15,8 @@
 TITLE="HTMLtree"
 HREF="gnome-xml-htmltree.html"><LINK
 REL="NEXT"
-TITLE="nanohttp"
-HREF="gnome-xml-nanohttp.html"></HEAD
+TITLE="xpointer"
+HREF="gnome-xml-xpointer.html"></HEAD
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
@@ -98,7 +98,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="gnome-xml-nanohttp.html"
+HREF="gnome-xml-xpointer.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10415"
+NAME="AEN10509"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10418"
+NAME="AEN10512"
 ></A
 ><H2
 >Synopsis</H2
@@ -268,6 +268,40 @@
 HREF="gnome-xml-xpath.html#CHECK-TYPE"
 >CHECK_TYPE</A
 >                      (typeval)
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHDEBUGDUMPOBJECT"
+>xmlXPathDebugDumpObject</A
+>         (<GTKDOCLINK
+HREF="FILE"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> cur,
+                                             int depth);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> <A
+HREF="gnome-xml-xpath.html#XMLXPATHNEWPARSERCONTEXT"
+>xmlXPathNewParserContext</A
+>
+                                            (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt);
+void        <A
+HREF="gnome-xml-xpath.html#XMLXPATHFREEPARSERCONTEXT"
+>xmlXPathFreeParserContext</A
+>       (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);
 <A
 HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
 >xmlXPathObjectPtr</A
@@ -342,6 +376,46 @@
 HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt);
+<A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSENAME"
+>xmlXPathParseName</A
+>               (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);
+int         <A
+HREF="gnome-xml-xpath.html#XMLXPATHREGISTERFUNC"
+>xmlXPathRegisterFunc</A
+>            (<A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHFUNCTION"
+>xmlXPathFunction</A
+> f);
+int         <A
+HREF="gnome-xml-xpath.html#XMLXPATHREGISTERVARIABLE"
+>xmlXPathRegisterVariable</A
+>        (<A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> value);
 void        <A
 HREF="gnome-xml-xpath.html#XMLXPATHINIT"
 >xmlXPathInit</A
@@ -435,7 +509,17 @@
 >             (<A
 HREF="gnome-xml-xpath.html#XMLNODESETPTR"
 >xmlNodeSetPtr</A
-> obj);</PRE
+> obj);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTCOPY"
+>xmlXPathObjectCopy</A
+>        (<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -443,7 +527,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10502"
+NAME="AEN10619"
 ></A
 ><H2
 >Description</H2
@@ -453,14 +537,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10505"
+NAME="AEN10622"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10507"
+NAME="AEN10624"
 ></A
 ><H3
 ><A
@@ -482,19 +566,19 @@
 
     int nb_variables;			/* number of defined variables */
     int max_variables;			/* max number of variables */
-    xmlXPathVariablePtr *variables;	/* Array of defined variables */
+    xmlXPathVariablePtr variables;	/* Array of defined variables */
 
     int nb_types;			/* number of defined types */
     int max_types;			/* max number of types */
-    xmlXPathTypePtr *types;		/* Array of defined types */
+    xmlXPathTypePtr types;		/* Array of defined types */
 
     int nb_funcs;			/* number of defined funcs */
     int max_funcs;			/* max number of funcs */
-    xmlXPathFuncPtr *funcs;		/* Array of defined funcs */
+    xmlXPathFuncPtr funcs;		/* Array of defined funcs */
 
     int nb_axis;			/* number of defined axis */
     int max_axis;			/* max number of axis */
-    xmlXPathAxisPtr *axis;		/* Array of defined axis */
+    xmlXPathAxisPtr axis;		/* Array of defined axis */
 
     /* Namespace traversal should be implemented with user */
     xmlNsPtr *namespaces;		/* The namespaces lookup */
@@ -519,20 +603,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10512"
+NAME="AEN10629"
 ></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="AEN10516"
+NAME="AEN10634"
 ></A
 ><H3
 ><A
@@ -569,20 +666,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10521"
+NAME="AEN10639"
 ></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="AEN10525"
+NAME="AEN10644"
 ></A
 ><H3
 ><A
@@ -613,7 +723,11 @@
     XPATH_INVALID_TYPE,
     XPATH_INVALID_ARITY,
     XPATH_INVALID_CTXT_SIZE,
-    XPATH_INVALID_CTXT_POSITION
+    XPATH_INVALID_CTXT_POSITION,
+    XPATH_MEMORY_ERROR,
+    XPTR_SYNTAX_ERROR,
+    XPTR_RESOURCE_ERROR,
+    XPTR_SUB_RESOURCE_ERROR
 } xmlXPathError;</PRE
 ></TD
 ></TR
@@ -631,7 +745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10532"
+NAME="AEN10651"
 ></A
 ><H3
 ><A
@@ -661,20 +775,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10537"
+NAME="AEN10656"
 ></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="AEN10541"
+NAME="AEN10661"
 ></A
 ><H3
 ><A
@@ -710,7 +837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10546"
+NAME="AEN10666"
 ></A
 ><H3
 ><A
@@ -746,20 +873,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10551"
+NAME="AEN10671"
 ></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="AEN10555"
+NAME="AEN10676"
 ></A
 ><H3
 ><A
@@ -853,7 +993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10578"
+NAME="AEN10699"
 ></A
 ><H3
 ><A
@@ -882,20 +1022,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10583"
+NAME="AEN10704"
 ></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="AEN10587"
+NAME="AEN10709"
 ></A
 ><H3
 ><A
@@ -924,20 +1077,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10592"
+NAME="AEN10714"
 ></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="AEN10596"
+NAME="AEN10719"
 ></A
 ><H3
 ><A
@@ -1016,7 +1182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10615"
+NAME="AEN10738"
 ></A
 ><H3
 ><A
@@ -1045,20 +1211,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10620"
+NAME="AEN10743"
 ></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="AEN10624"
+NAME="AEN10748"
 ></A
 ><H3
 ><A
@@ -1158,7 +1337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10649"
+NAME="AEN10773"
 ></A
 ><H3
 ><A
@@ -1187,20 +1366,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10654"
+NAME="AEN10778"
 ></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="AEN10658"
+NAME="AEN10783"
 ></A
 ><H3
 ><A
@@ -1279,7 +1471,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10677"
+NAME="AEN10802"
 ></A
 ><H3
 ><A
@@ -1305,7 +1497,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10682"
+NAME="AEN10807"
 ></A
 ><H3
 ><A
@@ -1331,7 +1523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10687"
+NAME="AEN10812"
 ></A
 ><H3
 ><A
@@ -1389,7 +1581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10701"
+NAME="AEN10826"
 ></A
 ><H3
 ><A
@@ -1447,7 +1639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10715"
+NAME="AEN10840"
 ></A
 ><H3
 ><A
@@ -1505,7 +1697,273 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10729"
+NAME="AEN10854"
+></A
+><H3
+><A
+NAME="XMLXPATHDEBUGDUMPOBJECT"
+></A
+>xmlXPathDebugDumpObject ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathDebugDumpObject         (<GTKDOCLINK
+HREF="FILE"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> cur,
+                                             int depth);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>output</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
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>depth</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10878"
+></A
+><H3
+><A
+NAME="XMLXPATHNEWPARSERCONTEXT"
+></A
+>xmlXPathNewParserContext ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> xmlXPathNewParserContext
+                                            (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new xmlXPathParserContext</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath expression</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the xmlXPathParserContext just allocated.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10904"
+></A
+><H3
+><A
+NAME="XMLXPATHFREEPARSERCONTEXT"
+></A
+>xmlXPathFreeParserContext ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathFreeParserContext       (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free up an xmlXPathParserContext</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the context to free</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN10920"
 ></A
 ><H3
 ><A
@@ -1584,7 +2042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10749"
+NAME="AEN10940"
 ></A
 ><H3
 ><A
@@ -1681,7 +2139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10773"
+NAME="AEN10964"
 ></A
 ><H3
 ><A
@@ -1742,7 +2200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar * value</TD
 ></TR
 ><TR
 ><TD
@@ -1757,7 +2215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TABLE
 ><P
@@ -1767,7 +2225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10795"
+NAME="AEN10986"
 ></A
 ><H3
 ><A
@@ -1829,7 +2287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the NodePtr value</TD
 ></TR
 ><TR
 ><TD
@@ -1844,7 +2302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TABLE
 ><P
@@ -1854,7 +2312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10817"
+NAME="AEN11008"
 ></A
 ><H3
 ><A
@@ -1911,7 +2369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the initial node set</TD
 ></TR
 ><TR
 ><TD
@@ -1928,7 +2386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a new xmlNodePtr</TD
 ></TR
 ></TABLE
 ><P
@@ -1938,7 +2396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10838"
+NAME="AEN11029"
 ></A
 ><H3
 ><A
@@ -2005,7 +2463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2032,7 +2490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10859"
+NAME="AEN11050"
 ></A
 ><H3
 ><A
@@ -2085,7 +2543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -2095,7 +2553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10875"
+NAME="AEN11066"
 ></A
 ><H3
 ><A
@@ -2152,7 +2610,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath Parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -2162,7 +2620,344 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10892"
+NAME="AEN11083"
+></A
+><H3
+><A
+NAME="XMLXPATHPARSENAME"
+></A
+>xmlXPathParseName ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlXPathParseName               (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>parse an XML name</P
+><P
+>[4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
+CombiningChar | Extender</P
+><P
+>[5] Name ::= (Letter | '_' | ':') (NameChar)*</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPointer Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the namespace name or NULL</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11106"
+></A
+><H3
+><A
+NAME="XMLXPATHREGISTERFUNC"
+></A
+>xmlXPathRegisterFunc ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathRegisterFunc            (<A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHFUNCTION"
+>xmlXPathFunction</A
+> f);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Register a new function. If <TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+> is NULL it unregisters the function</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the function name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the function implementation or NULL</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 in case of success, -1 in case of error</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11137"
+></A
+><H3
+><A
+NAME="XMLXPATHREGISTERVARIABLE"
+></A
+>xmlXPathRegisterVariable ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathRegisterVariable        (<A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> value);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Register a new variable value. If <TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+> is NULL it unregisters
+the variable</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the variable name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the variable value or NULL</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 in case of success, -1 in case of error</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11168"
 ></A
 ><H3
 ><A
@@ -2190,7 +2985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10898"
+NAME="AEN11174"
 ></A
 ><H3
 ><A
@@ -2246,7 +3041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML document</TD
 ></TR
 ><TR
 ><TD
@@ -2261,7 +3056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathContext just allocated.</TD
 ></TR
 ></TABLE
 ><P
@@ -2271,7 +3066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10919"
+NAME="AEN11195"
 ></A
 ><H3
 ><A
@@ -2324,7 +3119,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the context to free</TD
 ></TR
 ></TABLE
 ><P
@@ -2334,7 +3129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10935"
+NAME="AEN11211"
 ></A
 ><H3
 ><A
@@ -2394,7 +3189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -2426,7 +3221,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TABLE
 ><P
@@ -2436,7 +3232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10961"
+NAME="AEN11237"
 ></A
 ><H3
 ><A
@@ -2467,8 +3263,6 @@
 ></TR
 ></TABLE
 ><P
->Evaluate the location set corresponding to this expression.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -2538,7 +3332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10987"
+NAME="AEN11262"
 ></A
 ><H3
 ><A
@@ -2591,7 +3385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the object to free</TD
 ></TR
 ></TABLE
 ><P
@@ -2601,7 +3395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11003"
+NAME="AEN11278"
 ></A
 ><H3
 ><A
@@ -2661,7 +3455,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath expression</TD
 ></TR
 ><TR
 ><TD
@@ -2678,7 +3472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath context</TD
 ></TR
 ><TR
 ><TD
@@ -2693,7 +3487,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlXPathObjectPtr resulting from the evaluation or NULL.
+the caller has to free the object.</TD
 ></TR
 ></TABLE
 ><P
@@ -2703,7 +3498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11029"
+NAME="AEN11304"
 ></A
 ><H3
 ><A
@@ -2764,7 +3559,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an initial xmlNodePtr, or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2779,7 +3574,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the newly created object.</TD
 ></TR
 ></TABLE
 ><P
@@ -2789,7 +3584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11051"
+NAME="AEN11326"
 ></A
 ><H3
 ><A
@@ -2851,7 +3646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an existing NodeSetList object</TD
 ></TR
 ></TABLE
 ><P
@@ -2861,7 +3656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11069"
+NAME="AEN11344"
 ></A
 ><H3
 ><A
@@ -2914,7 +3709,88 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlNodeSetPtr to free</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11360"
+></A
+><H3
+><A
+NAME="XMLXPATHOBJECTCOPY"
+></A
+>xmlXPathObjectCopy ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPathObjectCopy        (<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>allocate a new copy of a given object</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the original object</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the newly created object.</TD
 ></TR
 ></TABLE
 ><P
@@ -2991,7 +3867,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="gnome-xml-nanohttp.html"
+HREF="gnome-xml-xpointer.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -3019,7 +3895,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->nanohttp</B
+>xpointer</B
 ></FONT
 ></TD
 ></TR
diff --git a/doc/html/gnome-xml-xpointer.html b/doc/html/gnome-xml-xpointer.html
new file mode 100644
index 0000000..3514b43
--- /dev/null
+++ b/doc/html/gnome-xml-xpointer.html
@@ -0,0 +1,879 @@
+<HTML
+><HEAD
+><TITLE
+>xpointer</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+REL="HOME"
+TITLE="Gnome XML Library Reference Manual"
+HREF="book1.html"><LINK
+REL="UP"
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
+REL="PREVIOUS"
+TITLE="xpath"
+HREF="gnome-xml-xpath.html"><LINK
+REL="NEXT"
+TITLE="nanohttp"
+HREF="gnome-xml-nanohttp.html"></HEAD
+><BODY
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+WIDTH="100%"
+BORDER="0"
+BGCOLOR="#000000"
+CELLPADDING="1"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="4"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="5"
+>Gnome XML Library Reference Manual</FONT
+></TH
+></TR
+><TR
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="left"
+><A
+HREF="gnome-xml-xpath.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>&#60;&#60;&#60; Previous Page</B
+></FONT
+></A
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#0000C0"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="book1.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Home</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#00C000"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="libxml-lib.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Up</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="right"
+><A
+HREF="gnome-xml-nanohttp.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page &#62;&#62;&#62;</B
+></FONT
+></A
+></TD
+></TR
+></TABLE
+></DIV
+><H1
+>xpointer</H1
+><DIV
+CLASS="REFNAMEDIV"
+><A
+NAME="AEN11386"
+></A
+><H2
+>Name</H2
+>xpointer &#8212; </DIV
+><DIV
+CLASS="REFSYNOPSISDIV"
+><A
+NAME="AEN11389"
+></A
+><H2
+>Synopsis</H2
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="SYNOPSIS"
+>&#13;
+
+struct      <A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSET"
+>xmlLocationSet</A
+>;
+typedef     <A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+>;
+void        <A
+HREF="gnome-xml-xpointer.html#XMLXPTRFREELOCATIONSET"
+>xmlXPtrFreeLocationSet</A
+>          (<A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> obj);
+<A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> <A
+HREF="gnome-xml-xpointer.html#XMLXPTRLOCATIONSETMERGE"
+>xmlXPtrLocationSetMerge</A
+>   (<A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> val1,
+                                             <A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> val2);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> <A
+HREF="gnome-xml-xpointer.html#XMLXPTRNEWCONTEXT"
+>xmlXPtrNewContext</A
+>        (<A
+HREF="gnome-xml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> here,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> origin);
+<A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> <A
+HREF="gnome-xml-xpointer.html#XMLXPTREVAL"
+>xmlXPtrEval</A
+>               (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctx);
+void        <A
+HREF="gnome-xml-xpointer.html#XMLXPTRRANGETOFUNCTION"
+>xmlXPtrRangeToFunction</A
+>          (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);</PRE
+></TD
+></TR
+></TABLE
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN11411"
+></A
+><H2
+>Description</H2
+><P
+></P
+></DIV
+><DIV
+CLASS="REFSECT1"
+><A
+NAME="AEN11414"
+></A
+><H2
+>Details</H2
+><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11416"
+></A
+><H3
+><A
+NAME="XMLLOCATIONSET"
+></A
+>struct xmlLocationSet</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlLocationSet {
+    int locNr;		      /* number of locations in the set */
+    int locMax;		      /* size of the array as allocated */
+    xmlXPathObjectPtr *locTab;/* array of locations */
+};</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11421"
+></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="AEN11426"
+></A
+><H3
+><A
+NAME="XMLXPTRFREELOCATIONSET"
+></A
+>xmlXPtrFreeLocationSet ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPtrFreeLocationSet          (<A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> obj);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free the LocationSet compound (not the actual ranges !).</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>obj</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the xmlLocationSetPtr to free</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11442"
+></A
+><H3
+><A
+NAME="XMLXPTRLOCATIONSETMERGE"
+></A
+>xmlXPtrLocationSetMerge ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> xmlXPtrLocationSetMerge   (<A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> val1,
+                                             <A
+HREF="gnome-xml-xpointer.html#XMLLOCATIONSETPTR"
+>xmlLocationSetPtr</A
+> val2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Merges two rangesets, all ranges from <TT
+CLASS="PARAMETER"
+><I
+>val2</I
+></TT
+> are added to <TT
+CLASS="PARAMETER"
+><I
+>val1</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val1</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the first LocationSet</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the second LocationSet</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>val1 once extended or NULL in case of error.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11470"
+></A
+><H3
+><A
+NAME="XMLXPTRNEWCONTEXT"
+></A
+>xmlXPtrNewContext ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> xmlXPtrNewContext        (<A
+HREF="gnome-xml-tree.html#XMLDOCPTR"
+>xmlDocPtr</A
+> doc,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> here,
+                                             <A
+HREF="gnome-xml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> origin);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Create a new XPointer context</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>doc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XML document</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>here</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node that directly contains the XPointer being evaluated or NULL</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>origin</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the element from which a user or program initiated traversal of
+the link, or NULL.</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the xmlXPathContext just allocated.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11501"
+></A
+><H3
+><A
+NAME="XMLXPTREVAL"
+></A
+>xmlXPtrEval ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> xmlXPtrEval               (const <A
+HREF="gnome-xml-tree.html#XMLCHAR"
+>xmlChar</A
+> *str,
+                                             <A
+HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctx);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Evaluate the XPath Location Path in the given context.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPointer expression</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctx</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPointer context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the xmlXPathObjectPtr resulting from the eveluation or NULL.
+the caller has to free the object.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11527"
+></A
+><H3
+><A
+NAME="XMLXPTRRANGETOFUNCTION"
+></A
+>xmlXPtrRangeToFunction ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPtrRangeToFunction          (<A
+HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             int nargs);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implement the range-<GTKDOCLINK
+HREF="TO"
+>to</GTKDOCLINK
+>() XPointer function</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPointer Parser context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>nargs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><BR
+CLEAR="all"><BR><TABLE
+WIDTH="100%"
+BORDER="0"
+BGCOLOR="#000000"
+CELLPADDING="1"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="left"
+><A
+HREF="gnome-xml-xpath.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>&#60;&#60;&#60; Previous Page</B
+></FONT
+></A
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#0000C0"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="book1.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Home</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#00C000"
+ALIGN="center"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+><A
+HREF="libxml-lib.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Up</B
+></FONT
+></A
+></B
+></FONT
+></TD
+><TD
+WIDTH="25%"
+BGCOLOR="#C00000"
+ALIGN="right"
+><A
+HREF="gnome-xml-nanohttp.html"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>Next Page &#62;&#62;&#62;</B
+></FONT
+></A
+></TD
+></TR
+><TR
+><TD
+COLSPAN="2"
+ALIGN="left"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>xpath</B
+></FONT
+></TD
+><TD
+COLSPAN="2"
+ALIGN="right"
+><FONT
+COLOR="#FFFFFF"
+SIZE="3"
+><B
+>nanohttp</B
+></FONT
+></TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index cd49d79..c1441ad 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -124,6 +124,7 @@
 <ANCHOR id ="HASINTERNALSUBSET" href="gnome-xml/gnome-xml-sax.html#HASINTERNALSUBSET">
 <ANCHOR id ="HASEXTERNALSUBSET" href="gnome-xml/gnome-xml-sax.html#HASEXTERNALSUBSET">
 <ANCHOR id ="INTERNALSUBSET" href="gnome-xml/gnome-xml-sax.html#INTERNALSUBSET">
+<ANCHOR id ="EXTERNALSUBSET" href="gnome-xml/gnome-xml-sax.html#EXTERNALSUBSET">
 <ANCHOR id ="GETENTITY" href="gnome-xml/gnome-xml-sax.html#GETENTITY">
 <ANCHOR id ="GETPARAMETERENTITY" href="gnome-xml/gnome-xml-sax.html#GETPARAMETERENTITY">
 <ANCHOR id ="RESOLVEENTITY" href="gnome-xml/gnome-xml-sax.html#RESOLVEENTITY">
@@ -455,6 +456,7 @@
 <ANCHOR id ="HTML-TEXT-NODE" href="gnome-xml/gnome-xml-htmltree.html#HTML-TEXT-NODE">
 <ANCHOR id ="HTML-ENTITY-REF-NODE" href="gnome-xml/gnome-xml-htmltree.html#HTML-ENTITY-REF-NODE">
 <ANCHOR id ="HTML-COMMENT-NODE" href="gnome-xml/gnome-xml-htmltree.html#HTML-COMMENT-NODE">
+<ANCHOR id ="HTML-PRESERVE-NODE" href="gnome-xml/gnome-xml-htmltree.html#HTML-PRESERVE-NODE">
 <ANCHOR id ="HTMLNEWDOC" href="gnome-xml/gnome-xml-htmltree.html#HTMLNEWDOC">
 <ANCHOR id ="HTMLNEWDOCNODTD" href="gnome-xml/gnome-xml-htmltree.html#HTMLNEWDOCNODTD">
 <ANCHOR id ="HTMLGETMETAENCODING" href="gnome-xml/gnome-xml-htmltree.html#HTMLGETMETAENCODING">
@@ -493,6 +495,9 @@
 <ANCHOR id ="XP-ERROR" href="gnome-xml/gnome-xml-xpath.html#XP-ERROR">
 <ANCHOR id ="XP-ERROR0" href="gnome-xml/gnome-xml-xpath.html#XP-ERROR0">
 <ANCHOR id ="CHECK-TYPE" href="gnome-xml/gnome-xml-xpath.html#CHECK-TYPE">
+<ANCHOR id ="XMLXPATHDEBUGDUMPOBJECT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHDEBUGDUMPOBJECT">
+<ANCHOR id ="XMLXPATHNEWPARSERCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWPARSERCONTEXT">
+<ANCHOR id ="XMLXPATHFREEPARSERCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREEPARSERCONTEXT">
 <ANCHOR id ="VALUEPOP" href="gnome-xml/gnome-xml-xpath.html#VALUEPOP">
 <ANCHOR id ="VALUEPUSH" href="gnome-xml/gnome-xml-xpath.html#VALUEPUSH">
 <ANCHOR id ="XMLXPATHNEWSTRING" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWSTRING">
@@ -501,6 +506,9 @@
 <ANCHOR id ="XMLXPATHIDFUNCTION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHIDFUNCTION">
 <ANCHOR id ="XMLXPATHROOT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHROOT">
 <ANCHOR id ="XMLXPATHEVALEXPR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALEXPR">
+<ANCHOR id ="XMLXPATHPARSENAME" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHPARSENAME">
+<ANCHOR id ="XMLXPATHREGISTERFUNC" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHREGISTERFUNC">
+<ANCHOR id ="XMLXPATHREGISTERVARIABLE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHREGISTERVARIABLE">
 <ANCHOR id ="XMLXPATHINIT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHINIT">
 <ANCHOR id ="XMLXPATHNEWCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWCONTEXT">
 <ANCHOR id ="XMLXPATHFREECONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREECONTEXT">
@@ -511,6 +519,15 @@
 <ANCHOR id ="XMLXPATHNODESETCREATE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNODESETCREATE">
 <ANCHOR id ="XMLXPATHFREENODESETLIST" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREENODESETLIST">
 <ANCHOR id ="XMLXPATHFREENODESET" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREENODESET">
+<ANCHOR id ="XMLXPATHOBJECTCOPY" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHOBJECTCOPY">
+<ANCHOR id ="GNOME-XML-XPOINTER" href="gnome-xml/gnome-xml-xpointer.html">
+<ANCHOR id ="XMLLOCATIONSET" href="gnome-xml/gnome-xml-xpointer.html#XMLLOCATIONSET">
+<ANCHOR id ="XMLLOCATIONSETPTR" href="gnome-xml/gnome-xml-xpointer.html#XMLLOCATIONSETPTR">
+<ANCHOR id ="XMLXPTRFREELOCATIONSET" href="gnome-xml/gnome-xml-xpointer.html#XMLXPTRFREELOCATIONSET">
+<ANCHOR id ="XMLXPTRLOCATIONSETMERGE" href="gnome-xml/gnome-xml-xpointer.html#XMLXPTRLOCATIONSETMERGE">
+<ANCHOR id ="XMLXPTRNEWCONTEXT" href="gnome-xml/gnome-xml-xpointer.html#XMLXPTRNEWCONTEXT">
+<ANCHOR id ="XMLXPTREVAL" href="gnome-xml/gnome-xml-xpointer.html#XMLXPTREVAL">
+<ANCHOR id ="XMLXPTRRANGETOFUNCTION" href="gnome-xml/gnome-xml-xpointer.html#XMLXPTRRANGETOFUNCTION">
 <ANCHOR id ="GNOME-XML-NANOHTTP" href="gnome-xml/gnome-xml-nanohttp.html">
 <ANCHOR id ="XMLNANOHTTPINIT" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPINIT">
 <ANCHOR id ="XMLNANOHTTPCLEANUP" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPCLEANUP">
diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index a896ee1..78a178b 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -164,6 +164,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="gnome-xml-xpointer.html"
+>xpointer</A
+> &#8212; </DT
+><DT
+><A
 HREF="gnome-xml-nanohttp.html"
 >nanohttp</A
 > &#8212; </DT