Getting ready for 1.8.12 release:
- doc/xml.html: updated
- doc/html/*: rebuilt the docs
Daniel
diff --git a/ChangeLog b/ChangeLog
index a9acf03..74be8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri May  4 08:53:41 CEST 2001 <Daniel.Veillard@imag.fr>
+
+	* doc/xml.html: updated
+	* doc/html/*: rebuilt the docs
+
+Tue Mar 27 00:50:04 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* parser.c: fixed line number reporting on error
+
 Mon Mar 26 23:20:36 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* parser.c parserold.c: Sullivan and Darin found a parser bug,
diff --git a/doc/html/book1.html b/doc/html/book1.html
index c5097bf..1bac8d9 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -4,13 +4,16 @@
 >Gnome XML Library Reference Manual</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="NEXT"
 TITLE="Libxml Programming Notes"
 HREF="libxml-notes.html"></HEAD
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="BOOK"
 ><DIV
@@ -46,14 +49,14 @@
 ><DIV
 CLASS="ADDRESS"
 ><P
-CLASS="LITERALLAYOUT"
+CLASS="ADDRESS"
 >	&nbsp;&nbsp;&nbsp;&nbsp;Daniel.Veillard@w3.org<br>
 	&nbsp;&nbsp;</P
 ></DIV
 ></DIV
 ><P
 CLASS="COPYRIGHT"
->Copyright © 1999 by <SPAN
+>Copyright &copy; 1999 by <SPAN
 CLASS="HOLDER"
 >Daniel Veillard</SPAN
 ></P
diff --git a/doc/html/gnome-xml-debugxml.html b/doc/html/gnome-xml-debugxml.html
index 9769458..72535be 100644
--- a/doc/html/gnome-xml-debugxml.html
+++ b/doc/html/gnome-xml-debugxml.html
@@ -4,7 +4,7 @@
 >debugXML</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->debugXML</H1
+><A
+NAME="GNOME-XML-DEBUGXML"
+>debugXML</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12456"
+NAME="AEN12517"
 ></A
 ><H2
 >Name</H2
->debugXML &#8212; </DIV
+>debugXML&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12459"
+NAME="AEN12520"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,7 +148,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPSTRING"
 >xmlDebugDumpString</A
 >              (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              const <A
@@ -153,7 +159,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPATTR"
 >xmlDebugDumpAttr</A
 >                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -165,7 +171,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPATTRLIST"
 >xmlDebugDumpAttrList</A
 >            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -177,7 +183,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPONENODE"
 >xmlDebugDumpOneNode</A
 >             (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -189,7 +195,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPNODE"
 >xmlDebugDumpNode</A
 >                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -201,7 +207,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPNODELIST"
 >xmlDebugDumpNodeList</A
 >            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -213,7 +219,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENTHEAD"
 >xmlDebugDumpDocumentHead</A
 >        (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -224,7 +230,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENT"
 >xmlDebugDumpDocument</A
 >            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -235,7 +241,7 @@
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPENTITIES"
 >xmlDebugDumpEntities</A
 >            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -246,7 +252,7 @@
 HREF="gnome-xml-debugxml.html#XMLLSONENODE"
 >xmlLsOneNode</A
 >                    (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -294,7 +300,7 @@
 >xmlShellReadlineFunc</A
 > input,
                                              <GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output);</PRE
 ></TD
@@ -304,7 +310,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12503"
+NAME="AEN12564"
 ></A
 ><H2
 >Description</H2
@@ -314,14 +320,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12506"
+NAME="AEN12567"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12508"
+NAME="AEN12569"
 ></A
 ><H3
 ><A
@@ -338,7 +344,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpString              (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              const <A
@@ -393,7 +399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -403,7 +409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12528"
+NAME="AEN12589"
 ></A
 ><H3
 ><A
@@ -420,7 +426,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpAttr                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -493,7 +499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -503,7 +509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12552"
+NAME="AEN12613"
 ></A
 ><H3
 ><A
@@ -520,7 +526,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpAttrList            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -593,7 +599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -603,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12576"
+NAME="AEN12637"
 ></A
 ><H3
 ><A
@@ -620,7 +626,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpOneNode             (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -693,7 +699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -703,7 +709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12600"
+NAME="AEN12661"
 ></A
 ><H3
 ><A
@@ -720,7 +726,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpNode                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -793,7 +799,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -803,7 +809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12624"
+NAME="AEN12685"
 ></A
 ><H3
 ><A
@@ -820,7 +826,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpNodeList            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -893,7 +899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -903,7 +909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12648"
+NAME="AEN12709"
 ></A
 ><H3
 ><A
@@ -920,7 +926,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpDocumentHead        (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -975,7 +981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -985,7 +991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12668"
+NAME="AEN12729"
 ></A
 ><H3
 ><A
@@ -1002,7 +1008,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpDocument            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -1057,7 +1063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1067,7 +1073,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12688"
+NAME="AEN12749"
 ></A
 ><H3
 ><A
@@ -1084,7 +1090,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDebugDumpEntities            (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -1139,7 +1145,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1149,7 +1155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12708"
+NAME="AEN12769"
 ></A
 ><H3
 ><A
@@ -1166,7 +1172,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlLsOneNode                    (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output,
                                              <A
@@ -1221,7 +1227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1231,7 +1237,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12728"
+NAME="AEN12789"
 ></A
 ><H3
 ><A
@@ -1294,7 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1304,7 +1310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12746"
+NAME="AEN12807"
 ></A
 ><H3
 ><A
@@ -1338,7 +1344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12751"
+NAME="AEN12812"
 ></A
 ><H3
 ><A
@@ -1364,7 +1370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12756"
+NAME="AEN12817"
 ></A
 ><H3
 ><A
@@ -1490,7 +1496,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1500,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12789"
+NAME="AEN12850"
 ></A
 ><H3
 ><A
@@ -1526,7 +1532,7 @@
 >xmlShellReadlineFunc</A
 > input,
                                              <GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *output);</PRE
 ></TD
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index b255976..6ca002b 100644
--- a/doc/html/gnome-xml-encoding.html
+++ b/doc/html/gnome-xml-encoding.html
@@ -4,7 +4,7 @@
 >encoding</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->encoding</H1
+><A
+NAME="GNOME-XML-ENCODING"
+>encoding</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12239"
+NAME="AEN12300"
 ></A
 ><H2
 >Name</H2
->encoding &#8212; </DIV
+>encoding&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12242"
+NAME="AEN12303"
 ></A
 ><H2
 >Synopsis</H2
@@ -219,7 +225,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12263"
+NAME="AEN12324"
 ></A
 ><H2
 >Description</H2
@@ -229,14 +235,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12266"
+NAME="AEN12327"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12268"
+NAME="AEN12329"
 ></A
 ><H3
 ><A
@@ -286,7 +292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12273"
+NAME="AEN12334"
 ></A
 ><H3
 ><A
@@ -403,7 +409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -413,7 +419,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12303"
+NAME="AEN12364"
 ></A
 ><H3
 ><A
@@ -530,7 +536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -540,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12333"
+NAME="AEN12394"
 ></A
 ><H3
 ><A
@@ -570,7 +576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12338"
+NAME="AEN12399"
 ></A
 ><H3
 ><A
@@ -596,7 +602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12343"
+NAME="AEN12404"
 ></A
 ><H3
 ><A
@@ -627,7 +633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12349"
+NAME="AEN12410"
 ></A
 ><H3
 ><A
@@ -656,7 +662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12355"
+NAME="AEN12416"
 ></A
 ><H3
 ><A
@@ -719,7 +725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12371"
+NAME="AEN12432"
 ></A
 ><H3
 ><A
@@ -799,7 +805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12391"
+NAME="AEN12452"
 ></A
 ><H3
 ><A
@@ -880,7 +886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12411"
+NAME="AEN12472"
 ></A
 ><H3
 ><A
@@ -962,7 +968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12432"
+NAME="AEN12493"
 ></A
 ><H3
 ><A
@@ -1029,7 +1035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index eb501cc..4fe99a4 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -4,7 +4,7 @@
 >entities</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->entities</H1
+><A
+NAME="GNOME-XML-ENTITIES"
+>entities</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN5922"
+NAME="AEN5981"
 ></A
 ><H2
 >Name</H2
->entities &#8212; </DIV
+>entities&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN5925"
+NAME="AEN5984"
 ></A
 ><H2
 >Synopsis</H2
@@ -139,27 +145,27 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-entities.html#XML-INTERNAL-GENERAL-ENTITY"
+HREF="gnome-xml-entities.html#XML-INTERNAL-GENERAL-ENTITY-CAPS"
 >XML_INTERNAL_GENERAL_ENTITY</A
 >
 #define     <A
-HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-PARSED-ENTITY"
+HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-PARSED-ENTITY-CAPS"
 >XML_EXTERNAL_GENERAL_PARSED_ENTITY</A
 >
 #define     <A
-HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-UNPARSED-ENTITY"
+HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-UNPARSED-ENTITY-CAPS"
 >XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</A
 >
 #define     <A
-HREF="gnome-xml-entities.html#XML-INTERNAL-PARAMETER-ENTITY"
+HREF="gnome-xml-entities.html#XML-INTERNAL-PARAMETER-ENTITY-CAPS"
 >XML_INTERNAL_PARAMETER_ENTITY</A
 >
 #define     <A
-HREF="gnome-xml-entities.html#XML-EXTERNAL-PARAMETER-ENTITY"
+HREF="gnome-xml-entities.html#XML-EXTERNAL-PARAMETER-ENTITY-CAPS"
 >XML_EXTERNAL_PARAMETER_ENTITY</A
 >
 #define     <A
-HREF="gnome-xml-entities.html#XML-INTERNAL-PREDEFINED-ENTITY"
+HREF="gnome-xml-entities.html#XML-INTERNAL-PREDEFINED-ENTITY-CAPS"
 >XML_INTERNAL_PREDEFINED_ENTITY</A
 >
 struct      <A
@@ -171,7 +177,7 @@
 >xmlEntityPtr</A
 >;
 #define     <A
-HREF="gnome-xml-entities.html#XML-MIN-ENTITIES-TABLE"
+HREF="gnome-xml-entities.html#XML-MIN-ENTITIES-TABLE-CAPS"
 >XML_MIN_ENTITIES_TABLE</A
 >
 struct      <A
@@ -356,7 +362,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5985"
+NAME="AEN6044"
 ></A
 ><H2
 >Description</H2
@@ -366,18 +372,18 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN5988"
+NAME="AEN6047"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5990"
+NAME="AEN6049"
 ></A
 ><H3
 ><A
-NAME="XML-INTERNAL-GENERAL-ENTITY"
+NAME="XML-INTERNAL-GENERAL-ENTITY-CAPS"
 ></A
 >XML_INTERNAL_GENERAL_ENTITY</H3
 ><TABLE
@@ -399,11 +405,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5995"
+NAME="AEN6054"
 ></A
 ><H3
 ><A
-NAME="XML-EXTERNAL-GENERAL-PARSED-ENTITY"
+NAME="XML-EXTERNAL-GENERAL-PARSED-ENTITY-CAPS"
 ></A
 >XML_EXTERNAL_GENERAL_PARSED_ENTITY</H3
 ><TABLE
@@ -425,11 +431,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6000"
+NAME="AEN6059"
 ></A
 ><H3
 ><A
-NAME="XML-EXTERNAL-GENERAL-UNPARSED-ENTITY"
+NAME="XML-EXTERNAL-GENERAL-UNPARSED-ENTITY-CAPS"
 ></A
 >XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</H3
 ><TABLE
@@ -451,11 +457,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6005"
+NAME="AEN6064"
 ></A
 ><H3
 ><A
-NAME="XML-INTERNAL-PARAMETER-ENTITY"
+NAME="XML-INTERNAL-PARAMETER-ENTITY-CAPS"
 ></A
 >XML_INTERNAL_PARAMETER_ENTITY</H3
 ><TABLE
@@ -477,11 +483,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6010"
+NAME="AEN6069"
 ></A
 ><H3
 ><A
-NAME="XML-EXTERNAL-PARAMETER-ENTITY"
+NAME="XML-EXTERNAL-PARAMETER-ENTITY-CAPS"
 ></A
 >XML_EXTERNAL_PARAMETER_ENTITY</H3
 ><TABLE
@@ -503,11 +509,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6015"
+NAME="AEN6074"
 ></A
 ><H3
 ><A
-NAME="XML-INTERNAL-PREDEFINED-ENTITY"
+NAME="XML-INTERNAL-PREDEFINED-ENTITY-CAPS"
 ></A
 >XML_INTERNAL_PREDEFINED_ENTITY</H3
 ><TABLE
@@ -529,7 +535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6020"
+NAME="AEN6079"
 ></A
 ><H3
 ><A
@@ -554,6 +560,10 @@
     xmlChar *content;		/* The entity content or ndata if unparsed */
     int length;			/* the content length */
     xmlChar *orig;		/* The entity cont without ref substitution */
+    /* Extended when merging 2,3,5 */
+    struct _xmlNode    *children;/* NULL */
+    struct _xmlNode    *last;	/* NULL */
+    const xmlChar      *URI;	/* the full URI as computed */
 };</PRE
 ></TD
 ></TR
@@ -564,7 +574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6025"
+NAME="AEN6084"
 ></A
 ><H3
 ><A
@@ -590,11 +600,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6030"
+NAME="AEN6089"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-ENTITIES-TABLE"
+NAME="XML-MIN-ENTITIES-TABLE-CAPS"
 ></A
 >XML_MIN_ENTITIES_TABLE</H3
 ><TABLE
@@ -616,7 +626,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6035"
+NAME="AEN6094"
 ></A
 ><H3
 ><A
@@ -646,7 +656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6040"
+NAME="AEN6099"
 ></A
 ><H3
 ><A
@@ -672,7 +682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6045"
+NAME="AEN6104"
 ></A
 ><H3
 ><A
@@ -837,7 +847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6085"
+NAME="AEN6144"
 ></A
 ><H3
 ><A
@@ -1002,7 +1012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6125"
+NAME="AEN6184"
 ></A
 ><H3
 ><A
@@ -1083,7 +1093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6146"
+NAME="AEN6205"
 ></A
 ><H3
 ><A
@@ -1187,7 +1197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6172"
+NAME="AEN6231"
 ></A
 ><H3
 ><A
@@ -1290,7 +1300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6198"
+NAME="AEN6257"
 ></A
 ><H3
 ><A
@@ -1393,7 +1403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6224"
+NAME="AEN6283"
 ></A
 ><H3
 ><A
@@ -1502,7 +1512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6252"
+NAME="AEN6311"
 ></A
 ><H3
 ><A
@@ -1538,9 +1548,6 @@
 Contrary to xmlEncodeEntities, this routine is reentrant, and result
 must be deallocated.</P
 ><P
->TODO !!!! Once moved to UTF-8 internal encoding, the encoding of non-ascii
-get erroneous.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -1610,7 +1617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6279"
+NAME="AEN6337"
 ></A
 ><H3
 ><A
@@ -1671,7 +1678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6295"
+NAME="AEN6353"
 ></A
 ><H3
 ><A
@@ -1752,7 +1759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6316"
+NAME="AEN6374"
 ></A
 ><H3
 ><A
@@ -1815,7 +1822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6332"
+NAME="AEN6390"
 ></A
 ><H3
 ><A
@@ -1899,7 +1906,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6353"
+NAME="AEN6411"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 30deaaf..46b3166 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -4,7 +4,7 @@
 >HTMLparser</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->HTMLparser</H1
+><A
+NAME="GNOME-XML-HTMLPARSER"
+>HTMLparser</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8109"
+NAME="AEN8167"
 ></A
 ><H2
 >Name</H2
->HTMLparser &#8212; </DIV
+>HTMLparser&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8112"
+NAME="AEN8170"
 ></A
 ><H2
 >Synopsis</H2
@@ -354,7 +360,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8169"
+NAME="AEN8227"
 ></A
 ><H2
 >Description</H2
@@ -364,14 +370,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8172"
+NAME="AEN8230"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8174"
+NAME="AEN8232"
 ></A
 ><H3
 ><A
@@ -397,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8179"
+NAME="AEN8237"
 ></A
 ><H3
 ><A
@@ -423,7 +429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8184"
+NAME="AEN8242"
 ></A
 ><H3
 ><A
@@ -449,7 +455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8189"
+NAME="AEN8247"
 ></A
 ><H3
 ><A
@@ -475,7 +481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8194"
+NAME="AEN8252"
 ></A
 ><H3
 ><A
@@ -501,7 +507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8199"
+NAME="AEN8257"
 ></A
 ><H3
 ><A
@@ -527,7 +533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8204"
+NAME="AEN8262"
 ></A
 ><H3
 ><A
@@ -553,7 +559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8209"
+NAME="AEN8267"
 ></A
 ><H3
 ><A
@@ -579,7 +585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8214"
+NAME="AEN8272"
 ></A
 ><H3
 ><A
@@ -605,7 +611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8219"
+NAME="AEN8277"
 ></A
 ><H3
 ><A
@@ -639,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8224"
+NAME="AEN8282"
 ></A
 ><H3
 ><A
@@ -665,7 +671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8229"
+NAME="AEN8287"
 ></A
 ><H3
 ><A
@@ -695,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8234"
+NAME="AEN8292"
 ></A
 ><H3
 ><A
@@ -721,7 +727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8239"
+NAME="AEN8297"
 ></A
 ><H3
 ><A
@@ -802,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8260"
+NAME="AEN8318"
 ></A
 ><H3
 ><A
@@ -885,7 +891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8282"
+NAME="AEN8340"
 ></A
 ><H3
 ><A
@@ -986,7 +992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8307"
+NAME="AEN8365"
 ></A
 ><H3
 ><A
@@ -1109,7 +1115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8337"
+NAME="AEN8395"
 ></A
 ><H3
 ><A
@@ -1214,7 +1220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8364"
+NAME="AEN8422"
 ></A
 ><H3
 ><A
@@ -1298,7 +1304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8386"
+NAME="AEN8444"
 ></A
 ><H3
 ><A
@@ -1365,7 +1371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8404"
+NAME="AEN8462"
 ></A
 ><H3
 ><A
@@ -1505,7 +1511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8438"
+NAME="AEN8496"
 ></A
 ><H3
 ><A
@@ -1604,7 +1610,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8463"
+NAME="AEN8521"
 ></A
 ><H3
 ><A
@@ -1742,7 +1748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8496"
+NAME="AEN8554"
 ></A
 ><H3
 ><A
@@ -1839,7 +1845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8520"
+NAME="AEN8578"
 ></A
 ><H3
 ><A
@@ -1903,7 +1909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8536"
+NAME="AEN8594"
 ></A
 ><H3
 ><A
@@ -2090,7 +2096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8580"
+NAME="AEN8638"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index 31731c8..ea272ac 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -4,7 +4,7 @@
 >HTMLtree</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->HTMLtree</H1
+><A
+NAME="GNOME-XML-HTMLTREE"
+>HTMLtree</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8617"
+NAME="AEN8675"
 ></A
 ><H2
 >Name</H2
->HTMLtree &#8212; </DIV
+>HTMLtree&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8620"
+NAME="AEN8678"
 ></A
 ><H2
 >Synopsis</H2
@@ -139,15 +145,15 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-htmltree.html#HTML-TEXT-NODE"
+HREF="gnome-xml-htmltree.html#HTML-TEXT-NODE-CAPS"
 >HTML_TEXT_NODE</A
 >
 #define     <A
-HREF="gnome-xml-htmltree.html#HTML-ENTITY-REF-NODE"
+HREF="gnome-xml-htmltree.html#HTML-ENTITY-REF-NODE-CAPS"
 >HTML_ENTITY_REF_NODE</A
 >
 #define     <A
-HREF="gnome-xml-htmltree.html#HTML-COMMENT-NODE"
+HREF="gnome-xml-htmltree.html#HTML-COMMENT-NODE-CAPS"
 >HTML_COMMENT_NODE</A
 >
 void        <A
@@ -166,7 +172,7 @@
 HREF="gnome-xml-htmltree.html#HTMLDOCDUMP"
 >htmlDocDump</A
 >                     (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -200,7 +206,7 @@
 HREF="gnome-xml-htmltree.html#HTMLNODEDUMPFILE"
 >htmlNodeDumpFile</A
 >                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *out,
                                              <A
@@ -218,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8642"
+NAME="AEN8700"
 ></A
 ><H2
 >Description</H2
@@ -228,18 +234,18 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8645"
+NAME="AEN8703"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8647"
+NAME="AEN8705"
 ></A
 ><H3
 ><A
-NAME="HTML-TEXT-NODE"
+NAME="HTML-TEXT-NODE-CAPS"
 ></A
 >HTML_TEXT_NODE</H3
 ><TABLE
@@ -261,11 +267,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8652"
+NAME="AEN8710"
 ></A
 ><H3
 ><A
-NAME="HTML-ENTITY-REF-NODE"
+NAME="HTML-ENTITY-REF-NODE-CAPS"
 ></A
 >HTML_ENTITY_REF_NODE</H3
 ><TABLE
@@ -287,11 +293,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8657"
+NAME="AEN8715"
 ></A
 ><H3
 ><A
-NAME="HTML-COMMENT-NODE"
+NAME="HTML-COMMENT-NODE-CAPS"
 ></A
 >HTML_COMMENT_NODE</H3
 ><TABLE
@@ -313,7 +319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8662"
+NAME="AEN8720"
 ></A
 ><H3
 ><A
@@ -416,7 +422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8687"
+NAME="AEN8745"
 ></A
 ><H3
 ><A
@@ -433,7 +439,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        htmlDocDump                     (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -500,7 +506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8708"
+NAME="AEN8766"
 ></A
 ><H3
 ><A
@@ -596,7 +602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8732"
+NAME="AEN8790"
 ></A
 ><H3
 ><A
@@ -701,7 +707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8758"
+NAME="AEN8816"
 ></A
 ><H3
 ><A
@@ -718,7 +724,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        htmlNodeDumpFile                (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *out,
                                              <A
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index 75b293e..7019281 100644
--- a/doc/html/gnome-xml-nanoftp.html
+++ b/doc/html/gnome-xml-nanoftp.html
@@ -4,7 +4,7 @@
 >nanoftp</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->nanoftp</H1
+><A
+NAME="GNOME-XML-NANOFTP"
+>nanoftp</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9432"
+NAME="AEN9490"
 ></A
 ><H2
 >Name</H2
->nanoftp &#8212; </DIV
+>nanoftp&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9435"
+NAME="AEN9493"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +281,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9464"
+NAME="AEN9522"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +291,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9467"
+NAME="AEN9525"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9469"
+NAME="AEN9527"
 ></A
 ><H3
 ><A
@@ -541,7 +547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -551,7 +557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9528"
+NAME="AEN9586"
 ></A
 ><H3
 ><A
@@ -635,7 +641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -645,7 +651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9550"
+NAME="AEN9608"
 ></A
 ><H3
 ><A
@@ -675,7 +681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9556"
+NAME="AEN9614"
 ></A
 ><H3
 ><A
@@ -701,7 +707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9561"
+NAME="AEN9619"
 ></A
 ><H3
 ><A
@@ -761,7 +767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9576"
+NAME="AEN9634"
 ></A
 ><H3
 ><A
@@ -821,7 +827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9591"
+NAME="AEN9649"
 ></A
 ><H3
 ><A
@@ -889,7 +895,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the port (use 21 if 0)</TD
 ></TR
 ></TABLE
 ><P
@@ -899,7 +905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9610"
+NAME="AEN9668"
 ></A
 ><H3
 ><A
@@ -959,7 +965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9625"
+NAME="AEN9683"
 ></A
 ><H3
 ><A
@@ -1034,7 +1040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9644"
+NAME="AEN9702"
 ></A
 ><H3
 ><A
@@ -1109,7 +1115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9663"
+NAME="AEN9721"
 ></A
 ><H3
 ><A
@@ -1184,7 +1190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9682"
+NAME="AEN9740"
 ></A
 ><H3
 ><A
@@ -1247,7 +1253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9697"
+NAME="AEN9755"
 ></A
 ><H3
 ><A
@@ -1386,7 +1392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9729"
+NAME="AEN9787"
 ></A
 ><H3
 ><A
@@ -1483,7 +1489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9752"
+NAME="AEN9810"
 ></A
 ><H3
 ><A
@@ -1558,7 +1564,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9771"
+NAME="AEN9829"
 ></A
 ><H3
 ><A
@@ -1633,7 +1639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9790"
+NAME="AEN9848"
 ></A
 ><H3
 ><A
@@ -1655,6 +1661,8 @@
 ></TR
 ></TABLE
 ><P
+>Tries to change the remote directory</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -1682,7 +1690,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an FTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1699,7 +1707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a directory on the server</TD
 ></TR
 ><TR
 ><TD
@@ -1714,7 +1722,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
@@ -1724,7 +1732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9812"
+NAME="AEN9871"
 ></A
 ><H3
 ><A
@@ -1800,7 +1808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9831"
+NAME="AEN9890"
 ></A
 ><H3
 ><A
@@ -1875,7 +1883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9850"
+NAME="AEN9909"
 ></A
 ><H3
 ><A
@@ -2008,7 +2016,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9882"
+NAME="AEN9941"
 ></A
 ><H3
 ><A
@@ -2101,7 +2109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9905"
+NAME="AEN9964"
 ></A
 ><H3
 ><A
@@ -2234,7 +2242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9937"
+NAME="AEN9996"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 64876cf..3d0fd65 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -4,7 +4,7 @@
 >nanohttp</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->nanohttp</H1
+><A
+NAME="GNOME-XML-NANOHTTP"
+>nanohttp</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9216"
+NAME="AEN9274"
 ></A
 ><H2
 >Name</H2
->nanohttp &#8212; </DIV
+>nanohttp&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9219"
+NAME="AEN9277"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +201,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9232"
+NAME="AEN9290"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +211,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9235"
+NAME="AEN9293"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9237"
+NAME="AEN9295"
 ></A
 ><H3
 ><A
@@ -241,7 +247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9243"
+NAME="AEN9301"
 ></A
 ><H3
 ><A
@@ -267,7 +273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9248"
+NAME="AEN9306"
 ></A
 ><H3
 ><A
@@ -330,7 +336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9263"
+NAME="AEN9321"
 ></A
 ><H3
 ><A
@@ -444,7 +450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9290"
+NAME="AEN9348"
 ></A
 ><H3
 ><A
@@ -583,7 +589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9322"
+NAME="AEN9380"
 ></A
 ><H3
 ><A
@@ -663,7 +669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9341"
+NAME="AEN9399"
 ></A
 ><H3
 ><A
@@ -738,7 +744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9360"
+NAME="AEN9418"
 ></A
 ><H3
 ><A
@@ -861,7 +867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9389"
+NAME="AEN9447"
 ></A
 ><H3
 ><A
@@ -955,7 +961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9412"
+NAME="AEN9470"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index 0336fcf..eb03dd6 100644
--- a/doc/html/gnome-xml-parser.html
+++ b/doc/html/gnome-xml-parser.html
@@ -4,7 +4,7 @@
 >parser</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,7 +114,10 @@
 ></TABLE
 ></DIV
 ><H1
->parser</H1
+><A
+NAME="GNOME-XML-PARSER"
+>parser</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
@@ -119,7 +125,7 @@
 ></A
 ><H2
 >Name</H2
->parser &#8212; </DIV
+>parser&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
@@ -139,7 +145,7 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-parser.html#XML-DEFAULT-VERSION"
+HREF="gnome-xml-parser.html#XML-DEFAULT-VERSION-CAPS"
 >XML_DEFAULT_VERSION</A
 >
 void        (<A
@@ -963,7 +969,11 @@
                                              <A
 HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
-> context);</PRE
+> context);
+int         <A
+HREF="gnome-xml-parser.html#XMLUSENEWPARSER"
+>xmlUseNewParser</A
+>                 (int val);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -971,7 +981,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN248"
+NAME="AEN249"
 ></A
 ><H2
 >Description</H2
@@ -981,18 +991,18 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN251"
+NAME="AEN252"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN253"
+NAME="AEN254"
 ></A
 ><H3
 ><A
-NAME="XML-DEFAULT-VERSION"
+NAME="XML-DEFAULT-VERSION-CAPS"
 ></A
 >XML_DEFAULT_VERSION</H3
 ><TABLE
@@ -1014,7 +1024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN258"
+NAME="AEN259"
 ></A
 ><H3
 ><A
@@ -1065,7 +1075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1075,7 +1085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN273"
+NAME="AEN274"
 ></A
 ><H3
 ><A
@@ -1104,6 +1114,11 @@
     int col;                          /* Current column */
     int consumed;                     /* How many xmlChars already consumed */
     xmlParserInputDeallocate free;    /* function to deallocate the base */
+    /* added after 2.3.5 integration */
+    const xmlChar *end;               /* end of the arry to parse */
+    const xmlChar *encoding;          /* the encoding string for entity */
+    const xmlChar *version;           /* the version string for entity */
+    int standalone;                   /* Was that entity marked standalone */
 };</PRE
 ></TD
 ></TR
@@ -1114,7 +1129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN278"
+NAME="AEN279"
 ></A
 ><H3
 ><A
@@ -1140,7 +1155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN283"
+NAME="AEN284"
 ></A
 ><H3
 ><A
@@ -1173,7 +1188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN288"
+NAME="AEN289"
 ></A
 ><H3
 ><A
@@ -1199,7 +1214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN293"
+NAME="AEN294"
 ></A
 ><H3
 ><A
@@ -1229,7 +1244,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN298"
+NAME="AEN299"
 ></A
 ><H3
 ><A
@@ -1255,7 +1270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN303"
+NAME="AEN304"
 ></A
 ><H3
 ><A
@@ -1286,7 +1301,10 @@
     XML_PARSER_ENTITY_DECL,	/* within an entity declaration */
     XML_PARSER_ENTITY_VALUE,	/* within an entity value in a decl */
     XML_PARSER_ATTRIBUTE_VALUE,	/* within an attribute value */
-    XML_PARSER_EPILOG 		/* the Misc* after the last end tag */
+    XML_PARSER_EPILOG, 		/* the Misc* after the last end tag */
+    /* added after 2.3.5 integration */
+    XML_PARSER_SYSTEM_LITERAL,	/* within a SYSTEM value */
+    XML_PARSER_IGNORE		/* within an IGNORED section */
 } xmlParserInputState;</PRE
 ></TD
 ></TR
@@ -1297,7 +1315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN308"
+NAME="AEN309"
 ></A
 ><H3
 ><A
@@ -1363,6 +1381,31 @@
     long               nbChars;       /* number of xmlChar processed */
     long            checkIndex;       /* used by progressive parsing lookup */
     int             keepBlanks;       /* ugly but ... */
+
+    /* Added after integration of 2.3.5 parser */
+    int             disableSAX;       /* SAX callbacks are disabled */
+    int               inSubset;       /* Parsing is in int 1/ext 2 subset */
+    xmlChar *          intSubName;    /* name of subset */
+    xmlChar *          extSubURI;     /* URI of external subset */
+    xmlChar *          extSubSystem;  /* SYSTEM ID of external subset */
+
+    /* xml:space values */
+    int *              space;         /* Should the parser preserve spaces */
+    int                spaceNr;       /* Depth of the parsing stack */
+    int                spaceMax;      /* Max depth of the parsing stack */
+    int *              spaceTab;      /* array of space infos */
+
+    int                depth;         /* to prevent entity substitution loops */
+    xmlParserInputPtr  entity;        /* used to check entities boundaries */
+    int                charset;       /* encoding of the in-memory content
+				         actually an xmlCharEncoding */
+    int                nodelen;       /* Those two fields are there to */
+    int                nodemem;       /* Speed up large node parsing */
+    int                pedantic;      /* signal pedantic warnings or loose
+					 behaviour */
+    void              *_private;      /* For user data, libxml won't touch it */
+
+    int                loadsubset;    /* should the external subset be loaded */
 };</PRE
 ></TD
 ></TR
@@ -1373,7 +1416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN313"
+NAME="AEN314"
 ></A
 ><H3
 ><A
@@ -1399,7 +1442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN318"
+NAME="AEN319"
 ></A
 ><H3
 ><A
@@ -1430,7 +1473,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN323"
+NAME="AEN324"
 ></A
 ><H3
 ><A
@@ -1456,7 +1499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN328"
+NAME="AEN329"
 ></A
 ><H3
 ><A
@@ -1564,7 +1607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1574,7 +1617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN357"
+NAME="AEN358"
 ></A
 ><H3
 ><A
@@ -1685,7 +1728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1695,7 +1738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN386"
+NAME="AEN387"
 ></A
 ><H3
 ><A
@@ -1782,7 +1825,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1792,7 +1835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN410"
+NAME="AEN411"
 ></A
 ><H3
 ><A
@@ -1879,7 +1922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1889,7 +1932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN434"
+NAME="AEN435"
 ></A
 ><H3
 ><A
@@ -2039,7 +2082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2049,7 +2092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN472"
+NAME="AEN473"
 ></A
 ><H3
 ><A
@@ -2160,7 +2203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2170,7 +2213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN501"
+NAME="AEN502"
 ></A
 ><H3
 ><A
@@ -2338,7 +2381,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2348,7 +2391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN543"
+NAME="AEN544"
 ></A
 ><H3
 ><A
@@ -2456,7 +2499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2466,7 +2509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN571"
+NAME="AEN572"
 ></A
 ><H3
 ><A
@@ -2598,7 +2641,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2608,7 +2651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN605"
+NAME="AEN606"
 ></A
 ><H3
 ><A
@@ -2677,7 +2720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2687,7 +2730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN624"
+NAME="AEN625"
 ></A
 ><H3
 ><A
@@ -2735,7 +2778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2745,7 +2788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN638"
+NAME="AEN639"
 ></A
 ><H3
 ><A
@@ -2793,7 +2836,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2803,7 +2846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN652"
+NAME="AEN653"
 ></A
 ><H3
 ><A
@@ -2893,7 +2936,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2903,7 +2946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN676"
+NAME="AEN677"
 ></A
 ><H3
 ><A
@@ -2972,7 +3015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2982,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN695"
+NAME="AEN696"
 ></A
 ><H3
 ><A
@@ -3072,7 +3115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3082,7 +3125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN719"
+NAME="AEN720"
 ></A
 ><H3
 ><A
@@ -3151,7 +3194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3161,7 +3204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN738"
+NAME="AEN739"
 ></A
 ><H3
 ><A
@@ -3248,7 +3291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3258,7 +3301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN761"
+NAME="AEN762"
 ></A
 ><H3
 ><A
@@ -3345,7 +3388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3355,7 +3398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN784"
+NAME="AEN785"
 ></A
 ><H3
 ><A
@@ -3445,7 +3488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3455,7 +3498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN808"
+NAME="AEN809"
 ></A
 ><H3
 ><A
@@ -3524,7 +3567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3534,7 +3577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN827"
+NAME="AEN828"
 ></A
 ><H3
 ><A
@@ -3621,7 +3664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3631,7 +3674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN850"
+NAME="AEN851"
 ></A
 ><H3
 ><A
@@ -3715,7 +3758,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3725,7 +3768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN872"
+NAME="AEN873"
 ></A
 ><H3
 ><A
@@ -3809,7 +3852,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3819,7 +3862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN894"
+NAME="AEN895"
 ></A
 ><H3
 ><A
@@ -3903,7 +3946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3913,7 +3956,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN916"
+NAME="AEN917"
 ></A
 ><H3
 ><A
@@ -3976,7 +4019,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3986,7 +4029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN934"
+NAME="AEN935"
 ></A
 ><H3
 ><A
@@ -4049,7 +4092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -4059,7 +4102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN952"
+NAME="AEN953"
 ></A
 ><H3
 ><A
@@ -4122,7 +4165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -4132,7 +4175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN970"
+NAME="AEN971"
 ></A
 ><H3
 ><A
@@ -4185,7 +4228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN975"
+NAME="AEN976"
 ></A
 ><H3
 ><A
@@ -4211,7 +4254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN980"
+NAME="AEN981"
 ></A
 ><H3
 ><A
@@ -4317,7 +4360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -4327,7 +4370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1008"
+NAME="AEN1009"
 ></A
 ><H3
 ><A
@@ -4353,7 +4396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1013"
+NAME="AEN1014"
 ></A
 ><H3
 ><A
@@ -4379,7 +4422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1018"
+NAME="AEN1019"
 ></A
 ><H3
 ><A
@@ -4405,7 +4448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1023"
+NAME="AEN1024"
 ></A
 ><H3
 ><A
@@ -4431,7 +4474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1028"
+NAME="AEN1029"
 ></A
 ><H3
 ><A
@@ -4457,7 +4500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1033"
+NAME="AEN1034"
 ></A
 ><H3
 ><A
@@ -4488,7 +4531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1039"
+NAME="AEN1040"
 ></A
 ><H3
 ><A
@@ -4586,7 +4629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1063"
+NAME="AEN1064"
 ></A
 ><H3
 ><A
@@ -4684,7 +4727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1087"
+NAME="AEN1088"
 ></A
 ><H3
 ><A
@@ -4765,7 +4808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1108"
+NAME="AEN1109"
 ></A
 ><H3
 ><A
@@ -4869,7 +4912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1135"
 ></A
 ><H3
 ><A
@@ -4986,7 +5029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1163"
+NAME="AEN1164"
 ></A
 ><H3
 ><A
@@ -5088,7 +5131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1189"
+NAME="AEN1190"
 ></A
 ><H3
 ><A
@@ -5190,7 +5233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1215"
+NAME="AEN1216"
 ></A
 ><H3
 ><A
@@ -5289,7 +5332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1240"
+NAME="AEN1241"
 ></A
 ><H3
 ><A
@@ -5406,7 +5449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1269"
+NAME="AEN1270"
 ></A
 ><H3
 ><A
@@ -5484,7 +5527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1289"
+NAME="AEN1290"
 ></A
 ><H3
 ><A
@@ -5586,7 +5629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1315"
+NAME="AEN1316"
 ></A
 ><H3
 ><A
@@ -5711,7 +5754,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1346"
+NAME="AEN1347"
 ></A
 ><H3
 ><A
@@ -5792,7 +5835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1367"
+NAME="AEN1368"
 ></A
 ><H3
 ><A
@@ -5888,7 +5931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1391"
+NAME="AEN1392"
 ></A
 ><H3
 ><A
@@ -5967,7 +6010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1411"
+NAME="AEN1412"
 ></A
 ><H3
 ><A
@@ -6050,7 +6093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1431"
+NAME="AEN1432"
 ></A
 ><H3
 ><A
@@ -6152,7 +6195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1454"
+NAME="AEN1455"
 ></A
 ><H3
 ><A
@@ -6234,7 +6277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1475"
+NAME="AEN1476"
 ></A
 ><H3
 ><A
@@ -6331,7 +6374,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1499"
+NAME="AEN1500"
 ></A
 ><H3
 ><A
@@ -6411,7 +6454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1519"
+NAME="AEN1520"
 ></A
 ><H3
 ><A
@@ -6495,7 +6538,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1541"
+NAME="AEN1542"
 ></A
 ><H3
 ><A
@@ -6618,7 +6661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1571"
+NAME="AEN1572"
 ></A
 ><H3
 ><A
@@ -6733,7 +6776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1599"
+NAME="AEN1600"
 ></A
 ><H3
 ><A
@@ -6866,7 +6909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1631"
+NAME="AEN1632"
 ></A
 ><H3
 ><A
@@ -7004,7 +7047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1664"
+NAME="AEN1665"
 ></A
 ><H3
 ><A
@@ -7125,7 +7168,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1693"
+NAME="AEN1694"
 ></A
 ><H3
 ><A
@@ -7227,7 +7270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1719"
+NAME="AEN1720"
 ></A
 ><H3
 ><A
@@ -7350,7 +7393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1750"
+NAME="AEN1751"
 ></A
 ><H3
 ><A
@@ -7378,7 +7421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1756"
+NAME="AEN1757"
 ></A
 ><H3
 ><A
@@ -7406,7 +7449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1762"
+NAME="AEN1763"
 ></A
 ><H3
 ><A
@@ -7459,7 +7502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>  an XML parser context</TD
 ></TR
 ></TABLE
 ><P
@@ -7469,7 +7512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1778"
+NAME="AEN1779"
 ></A
 ><H3
 ><A
@@ -7532,7 +7575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1794"
+NAME="AEN1795"
 ></A
 ><H3
 ><A
@@ -7596,7 +7639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1810"
+NAME="AEN1811"
 ></A
 ><H3
 ><A
@@ -7700,7 +7743,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1835"
+NAME="AEN1836"
 ></A
 ><H3
 ><A
@@ -7781,7 +7824,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1856"
+NAME="AEN1857"
 ></A
 ><H3
 ><A
@@ -7947,7 +7990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1895"
+NAME="AEN1896"
 ></A
 ><H3
 ><A
@@ -8079,7 +8122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1927"
+NAME="AEN1928"
 ></A
 ><H3
 ><A
@@ -8182,7 +8225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1953"
+NAME="AEN1954"
 ></A
 ><H3
 ><A
@@ -8245,7 +8288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1969"
+NAME="AEN1970"
 ></A
 ><H3
 ><A
@@ -8309,7 +8352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1985"
+NAME="AEN1986"
 ></A
 ><H3
 ><A
@@ -8412,7 +8455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2011"
+NAME="AEN2012"
 ></A
 ><H3
 ><A
@@ -8496,7 +8539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2032"
+NAME="AEN2033"
 ></A
 ><H3
 ><A
@@ -8547,7 +8590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -8557,7 +8600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2047"
+NAME="AEN2048"
 ></A
 ><H3
 ><A
@@ -8607,7 +8650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -8617,7 +8660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2062"
+NAME="AEN2063"
 ></A
 ><H3
 ><A
@@ -8722,7 +8765,87 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN2091"
+></A
+><H3
+><A
+NAME="XMLUSENEWPARSER"
+></A
+>xmlUseNewParser ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlUseNewParser                 (int val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Set and return the previous value for the default XML parser to use
+The 1.x version of the parser up to 1.8.11 is horribly broken
+The 2.x and later version aim at completete compliance to the standard
+This function is provided as a way to force using the new parser
+on 1.X libs when the applications are ready to handle correct XML
+and the UTF8 character flow provided by the new parser.</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"
+>  int 0 or 1 </TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the last value for 0 for no substitution, 1 for substitution.</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index 5cc73b6..97eb860 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -4,7 +4,7 @@
 >parserInternals</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->parserInternals</H1
+><A
+NAME="GNOME-XML-PARSERINTERNALS"
+>parserInternals</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10228"
+NAME="AEN10287"
 ></A
 ><H2
 >Name</H2
->parserInternals &#8212; </DIV
+>parserInternals&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10231"
+NAME="AEN10290"
 ></A
 ><H2
 >Synopsis</H2
@@ -139,67 +145,67 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-parserinternals.html#XML-MAX-NAMELEN"
+HREF="gnome-xml-parserinternals.html#XML-MAX-NAMELEN-CAPS"
 >XML_MAX_NAMELEN</A
 >
 typedef     <A
-HREF="gnome-xml-parserinternals.html#CHARVAL"
+HREF="gnome-xml-parserinternals.html#CHARVAL-CAPS"
 >CHARVAL</A
 >;
 #define     <A
-HREF="gnome-xml-parserinternals.html#NEXTCHARVAL"
+HREF="gnome-xml-parserinternals.html#NEXTCHARVAL-CAPS"
 >NEXTCHARVAL</A
 >                     (p)
 #define     <A
-HREF="gnome-xml-parserinternals.html#SKIPCHARVAL"
+HREF="gnome-xml-parserinternals.html#SKIPCHARVAL-CAPS"
 >SKIPCHARVAL</A
 >                     (p)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-CHAR"
+HREF="gnome-xml-parserinternals.html#IS-CHAR-CAPS"
 >IS_CHAR</A
 >                         (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-BLANK"
+HREF="gnome-xml-parserinternals.html#IS-BLANK-CAPS"
 >IS_BLANK</A
 >                        (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-BASECHAR"
+HREF="gnome-xml-parserinternals.html#IS-BASECHAR-CAPS"
 >IS_BASECHAR</A
 >                     (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-DIGIT"
+HREF="gnome-xml-parserinternals.html#IS-DIGIT-CAPS"
 >IS_DIGIT</A
 >                        (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-COMBINING"
+HREF="gnome-xml-parserinternals.html#IS-COMBINING-CAPS"
 >IS_COMBINING</A
 >                    (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-EXTENDER"
+HREF="gnome-xml-parserinternals.html#IS-EXTENDER-CAPS"
 >IS_EXTENDER</A
 >                     (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-IDEOGRAPHIC"
+HREF="gnome-xml-parserinternals.html#IS-IDEOGRAPHIC-CAPS"
 >IS_IDEOGRAPHIC</A
 >                  (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-LETTER"
+HREF="gnome-xml-parserinternals.html#IS-LETTER-CAPS"
 >IS_LETTER</A
 >                       (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#IS-PUBIDCHAR"
+HREF="gnome-xml-parserinternals.html#IS-PUBIDCHAR-CAPS"
 >IS_PUBIDCHAR</A
 >                    (c)
 #define     <A
-HREF="gnome-xml-parserinternals.html#SKIP-EOL"
+HREF="gnome-xml-parserinternals.html#SKIP-EOL-CAPS"
 >SKIP_EOL</A
 >                        (p)
 #define     <A
-HREF="gnome-xml-parserinternals.html#MOVETO-ENDTAG"
+HREF="gnome-xml-parserinternals.html#MOVETO-ENDTAG-CAPS"
 >MOVETO_ENDTAG</A
 >                   (p)
 #define     <A
-HREF="gnome-xml-parserinternals.html#MOVETO-STARTTAG"
+HREF="gnome-xml-parserinternals.html#MOVETO-STARTTAG-CAPS"
 >MOVETO_STARTTAG</A
 >                 (p)
 <A
@@ -794,19 +800,19 @@
 >xmlChar</A
 > *SystemID);
 #define     <A
-HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-NONE"
+HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-NONE-CAPS"
 >XML_SUBSTITUTE_NONE</A
 >
 #define     <A
-HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-REF"
+HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-REF-CAPS"
 >XML_SUBSTITUTE_REF</A
 >
 #define     <A
-HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-PEREF"
+HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-PEREF-CAPS"
 >XML_SUBSTITUTE_PEREF</A
 >
 #define     <A
-HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-BOTH"
+HREF="gnome-xml-parserinternals.html#XML-SUBSTITUTE-BOTH-CAPS"
 >XML_SUBSTITUTE_BOTH</A
 >
 <A
@@ -882,7 +888,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10441"
+NAME="AEN10500"
 ></A
 ><H2
 >Description</H2
@@ -892,18 +898,18 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10444"
+NAME="AEN10503"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10446"
+NAME="AEN10505"
 ></A
 ><H3
 ><A
-NAME="XML-MAX-NAMELEN"
+NAME="XML-MAX-NAMELEN-CAPS"
 ></A
 >XML_MAX_NAMELEN</H3
 ><TABLE
@@ -925,11 +931,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10451"
+NAME="AEN10510"
 ></A
 ><H3
 ><A
-NAME="CHARVAL"
+NAME="CHARVAL-CAPS"
 ></A
 >CHARVAL</H3
 ><P
@@ -938,11 +944,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10455"
+NAME="AEN10514"
 ></A
 ><H3
 ><A
-NAME="NEXTCHARVAL"
+NAME="NEXTCHARVAL-CAPS"
 ></A
 >NEXTCHARVAL()</H3
 ><TABLE
@@ -986,7 +992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -996,11 +1002,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10469"
+NAME="AEN10528"
 ></A
 ><H3
 ><A
-NAME="SKIPCHARVAL"
+NAME="SKIPCHARVAL-CAPS"
 ></A
 >SKIPCHARVAL()</H3
 ><TABLE
@@ -1044,7 +1050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1054,11 +1060,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10483"
+NAME="AEN10542"
 ></A
 ><H3
 ><A
-NAME="IS-CHAR"
+NAME="IS-CHAR-CAPS"
 ></A
 >IS_CHAR()</H3
 ><TABLE
@@ -1102,7 +1108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1112,11 +1118,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10497"
+NAME="AEN10556"
 ></A
 ><H3
 ><A
-NAME="IS-BLANK"
+NAME="IS-BLANK-CAPS"
 ></A
 >IS_BLANK()</H3
 ><TABLE
@@ -1160,7 +1166,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1170,11 +1176,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10511"
+NAME="AEN10570"
 ></A
 ><H3
 ><A
-NAME="IS-BASECHAR"
+NAME="IS-BASECHAR-CAPS"
 ></A
 >IS_BASECHAR()</H3
 ><TABLE
@@ -1218,7 +1224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1228,11 +1234,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10525"
+NAME="AEN10584"
 ></A
 ><H3
 ><A
-NAME="IS-DIGIT"
+NAME="IS-DIGIT-CAPS"
 ></A
 >IS_DIGIT()</H3
 ><TABLE
@@ -1276,7 +1282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1286,11 +1292,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10539"
+NAME="AEN10598"
 ></A
 ><H3
 ><A
-NAME="IS-COMBINING"
+NAME="IS-COMBINING-CAPS"
 ></A
 >IS_COMBINING()</H3
 ><TABLE
@@ -1334,7 +1340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1344,11 +1350,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10553"
+NAME="AEN10612"
 ></A
 ><H3
 ><A
-NAME="IS-EXTENDER"
+NAME="IS-EXTENDER-CAPS"
 ></A
 >IS_EXTENDER()</H3
 ><TABLE
@@ -1392,7 +1398,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1402,11 +1408,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10567"
+NAME="AEN10626"
 ></A
 ><H3
 ><A
-NAME="IS-IDEOGRAPHIC"
+NAME="IS-IDEOGRAPHIC-CAPS"
 ></A
 >IS_IDEOGRAPHIC()</H3
 ><TABLE
@@ -1450,7 +1456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1460,11 +1466,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10581"
+NAME="AEN10640"
 ></A
 ><H3
 ><A
-NAME="IS-LETTER"
+NAME="IS-LETTER-CAPS"
 ></A
 >IS_LETTER()</H3
 ><TABLE
@@ -1508,7 +1514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1518,11 +1524,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10595"
+NAME="AEN10654"
 ></A
 ><H3
 ><A
-NAME="IS-PUBIDCHAR"
+NAME="IS-PUBIDCHAR-CAPS"
 ></A
 >IS_PUBIDCHAR()</H3
 ><TABLE
@@ -1566,7 +1572,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1576,11 +1582,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10609"
+NAME="AEN10668"
 ></A
 ><H3
 ><A
-NAME="SKIP-EOL"
+NAME="SKIP-EOL-CAPS"
 ></A
 >SKIP_EOL()</H3
 ><TABLE
@@ -1624,7 +1630,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1634,11 +1640,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10623"
+NAME="AEN10682"
 ></A
 ><H3
 ><A
-NAME="MOVETO-ENDTAG"
+NAME="MOVETO-ENDTAG-CAPS"
 ></A
 >MOVETO_ENDTAG()</H3
 ><TABLE
@@ -1682,7 +1688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1692,11 +1698,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10637"
+NAME="AEN10696"
 ></A
 ><H3
 ><A
-NAME="MOVETO-STARTTAG"
+NAME="MOVETO-STARTTAG-CAPS"
 ></A
 >MOVETO_STARTTAG()</H3
 ><TABLE
@@ -1740,7 +1746,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1750,7 +1756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10651"
+NAME="AEN10710"
 ></A
 ><H3
 ><A
@@ -1821,7 +1827,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1831,7 +1837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10672"
+NAME="AEN10731"
 ></A
 ><H3
 ><A
@@ -1911,7 +1917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10692"
+NAME="AEN10751"
 ></A
 ><H3
 ><A
@@ -2007,7 +2013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10716"
+NAME="AEN10775"
 ></A
 ><H3
 ><A
@@ -2061,7 +2067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -2071,7 +2077,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10732"
+NAME="AEN10791"
 ></A
 ><H3
 ><A
@@ -2132,7 +2138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10748"
+NAME="AEN10807"
 ></A
 ><H3
 ><A
@@ -2217,7 +2223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10769"
+NAME="AEN10828"
 ></A
 ><H3
 ><A
@@ -2304,7 +2310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10791"
+NAME="AEN10850"
 ></A
 ><H3
 ><A
@@ -2406,7 +2412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10817"
+NAME="AEN10876"
 ></A
 ><H3
 ><A
@@ -2491,7 +2497,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10838"
+NAME="AEN10897"
 ></A
 ><H3
 ><A
@@ -2573,7 +2579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10859"
+NAME="AEN10918"
 ></A
 ><H3
 ><A
@@ -2636,7 +2642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10875"
+NAME="AEN10934"
 ></A
 ><H3
 ><A
@@ -2735,7 +2741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10900"
+NAME="AEN10959"
 ></A
 ><H3
 ><A
@@ -2844,7 +2850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10929"
+NAME="AEN10988"
 ></A
 ><H3
 ><A
@@ -2930,7 +2936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10952"
+NAME="AEN11011"
 ></A
 ><H3
 ><A
@@ -3039,7 +3045,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10981"
+NAME="AEN11040"
 ></A
 ><H3
 ><A
@@ -3124,7 +3130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11004"
+NAME="AEN11063"
 ></A
 ><H3
 ><A
@@ -3206,7 +3212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11025"
+NAME="AEN11084"
 ></A
 ><H3
 ><A
@@ -3275,7 +3281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11043"
+NAME="AEN11102"
 ></A
 ><H3
 ><A
@@ -3364,7 +3370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11067"
+NAME="AEN11126"
 ></A
 ><H3
 ><A
@@ -3452,7 +3458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11091"
+NAME="AEN11150"
 ></A
 ><H3
 ><A
@@ -3537,7 +3543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11114"
+NAME="AEN11173"
 ></A
 ><H3
 ><A
@@ -3568,7 +3574,7 @@
 ></TR
 ></TABLE
 ><P
->parse a value for ENTITY decl.</P
+>parse a value for ENTITY declarations</P
 ><P
 >[9] EntityValue ::= '"' ([^%&amp;"] | PEReference | Reference)* '"' |
 "'" ([^%&amp;'] | PEReference | Reference)* "'"</P
@@ -3642,7 +3648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11141"
+NAME="AEN11200"
 ></A
 ><H3
 ><A
@@ -3780,7 +3786,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11175"
+NAME="AEN11234"
 ></A
 ><H3
 ><A
@@ -3863,7 +3869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11197"
+NAME="AEN11256"
 ></A
 ><H3
 ><A
@@ -3946,7 +3952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11219"
+NAME="AEN11278"
 ></A
 ><H3
 ><A
@@ -3974,6 +3980,11 @@
 >parse a CharData section.
 if we are within a CDATA section ']]&gt;' marks an end of section.</P
 ><P
+>The right angle bracket (&gt;) may be represented using the string "&amp;gt;",
+and must, for compatibility, be escaped using "&amp;gt;" or a character
+reference when it appears in the string "]]&gt;" in content, when that
+string is not marking the end of a CDATA section. </P
+><P
 >[14] CharData ::= [^&lt;&amp;]* - ([^&lt;&amp;]* ']]&gt;' [^&lt;&amp;]*)</P
 ><P
 ></P
@@ -4030,7 +4041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11240"
+NAME="AEN11300"
 ></A
 ><H3
 ><A
@@ -4161,7 +4172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11273"
+NAME="AEN11333"
 ></A
 ><H3
 ><A
@@ -4228,7 +4239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11290"
+NAME="AEN11350"
 ></A
 ><H3
 ><A
@@ -4311,7 +4322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11312"
+NAME="AEN11372"
 ></A
 ><H3
 ><A
@@ -4378,7 +4389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11330"
+NAME="AEN11390"
 ></A
 ><H3
 ><A
@@ -4453,7 +4464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11350"
+NAME="AEN11410"
 ></A
 ><H3
 ><A
@@ -4531,7 +4542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11373"
+NAME="AEN11433"
 ></A
 ><H3
 ><A
@@ -4562,19 +4573,19 @@
 >Parse an attribute default declaration</P
 ><P
 >[60] DefaultDecl ::= '<GTKDOCLINK
-HREF="REQUIRED"
+HREF="REQUIRED-CAPS"
 >REQUIRED</GTKDOCLINK
 >' | '<GTKDOCLINK
-HREF="IMPLIED"
+HREF="IMPLIED-CAPS"
 >IMPLIED</GTKDOCLINK
 >' | (('<GTKDOCLINK
-HREF="FIXED"
+HREF="FIXED-CAPS"
 >FIXED</GTKDOCLINK
 >' S)? AttValue)</P
 ><P
 >[ VC: Required Attribute ]
 if the default declaration is the keyword <GTKDOCLINK
-HREF="REQUIRED"
+HREF="REQUIRED-CAPS"
 >REQUIRED</GTKDOCLINK
 >, then the
 attribute must be specified for all elements of the type in the
@@ -4589,7 +4600,7 @@
 ><P
 >[ VC: Fixed Attribute Default ]
 if an attribute has a default value declared with the <GTKDOCLINK
-HREF="FIXED"
+HREF="FIXED-CAPS"
 >FIXED</GTKDOCLINK
 >
 keyword, instances of that attribute must match the default value. </P
@@ -4670,7 +4681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11410"
+NAME="AEN11470"
 ></A
 ><H3
 ><A
@@ -4759,7 +4770,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11434"
+NAME="AEN11494"
 ></A
 ><H3
 ><A
@@ -4846,7 +4857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11457"
+NAME="AEN11517"
 ></A
 ><H3
 ><A
@@ -4949,7 +4960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11484"
+NAME="AEN11544"
 ></A
 ><H3
 ><A
@@ -5002,10 +5013,10 @@
 ><P
 >[ VC: ID Attribute Default ]
 An ID attribute must have a declared default of <GTKDOCLINK
-HREF="IMPLIED"
+HREF="IMPLIED-CAPS"
 >IMPLIED</GTKDOCLINK
 > or <GTKDOCLINK
-HREF="REQUIRED"
+HREF="REQUIRED-CAPS"
 >REQUIRED</GTKDOCLINK
 >.</P
 ><P
@@ -5093,7 +5104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11522"
+NAME="AEN11582"
 ></A
 ><H3
 ><A
@@ -5160,7 +5171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11540"
+NAME="AEN11600"
 ></A
 ><H3
 ><A
@@ -5192,11 +5203,11 @@
 The leading '(' and spaces have been skipped in xmlParseElementContentDecl</P
 ><P
 >[51] Mixed ::= '(' S? '<GTKDOCLINK
-HREF="PCDATA"
+HREF="PCDATA-CAPS"
 >PCDATA</GTKDOCLINK
 >' (S? '|' S? Name)* S? ')*' |
 '(' S? '<GTKDOCLINK
-HREF="PCDATA"
+HREF="PCDATA-CAPS"
 >PCDATA</GTKDOCLINK
 >' S? ')'</P
 ><P
@@ -5258,7 +5269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11566"
+NAME="AEN11626"
 ></A
 ><H3
 ><A
@@ -5361,7 +5372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11592"
+NAME="AEN11652"
 ></A
 ><H3
 ><A
@@ -5484,7 +5495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11623"
+NAME="AEN11683"
 ></A
 ><H3
 ><A
@@ -5567,7 +5578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11645"
+NAME="AEN11705"
 ></A
 ><H3
 ><A
@@ -5597,7 +5608,7 @@
 NotationDecl | PI | Comment</P
 ><P
 >[ VC: Proper Declaration/PE Nesting ]
-TODO Parameter-entity replacement text must be properly nested with
+Parameter-entity replacement text must be properly nested with
 markup declarations. That is to say, if either the first character
 or the last character of a markup declaration (markupdecl above) is
 contained in the replacement text for a parameter-entity reference,
@@ -5646,7 +5657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11664"
+NAME="AEN11724"
 ></A
 ><H3
 ><A
@@ -5734,7 +5745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11687"
+NAME="AEN11747"
 ></A
 ><H3
 ><A
@@ -5835,7 +5846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11711"
+NAME="AEN11771"
 ></A
 ><H3
 ><A
@@ -5909,7 +5920,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11730"
+NAME="AEN11790"
 ></A
 ><H3
 ><A
@@ -5940,7 +5951,7 @@
 >[69] PEReference ::= '%' Name ';'</P
 ><P
 >[ WFC: No Recursion ]
-TODO A parsed entity must not contain a recursive
+A parsed entity must not contain a recursive
 reference to itself, either directly or indirectly. </P
 ><P
 >[ WFC: Entity Declared ]
@@ -5995,7 +6006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11751"
+NAME="AEN11811"
 ></A
 ><H3
 ><A
@@ -6065,7 +6076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11769"
+NAME="AEN11829"
 ></A
 ><H3
 ><A
@@ -6190,7 +6201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11803"
+NAME="AEN11863"
 ></A
 ><H3
 ><A
@@ -6238,8 +6249,6 @@
 ><P
 >[NS 10] EmptyElement ::= '&lt;' QName (S Attribute)* S? '/&gt;'</P
 ><P
->Returne the element name parsed</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -6282,7 +6291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the element name parsed</TD
 ></TR
 ></TABLE
 ><P
@@ -6292,7 +6301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11832"
+NAME="AEN11891"
 ></A
 ><H3
 ><A
@@ -6361,7 +6370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11851"
+NAME="AEN11910"
 ></A
 ><H3
 ><A
@@ -6432,7 +6441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11871"
+NAME="AEN11930"
 ></A
 ><H3
 ><A
@@ -6497,7 +6506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11888"
+NAME="AEN11947"
 ></A
 ><H3
 ><A
@@ -6579,7 +6588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11907"
+NAME="AEN11966"
 ></A
 ><H3
 ><A
@@ -6662,7 +6671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11929"
+NAME="AEN11988"
 ></A
 ><H3
 ><A
@@ -6747,7 +6756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11952"
+NAME="AEN12011"
 ></A
 ><H3
 ><A
@@ -6830,7 +6839,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11974"
+NAME="AEN12033"
 ></A
 ><H3
 ><A
@@ -6861,7 +6870,7 @@
 ><P
 >[80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' |  "'" EncName "'")</P
 ><P
->TODO: this should setup the conversion filters.</P
+>this setups the conversion filters.</P
 ><P
 ></P
 ><DIV
@@ -6915,7 +6924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11997"
+NAME="AEN12056"
 ></A
 ><H3
 ><A
@@ -7010,7 +7019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12019"
+NAME="AEN12078"
 ></A
 ><H3
 ><A
@@ -7075,7 +7084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12036"
+NAME="AEN12095"
 ></A
 ><H3
 ><A
@@ -7140,7 +7149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12053"
+NAME="AEN12112"
 ></A
 ><H3
 ><A
@@ -7249,11 +7258,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12081"
+NAME="AEN12140"
 ></A
 ><H3
 ><A
-NAME="XML-SUBSTITUTE-NONE"
+NAME="XML-SUBSTITUTE-NONE-CAPS"
 ></A
 >XML_SUBSTITUTE_NONE</H3
 ><TABLE
@@ -7275,11 +7284,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12086"
+NAME="AEN12145"
 ></A
 ><H3
 ><A
-NAME="XML-SUBSTITUTE-REF"
+NAME="XML-SUBSTITUTE-REF-CAPS"
 ></A
 >XML_SUBSTITUTE_REF</H3
 ><TABLE
@@ -7301,11 +7310,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12091"
+NAME="AEN12150"
 ></A
 ><H3
 ><A
-NAME="XML-SUBSTITUTE-PEREF"
+NAME="XML-SUBSTITUTE-PEREF-CAPS"
 ></A
 >XML_SUBSTITUTE_PEREF</H3
 ><TABLE
@@ -7327,11 +7336,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12096"
+NAME="AEN12155"
 ></A
 ><H3
 ><A
-NAME="XML-SUBSTITUTE-BOTH"
+NAME="XML-SUBSTITUTE-BOTH-CAPS"
 ></A
 >XML_SUBSTITUTE_BOTH</H3
 ><TABLE
@@ -7353,7 +7362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12101"
+NAME="AEN12160"
 ></A
 ><H3
 ><A
@@ -7394,6 +7403,11 @@
 ></TR
 ></TABLE
 ><P
+>This function is deprecated, we now always process entities content
+through xmlStringDecodeEntities</P
+><P
+>TODO: remove it in next major release.</P
+><P
 >[67] Reference ::= EntityRef | CharRef</P
 ><P
 >[69] PEReference ::= '%' Name ';'</P
@@ -7536,7 +7550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12146"
+NAME="AEN12207"
 ></A
 ><H3
 ><A
@@ -7623,7 +7637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -7633,7 +7647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12170"
+NAME="AEN12231"
 ></A
 ><H3
 ><A
@@ -7702,7 +7716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -7712,7 +7726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12190"
+NAME="AEN12251"
 ></A
 ><H3
 ><A
@@ -7799,7 +7813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -7809,7 +7823,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12214"
+NAME="AEN12275"
 ></A
 ><H3
 ><A
@@ -7878,7 +7892,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-sax.html b/doc/html/gnome-xml-sax.html
index 533e539..6620c84 100644
--- a/doc/html/gnome-xml-sax.html
+++ b/doc/html/gnome-xml-sax.html
@@ -4,7 +4,7 @@
 >SAX</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->SAX</H1
+><A
+NAME="GNOME-XML-SAX"
+>SAX</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2095"
+NAME="AEN2115"
 ></A
 ><H2
 >Name</H2
->SAX &#8212; </DIV
+>SAX&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2098"
+NAME="AEN2118"
 ></A
 ><H2
 >Synopsis</H2
@@ -486,7 +492,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2186"
+NAME="AEN2206"
 ></A
 ><H2
 >Description</H2
@@ -496,14 +502,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2189"
+NAME="AEN2209"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2191"
+NAME="AEN2211"
 ></A
 ><H3
 ><A
@@ -529,7 +535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2196"
+NAME="AEN2216"
 ></A
 ><H3
 ><A
@@ -607,7 +613,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2216"
+NAME="AEN2236"
 ></A
 ><H3
 ><A
@@ -686,7 +692,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2236"
+NAME="AEN2256"
 ></A
 ><H3
 ><A
@@ -768,7 +774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2256"
+NAME="AEN2276"
 ></A
 ><H3
 ><A
@@ -843,7 +849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN2295"
 ></A
 ><H3
 ><A
@@ -918,7 +924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2294"
+NAME="AEN2314"
 ></A
 ><H3
 ><A
@@ -993,7 +999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2313"
+NAME="AEN2333"
 ></A
 ><H3
 ><A
@@ -1068,7 +1074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2332"
+NAME="AEN2352"
 ></A
 ><H3
 ><A
@@ -1143,7 +1149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2351"
+NAME="AEN2371"
 ></A
 ><H3
 ><A
@@ -1256,7 +1262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1266,7 +1272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2381"
+NAME="AEN2401"
 ></A
 ><H3
 ><A
@@ -1365,7 +1371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2406"
+NAME="AEN2426"
 ></A
 ><H3
 ><A
@@ -1464,7 +1470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2431"
+NAME="AEN2451"
 ></A
 ><H3
 ><A
@@ -1594,7 +1600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2463"
+NAME="AEN2483"
 ></A
 ><H3
 ><A
@@ -1756,7 +1762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2502"
+NAME="AEN2522"
 ></A
 ><H3
 ><A
@@ -1926,7 +1932,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1936,7 +1942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2545"
+NAME="AEN2565"
 ></A
 ><H3
 ><A
@@ -2056,7 +2062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2574"
+NAME="AEN2594"
 ></A
 ><H3
 ><A
@@ -2179,7 +2185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2604"
+NAME="AEN2624"
 ></A
 ><H3
 ><A
@@ -2323,7 +2329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2639"
+NAME="AEN2659"
 ></A
 ><H3
 ><A
@@ -2383,7 +2389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2654"
+NAME="AEN2674"
 ></A
 ><H3
 ><A
@@ -2443,7 +2449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2669"
+NAME="AEN2689"
 ></A
 ><H3
 ><A
@@ -2548,7 +2554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2694"
+NAME="AEN2714"
 ></A
 ><H3
 ><A
@@ -2650,7 +2656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2719"
+NAME="AEN2739"
 ></A
 ><H3
 ><A
@@ -2731,7 +2737,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2739"
+NAME="AEN2759"
 ></A
 ><H3
 ><A
@@ -2812,7 +2818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2759"
+NAME="AEN2779"
 ></A
 ><H3
 ><A
@@ -2912,7 +2918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2783"
+NAME="AEN2803"
 ></A
 ><H3
 ><A
@@ -3012,7 +3018,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2807"
+NAME="AEN2827"
 ></A
 ><H3
 ><A
@@ -3114,7 +3120,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2832"
+NAME="AEN2852"
 ></A
 ><H3
 ><A
@@ -3216,7 +3222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2857"
+NAME="AEN2877"
 ></A
 ><H3
 ><A
@@ -3297,7 +3303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2877"
+NAME="AEN2897"
 ></A
 ><H3
 ><A
@@ -3365,7 +3371,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3375,7 +3381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2897"
+NAME="AEN2917"
 ></A
 ><H3
 ><A
@@ -3462,7 +3468,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3472,7 +3478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2921"
+NAME="AEN2941"
 ></A
 ><H3
 ><A
@@ -3574,7 +3580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2946"
+NAME="AEN2966"
 ></A
 ><H3
 ><A
@@ -3655,7 +3661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2966"
+NAME="AEN2986"
 ></A
 ><H3
 ><A
@@ -3754,7 +3760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2990"
+NAME="AEN3010"
 ></A
 ><H3
 ><A
@@ -3782,7 +3788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2996"
+NAME="AEN3016"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index bd5d08f..1480991 100644
--- a/doc/html/gnome-xml-tree.html
+++ b/doc/html/gnome-xml-tree.html
@@ -4,7 +4,7 @@
 >tree</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->tree</H1
+><A
+NAME="GNOME-XML-TREE"
+>tree</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3007"
+NAME="AEN3027"
 ></A
 ><H2
 >Name</H2
->tree &#8212; </DIV
+>tree&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3010"
+NAME="AEN3030"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,6 +144,18 @@
 CLASS="SYNOPSIS"
 >&#13;
 
+void        <A
+HREF="gnome-xml-tree.html#XMLCHECKVERSION"
+>xmlCheckVersion</A
+>                 (int version);
+#define     <A
+HREF="gnome-xml-tree.html#LIBXML-VERSION-NUMBER-CAPS"
+>LIBXML_VERSION_NUMBER</A
+>
+#define     <A
+HREF="gnome-xml-tree.html#LIBXML-TEST-VERSION-CAPS"
+>LIBXML_TEST_VERSION</A
+>
 enum        <A
 HREF="gnome-xml-tree.html#XMLELEMENTTYPE"
 >xmlElementType</A
@@ -147,11 +165,11 @@
 >xmlChar</A
 >;
 #define     <A
-HREF="gnome-xml-tree.html#CHAR"
+HREF="gnome-xml-tree.html#CHAR-CAPS"
 >CHAR</A
 >
 #define     <A
-HREF="gnome-xml-tree.html#BAD-CAST"
+HREF="gnome-xml-tree.html#BAD-CAST-CAPS"
 >BAD_CAST</A
 >
 struct      <A
@@ -286,6 +304,14 @@
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >;
+#define     <A
+HREF="gnome-xml-tree.html#XMLCHILDRENNODE"
+>xmlChildrenNode</A
+>
+#define     <A
+HREF="gnome-xml-tree.html#XMLROOTNODE"
+>xmlRootNode</A
+>
 extern      xmlNsPtr <A
 HREF="gnome-xml-tree.html#BASEDTD"
 >baseDTD</A
@@ -334,7 +360,7 @@
 HREF="gnome-xml-tree.html#XMLBUFFERDUMP"
 >xmlBufferDump</A
 >                   (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *file,
                                              <A
@@ -1080,13 +1106,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > cur);
-int         <A
-HREF="gnome-xml-tree.html#XMLREMOVEPROP"
->xmlRemoveProp</A
->                   (<A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> cur);
 <A
 HREF="gnome-xml-tree.html#XMLNSPTR"
 >xmlNsPtr</A
@@ -1354,6 +1373,13 @@
 >xmlNodePtr</A
 > cur);
 int         <A
+HREF="gnome-xml-tree.html#XMLREMOVEPROP"
+>xmlRemoveProp</A
+>                   (<A
+HREF="gnome-xml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+> cur);
+int         <A
 HREF="gnome-xml-tree.html#XMLREMOVENODE"
 >xmlRemoveNode</A
 >                   (<A
@@ -1406,7 +1432,7 @@
 HREF="gnome-xml-tree.html#XMLDOCDUMP"
 >xmlDocDump</A
 >                      (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -1417,7 +1443,7 @@
 HREF="gnome-xml-tree.html#XMLELEMDUMP"
 >xmlElemDump</A
 >                     (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -1466,7 +1492,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3376"
+NAME="AEN3401"
 ></A
 ><H2
 >Description</H2
@@ -1476,14 +1502,124 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3379"
+NAME="AEN3404"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3381"
+NAME="AEN3406"
+></A
+><H3
+><A
+NAME="XMLCHECKVERSION"
+></A
+>xmlCheckVersion ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlCheckVersion                 (int version);</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
+>version</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&#13;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3420"
+></A
+><H3
+><A
+NAME="LIBXML-VERSION-NUMBER-CAPS"
+></A
+>LIBXML_VERSION_NUMBER</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define LIBXML_VERSION_NUMBER 10808</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3425"
+></A
+><H3
+><A
+NAME="LIBXML-TEST-VERSION-CAPS"
+></A
+>LIBXML_TEST_VERSION</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define LIBXML_TEST_VERSION xmlCheckVersion(LIBXML_VERSION_NUMBER);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3430"
 ></A
 ><H3
 ><A
@@ -1523,7 +1659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3386"
+NAME="AEN3435"
 ></A
 ><H3
 ><A
@@ -1536,11 +1672,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3390"
+NAME="AEN3439"
 ></A
 ><H3
 ><A
-NAME="CHAR"
+NAME="CHAR-CAPS"
 ></A
 >CHAR</H3
 ><TABLE
@@ -1562,11 +1698,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3395"
+NAME="AEN3444"
 ></A
 ><H3
 ><A
-NAME="BAD-CAST"
+NAME="BAD-CAST-CAPS"
 ></A
 >BAD_CAST</H3
 ><TABLE
@@ -1588,7 +1724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3400"
+NAME="AEN3449"
 ></A
 ><H3
 ><A
@@ -1618,7 +1754,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3405"
+NAME="AEN3454"
 ></A
 ><H3
 ><A
@@ -1644,7 +1780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3410"
+NAME="AEN3459"
 ></A
 ><H3
 ><A
@@ -1681,7 +1817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3415"
+NAME="AEN3464"
 ></A
 ><H3
 ><A
@@ -1712,7 +1848,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3420"
+NAME="AEN3469"
 ></A
 ><H3
 ><A
@@ -1741,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3425"
+NAME="AEN3474"
 ></A
 ><H3
 ><A
@@ -1767,7 +1903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3430"
+NAME="AEN3479"
 ></A
 ><H3
 ><A
@@ -1802,7 +1938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3435"
+NAME="AEN3484"
 ></A
 ><H3
 ><A
@@ -1828,7 +1964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3440"
+NAME="AEN3489"
 ></A
 ><H3
 ><A
@@ -1859,7 +1995,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3445"
+NAME="AEN3494"
 ></A
 ><H3
 ><A
@@ -1890,7 +2026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3450"
+NAME="AEN3499"
 ></A
 ><H3
 ><A
@@ -1922,7 +2058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3455"
+NAME="AEN3504"
 ></A
 ><H3
 ><A
@@ -1948,7 +2084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3460"
+NAME="AEN3509"
 ></A
 ><H3
 ><A
@@ -1979,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3465"
+NAME="AEN3514"
 ></A
 ><H3
 ><A
@@ -2010,7 +2146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3470"
+NAME="AEN3519"
 ></A
 ><H3
 ><A
@@ -2036,7 +2172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3475"
+NAME="AEN3524"
 ></A
 ><H3
 ><A
@@ -2065,7 +2201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3480"
+NAME="AEN3529"
 ></A
 ><H3
 ><A
@@ -2096,7 +2232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3485"
+NAME="AEN3534"
 ></A
 ><H3
 ><A
@@ -2122,7 +2258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3490"
+NAME="AEN3539"
 ></A
 ><H3
 ><A
@@ -2157,7 +2293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3495"
+NAME="AEN3544"
 ></A
 ><H3
 ><A
@@ -2183,7 +2319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3500"
+NAME="AEN3549"
 ></A
 ><H3
 ><A
@@ -2220,7 +2356,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3505"
+NAME="AEN3554"
 ></A
 ><H3
 ><A
@@ -2246,7 +2382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3510"
+NAME="AEN3559"
 ></A
 ><H3
 ><A
@@ -2276,7 +2412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3515"
+NAME="AEN3564"
 ></A
 ><H3
 ><A
@@ -2302,7 +2438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3520"
+NAME="AEN3569"
 ></A
 ><H3
 ><A
@@ -2332,7 +2468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3525"
+NAME="AEN3574"
 ></A
 ><H3
 ><A
@@ -2358,7 +2494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3530"
+NAME="AEN3579"
 ></A
 ><H3
 ><A
@@ -2389,7 +2525,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3536"
+NAME="AEN3585"
 ></A
 ><H3
 ><A
@@ -2420,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3541"
+NAME="AEN3590"
 ></A
 ><H3
 ><A
@@ -2446,7 +2582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3546"
+NAME="AEN3595"
 ></A
 ><H3
 ><A
@@ -2493,7 +2629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3551"
+NAME="AEN3600"
 ></A
 ><H3
 ><A
@@ -2519,7 +2655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3556"
+NAME="AEN3605"
 ></A
 ><H3
 ><A
@@ -2562,7 +2698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3561"
+NAME="AEN3610"
 ></A
 ><H3
 ><A
@@ -2588,7 +2724,59 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3566"
+NAME="AEN3615"
+></A
+><H3
+><A
+NAME="XMLCHILDRENNODE"
+></A
+>xmlChildrenNode</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define xmlChildrenNode childs</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3620"
+></A
+><H3
+><A
+NAME="XMLROOTNODE"
+></A
+>xmlRootNode</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define xmlRootNode root</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3625"
 ></A
 ><H3
 ><A
@@ -2614,7 +2802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3571"
+NAME="AEN3630"
 ></A
 ><H3
 ><A
@@ -2640,7 +2828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3576"
+NAME="AEN3635"
 ></A
 ><H3
 ><A
@@ -2666,7 +2854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3581"
+NAME="AEN3640"
 ></A
 ><H3
 ><A
@@ -2692,7 +2880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3586"
+NAME="AEN3645"
 ></A
 ><H3
 ><A
@@ -2718,7 +2906,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3591"
+NAME="AEN3650"
 ></A
 ><H3
 ><A
@@ -2779,7 +2967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3607"
+NAME="AEN3666"
 ></A
 ><H3
 ><A
@@ -2860,7 +3048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3628"
+NAME="AEN3687"
 ></A
 ><H3
 ><A
@@ -2923,7 +3111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3644"
+NAME="AEN3703"
 ></A
 ><H3
 ><A
@@ -2940,7 +3128,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >int         xmlBufferDump                   (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *file,
                                              <A
@@ -3022,7 +3210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3669"
+NAME="AEN3728"
 ></A
 ><H3
 ><A
@@ -3125,7 +3313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3694"
+NAME="AEN3753"
 ></A
 ><H3
 ><A
@@ -3209,7 +3397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3715"
+NAME="AEN3774"
 ></A
 ><H3
 ><A
@@ -3290,7 +3478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3735"
+NAME="AEN3794"
 ></A
 ><H3
 ><A
@@ -3386,7 +3574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3759"
+NAME="AEN3818"
 ></A
 ><H3
 ><A
@@ -3449,7 +3637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3775"
+NAME="AEN3834"
 ></A
 ><H3
 ><A
@@ -3530,7 +3718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3796"
+NAME="AEN3855"
 ></A
 ><H3
 ><A
@@ -3596,7 +3784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3606,7 +3794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3815"
+NAME="AEN3874"
 ></A
 ><H3
 ><A
@@ -3678,7 +3866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3688,7 +3876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3835"
+NAME="AEN3894"
 ></A
 ><H3
 ><A
@@ -3766,7 +3954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3855"
+NAME="AEN3914"
 ></A
 ><H3
 ><A
@@ -3910,7 +4098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3891"
+NAME="AEN3950"
 ></A
 ><H3
 ><A
@@ -4054,7 +4242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3927"
+NAME="AEN3986"
 ></A
 ><H3
 ><A
@@ -4117,7 +4305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3943"
+NAME="AEN4002"
 ></A
 ><H3
 ><A
@@ -4242,7 +4430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3974"
+NAME="AEN4033"
 ></A
 ><H3
 ><A
@@ -4367,7 +4555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4005"
+NAME="AEN4064"
 ></A
 ><H3
 ><A
@@ -4430,7 +4618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4021"
+NAME="AEN4080"
 ></A
 ><H3
 ><A
@@ -4511,7 +4699,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4042"
+NAME="AEN4101"
 ></A
 ><H3
 ><A
@@ -4575,7 +4763,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4058"
+NAME="AEN4117"
 ></A
 ><H3
 ><A
@@ -4698,7 +4886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4089"
+NAME="AEN4148"
 ></A
 ><H3
 ><A
@@ -4821,7 +5009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4120"
+NAME="AEN4179"
 ></A
 ><H3
 ><A
@@ -4965,7 +5153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4156"
+NAME="AEN4215"
 ></A
 ><H3
 ><A
@@ -5028,7 +5216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4172"
+NAME="AEN4231"
 ></A
 ><H3
 ><A
@@ -5091,7 +5279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4188"
+NAME="AEN4247"
 ></A
 ><H3
 ><A
@@ -5193,7 +5381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4214"
+NAME="AEN4273"
 ></A
 ><H3
 ><A
@@ -5295,7 +5483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4240"
+NAME="AEN4299"
 ></A
 ><H3
 ><A
@@ -5376,7 +5564,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4261"
+NAME="AEN4320"
 ></A
 ><H3
 ><A
@@ -5476,7 +5664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4286"
+NAME="AEN4345"
 ></A
 ><H3
 ><A
@@ -5646,7 +5834,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4327"
+NAME="AEN4386"
 ></A
 ><H3
 ><A
@@ -5801,7 +5989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4365"
+NAME="AEN4424"
 ></A
 ><H3
 ><A
@@ -5915,7 +6103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4393"
+NAME="AEN4452"
 ></A
 ><H3
 ><A
@@ -6091,7 +6279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4435"
+NAME="AEN4494"
 ></A
 ><H3
 ><A
@@ -6252,7 +6440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4474"
+NAME="AEN4533"
 ></A
 ><H3
 ><A
@@ -6354,7 +6542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4500"
+NAME="AEN4559"
 ></A
 ><H3
 ><A
@@ -6435,7 +6623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4521"
+NAME="AEN4580"
 ></A
 ><H3
 ><A
@@ -6537,7 +6725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4547"
+NAME="AEN4606"
 ></A
 ><H3
 ><A
@@ -6658,7 +6846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4577"
+NAME="AEN4636"
 ></A
 ><H3
 ><A
@@ -6757,7 +6945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4602"
+NAME="AEN4661"
 ></A
 ><H3
 ><A
@@ -6859,7 +7047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4628"
+NAME="AEN4687"
 ></A
 ><H3
 ><A
@@ -6940,7 +7128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4649"
+NAME="AEN4708"
 ></A
 ><H3
 ><A
@@ -7060,7 +7248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4679"
+NAME="AEN4738"
 ></A
 ><H3
 ><A
@@ -7162,7 +7350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4705"
+NAME="AEN4764"
 ></A
 ><H3
 ><A
@@ -7261,7 +7449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4730"
+NAME="AEN4789"
 ></A
 ><H3
 ><A
@@ -7342,7 +7530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4751"
+NAME="AEN4810"
 ></A
 ><H3
 ><A
@@ -7423,7 +7611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4772"
+NAME="AEN4831"
 ></A
 ><H3
 ><A
@@ -7505,7 +7693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4793"
+NAME="AEN4852"
 ></A
 ><H3
 ><A
@@ -7586,7 +7774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4814"
+NAME="AEN4873"
 ></A
 ><H3
 ><A
@@ -7664,7 +7852,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4834"
+NAME="AEN4893"
 ></A
 ><H3
 ><A
@@ -7742,7 +7930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4854"
+NAME="AEN4913"
 ></A
 ><H3
 ><A
@@ -7845,7 +8033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4880"
+NAME="AEN4939"
 ></A
 ><H3
 ><A
@@ -7930,7 +8118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4901"
+NAME="AEN4960"
 ></A
 ><H3
 ><A
@@ -8037,7 +8225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4928"
+NAME="AEN4987"
 ></A
 ><H3
 ><A
@@ -8141,7 +8329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4954"
+NAME="AEN5013"
 ></A
 ><H3
 ><A
@@ -8255,7 +8443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4982"
+NAME="AEN5041"
 ></A
 ><H3
 ><A
@@ -8369,7 +8557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5010"
+NAME="AEN5069"
 ></A
 ><H3
 ><A
@@ -8483,7 +8671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5038"
+NAME="AEN5097"
 ></A
 ><H3
 ><A
@@ -8546,7 +8734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5054"
+NAME="AEN5113"
 ></A
 ><H3
 ><A
@@ -8648,7 +8836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5080"
+NAME="AEN5139"
 ></A
 ><H3
 ><A
@@ -8755,7 +8943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5106"
+NAME="AEN5165"
 ></A
 ><H3
 ><A
@@ -8819,7 +9007,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5122"
+NAME="AEN5181"
 ></A
 ><H3
 ><A
@@ -8882,86 +9070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5138"
-></A
-><H3
-><A
-NAME="XMLREMOVEPROP"
-></A
->xmlRemoveProp ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRemoveProp                   (<A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Unlink and free one attribute, all the content is freed too
-Note this doesn't work for namespace definition attributes</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
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an attribute</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 if success and -1 in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5158"
+NAME="AEN5197"
 ></A
 ><H3
 ><A
@@ -9092,7 +9201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5190"
+NAME="AEN5229"
 ></A
 ><H3
 ><A
@@ -9216,7 +9325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5221"
+NAME="AEN5260"
 ></A
 ><H3
 ><A
@@ -9320,7 +9429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5247"
+NAME="AEN5286"
 ></A
 ><H3
 ><A
@@ -9404,7 +9513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5268"
+NAME="AEN5307"
 ></A
 ><H3
 ><A
@@ -9485,7 +9594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5289"
+NAME="AEN5328"
 ></A
 ><H3
 ><A
@@ -9566,7 +9675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5310"
+NAME="AEN5349"
 ></A
 ><H3
 ><A
@@ -9689,7 +9798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5341"
+NAME="AEN5380"
 ></A
 ><H3
 ><A
@@ -9723,7 +9832,7 @@
 >Search and get the value of an attribute associated to a node
 This does the entity substitution.
 This function looks in DTD attribute declaration for <GTKDOCLINK
-HREF="FIXED"
+HREF="FIXED-CAPS"
 >FIXED</GTKDOCLINK
 > or
 default declaration values unless DTD use has been turned off.</P
@@ -9798,7 +9907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5368"
+NAME="AEN5407"
 ></A
 ><H3
 ><A
@@ -9837,7 +9946,7 @@
 This attribute has to be anchored in the namespace specified.
 This does the entity substitution.
 This function looks in DTD attribute declaration for <GTKDOCLINK
-HREF="FIXED"
+HREF="FIXED-CAPS"
 >FIXED</GTKDOCLINK
 > or
 default declaration values unless DTD use has been turned off.</P
@@ -9929,7 +10038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5400"
+NAME="AEN5439"
 ></A
 ><H3
 ><A
@@ -10032,7 +10141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5426"
+NAME="AEN5465"
 ></A
 ><H3
 ><A
@@ -10153,7 +10262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5456"
+NAME="AEN5495"
 ></A
 ><H3
 ><A
@@ -10274,7 +10383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5486"
+NAME="AEN5525"
 ></A
 ><H3
 ><A
@@ -10358,7 +10467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5507"
+NAME="AEN5546"
 ></A
 ><H3
 ><A
@@ -10465,7 +10574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5533"
+NAME="AEN5572"
 ></A
 ><H3
 ><A
@@ -10549,7 +10658,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5554"
+NAME="AEN5593"
 ></A
 ><H3
 ><A
@@ -10656,7 +10765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5580"
+NAME="AEN5619"
 ></A
 ><H3
 ><A
@@ -10741,7 +10850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5601"
+NAME="AEN5640"
 ></A
 ><H3
 ><A
@@ -10824,7 +10933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5622"
+NAME="AEN5661"
 ></A
 ><H3
 ><A
@@ -10909,7 +11018,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5643"
+NAME="AEN5682"
 ></A
 ><H3
 ><A
@@ -11013,7 +11122,86 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5669"
+NAME="AEN5708"
+></A
+><H3
+><A
+NAME="XMLREMOVEPROP"
+></A
+>xmlRemoveProp ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlRemoveProp                   (<A
+HREF="gnome-xml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Unlink and free one attribute, all the content is freed too
+Note this doesn't work for namespace definition attributes</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
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an attribute</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 if success and -1 in case of error.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5728"
 ></A
 ><H3
 ><A
@@ -11079,7 +11267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -11089,7 +11277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5688"
+NAME="AEN5747"
 ></A
 ><H3
 ><A
@@ -11174,7 +11362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5709"
+NAME="AEN5768"
 ></A
 ><H3
 ><A
@@ -11256,7 +11444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5729"
+NAME="AEN5788"
 ></A
 ><H3
 ><A
@@ -11342,7 +11530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5750"
+NAME="AEN5809"
 ></A
 ><H3
 ><A
@@ -11445,7 +11633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5775"
+NAME="AEN5834"
 ></A
 ><H3
 ><A
@@ -11462,7 +11650,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlDocDump                      (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -11529,7 +11717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5796"
+NAME="AEN5855"
 ></A
 ><H3
 ><A
@@ -11546,7 +11734,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlElemDump                     (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *f,
                                              <A
@@ -11624,7 +11812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -11634,7 +11822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5822"
+NAME="AEN5881"
 ></A
 ><H3
 ><A
@@ -11737,7 +11925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5847"
+NAME="AEN5906"
 ></A
 ><H3
 ><A
@@ -11815,7 +12003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5867"
+NAME="AEN5926"
 ></A
 ><H3
 ><A
@@ -11897,7 +12085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5887"
+NAME="AEN5946"
 ></A
 ><H3
 ><A
@@ -11955,7 +12143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5902"
+NAME="AEN5961"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index 6540bf4..3a98b84 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -4,7 +4,7 @@
 >valid</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->valid</H1
+><A
+NAME="GNOME-XML-VALID"
+>valid</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN6364"
+NAME="AEN6422"
 ></A
 ><H2
 >Name</H2
->valid &#8212; </DIV
+>valid&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6367"
+NAME="AEN6425"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +165,7 @@
 >xmlValidCtxtPtr</A
 >;
 #define     <A
-HREF="gnome-xml-valid.html#XML-MIN-NOTATION-TABLE"
+HREF="gnome-xml-valid.html#XML-MIN-NOTATION-TABLE-CAPS"
 >XML_MIN_NOTATION_TABLE</A
 >
 struct      <A
@@ -171,7 +177,7 @@
 >xmlNotationTablePtr</A
 >;
 #define     <A
-HREF="gnome-xml-valid.html#XML-MIN-ELEMENT-TABLE"
+HREF="gnome-xml-valid.html#XML-MIN-ELEMENT-TABLE-CAPS"
 >XML_MIN_ELEMENT_TABLE</A
 >
 struct      <A
@@ -183,7 +189,7 @@
 >xmlElementTablePtr</A
 >;
 #define     <A
-HREF="gnome-xml-valid.html#XML-MIN-ATTRIBUTE-TABLE"
+HREF="gnome-xml-valid.html#XML-MIN-ATTRIBUTE-TABLE-CAPS"
 >XML_MIN_ATTRIBUTE_TABLE</A
 >
 struct      <A
@@ -195,7 +201,7 @@
 >xmlAttributeTablePtr</A
 >;
 #define     <A
-HREF="gnome-xml-valid.html#XML-MIN-ID-TABLE"
+HREF="gnome-xml-valid.html#XML-MIN-ID-TABLE-CAPS"
 >XML_MIN_ID_TABLE</A
 >
 struct      <A
@@ -207,7 +213,7 @@
 >xmlIDTablePtr</A
 >;
 #define     <A
-HREF="gnome-xml-valid.html#XML-MIN-REF-TABLE"
+HREF="gnome-xml-valid.html#XML-MIN-REF-TABLE-CAPS"
 >XML_MIN_REF_TABLE</A
 >
 struct      <A
@@ -859,7 +865,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6563"
+NAME="AEN6621"
 ></A
 ><H2
 >Description</H2
@@ -869,14 +875,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6566"
+NAME="AEN6624"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6568"
+NAME="AEN6626"
 ></A
 ><H3
 ><A
@@ -960,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -970,7 +976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6590"
+NAME="AEN6648"
 ></A
 ><H3
 ><A
@@ -1054,7 +1060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1064,7 +1070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6612"
+NAME="AEN6670"
 ></A
 ><H3
 ><A
@@ -1094,7 +1100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6617"
+NAME="AEN6675"
 ></A
 ><H3
 ><A
@@ -1120,11 +1126,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6622"
+NAME="AEN6680"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-NOTATION-TABLE"
+NAME="XML-MIN-NOTATION-TABLE-CAPS"
 ></A
 >XML_MIN_NOTATION_TABLE</H3
 ><TABLE
@@ -1146,7 +1152,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6627"
+NAME="AEN6685"
 ></A
 ><H3
 ><A
@@ -1176,7 +1182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6632"
+NAME="AEN6690"
 ></A
 ><H3
 ><A
@@ -1202,11 +1208,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6637"
+NAME="AEN6695"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-ELEMENT-TABLE"
+NAME="XML-MIN-ELEMENT-TABLE-CAPS"
 ></A
 >XML_MIN_ELEMENT_TABLE</H3
 ><TABLE
@@ -1228,7 +1234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6642"
+NAME="AEN6700"
 ></A
 ><H3
 ><A
@@ -1258,7 +1264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6647"
+NAME="AEN6705"
 ></A
 ><H3
 ><A
@@ -1284,11 +1290,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6652"
+NAME="AEN6710"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-ATTRIBUTE-TABLE"
+NAME="XML-MIN-ATTRIBUTE-TABLE-CAPS"
 ></A
 >XML_MIN_ATTRIBUTE_TABLE</H3
 ><TABLE
@@ -1310,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6657"
+NAME="AEN6715"
 ></A
 ><H3
 ><A
@@ -1340,7 +1346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6662"
+NAME="AEN6720"
 ></A
 ><H3
 ><A
@@ -1366,11 +1372,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6667"
+NAME="AEN6725"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-ID-TABLE"
+NAME="XML-MIN-ID-TABLE-CAPS"
 ></A
 >XML_MIN_ID_TABLE</H3
 ><TABLE
@@ -1392,7 +1398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6672"
+NAME="AEN6730"
 ></A
 ><H3
 ><A
@@ -1422,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6677"
+NAME="AEN6735"
 ></A
 ><H3
 ><A
@@ -1448,11 +1454,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6682"
+NAME="AEN6740"
 ></A
 ><H3
 ><A
-NAME="XML-MIN-REF-TABLE"
+NAME="XML-MIN-REF-TABLE-CAPS"
 ></A
 >XML_MIN_REF_TABLE</H3
 ><TABLE
@@ -1474,7 +1480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6687"
+NAME="AEN6745"
 ></A
 ><H3
 ><A
@@ -1504,7 +1510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6692"
+NAME="AEN6750"
 ></A
 ><H3
 ><A
@@ -1530,7 +1536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6697"
+NAME="AEN6755"
 ></A
 ><H3
 ><A
@@ -1695,7 +1701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6738"
+NAME="AEN6796"
 ></A
 ><H3
 ><A
@@ -1776,7 +1782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6759"
+NAME="AEN6817"
 ></A
 ><H3
 ><A
@@ -1839,7 +1845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6775"
+NAME="AEN6833"
 ></A
 ><H3
 ><A
@@ -1923,7 +1929,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6796"
+NAME="AEN6854"
 ></A
 ><H3
 ><A
@@ -2025,7 +2031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6822"
+NAME="AEN6880"
 ></A
 ><H3
 ><A
@@ -2106,7 +2112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6843"
+NAME="AEN6901"
 ></A
 ><H3
 ><A
@@ -2169,7 +2175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6859"
+NAME="AEN6917"
 ></A
 ><H3
 ><A
@@ -2334,7 +2340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6900"
+NAME="AEN6958"
 ></A
 ><H3
 ><A
@@ -2415,7 +2421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6921"
+NAME="AEN6979"
 ></A
 ><H3
 ><A
@@ -2478,7 +2484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6937"
+NAME="AEN6995"
 ></A
 ><H3
 ><A
@@ -2562,7 +2568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6958"
+NAME="AEN7016"
 ></A
 ><H3
 ><A
@@ -2644,7 +2650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6979"
+NAME="AEN7037"
 ></A
 ><H3
 ><A
@@ -2707,7 +2713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6995"
+NAME="AEN7053"
 ></A
 ><H3
 ><A
@@ -2789,7 +2795,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7016"
+NAME="AEN7074"
 ></A
 ><H3
 ><A
@@ -3017,7 +3023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7072"
+NAME="AEN7130"
 ></A
 ><H3
 ><A
@@ -3098,7 +3104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7093"
+NAME="AEN7151"
 ></A
 ><H3
 ><A
@@ -3161,7 +3167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7109"
+NAME="AEN7167"
 ></A
 ><H3
 ><A
@@ -3245,7 +3251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7130"
+NAME="AEN7188"
 ></A
 ><H3
 ><A
@@ -3389,7 +3395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7166"
+NAME="AEN7224"
 ></A
 ><H3
 ><A
@@ -3458,7 +3464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -3468,7 +3474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7186"
+NAME="AEN7244"
 ></A
 ><H3
 ><A
@@ -3531,7 +3537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7202"
+NAME="AEN7260"
 ></A
 ><H3
 ><A
@@ -3633,7 +3639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7228"
+NAME="AEN7286"
 ></A
 ><H3
 ><A
@@ -3755,7 +3761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7258"
+NAME="AEN7316"
 ></A
 ><H3
 ><A
@@ -3854,7 +3860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7283"
+NAME="AEN7341"
 ></A
 ><H3
 ><A
@@ -3998,7 +4004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7319"
+NAME="AEN7377"
 ></A
 ><H3
 ><A
@@ -4067,7 +4073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -4077,7 +4083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7339"
+NAME="AEN7397"
 ></A
 ><H3
 ><A
@@ -4140,7 +4146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7355"
+NAME="AEN7413"
 ></A
 ><H3
 ><A
@@ -4262,7 +4268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7385"
+NAME="AEN7443"
 ></A
 ><H3
 ><A
@@ -4361,7 +4367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7410"
+NAME="AEN7468"
 ></A
 ><H3
 ><A
@@ -4464,7 +4470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7435"
+NAME="AEN7493"
 ></A
 ><H3
 ><A
@@ -4589,7 +4595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7465"
+NAME="AEN7523"
 ></A
 ><H3
 ><A
@@ -4716,7 +4722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7496"
+NAME="AEN7554"
 ></A
 ><H3
 ><A
@@ -4830,7 +4836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7525"
+NAME="AEN7583"
 ></A
 ><H3
 ><A
@@ -4954,7 +4960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7555"
+NAME="AEN7613"
 ></A
 ><H3
 ><A
@@ -5076,7 +5082,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7586"
+NAME="AEN7644"
 ></A
 ><H3
 ><A
@@ -5179,7 +5185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7612"
+NAME="AEN7670"
 ></A
 ><H3
 ><A
@@ -5299,7 +5305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7642"
+NAME="AEN7700"
 ></A
 ><H3
 ><A
@@ -5429,7 +5435,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7674"
+NAME="AEN7732"
 ></A
 ><H3
 ><A
@@ -5603,7 +5609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7715"
+NAME="AEN7773"
 ></A
 ><H3
 ><A
@@ -5705,7 +5711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7741"
+NAME="AEN7799"
 ></A
 ><H3
 ><A
@@ -5826,7 +5832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7771"
+NAME="AEN7829"
 ></A
 ><H3
 ><A
@@ -5926,7 +5932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7796"
+NAME="AEN7854"
 ></A
 ><H3
 ><A
@@ -6050,7 +6056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7827"
+NAME="AEN7885"
 ></A
 ><H3
 ><A
@@ -6152,7 +6158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7853"
+NAME="AEN7911"
 ></A
 ><H3
 ><A
@@ -6254,7 +6260,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7879"
+NAME="AEN7937"
 ></A
 ><H3
 ><A
@@ -6420,7 +6426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7917"
+NAME="AEN7975"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index 30dcac7..a546822 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -4,7 +4,7 @@
 >xml-error</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->xml-error</H1
+><A
+NAME="GNOME-XML-XML-ERROR"
+>xml-error</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7955"
+NAME="AEN8013"
 ></A
 ><H2
 >Name</H2
->xml-error &#8212; </DIV
+>xml-error&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7958"
+NAME="AEN8016"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7970"
+NAME="AEN8028"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +203,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7973"
+NAME="AEN8031"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7975"
+NAME="AEN8033"
 ></A
 ><H3
 ><A
@@ -329,8 +335,25 @@
 
     XML_ERR_ENCODING_NAME, /* 80 */
 
-    XML_ERR_HYPHEN_IN_COMMENT /* 81 */
+    XML_ERR_HYPHEN_IN_COMMENT, /* 81 */
 
+    /* Added after 2.3.5 integration */
+    XML_ERR_INVALID_ENCODING, /* 82 */
+
+    XML_ERR_EXT_ENTITY_STANDALONE, /* 83 */
+
+    XML_ERR_CONDSEC_INVALID, /* 84 */
+
+    XML_ERR_VALUE_REQUIRED, /* 85 */
+
+    XML_ERR_NOT_WELL_BALANCED, /* 86 */
+    XML_ERR_EXTRA_CONTENT, /* 87 */
+    XML_ERR_ENTITY_CHAR_ERROR, /* 88 */
+    XML_ERR_ENTITY_PE_INTERNAL, /* 88 */
+    XML_ERR_ENTITY_LOOP, /* 89 */
+    XML_ERR_ENTITY_BOUNDARY, /* 90 */
+    XML_ERR_INVALID_URI, /* 91 */
+    XML_ERR_URI_FRAGMENT /* 92 */
 }xmlParserErrors;</PRE
 ></TD
 ></TR
@@ -341,7 +364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7980"
+NAME="AEN8038"
 ></A
 ><H3
 ><A
@@ -438,7 +461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8003"
+NAME="AEN8061"
 ></A
 ><H3
 ><A
@@ -535,7 +558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8026"
+NAME="AEN8084"
 ></A
 ><H3
 ><A
@@ -632,7 +655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8049"
+NAME="AEN8107"
 ></A
 ><H3
 ><A
@@ -729,7 +752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8072"
+NAME="AEN8130"
 ></A
 ><H3
 ><A
@@ -792,7 +815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8088"
+NAME="AEN8146"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index 5a10568..311817b 100644
--- a/doc/html/gnome-xml-xmlio.html
+++ b/doc/html/gnome-xml-xmlio.html
@@ -4,7 +4,7 @@
 >xmlIO</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->xmlIO</H1
+><A
+NAME="GNOME-XML-XMLIO"
+>xmlIO</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9971"
+NAME="AEN10030"
 ></A
 ><H2
 >Name</H2
->xmlIO &#8212; </DIV
+>xmlIO&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9974"
+NAME="AEN10033"
 ></A
 ><H2
 >Synopsis</H2
@@ -177,7 +183,7 @@
 >xmlParserInputBufferCreateFile</A
 >
                                             (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *file,
                                              <A
@@ -239,7 +245,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10001"
+NAME="AEN10060"
 ></A
 ><H2
 >Description</H2
@@ -249,14 +255,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10004"
+NAME="AEN10063"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10006"
+NAME="AEN10065"
 ></A
 ><H3
 ><A
@@ -283,6 +289,8 @@
     xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
     
     xmlBufferPtr buffer;    /* Local buffer encoded in  UTF-8 */
+    /* Added when merging 2.3.5 code */
+    xmlBufferPtr raw;       /* if encoder != NULL buffer for raw input */
 };</PRE
 ></TD
 ></TR
@@ -293,7 +301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10011"
+NAME="AEN10070"
 ></A
 ><H3
 ><A
@@ -319,7 +327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10016"
+NAME="AEN10075"
 ></A
 ><H3
 ><A
@@ -401,7 +409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10037"
+NAME="AEN10096"
 ></A
 ><H3
 ><A
@@ -504,7 +512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10062"
+NAME="AEN10121"
 ></A
 ><H3
 ><A
@@ -525,7 +533,7 @@
 >xmlParserInputBufferPtr</A
 > xmlParserInputBufferCreateFile
                                             (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *file,
                                              <A
@@ -608,7 +616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10088"
+NAME="AEN10147"
 ></A
 ><H3
 ><A
@@ -709,7 +717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10113"
+NAME="AEN10172"
 ></A
 ><H3
 ><A
@@ -808,7 +816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10137"
+NAME="AEN10196"
 ></A
 ><H3
 ><A
@@ -908,7 +916,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10161"
+NAME="AEN10220"
 ></A
 ><H3
 ><A
@@ -1025,7 +1033,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10189"
+NAME="AEN10248"
 ></A
 ><H3
 ><A
@@ -1088,7 +1096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10205"
+NAME="AEN10264"
 ></A
 ><H3
 ><A
@@ -1151,7 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index ae258cd..e01d7e6 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -4,7 +4,7 @@
 >xmlmemory</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -17,6 +17,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -99,19 +102,22 @@
 ></TABLE
 ></DIV
 ><H1
->xmlmemory</H1
+><A
+NAME="GNOME-XML-XMLMEMORY"
+>xmlmemory</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12824"
+NAME="AEN12885"
 ></A
 ><H2
 >Name</H2
->xmlmemory &#8212; </DIV
+>xmlmemory&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12827"
+NAME="AEN12888"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,7 +133,7 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY"
+HREF="gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY-CAPS"
 >NO_DEBUG_MEMORY</A
 >
 void        <A
@@ -163,27 +169,27 @@
 HREF="gnome-xml-xmlmemory.html#XMLMEMDISPLAY"
 >xmlMemDisplay</A
 >                   (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *fp);
 void        <A
 HREF="gnome-xml-xmlmemory.html#XMLMEMSHOW"
 >xmlMemShow</A
 >                      (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *fp,
                                              int nr);
 #define     <A
-HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION"
+HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION-CAPS"
 >DEBUG_MEMORY_LOCATION</A
 >
 #define     <A
-HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY"
+HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY-CAPS"
 >DEBUG_MEMORY</A
 >
 #define     <A
-HREF="gnome-xml-xmlmemory.html#MEM-LIST"
+HREF="gnome-xml-xmlmemory.html#MEM-LIST-CAPS"
 >MEM_LIST</A
 >
 void*       <A
@@ -212,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12848"
+NAME="AEN12909"
 ></A
 ><H2
 >Description</H2
@@ -222,18 +228,18 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12851"
+NAME="AEN12912"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12853"
+NAME="AEN12914"
 ></A
 ><H3
 ><A
-NAME="NO-DEBUG-MEMORY"
+NAME="NO-DEBUG-MEMORY-CAPS"
 ></A
 >NO_DEBUG_MEMORY</H3
 ><TABLE
@@ -255,7 +261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12858"
+NAME="AEN12919"
 ></A
 ><H3
 ><A
@@ -318,7 +324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12874"
+NAME="AEN12935"
 ></A
 ><H3
 ><A
@@ -381,7 +387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12890"
+NAME="AEN12951"
 ></A
 ><H3
 ><A
@@ -462,7 +468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12910"
+NAME="AEN12971"
 ></A
 ><H3
 ><A
@@ -540,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12930"
+NAME="AEN12991"
 ></A
 ><H3
 ><A
@@ -598,7 +604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12945"
+NAME="AEN13006"
 ></A
 ><H3
 ><A
@@ -656,7 +662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12960"
+NAME="AEN13021"
 ></A
 ><H3
 ><A
@@ -684,7 +690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12966"
+NAME="AEN13027"
 ></A
 ><H3
 ><A
@@ -701,7 +707,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlMemDisplay                   (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *fp);</PRE
 ></TD
@@ -748,7 +754,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12982"
+NAME="AEN13043"
 ></A
 ><H3
 ><A
@@ -765,7 +771,7 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >void        xmlMemShow                      (<GTKDOCLINK
-HREF="FILE"
+HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *fp,
                                              int nr);</PRE
@@ -835,11 +841,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13003"
+NAME="AEN13064"
 ></A
 ><H3
 ><A
-NAME="DEBUG-MEMORY-LOCATION"
+NAME="DEBUG-MEMORY-LOCATION-CAPS"
 ></A
 >DEBUG_MEMORY_LOCATION</H3
 ><TABLE
@@ -861,11 +867,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13008"
+NAME="AEN13069"
 ></A
 ><H3
 ><A
-NAME="DEBUG-MEMORY"
+NAME="DEBUG-MEMORY-CAPS"
 ></A
 >DEBUG_MEMORY</H3
 ><TABLE
@@ -887,11 +893,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13013"
+NAME="AEN13074"
 ></A
 ><H3
 ><A
-NAME="MEM-LIST"
+NAME="MEM-LIST-CAPS"
 ></A
 >MEM_LIST</H3
 ><TABLE
@@ -913,7 +919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13018"
+NAME="AEN13079"
 ></A
 ><H3
 ><A
@@ -1008,7 +1014,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1018,7 +1024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13043"
+NAME="AEN13104"
 ></A
 ><H3
 ><A
@@ -1125,7 +1131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1135,7 +1141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13071"
+NAME="AEN13132"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index 647cf0a..b1b8473 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -4,7 +4,7 @@
 >xpath</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -20,6 +20,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,19 +114,22 @@
 ></TABLE
 ></DIV
 ><H1
->xpath</H1
+><A
+NAME="GNOME-XML-XPATH"
+>xpath</A
+></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8789"
+NAME="AEN8847"
 ></A
 ><H2
 >Name</H2
->xpath &#8212; </DIV
+>xpath&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8792"
+NAME="AEN8850"
 ></A
 ><H2
 >Synopsis</H2
@@ -163,27 +169,27 @@
 >xmlNodeSetPtr</A
 >;
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-UNDEFINED"
+HREF="gnome-xml-xpath.html#XPATH-UNDEFINED-CAPS"
 >XPATH_UNDEFINED</A
 >
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-NODESET"
+HREF="gnome-xml-xpath.html#XPATH-NODESET-CAPS"
 >XPATH_NODESET</A
 >
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-BOOLEAN"
+HREF="gnome-xml-xpath.html#XPATH-BOOLEAN-CAPS"
 >XPATH_BOOLEAN</A
 >
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-NUMBER"
+HREF="gnome-xml-xpath.html#XPATH-NUMBER-CAPS"
 >XPATH_NUMBER</A
 >
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-STRING"
+HREF="gnome-xml-xpath.html#XPATH-STRING-CAPS"
 >XPATH_STRING</A
 >
 #define     <A
-HREF="gnome-xml-xpath.html#XPATH-USERS"
+HREF="gnome-xml-xpath.html#XPATH-USERS-CAPS"
 >XPATH_USERS</A
 >
 struct      <A
@@ -347,7 +353,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8849"
+NAME="AEN8907"
 ></A
 ><H2
 >Description</H2
@@ -357,14 +363,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8852"
+NAME="AEN8910"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8854"
+NAME="AEN8912"
 ></A
 ><H3
 ><A
@@ -415,7 +421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8859"
+NAME="AEN8917"
 ></A
 ><H3
 ><A
@@ -441,7 +447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8864"
+NAME="AEN8922"
 ></A
 ><H3
 ><A
@@ -478,7 +484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8869"
+NAME="AEN8927"
 ></A
 ><H3
 ><A
@@ -504,7 +510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8874"
+NAME="AEN8932"
 ></A
 ><H3
 ><A
@@ -534,7 +540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8879"
+NAME="AEN8937"
 ></A
 ><H3
 ><A
@@ -560,11 +566,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8884"
+NAME="AEN8942"
 ></A
 ><H3
 ><A
-NAME="XPATH-UNDEFINED"
+NAME="XPATH-UNDEFINED-CAPS"
 ></A
 >XPATH_UNDEFINED</H3
 ><TABLE
@@ -586,11 +592,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8889"
+NAME="AEN8947"
 ></A
 ><H3
 ><A
-NAME="XPATH-NODESET"
+NAME="XPATH-NODESET-CAPS"
 ></A
 >XPATH_NODESET</H3
 ><TABLE
@@ -612,11 +618,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8894"
+NAME="AEN8952"
 ></A
 ><H3
 ><A
-NAME="XPATH-BOOLEAN"
+NAME="XPATH-BOOLEAN-CAPS"
 ></A
 >XPATH_BOOLEAN</H3
 ><TABLE
@@ -638,11 +644,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8899"
+NAME="AEN8957"
 ></A
 ><H3
 ><A
-NAME="XPATH-NUMBER"
+NAME="XPATH-NUMBER-CAPS"
 ></A
 >XPATH_NUMBER</H3
 ><TABLE
@@ -664,11 +670,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8904"
+NAME="AEN8962"
 ></A
 ><H3
 ><A
-NAME="XPATH-STRING"
+NAME="XPATH-STRING-CAPS"
 ></A
 >XPATH_STRING</H3
 ><TABLE
@@ -690,11 +696,11 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8909"
+NAME="AEN8967"
 ></A
 ><H3
 ><A
-NAME="XPATH-USERS"
+NAME="XPATH-USERS-CAPS"
 ></A
 >XPATH_USERS</H3
 ><TABLE
@@ -716,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8914"
+NAME="AEN8972"
 ></A
 ><H3
 ><A
@@ -749,7 +755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8919"
+NAME="AEN8977"
 ></A
 ><H3
 ><A
@@ -775,7 +781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8924"
+NAME="AEN8982"
 ></A
 ><H3
 ><A
@@ -859,7 +865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -869,7 +875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8947"
+NAME="AEN9005"
 ></A
 ><H3
 ><A
@@ -898,7 +904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8952"
+NAME="AEN9010"
 ></A
 ><H3
 ><A
@@ -924,7 +930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8957"
+NAME="AEN9015"
 ></A
 ><H3
 ><A
@@ -953,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8962"
+NAME="AEN9020"
 ></A
 ><H3
 ><A
@@ -979,7 +985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8967"
+NAME="AEN9025"
 ></A
 ><H3
 ><A
@@ -1048,7 +1054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1058,7 +1064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8986"
+NAME="AEN9044"
 ></A
 ><H3
 ><A
@@ -1087,7 +1093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8991"
+NAME="AEN9049"
 ></A
 ><H3
 ><A
@@ -1113,7 +1119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8996"
+NAME="AEN9054"
 ></A
 ><H3
 ><A
@@ -1203,7 +1209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1213,7 +1219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9021"
+NAME="AEN9079"
 ></A
 ><H3
 ><A
@@ -1242,7 +1248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9026"
+NAME="AEN9084"
 ></A
 ><H3
 ><A
@@ -1268,7 +1274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9031"
+NAME="AEN9089"
 ></A
 ><H3
 ><A
@@ -1337,7 +1343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>&#13;</TD
 ></TR
 ></TABLE
 ><P
@@ -1347,7 +1353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9050"
+NAME="AEN9108"
 ></A
 ><H3
 ><A
@@ -1428,7 +1434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9071"
+NAME="AEN9129"
 ></A
 ><H3
 ><A
@@ -1491,7 +1497,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9087"
+NAME="AEN9145"
 ></A
 ><H3
 ><A
@@ -1594,7 +1600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9113"
+NAME="AEN9171"
 ></A
 ><H3
 ><A
@@ -1657,7 +1663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9129"
+NAME="AEN9187"
 ></A
 ><H3
 ><A
@@ -1760,7 +1766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9155"
+NAME="AEN9213"
 ></A
 ><H3
 ><A
@@ -1846,7 +1852,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9177"
+NAME="AEN9235"
 ></A
 ><H3
 ><A
@@ -1918,7 +1924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9195"
+NAME="AEN9253"
 ></A
 ><H3
 ><A
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 65e8d9e..903bd8f 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -1,5 +1,5 @@
 <ANCHOR id ="GNOME-XML-PARSER" href="gnome-xml/gnome-xml-parser.html">
-<ANCHOR id ="XML-DEFAULT-VERSION" href="gnome-xml/gnome-xml-parser.html#XML-DEFAULT-VERSION">
+<ANCHOR id ="XML-DEFAULT-VERSION-CAPS" href="gnome-xml/gnome-xml-parser.html#XML-DEFAULT-VERSION-CAPS">
 <ANCHOR id ="XMLPARSERINPUTDEALLOCATE" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUTDEALLOCATE">
 <ANCHOR id ="XMLPARSERINPUT" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUT">
 <ANCHOR id ="XMLPARSERINPUTPTR" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUTPTR">
@@ -93,6 +93,7 @@
 <ANCHOR id ="XMLSETEXTERNALENTITYLOADER" href="gnome-xml/gnome-xml-parser.html#XMLSETEXTERNALENTITYLOADER">
 <ANCHOR id ="XMLGETEXTERNALENTITYLOADER" href="gnome-xml/gnome-xml-parser.html#XMLGETEXTERNALENTITYLOADER">
 <ANCHOR id ="XMLLOADEXTERNALENTITY" href="gnome-xml/gnome-xml-parser.html#XMLLOADEXTERNALENTITY">
+<ANCHOR id ="XMLUSENEWPARSER" href="gnome-xml/gnome-xml-parser.html#XMLUSENEWPARSER">
 <ANCHOR id ="GNOME-XML-SAX" href="gnome-xml/gnome-xml-sax.html">
 <ANCHOR id ="EXTERN" href="gnome-xml/gnome-xml-sax.html#EXTERN">
 <ANCHOR id ="GETPUBLICID" href="gnome-xml/gnome-xml-sax.html#GETPUBLICID">
@@ -131,10 +132,13 @@
 <ANCHOR id ="XMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-sax.html#XMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="HTMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-sax.html#HTMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="GNOME-XML-TREE" href="gnome-xml/gnome-xml-tree.html">
+<ANCHOR id ="XMLCHECKVERSION" href="gnome-xml/gnome-xml-tree.html#XMLCHECKVERSION">
+<ANCHOR id ="LIBXML-VERSION-NUMBER-CAPS" href="gnome-xml/gnome-xml-tree.html#LIBXML-VERSION-NUMBER-CAPS">
+<ANCHOR id ="LIBXML-TEST-VERSION-CAPS" href="gnome-xml/gnome-xml-tree.html#LIBXML-TEST-VERSION-CAPS">
 <ANCHOR id ="XMLELEMENTTYPE" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTTYPE">
 <ANCHOR id ="XMLCHAR" href="gnome-xml/gnome-xml-tree.html#XMLCHAR">
-<ANCHOR id ="CHAR" href="gnome-xml/gnome-xml-tree.html#CHAR">
-<ANCHOR id ="BAD-CAST" href="gnome-xml/gnome-xml-tree.html#BAD-CAST">
+<ANCHOR id ="CHAR-CAPS" href="gnome-xml/gnome-xml-tree.html#CHAR-CAPS">
+<ANCHOR id ="BAD-CAST-CAPS" href="gnome-xml/gnome-xml-tree.html#BAD-CAST-CAPS">
 <ANCHOR id ="XMLNOTATION" href="gnome-xml/gnome-xml-tree.html#XMLNOTATION">
 <ANCHOR id ="XMLNOTATIONPTR" href="gnome-xml/gnome-xml-tree.html#XMLNOTATIONPTR">
 <ANCHOR id ="XMLATTRIBUTETYPE" href="gnome-xml/gnome-xml-tree.html#XMLATTRIBUTETYPE">
@@ -168,6 +172,8 @@
 <ANCHOR id ="XMLNODEPTR" href="gnome-xml/gnome-xml-tree.html#XMLNODEPTR">
 <ANCHOR id ="XMLDOC" href="gnome-xml/gnome-xml-tree.html#XMLDOC">
 <ANCHOR id ="XMLDOCPTR" href="gnome-xml/gnome-xml-tree.html#XMLDOCPTR">
+<ANCHOR id ="XMLCHILDRENNODE" href="gnome-xml/gnome-xml-tree.html#XMLCHILDRENNODE">
+<ANCHOR id ="XMLROOTNODE" href="gnome-xml/gnome-xml-tree.html#XMLROOTNODE">
 <ANCHOR id ="BASEDTD" href="gnome-xml/gnome-xml-tree.html#BASEDTD">
 <ANCHOR id ="OLDXMLWDCOMPATIBILITY" href="gnome-xml/gnome-xml-tree.html#OLDXMLWDCOMPATIBILITY">
 <ANCHOR id ="XMLINDENTTREEOUTPUT" href="gnome-xml/gnome-xml-tree.html#XMLINDENTTREEOUTPUT">
@@ -236,7 +242,6 @@
 <ANCHOR id ="XMLTEXTCONCAT" href="gnome-xml/gnome-xml-tree.html#XMLTEXTCONCAT">
 <ANCHOR id ="XMLFREENODELIST" href="gnome-xml/gnome-xml-tree.html#XMLFREENODELIST">
 <ANCHOR id ="XMLFREENODE" href="gnome-xml/gnome-xml-tree.html#XMLFREENODE">
-<ANCHOR id ="XMLREMOVEPROP" href="gnome-xml/gnome-xml-tree.html#XMLREMOVEPROP">
 <ANCHOR id ="XMLSEARCHNS" href="gnome-xml/gnome-xml-tree.html#XMLSEARCHNS">
 <ANCHOR id ="XMLSEARCHNSBYHREF" href="gnome-xml/gnome-xml-tree.html#XMLSEARCHNSBYHREF">
 <ANCHOR id ="XMLGETNSLIST" href="gnome-xml/gnome-xml-tree.html#XMLGETNSLIST">
@@ -257,6 +262,7 @@
 <ANCHOR id ="XMLNODEGETLANG" href="gnome-xml/gnome-xml-tree.html#XMLNODEGETLANG">
 <ANCHOR id ="XMLNODESETLANG" href="gnome-xml/gnome-xml-tree.html#XMLNODESETLANG">
 <ANCHOR id ="XMLNODEGETBASE" href="gnome-xml/gnome-xml-tree.html#XMLNODEGETBASE">
+<ANCHOR id ="XMLREMOVEPROP" href="gnome-xml/gnome-xml-tree.html#XMLREMOVEPROP">
 <ANCHOR id ="XMLREMOVENODE" href="gnome-xml/gnome-xml-tree.html#XMLREMOVENODE">
 <ANCHOR id ="XMLBUFFERWRITECHAR" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERWRITECHAR">
 <ANCHOR id ="XMLBUFFERWRITECHAR" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERWRITECHAR">
@@ -270,15 +276,15 @@
 <ANCHOR id ="XMLGETCOMPRESSMODE" href="gnome-xml/gnome-xml-tree.html#XMLGETCOMPRESSMODE">
 <ANCHOR id ="XMLSETCOMPRESSMODE" href="gnome-xml/gnome-xml-tree.html#XMLSETCOMPRESSMODE">
 <ANCHOR id ="GNOME-XML-ENTITIES" href="gnome-xml/gnome-xml-entities.html">
-<ANCHOR id ="XML-INTERNAL-GENERAL-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-GENERAL-ENTITY">
-<ANCHOR id ="XML-EXTERNAL-GENERAL-PARSED-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-GENERAL-PARSED-ENTITY">
-<ANCHOR id ="XML-EXTERNAL-GENERAL-UNPARSED-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-GENERAL-UNPARSED-ENTITY">
-<ANCHOR id ="XML-INTERNAL-PARAMETER-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-PARAMETER-ENTITY">
-<ANCHOR id ="XML-EXTERNAL-PARAMETER-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-PARAMETER-ENTITY">
-<ANCHOR id ="XML-INTERNAL-PREDEFINED-ENTITY" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-PREDEFINED-ENTITY">
+<ANCHOR id ="XML-INTERNAL-GENERAL-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-GENERAL-ENTITY-CAPS">
+<ANCHOR id ="XML-EXTERNAL-GENERAL-PARSED-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-GENERAL-PARSED-ENTITY-CAPS">
+<ANCHOR id ="XML-EXTERNAL-GENERAL-UNPARSED-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-GENERAL-UNPARSED-ENTITY-CAPS">
+<ANCHOR id ="XML-INTERNAL-PARAMETER-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-PARAMETER-ENTITY-CAPS">
+<ANCHOR id ="XML-EXTERNAL-PARAMETER-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-EXTERNAL-PARAMETER-ENTITY-CAPS">
+<ANCHOR id ="XML-INTERNAL-PREDEFINED-ENTITY-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-INTERNAL-PREDEFINED-ENTITY-CAPS">
 <ANCHOR id ="XMLENTITY" href="gnome-xml/gnome-xml-entities.html#XMLENTITY">
 <ANCHOR id ="XMLENTITYPTR" href="gnome-xml/gnome-xml-entities.html#XMLENTITYPTR">
-<ANCHOR id ="XML-MIN-ENTITIES-TABLE" href="gnome-xml/gnome-xml-entities.html#XML-MIN-ENTITIES-TABLE">
+<ANCHOR id ="XML-MIN-ENTITIES-TABLE-CAPS" href="gnome-xml/gnome-xml-entities.html#XML-MIN-ENTITIES-TABLE-CAPS">
 <ANCHOR id ="XMLENTITIESTABLE" href="gnome-xml/gnome-xml-entities.html#XMLENTITIESTABLE">
 <ANCHOR id ="XMLENTITIESTABLEPTR" href="gnome-xml/gnome-xml-entities.html#XMLENTITIESTABLEPTR">
 <ANCHOR id ="XMLADDDOCENTITY" href="gnome-xml/gnome-xml-entities.html#XMLADDDOCENTITY">
@@ -299,19 +305,19 @@
 <ANCHOR id ="XMLVALIDITYWARNINGFUNC" href="gnome-xml/gnome-xml-valid.html#XMLVALIDITYWARNINGFUNC">
 <ANCHOR id ="XMLVALIDCTXT" href="gnome-xml/gnome-xml-valid.html#XMLVALIDCTXT">
 <ANCHOR id ="XMLVALIDCTXTPTR" href="gnome-xml/gnome-xml-valid.html#XMLVALIDCTXTPTR">
-<ANCHOR id ="XML-MIN-NOTATION-TABLE" href="gnome-xml/gnome-xml-valid.html#XML-MIN-NOTATION-TABLE">
+<ANCHOR id ="XML-MIN-NOTATION-TABLE-CAPS" href="gnome-xml/gnome-xml-valid.html#XML-MIN-NOTATION-TABLE-CAPS">
 <ANCHOR id ="XMLNOTATIONTABLE" href="gnome-xml/gnome-xml-valid.html#XMLNOTATIONTABLE">
 <ANCHOR id ="XMLNOTATIONTABLEPTR" href="gnome-xml/gnome-xml-valid.html#XMLNOTATIONTABLEPTR">
-<ANCHOR id ="XML-MIN-ELEMENT-TABLE" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ELEMENT-TABLE">
+<ANCHOR id ="XML-MIN-ELEMENT-TABLE-CAPS" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ELEMENT-TABLE-CAPS">
 <ANCHOR id ="XMLELEMENTTABLE" href="gnome-xml/gnome-xml-valid.html#XMLELEMENTTABLE">
 <ANCHOR id ="XMLELEMENTTABLEPTR" href="gnome-xml/gnome-xml-valid.html#XMLELEMENTTABLEPTR">
-<ANCHOR id ="XML-MIN-ATTRIBUTE-TABLE" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ATTRIBUTE-TABLE">
+<ANCHOR id ="XML-MIN-ATTRIBUTE-TABLE-CAPS" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ATTRIBUTE-TABLE-CAPS">
 <ANCHOR id ="XMLATTRIBUTETABLE" href="gnome-xml/gnome-xml-valid.html#XMLATTRIBUTETABLE">
 <ANCHOR id ="XMLATTRIBUTETABLEPTR" href="gnome-xml/gnome-xml-valid.html#XMLATTRIBUTETABLEPTR">
-<ANCHOR id ="XML-MIN-ID-TABLE" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ID-TABLE">
+<ANCHOR id ="XML-MIN-ID-TABLE-CAPS" href="gnome-xml/gnome-xml-valid.html#XML-MIN-ID-TABLE-CAPS">
 <ANCHOR id ="XMLIDTABLE" href="gnome-xml/gnome-xml-valid.html#XMLIDTABLE">
 <ANCHOR id ="XMLIDTABLEPTR" href="gnome-xml/gnome-xml-valid.html#XMLIDTABLEPTR">
-<ANCHOR id ="XML-MIN-REF-TABLE" href="gnome-xml/gnome-xml-valid.html#XML-MIN-REF-TABLE">
+<ANCHOR id ="XML-MIN-REF-TABLE-CAPS" href="gnome-xml/gnome-xml-valid.html#XML-MIN-REF-TABLE-CAPS">
 <ANCHOR id ="XMLREFTABLE" href="gnome-xml/gnome-xml-valid.html#XMLREFTABLE">
 <ANCHOR id ="XMLREFTABLEPTR" href="gnome-xml/gnome-xml-valid.html#XMLREFTABLEPTR">
 <ANCHOR id ="XMLADDNOTATIONDECL" href="gnome-xml/gnome-xml-valid.html#XMLADDNOTATIONDECL">
@@ -398,9 +404,9 @@
 <ANCHOR id ="HTMLCREATEPUSHPARSERCTXT" href="gnome-xml/gnome-xml-htmlparser.html#HTMLCREATEPUSHPARSERCTXT">
 <ANCHOR id ="HTMLPARSECHUNK" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSECHUNK">
 <ANCHOR id ="GNOME-XML-HTMLTREE" href="gnome-xml/gnome-xml-htmltree.html">
-<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-TEXT-NODE-CAPS" href="gnome-xml/gnome-xml-htmltree.html#HTML-TEXT-NODE-CAPS">
+<ANCHOR id ="HTML-ENTITY-REF-NODE-CAPS" href="gnome-xml/gnome-xml-htmltree.html#HTML-ENTITY-REF-NODE-CAPS">
+<ANCHOR id ="HTML-COMMENT-NODE-CAPS" href="gnome-xml/gnome-xml-htmltree.html#HTML-COMMENT-NODE-CAPS">
 <ANCHOR id ="HTMLDOCDUMPMEMORY" href="gnome-xml/gnome-xml-htmltree.html#HTMLDOCDUMPMEMORY">
 <ANCHOR id ="HTMLDOCDUMP" href="gnome-xml/gnome-xml-htmltree.html#HTMLDOCDUMP">
 <ANCHOR id ="HTMLSAVEFILE" href="gnome-xml/gnome-xml-htmltree.html#HTMLSAVEFILE">
@@ -413,12 +419,12 @@
 <ANCHOR id ="XMLXPATHPARSERCONTEXTPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR">
 <ANCHOR id ="XMLNODESET" href="gnome-xml/gnome-xml-xpath.html#XMLNODESET">
 <ANCHOR id ="XMLNODESETPTR" href="gnome-xml/gnome-xml-xpath.html#XMLNODESETPTR">
-<ANCHOR id ="XPATH-UNDEFINED" href="gnome-xml/gnome-xml-xpath.html#XPATH-UNDEFINED">
-<ANCHOR id ="XPATH-NODESET" href="gnome-xml/gnome-xml-xpath.html#XPATH-NODESET">
-<ANCHOR id ="XPATH-BOOLEAN" href="gnome-xml/gnome-xml-xpath.html#XPATH-BOOLEAN">
-<ANCHOR id ="XPATH-NUMBER" href="gnome-xml/gnome-xml-xpath.html#XPATH-NUMBER">
-<ANCHOR id ="XPATH-STRING" href="gnome-xml/gnome-xml-xpath.html#XPATH-STRING">
-<ANCHOR id ="XPATH-USERS" href="gnome-xml/gnome-xml-xpath.html#XPATH-USERS">
+<ANCHOR id ="XPATH-UNDEFINED-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-UNDEFINED-CAPS">
+<ANCHOR id ="XPATH-NODESET-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-NODESET-CAPS">
+<ANCHOR id ="XPATH-BOOLEAN-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-BOOLEAN-CAPS">
+<ANCHOR id ="XPATH-NUMBER-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-NUMBER-CAPS">
+<ANCHOR id ="XPATH-STRING-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-STRING-CAPS">
+<ANCHOR id ="XPATH-USERS-CAPS" href="gnome-xml/gnome-xml-xpath.html#XPATH-USERS-CAPS">
 <ANCHOR id ="XMLXPATHOBJECT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHOBJECT">
 <ANCHOR id ="XMLXPATHOBJECTPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHOBJECTPTR">
 <ANCHOR id ="XMLXPATHCONVERTFUNC" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHCONVERTFUNC">
@@ -489,22 +495,22 @@
 <ANCHOR id ="XMLFREEPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLFREEPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERGETDIRECTORY" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERGETDIRECTORY">
 <ANCHOR id ="GNOME-XML-PARSERINTERNALS" href="gnome-xml/gnome-xml-parserinternals.html">
-<ANCHOR id ="XML-MAX-NAMELEN" href="gnome-xml/gnome-xml-parserinternals.html#XML-MAX-NAMELEN">
-<ANCHOR id ="CHARVAL" href="gnome-xml/gnome-xml-parserinternals.html#CHARVAL">
-<ANCHOR id ="NEXTCHARVAL" href="gnome-xml/gnome-xml-parserinternals.html#NEXTCHARVAL">
-<ANCHOR id ="SKIPCHARVAL" href="gnome-xml/gnome-xml-parserinternals.html#SKIPCHARVAL">
-<ANCHOR id ="IS-CHAR" href="gnome-xml/gnome-xml-parserinternals.html#IS-CHAR">
-<ANCHOR id ="IS-BLANK" href="gnome-xml/gnome-xml-parserinternals.html#IS-BLANK">
-<ANCHOR id ="IS-BASECHAR" href="gnome-xml/gnome-xml-parserinternals.html#IS-BASECHAR">
-<ANCHOR id ="IS-DIGIT" href="gnome-xml/gnome-xml-parserinternals.html#IS-DIGIT">
-<ANCHOR id ="IS-COMBINING" href="gnome-xml/gnome-xml-parserinternals.html#IS-COMBINING">
-<ANCHOR id ="IS-EXTENDER" href="gnome-xml/gnome-xml-parserinternals.html#IS-EXTENDER">
-<ANCHOR id ="IS-IDEOGRAPHIC" href="gnome-xml/gnome-xml-parserinternals.html#IS-IDEOGRAPHIC">
-<ANCHOR id ="IS-LETTER" href="gnome-xml/gnome-xml-parserinternals.html#IS-LETTER">
-<ANCHOR id ="IS-PUBIDCHAR" href="gnome-xml/gnome-xml-parserinternals.html#IS-PUBIDCHAR">
-<ANCHOR id ="SKIP-EOL" href="gnome-xml/gnome-xml-parserinternals.html#SKIP-EOL">
-<ANCHOR id ="MOVETO-ENDTAG" href="gnome-xml/gnome-xml-parserinternals.html#MOVETO-ENDTAG">
-<ANCHOR id ="MOVETO-STARTTAG" href="gnome-xml/gnome-xml-parserinternals.html#MOVETO-STARTTAG">
+<ANCHOR id ="XML-MAX-NAMELEN-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#XML-MAX-NAMELEN-CAPS">
+<ANCHOR id ="CHARVAL-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#CHARVAL-CAPS">
+<ANCHOR id ="NEXTCHARVAL-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#NEXTCHARVAL-CAPS">
+<ANCHOR id ="SKIPCHARVAL-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#SKIPCHARVAL-CAPS">
+<ANCHOR id ="IS-CHAR-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-CHAR-CAPS">
+<ANCHOR id ="IS-BLANK-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-BLANK-CAPS">
+<ANCHOR id ="IS-BASECHAR-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-BASECHAR-CAPS">
+<ANCHOR id ="IS-DIGIT-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-DIGIT-CAPS">
+<ANCHOR id ="IS-COMBINING-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-COMBINING-CAPS">
+<ANCHOR id ="IS-EXTENDER-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-EXTENDER-CAPS">
+<ANCHOR id ="IS-IDEOGRAPHIC-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-IDEOGRAPHIC-CAPS">
+<ANCHOR id ="IS-LETTER-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-LETTER-CAPS">
+<ANCHOR id ="IS-PUBIDCHAR-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#IS-PUBIDCHAR-CAPS">
+<ANCHOR id ="SKIP-EOL-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#SKIP-EOL-CAPS">
+<ANCHOR id ="MOVETO-ENDTAG-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#MOVETO-ENDTAG-CAPS">
+<ANCHOR id ="MOVETO-STARTTAG-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#MOVETO-STARTTAG-CAPS">
 <ANCHOR id ="XMLCREATEDOCPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLCREATEDOCPARSERCTXT">
 <ANCHOR id ="XMLCREATEFILEPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLCREATEFILEPARSERCTXT">
 <ANCHOR id ="XMLCREATEMEMORYPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLCREATEMEMORYPARSERCTXT">
@@ -567,10 +573,10 @@
 <ANCHOR id ="XMLPARSEXMLDECL" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSEXMLDECL">
 <ANCHOR id ="XMLPARSEMISC" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSEMISC">
 <ANCHOR id ="XMLPARSEEXTERNALSUBSET" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSEEXTERNALSUBSET">
-<ANCHOR id ="XML-SUBSTITUTE-NONE" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-NONE">
-<ANCHOR id ="XML-SUBSTITUTE-REF" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-REF">
-<ANCHOR id ="XML-SUBSTITUTE-PEREF" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-PEREF">
-<ANCHOR id ="XML-SUBSTITUTE-BOTH" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-BOTH">
+<ANCHOR id ="XML-SUBSTITUTE-NONE-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-NONE-CAPS">
+<ANCHOR id ="XML-SUBSTITUTE-REF-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-REF-CAPS">
+<ANCHOR id ="XML-SUBSTITUTE-PEREF-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-PEREF-CAPS">
+<ANCHOR id ="XML-SUBSTITUTE-BOTH-CAPS" href="gnome-xml/gnome-xml-parserinternals.html#XML-SUBSTITUTE-BOTH-CAPS">
 <ANCHOR id ="XMLDECODEENTITIES" href="gnome-xml/gnome-xml-parserinternals.html#XMLDECODEENTITIES">
 <ANCHOR id ="NODEPUSH" href="gnome-xml/gnome-xml-parserinternals.html#NODEPUSH">
 <ANCHOR id ="NODEPOP" href="gnome-xml/gnome-xml-parserinternals.html#NODEPOP">
@@ -606,7 +612,7 @@
 <ANCHOR id ="XMLSHELLCMD" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELLCMD">
 <ANCHOR id ="XMLSHELL" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELL">
 <ANCHOR id ="GNOME-XML-XMLMEMORY" href="gnome-xml/gnome-xml-xmlmemory.html">
-<ANCHOR id ="NO-DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY">
+<ANCHOR id ="NO-DEBUG-MEMORY-CAPS" href="gnome-xml/gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY-CAPS">
 <ANCHOR id ="XMLFREE" href="gnome-xml/gnome-xml-xmlmemory.html#XMLFREE">
 <ANCHOR id ="XMLMALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOC">
 <ANCHOR id ="XMLREALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOC">
@@ -616,9 +622,9 @@
 <ANCHOR id ="XMLMEMORYDUMP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMORYDUMP">
 <ANCHOR id ="XMLMEMDISPLAY" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMDISPLAY">
 <ANCHOR id ="XMLMEMSHOW" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSHOW">
-<ANCHOR id ="DEBUG-MEMORY-LOCATION" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION">
-<ANCHOR id ="DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY">
-<ANCHOR id ="MEM-LIST" href="gnome-xml/gnome-xml-xmlmemory.html#MEM-LIST">
+<ANCHOR id ="DEBUG-MEMORY-LOCATION-CAPS" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION-CAPS">
+<ANCHOR id ="DEBUG-MEMORY-CAPS" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY-CAPS">
+<ANCHOR id ="MEM-LIST-CAPS" href="gnome-xml/gnome-xml-xmlmemory.html#MEM-LIST-CAPS">
 <ANCHOR id ="XMLMALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOCLOC">
 <ANCHOR id ="XMLREALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOCLOC">
 <ANCHOR id ="XMLMEMSTRDUPLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSTRDUPLOC">
diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index 20f46d7..f49d062 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -4,7 +4,7 @@
 >Libxml Library Reference</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -17,6 +17,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
diff --git a/doc/html/libxml-notes.html b/doc/html/libxml-notes.html
index 985cbef..00d3ed9 100644
--- a/doc/html/libxml-notes.html
+++ b/doc/html/libxml-notes.html
@@ -4,7 +4,7 @@
 >Libxml Programming Notes</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.33"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.44"><LINK
 REL="HOME"
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
@@ -17,6 +17,9 @@
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
diff --git a/doc/xml.html b/doc/xml.html
index 28cf5ea..5dcf0e5 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -1,9 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                      "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
   <title>The XML library for Gnome</title>
-  <meta name="GENERATOR" content="amaya V2.1">
+  <meta name="GENERATOR" content="amaya V4.1">
   <meta http-equiv="Content-Type" content="text/html">
 </head>
 
@@ -13,6 +11,12 @@
 <h2 style="text-align: center">libxml, a.k.a. gnome-xml</h2>
 
 <p></p>
+
+<p><span style="background-color: #FF0000">Note</span>: this is a GNOME 1.x
+branch of libxml, this should not be used for developping new applications
+unless forced by binary compatibility constraints. Check the <a
+href="http://xmlsoft.org/">main web page</a> to retrieve the most recent
+version.</p>
 <ul>
   <li><a href="#Introducti">Introduction</a></li>
   <li><a href="#Documentat">Documentation</a></li>
@@ -61,7 +65,7 @@
   <li>This library is released both under the W3C Copyright and the GNU LGPL.
     Basically, everybody should be happy; if not, drop me a mail.</li>
   <li>There is <a href="upgrade.html">a  first set of instruction</a>
-    concerning upgrade from libxml-1.x to libxml-2.x </li>
+    concerning upgrade from libxml-1.x to libxml-2.x</li>
 </ul>
 
 <h2><a name="Documentat">Documentation</a></h2>
@@ -184,6 +188,20 @@
   </li>
 </ul>
 
+<h3>1.8.12: May 4 2001</h3>
+<ul>
+  <li>integated the new libxml2 XML parser and made it available through
+    xmlUseNewParser()</li>
+  <li>fixed a number of tests case</li>
+  <li>upgraded the tester program</li>
+  <li>a few bug fixes on the default old parser too.</li>
+</ul>
+
+<h3>1.8.10: Sep 6 2000</h3>
+<ul>
+  <li>bug fix release for some Gnome projects</li>
+</ul>
+
 <h3>1.8.7: Mar 6 2000</h3>
 <ul>
   <li>This is a bug fix release:</li>
@@ -192,8 +210,8 @@
     that for adherence to XML spec, this behaviour will be disabled by default
     in 2.x . The same function will allow to keep compatibility for old
   code.</li>
-  <li>Blanks in &lt;a>  &lt;/a> constructs are not ignored anymore, avoiding
-    heuristic is really the Right Way :-\</li>
+  <li>Blanks in &lt;a&gt;  &lt;/a&gt; constructs are not ignored anymore,
+    avoiding heuristic is really the Right Way :-\</li>
   <li>The unchecked use of snprintf which was breaking libxml-1.8.6
     compilation on some platforms has been fixed</li>
   <li>nanoftp.c nanohttp.c: Fixed '#' and '?' stripping when processing
@@ -213,8 +231,8 @@
     href="http://www.w3.org/TR/REC-xml#NT-content">[43] content</a> of the XML
     spec)</li>
   <li>fixed a hideous bug in xmlGetProp pointed by Rune.Djurhuus@fast.no</li>
-  <li>Jody Goldberg &lt;jgoldberg@home.com> provided another patch trying to
-    solve the zlib checks problems</li>
+  <li>Jody Goldberg &lt;jgoldberg@home.com&gt; provided another patch trying
+    to solve the zlib checks problems</li>
   <li>The current state in gnome CVS base is expected to ship as 1.8.5 with
     gnumeric soon</li>
 </ul>
@@ -321,27 +339,27 @@
 <p><a href="http://www.w3.org/TR/REC-xml">XML is a standard</a> for
 markup-based structured documents. Here is <a name="example">an example XML
 document</a>:</p>
-<pre>&lt;?xml version="1.0"?>
-&lt;EXAMPLE prop1="gnome is great" prop2="&amp;amp; linux too">
-  &lt;head>
-   &lt;title>Welcome to Gnome&lt;/title>
-  &lt;/head>
-  &lt;chapter>
-   &lt;title>The Linux adventure&lt;/title>
-   &lt;p>bla bla bla ...&lt;/p>
-   &lt;image href="linus.gif"/>
-   &lt;p>...&lt;/p>
-  &lt;/chapter>
-&lt;/EXAMPLE></pre>
+<pre>&lt;?xml version="1.0"?&gt;
+&lt;EXAMPLE prop1="gnome is great" prop2="&amp;amp; linux too"&gt;
+  &lt;head&gt;
+   &lt;title&gt;Welcome to Gnome&lt;/title&gt;
+  &lt;/head&gt;
+  &lt;chapter&gt;
+   &lt;title&gt;The Linux adventure&lt;/title&gt;
+   &lt;p&gt;bla bla bla ...&lt;/p&gt;
+   &lt;image href="linus.gif"/&gt;
+   &lt;p&gt;...&lt;/p&gt;
+  &lt;/chapter&gt;
+&lt;/EXAMPLE&gt;</pre>
 
 <p>The first line specifies that it's an XML document and gives useful
 information about its encoding. Then the document is a text format whose
 structure is specified by tags between brackets. <strong>Each tag opened has
 to be closed</strong>. XML is pedantic about this. However, if a tag is empty
 (no content), a single tag can serve as both the opening and closing tag if it
-ends with <code>/></code> rather than with <code>></code>. Note that, for
-example, the image tag has no content (just an attribute) and is closed by
-ending the tag with <code>/></code>.</p>
+ends with <code>/&gt;</code> rather than with <code>&gt;</code>. Note that,
+for example, the image tag has no content (just an attribute) and is closed by
+ending the tag with <code>/&gt;</code>.</p>
 
 <p>XML can be applied sucessfully to a wide range of uses, from long term
 structured document maintenance (where it follows the steps of SGML) to simple
@@ -357,9 +375,10 @@
 as the file name, the document type, and a <strong>root</strong> pointer which
 is the root of the document (or more exactly the first child under the root
 which is the document). The tree is made of <strong>xmlNode</strong>s, chained
-in double-linked lists of siblings and with childs&lt;->parent relationship.
-An xmlNode can also carry properties (a chain of xmlAttr structures). An
-attribute may have a value which is a list of TEXT or ENTITY_REF nodes.</p>
+in double-linked lists of siblings and with childs&lt;-&gt;parent
+relationship. An xmlNode can also carry properties (a chain of xmlAttr
+structures). An attribute may have a value which is a list of TEXT or
+ENTITY_REF nodes.</p>
 
 <p>Here is an example (erroneous with respect to the XML spec since there
 should be only one ELEMENT under the root):</p>
@@ -415,7 +434,7 @@
 
 <p>To get more detailed step-by-step guidance on using the SAX interface of
 libxml, see the
-href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">nice
+href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html"&gt;nice
 documentation.written by <a href="mailto:james@daa.com.au">James
 Henstridge</a>.</p>
 
@@ -523,14 +542,14 @@
                 xmlParserCtxtPtr ctxt;
 
                 res = fread(chars, 1, 4, f);
-                if (res > 0) {
+                if (res &gt; 0) {
                     ctxt = xmlCreatePushParserCtxt(NULL, NULL,
                                 chars, res, filename);
-                    while ((res = fread(chars, 1, size, f)) > 0) {
+                    while ((res = fread(chars, 1, size, f)) &gt; 0) {
                         xmlParseChunk(ctxt, chars, res, 0);
                     }
                     xmlParseChunk(ctxt, chars, 0, 1);
-                    doc = ctxt->myDoc;
+                    doc = ctxt-&gt;myDoc;
                     xmlFreeParserCtxt(ctxt);
                 }
             }</pre>
@@ -559,12 +578,12 @@
     xmlNodePtr tree, subtree;
 
     doc = xmlNewDoc("1.0");
-    doc->root = xmlNewDocNode(doc, NULL, "EXAMPLE", NULL);
-    xmlSetProp(doc->root, "prop1", "gnome is great");
-    xmlSetProp(doc->root, "prop2", "&amp; linux too");
-    tree = xmlNewChild(doc->root, NULL, "head", NULL);
+    doc-&gt;root = xmlNewDocNode(doc, NULL, "EXAMPLE", NULL);
+    xmlSetProp(doc-&gt;root, "prop1", "gnome is great");
+    xmlSetProp(doc-&gt;root, "prop2", "&amp; linux too");
+    tree = xmlNewChild(doc-&gt;root, NULL, "head", NULL);
     subtree = xmlNewChild(tree, NULL, "title", "Welcome to Gnome");
-    tree = xmlNewChild(doc->root, NULL, "chapter", NULL);
+    tree = xmlNewChild(doc-&gt;root, NULL, "chapter", NULL);
     subtree = xmlNewChild(tree, NULL, "title", "The Linux adventure");
     subtree = xmlNewChild(tree, NULL, "p", "bla bla bla ...");
     subtree = xmlNewChild(tree, NULL, "image", NULL);
@@ -580,16 +599,16 @@
 <strong>childs</strong>, <strong>next</strong>, <strong>prev</strong>,
 <strong>properties</strong>, etc... For example, still with the previous
 example:</p>
-<pre><code>doc->root->childs->childs</code></pre>
+<pre><code>doc-&gt;root-&gt;childs-&gt;childs</code></pre>
 
 <p>points to the title element,</p>
-<pre>doc->root->childs->next->child->child</pre>
+<pre>doc-&gt;root-&gt;childs-&gt;next-&gt;child-&gt;child</pre>
 
 <p>points to the text node containing the chapter title "The Linux
 adventure".</p>
 
 <p><strong>NOTE</strong>: XML allows <em>PI</em>s and <em>comments</em> to be
-present before the document root, so <code>doc->root</code> may point to an
+present before the document root, so <code>doc-&gt;root</code> may point to an
 element which is not the document Root Element, a function
 <code>xmlDocGetRootElement()</code> was added for this purpose.</p>
 
@@ -692,20 +711,20 @@
 may occur frequently within a document, or to confine the change needed to a
 document to a restricted area in the internal subset of the document (at the
 beginning). Example:</p>
-<pre>1 &lt;?xml version="1.0"?>
+<pre>1 &lt;?xml version="1.0"?&gt;
 2 &lt;!DOCTYPE EXAMPLE SYSTEM "example.dtd" [
-3 &lt;!ENTITY xml "Extensible Markup Language">
-4 ]>
-5 &lt;EXAMPLE>
+3 &lt;!ENTITY xml "Extensible Markup Language"&gt;
+4 ]&gt;
+5 &lt;EXAMPLE&gt;
 6    &amp;xml;
-7 &lt;/EXAMPLE></pre>
+7 &lt;/EXAMPLE&gt;</pre>
 
 <p>Line 3 declares the xml entity. Line 6 uses the xml entity, by prefixing
 it's name with '&amp;' and following it by ';' without any spaces added. There
 are 5 predefined entities in libxml allowing you to escape charaters with
 predefined meaning in some parts of the xml document content:
 <strong>&amp;lt;</strong> for the character '&lt;', <strong>&amp;gt;</strong>
-for the character '>',  <strong>&amp;apos;</strong> for the character ''',
+for the character '&gt;',  <strong>&amp;apos;</strong> for the character ''',
 <strong>&amp;quot;</strong> for the character '"', and
 <strong>&amp;amp;</strong> for the character '&amp;'.</p>
 
@@ -722,7 +741,7 @@
 
 <p>Here is the DOM tree built by libxml for the previous document in the
 default case:</p>
-<pre>/gnome/src/gnome-xml -> ./tester --debug test/ent1
+<pre>/gnome/src/gnome-xml -&gt; ./tester --debug test/ent1
 DOCUMENT
 version=1.0
    ELEMENT EXAMPLE
@@ -735,7 +754,7 @@
      content=</pre>
 
 <p>And here is the result when substituting entities:</p>
-<pre>/gnome/src/gnome-xml -> ./tester --debug --noent test/ent1
+<pre>/gnome/src/gnome-xml -&gt; ./tester --debug --noent test/ent1
 DOCUMENT
 version=1.0
    ELEMENT EXAMPLE
@@ -778,10 +797,10 @@
 version-independent prefix is installed on the root element of your document,
 and if the version information don't match something you know, warn the user
 and be liberal in what you accept as the input. Also do *not* try to base
-namespace checking on the prefix value. &lt;foo:text> may be exactly the same
-as &lt;bar:text> in another document. What really matter is the URI associated
-with the element or the attribute, not the prefix string (which is just a
-shortcut for the full URI).</p>
+namespace checking on the prefix value. &lt;foo:text&gt; may be exactly the
+same as &lt;bar:text&gt; in another document. What really matter is the URI
+associated with the element or the attribute, not the prefix string (which is
+just a shortcut for the full URI).</p>
 
 <p>@@Interfaces@@</p>
 
@@ -871,49 +890,49 @@
 a proposal to keep a database of jobs related to Gnome, with an XML based
 storage structure. Here is an <a href="gjobs.xml">XML encoded jobs
 base</a>:</p>
-<pre>&lt;?xml version="1.0"?>
-&lt;gjob:Helping xmlns:gjob="http://www.gnome.org/some-location">
-  &lt;gjob:Jobs>
+<pre>&lt;?xml version="1.0"?&gt;
+&lt;gjob:Helping xmlns:gjob="http://www.gnome.org/some-location"&gt;
+  &lt;gjob:Jobs&gt;
 
-    &lt;gjob:Job>
-      &lt;gjob:Project ID="3"/>
-      &lt;gjob:Application>GBackup&lt;/gjob:Application>
-      &lt;gjob:Category>Development&lt;/gjob:Category>
+    &lt;gjob:Job&gt;
+      &lt;gjob:Project ID="3"/&gt;
+      &lt;gjob:Application&gt;GBackup&lt;/gjob:Application&gt;
+      &lt;gjob:Category&gt;Development&lt;/gjob:Category&gt;
 
-      &lt;gjob:Update>
-        &lt;gjob:Status>Open&lt;/gjob:Status>
-        &lt;gjob:Modified>Mon, 07 Jun 1999 20:27:45 -0400 MET DST&lt;/gjob:Modified>
-        &lt;gjob:Salary>USD 0.00&lt;/gjob:Salary>
-      &lt;/gjob:Update>
+      &lt;gjob:Update&gt;
+        &lt;gjob:Status&gt;Open&lt;/gjob:Status&gt;
+        &lt;gjob:Modified&gt;Mon, 07 Jun 1999 20:27:45 -0400 MET DST&lt;/gjob:Modified&gt;
+        &lt;gjob:Salary&gt;USD 0.00&lt;/gjob:Salary&gt;
+      &lt;/gjob:Update&gt;
 
-      &lt;gjob:Developers>
-        &lt;gjob:Developer>
-        &lt;/gjob:Developer>
-      &lt;/gjob:Developers>
+      &lt;gjob:Developers&gt;
+        &lt;gjob:Developer&gt;
+        &lt;/gjob:Developer&gt;
+      &lt;/gjob:Developers&gt;
 
-      &lt;gjob:Contact>
-        &lt;gjob:Person>Nathan Clemons&lt;/gjob:Person>
-        &lt;gjob:Email>nathan@windsofstorm.net&lt;/gjob:Email>
-        &lt;gjob:Company>
-        &lt;/gjob:Company>
-        &lt;gjob:Organisation>
-        &lt;/gjob:Organisation>
-        &lt;gjob:Webpage>
-        &lt;/gjob:Webpage>
-        &lt;gjob:Snailmail>
-        &lt;/gjob:Snailmail>
-        &lt;gjob:Phone>
-        &lt;/gjob:Phone>
-      &lt;/gjob:Contact>
+      &lt;gjob:Contact&gt;
+        &lt;gjob:Person&gt;Nathan Clemons&lt;/gjob:Person&gt;
+        &lt;gjob:Email&gt;nathan@windsofstorm.net&lt;/gjob:Email&gt;
+        &lt;gjob:Company&gt;
+        &lt;/gjob:Company&gt;
+        &lt;gjob:Organisation&gt;
+        &lt;/gjob:Organisation&gt;
+        &lt;gjob:Webpage&gt;
+        &lt;/gjob:Webpage&gt;
+        &lt;gjob:Snailmail&gt;
+        &lt;/gjob:Snailmail&gt;
+        &lt;gjob:Phone&gt;
+        &lt;/gjob:Phone&gt;
+      &lt;/gjob:Contact&gt;
 
-      &lt;gjob:Requirements>
+      &lt;gjob:Requirements&gt;
       The program should be released as free software, under the GPL.
-      &lt;/gjob:Requirements>
+      &lt;/gjob:Requirements&gt;
 
-      &lt;gjob:Skills>
-      &lt;/gjob:Skills>
+      &lt;gjob:Skills&gt;
+      &lt;/gjob:Skills&gt;
 
-      &lt;gjob:Details>
+      &lt;gjob:Details&gt;
       A GNOME based system that will allow a superuser to configure 
       compressed and uncompressed files and/or file systems to be backed 
       up with a supported media in the system.  This should be able to 
@@ -921,12 +940,12 @@
       to tar, dd, cpio, cp, gzip, etc., to be directed to the tape machine 
       or via operations performed on the filesystem itself. Email 
       notification and GUI status display very important.
-      &lt;/gjob:Details>
+      &lt;/gjob:Details&gt;
 
-    &lt;/gjob:Job>
+    &lt;/gjob:Job&gt;
 
-  &lt;/gjob:Jobs>
-&lt;/gjob:Helping></pre>
+  &lt;/gjob:Jobs&gt;
+&lt;/gjob:Helping&gt;</pre>
 
 <p>While loading the XML file into an internal DOM tree is a matter of calling
 only a couple of functions, browsing the tree to gather the informations and
@@ -969,13 +988,13 @@
     memset(ret, 0, sizeof(person));
 
     /* We don't care what the top level element name is */
-    cur = cur->childs;
+    cur = cur-&gt;childs;
     while (cur != NULL) {
-        if ((!strcmp(cur->name, "Person")) &amp;&amp; (cur->ns == ns))
-            ret->name = xmlNodeListGetString(doc, cur->childs, 1);
-        if ((!strcmp(cur->name, "Email")) &amp;&amp; (cur->ns == ns))
-            ret->email = xmlNodeListGetString(doc, cur->childs, 1);
-        cur = cur->next;
+        if ((!strcmp(cur-&gt;name, "Person")) &amp;&amp; (cur-&gt;ns == ns))
+            ret-&gt;name = xmlNodeListGetString(doc, cur-&gt;childs, 1);
+        if ((!strcmp(cur-&gt;name, "Email")) &amp;&amp; (cur-&gt;ns == ns))
+            ret-&gt;email = xmlNodeListGetString(doc, cur-&gt;childs, 1);
+        cur = cur-&gt;next;
     }
 
     return(ret);
@@ -992,7 +1011,7 @@
     entities and it's a good coding practice to define a namespace for your
     application set of data and test that the element and attributes you're
     analyzing actually pertains to your application space. This is done by a
-    simple equality test (cur->ns == ns).</li>
+    simple equality test (cur-&gt;ns == ns).</li>
   <li>To retrieve text and attributes value, it is suggested to use the
     function <em>xmlNodeListGetString</em> to gather all the text and entity
     reference nodes generated by the DOM output and produce an single text
@@ -1031,22 +1050,22 @@
     memset(ret, 0, sizeof(job));
 
     /* We don't care what the top level element name is */
-    cur = cur->childs;
+    cur = cur-&gt;childs;
     while (cur != NULL) {
         
-        if ((!strcmp(cur->name, "Project")) &amp;&amp; (cur->ns == ns)) {
-            ret->projectID = xmlGetProp(cur, "ID");
-            if (ret->projectID == NULL) {
+        if ((!strcmp(cur-&gt;name, "Project")) &amp;&amp; (cur-&gt;ns == ns)) {
+            ret-&gt;projectID = xmlGetProp(cur, "ID");
+            if (ret-&gt;projectID == NULL) {
                 fprintf(stderr, "Project has no ID\n");
             }
         }
-        if ((!strcmp(cur->name, "Application")) &amp;&amp; (cur->ns == ns))
-            ret->application = xmlNodeListGetString(doc, cur->childs, 1);
-        if ((!strcmp(cur->name, "Category")) &amp;&amp; (cur->ns == ns))
-            ret->category = xmlNodeListGetString(doc, cur->childs, 1);
-        if ((!strcmp(cur->name, "Contact")) &amp;&amp; (cur->ns == ns))
-            ret->contact = parsePerson(doc, ns, cur);
-        cur = cur->next;
+        if ((!strcmp(cur-&gt;name, "Application")) &amp;&amp; (cur-&gt;ns == ns))
+            ret-&gt;application = xmlNodeListGetString(doc, cur-&gt;childs, 1);
+        if ((!strcmp(cur-&gt;name, "Category")) &amp;&amp; (cur-&gt;ns == ns))
+            ret-&gt;category = xmlNodeListGetString(doc, cur-&gt;childs, 1);
+        if ((!strcmp(cur-&gt;name, "Contact")) &amp;&amp; (cur-&gt;ns == ns))
+            ret-&gt;contact = parsePerson(doc, ns, cur);
+        cur = cur-&gt;next;
     }
 
     return(ret);
@@ -1066,6 +1085,6 @@
 
 <p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.27 2000/03/02 00:15:55 veillard Exp $</p>
+<p>$Id: xml.html,v 1.28 2000/03/06 07:41:49 veillard Exp $</p>
 </body>
 </html>