removed extraneous xmlRemoveProp definition added item about

* tree.h: removed extraneous xmlRemoveProp definition
* TODO: added item about --disable-corba configure switch
* tree.c parser.c: fixed problems for xmlCopyDoc and postvalidation
* nanoftp.c: fixed include problems giving troubles on AIX and
  slowlaris
* xmlIO.[ch] valid.h tree.[ch] xlink.c xmlmemory.c uri.c
  parser.c nanoftp.c nanohttp.c SAX.c testSAX.c :
  comment and headers changes to lower gtk-doc number of warnings
* doc/html/*: rebuilt docs
Daniel
diff --git a/ChangeLog b/ChangeLog
index 4339b4b..5ccb9e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Apr 24 13:30:13 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* tree.h: removed extraneous xmlRemoveProp definition
+	* TODO: added item about --disable-corba configure switch
+	* tree.c parser.c: fixed problems for xmlCopyDoc and postvalidation
+	* nanoftp.c: fixed include problems giving troubles on AIX and 
+	  slowlaris
+	* xmlIO.[ch] valid.h tree.[ch] xlink.c xmlmemory.c uri.c 
+	  parser.c nanoftp.c nanohttp.c SAX.c testSAX.c :
+	  comment and headers changes to lower gtk-doc number of warnings
+	* doc/html/*: rebuilt docs
+
 Sun Apr 16 11:23:29 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* HACKING: documented the tag for 1.x and instructions
diff --git a/SAX.c b/SAX.c
index f1a85ed..5293df7 100644
--- a/SAX.c
+++ b/SAX.c
@@ -144,7 +144,10 @@
 
 /**
  * internalSubset:
- * @ctx: the user data (XML parser context)
+ * @ctx:  the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
  *
  * Callback on internal subset declaration.
  */
@@ -163,6 +166,9 @@
 /**
  * externalSubset:
  * @ctx: the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
  *
  * Callback on external subset declaration.
  */
@@ -378,11 +384,12 @@
 /**
  * attributeDecl:
  * @ctx: the user data (XML parser context)
+ * @elem:  the name of the element
  * @fullname:  the attribute name 
  * @type:  the attribute type 
- * @publicId: The public ID of the attribute
- * @systemId: The system ID of the attribute
- * @content: the attribute value (without processing).
+ * @def:  the type of default value
+ * @defaultValue: the attribute default value
+ * @tree:  the tree of enumerated value set
  *
  * An attribute definition has been parsed
  */
@@ -428,9 +435,7 @@
  * @ctx: the user data (XML parser context)
  * @name:  the element name 
  * @type:  the element type 
- * @publicId: The public ID of the element
- * @systemId: The system ID of the element
- * @content: the element value (without processing).
+ * @content: the element value tree
  *
  * An element definition has been parsed
  */
@@ -595,7 +600,7 @@
 /**
  * attribute:
  * @ctx: the user data (XML parser context)
- * @name:  The attribute name
+ * @fullname:  The attribute name, including namespace prefix
  * @value:  The attribute value
  *
  * Handle an attribute that has been read by the parser.
@@ -743,7 +748,7 @@
 /**
  * startElement:
  * @ctx: the user data (XML parser context)
- * @name:  The element name
+ * @fullname:  The element name, including namespace prefix
  * @atts:  An array of name/value attributes pairs, NULL terminated
  *
  * called when an opening tag has been processed.
@@ -1029,7 +1034,6 @@
  * @ctx: the user data (XML parser context)
  * @target:  the target name
  * @data: the PI data's
- * @len: the number of xmlChar
  *
  * A processing instruction has been parsed.
  */
@@ -1102,6 +1106,7 @@
  *
  * Set the current element namespace.
  */
+
 void
 setNamespace(void *ctx, const xmlChar *name)
 {
@@ -1128,7 +1133,10 @@
  * @ctx: the user data (XML parser context)
  *
  * Get the current element namespace.
+ *
+ * Returns the xmlNsPtr or NULL if none
  */
+
 xmlNsPtr
 getNamespace(void *ctx)
 {
@@ -1149,7 +1157,10 @@
  *
  * Check that the current element namespace is the same as the
  * one read upon parsing.
+ *
+ * Returns 1 if true 0 otherwise
  */
+
 int
 checkNamespace(void *ctx, xmlChar *namespace)
 {
diff --git a/TODO b/TODO
index dc8ee4a..51ea18b 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@
 - Handle undefined namespaces in entity contents better ... at least
   issue a warning
 - General checking of DTD validation in presence of namespaces ... hairy
+- fix --disable-corba configure switch handling, and use XML_WITHOUT_CORBA
+  not WITHOUT_CORBA flag
 
 TODO:
 =====
diff --git a/doc/html/book1.html b/doc/html/book1.html
index e066da6..f23eca2 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 66cb91b..7a01e36 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="AEN13459"
+NAME="AEN11140"
 ></A
 ><H2
 >Name</H2
->debugXML &#8212; </DIV
+>debugXML&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13462"
+NAME="AEN11143"
 ></A
 ><H2
 >Synopsis</H2
@@ -210,17 +216,6 @@
 > node,
                                              int depth);
 void        <A
-HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENTHEAD"
->xmlDebugDumpDocumentHead</A
->        (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-void        <A
 HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENT"
 >xmlDebugDumpDocument</A
 >            (<GTKDOCLINK
@@ -230,73 +225,7 @@
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
-> doc);
-void        <A
-HREF="gnome-xml-debugxml.html#XMLDEBUGDUMPENTITIES"
->xmlDebugDumpEntities</A
->            (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-void        <A
-HREF="gnome-xml-debugxml.html#XMLLSONENODE"
->xmlLsOneNode</A
->                    (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);
-char*       (<A
-HREF="gnome-xml-debugxml.html#XMLSHELLREADLINEFUNC"
->*xmlShellReadlineFunc</A
->)         (char *prompt);
-struct      <A
-HREF="gnome-xml-debugxml.html#XMLSHELLCTXT"
->xmlShellCtxt</A
->;
-typedef     <A
-HREF="gnome-xml-debugxml.html#XMLSHELLCTXTPTR"
->xmlShellCtxtPtr</A
->;
-int         (<A
-HREF="gnome-xml-debugxml.html#XMLSHELLCMD"
->*xmlShellCmd</A
->)                  (<A
-HREF="gnome-xml-debugxml.html#XMLSHELLCTXTPTR"
->xmlShellCtxtPtr</A
-> ctxt,
-                                             char *arg,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node2);
-void        <A
-HREF="gnome-xml-debugxml.html#XMLSHELL"
->xmlShell</A
->                        (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             char *filename,
-                                             <A
-HREF="gnome-xml-debugxml.html#XMLSHELLREADLINEFUNC"
->xmlShellReadlineFunc</A
-> input,
-                                             <GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output);</PRE
+> doc);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -304,7 +233,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13506"
+NAME="AEN11167"
 ></A
 ><H2
 >Description</H2
@@ -314,14 +243,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13509"
+NAME="AEN11170"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13511"
+NAME="AEN11172"
 ></A
 ><H3
 ><A
@@ -403,7 +332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13531"
+NAME="AEN11192"
 ></A
 ><H3
 ><A
@@ -503,7 +432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13555"
+NAME="AEN11216"
 ></A
 ><H3
 ><A
@@ -603,7 +532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13579"
+NAME="AEN11240"
 ></A
 ><H3
 ><A
@@ -703,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13603"
+NAME="AEN11264"
 ></A
 ><H3
 ><A
@@ -803,7 +732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13627"
+NAME="AEN11288"
 ></A
 ><H3
 ><A
@@ -903,89 +832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13651"
-></A
-><H3
-><A
-NAME="XMLDEBUGDUMPDOCUMENTHEAD"
-></A
->xmlDebugDumpDocumentHead ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDebugDumpDocumentHead        (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->output</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13671"
+NAME="AEN11312"
 ></A
 ><H3
 ><A
@@ -1064,564 +911,6 @@
 ></P
 ></DIV
 ></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13691"
-></A
-><H3
-><A
-NAME="XMLDEBUGDUMPENTITIES"
-></A
->xmlDebugDumpEntities ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDebugDumpEntities            (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->output</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13711"
-></A
-><H3
-><A
-NAME="XMLLSONENODE"
-></A
->xmlLsOneNode ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlLsOneNode                    (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->output</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13731"
-></A
-><H3
-><A
-NAME="XMLSHELLREADLINEFUNC"
-></A
->xmlShellReadlineFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->char*       (*xmlShellReadlineFunc)         (char *prompt);</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
->prompt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13749"
-></A
-><H3
-><A
-NAME="XMLSHELLCTXT"
-></A
->struct xmlShellCtxt</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlShellCtxt {
-    char *filename;
-    xmlDocPtr doc;
-    xmlNodePtr node;
-    xmlXPathContextPtr pctxt;
-    int loaded;
-    FILE *output;
-    xmlShellReadlineFunc input;
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13754"
-></A
-><H3
-><A
-NAME="XMLSHELLCTXTPTR"
-></A
->xmlShellCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlShellCtxt *xmlShellCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13759"
-></A
-><H3
-><A
-NAME="XMLSHELLCMD"
-></A
->xmlShellCmd ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         (*xmlShellCmd)                  (<A
-HREF="gnome-xml-debugxml.html#XMLSHELLCTXTPTR"
->xmlShellCtxtPtr</A
-> ctxt,
-                                             char *arg,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node2);</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
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->arg</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->node2</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13792"
-></A
-><H3
-><A
-NAME="XMLSHELL"
-></A
->xmlShell ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlShell                        (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             char *filename,
-                                             <A
-HREF="gnome-xml-debugxml.html#XMLSHELLREADLINEFUNC"
->xmlShellReadlineFunc</A
-> input,
-                                             <GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *output);</PRE
-></TD
-></TR
-></TABLE
-><P
->Implements the XML shell 
-This allow to load, validate, view, modify and save a document
-using a environment similar to a UNIX commandline.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the initial document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the output buffer</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->input</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the line reading function</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->output</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the output FILE*</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index f43276b..4326f3c 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="AEN13215"
+NAME="AEN10933"
 ></A
 ><H2
 >Name</H2
->encoding &#8212; </DIV
+>encoding&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13218"
+NAME="AEN10936"
 ></A
 ><H2
 >Synopsis</H2
@@ -156,23 +162,11 @@
                                              int outlen,
                                              unsigned char *in,
                                              int *inlen);
-struct      <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODINGHANDLER"
->xmlCharEncodingHandler</A
->;
 typedef     <A
 HREF="gnome-xml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 >xmlCharEncodingHandlerPtr</A
 >;
 void        <A
-HREF="gnome-xml-encoding.html#XMLINITCHARENCODINGHANDLERS"
->xmlInitCharEncodingHandlers</A
->     (void);
-void        <A
-HREF="gnome-xml-encoding.html#XMLCLEANUPCHARENCODINGHANDLERS"
->xmlCleanupCharEncodingHandlers</A
->  (void);
-void        <A
 HREF="gnome-xml-encoding.html#XMLREGISTERCHARENCODINGHANDLER"
 >xmlRegisterCharEncodingHandler</A
 >  (<A
@@ -180,21 +174,6 @@
 >xmlCharEncodingHandlerPtr</A
 > handler);
 <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> <A
-HREF="gnome-xml-encoding.html#XMLDETECTCHARENCODING"
->xmlDetectCharEncoding</A
->       (unsigned char *in,
-                                             int len);
-<A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> <A
-HREF="gnome-xml-encoding.html#XMLPARSECHARENCODING"
->xmlParseCharEncoding</A
->        (const char *name);
-<A
 HREF="gnome-xml-encoding.html#XMLCHARENCODINGHANDLERPTR"
 >xmlCharEncodingHandlerPtr</A
 > <A
@@ -213,10 +192,25 @@
 >xmlFindCharEncodingHandler</A
 >
                                             (const char *name);
-int         <A
-HREF="gnome-xml-encoding.html#XMLCHECKUTF8"
->xmlCheckUTF8</A
->                    (unsigned char *utf);</PRE
+<A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> <A
+HREF="gnome-xml-encoding.html#XMLDETECTCHARENCODING"
+>xmlDetectCharEncoding</A
+>       (unsigned char *in,
+                                             int len);
+<A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> <A
+HREF="gnome-xml-encoding.html#XMLPARSECHARENCODING"
+>xmlParseCharEncoding</A
+>        (const char *name);
+void        <A
+HREF="gnome-xml-encoding.html#XMLINITCHARENCODINGHANDLERS"
+>xmlInitCharEncodingHandlers</A
+>     (void);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -224,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13240"
+NAME="AEN10955"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +228,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13243"
+NAME="AEN10958"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13245"
+NAME="AEN10960"
 ></A
 ><H3
 ><A
@@ -291,7 +285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13250"
+NAME="AEN10965"
 ></A
 ><H3
 ><A
@@ -418,7 +412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13280"
+NAME="AEN10995"
 ></A
 ><H3
 ><A
@@ -545,123 +539,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13310"
-></A
-><H3
-><A
-NAME="XMLCHARENCODINGHANDLER"
-></A
->struct xmlCharEncodingHandler</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlCharEncodingHandler {
-    char                       *name;
-    xmlCharEncodingInputFunc   input;
-    xmlCharEncodingOutputFunc output;
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13315"
+NAME="AEN11025"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGHANDLERPTR"
 ></A
 >xmlCharEncodingHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13320"
-></A
-><H3
-><A
-NAME="XMLINITCHARENCODINGHANDLERS"
-></A
->xmlInitCharEncodingHandlers ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlInitCharEncodingHandlers     (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the char encoding support, it registers the default
-encoding supported.
-NOTE: while public, this function usually doesn't need to be called
-in normal processing.</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13326"
-></A
-><H3
-><A
-NAME="XMLCLEANUPCHARENCODINGHANDLERS"
-></A
->xmlCleanupCharEncodingHandlers ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlCleanupCharEncodingHandlers  (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Cleanup the memory allocated for the char encoding support, it
-unregisters all the encoding handlers.</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13332"
+NAME="AEN11029"
 ></A
 ><H3
 ><A
@@ -714,7 +605,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlCharEncodingHandlerPtr handler block</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -724,186 +615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13348"
-></A
-><H3
-><A
-NAME="XMLDETECTCHARENCODING"
-></A
->xmlDetectCharEncoding ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> xmlDetectCharEncoding       (unsigned char *in,
-                                             int len);</PRE
-></TD
-></TR
-></TABLE
-><P
->Guess the encoding of the entity using the first bytes of the entity content
-accordingly of the non-normative appendix F of the XML-1.0 recommendation.</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
->in</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a pointer to the first bytes of the XML entity, must be at least
-4 bytes long.</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  pointer to the length of the buffer</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13372"
-></A
-><H3
-><A
-NAME="XMLPARSECHARENCODING"
-></A
->xmlParseCharEncoding ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> xmlParseCharEncoding        (const char *name);</PRE
-></TD
-></TR
-></TABLE
-><P
->Conpare the string to the known encoding schemes already known. Note
-that the comparison is case insensitive accordingly to the section
-[XML] 4.3.3 Character Encoding in Entities.</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
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->one of the XML_CHAR_ENCODING_... values or XML_CHAR_ENCODING_NONE
-if not recognized.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13392"
+NAME="AEN11045"
 ></A
 ><H3
 ><A
@@ -960,7 +672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a string describing the char encoding.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -975,7 +687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the handler or NULL if not found</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -985,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13413"
+NAME="AEN11066"
 ></A
 ><H3
 ><A
@@ -1062,13 +774,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13432"
+NAME="AEN11085"
 ></A
 ><H3
 ><A
-NAME="XMLCHECKUTF8"
+NAME="XMLDETECTCHARENCODING"
 ></A
->xmlCheckUTF8 ()</H3
+>xmlDetectCharEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1078,27 +790,17 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlCheckUTF8                    (unsigned char *utf);</PRE
+><A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> xmlDetectCharEncoding       (unsigned char *in,
+                                             int len);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Checks <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> for being valid utf-8. <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is assumed to be
-null-terminated. This function is not super-strict, as it will
-allow longer utf-8 sequences than necessary. Note that Java is
-capable of producing these sequences if provoked. Also note, this
-routine checks for the 4-byte maxiumum size, but does not check for
-0x10ffff maximum value.</P
+>Guess the encoding of the entity using the first bytes of the entity content
+accordingly of the non-normative appendix F of the XML-1.0 recommendation.</P
 ><P
 ></P
 ><DIV
@@ -1120,14 +822,31 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->utf</I
+>in</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> Pointer to putative utf-8 encoded string.</TD
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>len</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1142,18 +861,124 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> true if <TT
-CLASS="PARAMETER"
-><I
->utf</I
-></TT
-> is valid.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
 ></P
 ></DIV
 ></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11109"
+></A
+><H3
+><A
+NAME="XMLPARSECHARENCODING"
+></A
+>xmlParseCharEncoding ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> xmlParseCharEncoding        (const char *name);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Conpare the string to the known encoding schemes already known. Note
+that the comparison is case insensitive accordingly to the section
+[XML] 4.3.3 Character Encoding in Entities.</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
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11129"
+></A
+><H3
+><A
+NAME="XMLINITCHARENCODINGHANDLERS"
+></A
+>xmlInitCharEncodingHandlers ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlInitCharEncodingHandlers     (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Initialize the char encoding support, it registers the default
+encoding supported.
+NOTE: while public theis function usually don't need to be called
+in normal processing.</P
+><P
+></P
+></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index 30a5573..a7f1c4e 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="AEN6234"
+NAME="AEN5069"
 ></A
 ><H2
 >Name</H2
->entities &#8212; </DIV
+>entities&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6237"
+NAME="AEN5072"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,14 +144,30 @@
 CLASS="SYNOPSIS"
 >&#13;
 
-enum        <A
-HREF="gnome-xml-entities.html#XMLENTITYTYPE"
->xmlEntityType</A
->;
-struct      <A
-HREF="gnome-xml-entities.html#XMLENTITY"
->xmlEntity</A
->;
+#define     <A
+HREF="gnome-xml-entities.html#XML-INTERNAL-GENERAL-ENTITY"
+>XML_INTERNAL_GENERAL_ENTITY</A
+>
+#define     <A
+HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-PARSED-ENTITY"
+>XML_EXTERNAL_GENERAL_PARSED_ENTITY</A
+>
+#define     <A
+HREF="gnome-xml-entities.html#XML-EXTERNAL-GENERAL-UNPARSED-ENTITY"
+>XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</A
+>
+#define     <A
+HREF="gnome-xml-entities.html#XML-INTERNAL-PARAMETER-ENTITY"
+>XML_INTERNAL_PARAMETER_ENTITY</A
+>
+#define     <A
+HREF="gnome-xml-entities.html#XML-EXTERNAL-PARAMETER-ENTITY"
+>XML_EXTERNAL_PARAMETER_ENTITY</A
+>
+#define     <A
+HREF="gnome-xml-entities.html#XML-INTERNAL-PREDEFINED-ENTITY"
+>XML_INTERNAL_PREDEFINED_ENTITY</A
+>
 typedef     <A
 HREF="gnome-xml-entities.html#XMLENTITYPTR"
 >xmlEntityPtr</A
@@ -154,10 +176,6 @@
 HREF="gnome-xml-entities.html#XML-MIN-ENTITIES-TABLE"
 >XML_MIN_ENTITIES_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-entities.html#XMLENTITIESTABLE"
->xmlEntitiesTable</A
->;
 typedef     <A
 HREF="gnome-xml-entities.html#XMLENTITIESTABLEPTR"
 >xmlEntitiesTablePtr</A
@@ -330,33 +348,7 @@
                                              <A
 HREF="gnome-xml-entities.html#XMLENTITIESTABLEPTR"
 >xmlEntitiesTablePtr</A
-> table);
-void        <A
-HREF="gnome-xml-entities.html#XMLDUMPENTITYDECL"
->xmlDumpEntityDecl</A
->               (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-entities.html#XMLENTITYPTR"
->xmlEntityPtr</A
-> ent);
-void        <A
-HREF="gnome-xml-entities.html#XMLCLEANUPPREDEFINEDENTITIES"
->xmlCleanupPredefinedEntities</A
->    (void);
-int         <A
-HREF="gnome-xml-entities.html#XMLENTITYADDREFERENCE"
->xmlEntityAddReference</A
->           (<A
-HREF="gnome-xml-entities.html#XMLENTITYPTR"
->xmlEntityPtr</A
-> ent,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *to);</PRE
+> table);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -364,7 +356,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6300"
+NAME="AEN5131"
 ></A
 ><H2
 >Description</H2
@@ -374,20 +366,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6303"
+NAME="AEN5134"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6305"
+NAME="AEN5136"
 ></A
 ><H3
 ><A
-NAME="XMLENTITYTYPE"
+NAME="XML-INTERNAL-GENERAL-ENTITY"
 ></A
->enum xmlEntityType</H3
+>XML_INTERNAL_GENERAL_ENTITY</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -397,14 +389,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef enum {
-    XML_INTERNAL_GENERAL_ENTITY = 1,
-    XML_EXTERNAL_GENERAL_PARSED_ENTITY = 2,
-    XML_EXTERNAL_GENERAL_UNPARSED_ENTITY = 3,
-    XML_INTERNAL_PARAMETER_ENTITY = 4,
-    XML_EXTERNAL_PARAMETER_ENTITY = 5,
-    XML_INTERNAL_PREDEFINED_ENTITY = 6
-} xmlEntityType;</PRE
+>#define XML_INTERNAL_GENERAL_ENTITY		1</PRE
 ></TD
 ></TR
 ></TABLE
@@ -414,13 +399,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6310"
+NAME="AEN5141"
 ></A
 ><H3
 ><A
-NAME="XMLENTITY"
+NAME="XML-EXTERNAL-GENERAL-PARSED-ENTITY"
 ></A
->struct xmlEntity</H3
+>XML_EXTERNAL_GENERAL_PARSED_ENTITY</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -430,34 +415,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->struct xmlEntity {
-#ifndef XML_WITHOUT_CORBA
-    void           *_private;	        /* for Corba, must be first ! */
-#endif
-    xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
-    const xmlChar          *name;	/* Attribute name */
-    struct _xmlNode    *children;	/* NULL */
-    struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
-    struct _xmlNode        *next;	/* next sibling link  */
-    struct _xmlNode        *prev;	/* previous sibling link  */
-    struct _xmlDoc          *doc;       /* the containing document */
-
-    xmlChar                *orig;	/* content without ref substitution */
-    xmlChar             *content;	/* content or ndata if unparsed */
-    int                   length;	/* the content length */
-    xmlEntityType          etype;	/* The entity type */
-    const xmlChar    *ExternalID;	/* External identifier for PUBLIC */
-    const xmlChar      *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
-
-#ifdef WITH_EXTRA_ENT_DETECT
-    /* Referenced entities name stack */
-    xmlChar           *ent;             /* Current parsed Node */
-    int                entNr;           /* Depth of the parsing stack */
-    int                entMax;          /* Max depth of the parsing stack */
-    xmlChar *         *entTab;          /* array of nodes */
-#endif
-};</PRE
+>#define XML_EXTERNAL_GENERAL_PARSED_ENTITY	2</PRE
 ></TD
 ></TR
 ></TABLE
@@ -467,33 +425,124 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6315"
+NAME="AEN5146"
+></A
+><H3
+><A
+NAME="XML-EXTERNAL-GENERAL-UNPARSED-ENTITY"
+></A
+>XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY	3</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5151"
+></A
+><H3
+><A
+NAME="XML-INTERNAL-PARAMETER-ENTITY"
+></A
+>XML_INTERNAL_PARAMETER_ENTITY</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define XML_INTERNAL_PARAMETER_ENTITY		4</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5156"
+></A
+><H3
+><A
+NAME="XML-EXTERNAL-PARAMETER-ENTITY"
+></A
+>XML_EXTERNAL_PARAMETER_ENTITY</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define XML_EXTERNAL_PARAMETER_ENTITY		5</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5161"
+></A
+><H3
+><A
+NAME="XML-INTERNAL-PREDEFINED-ENTITY"
+></A
+>XML_INTERNAL_PREDEFINED_ENTITY</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define XML_INTERNAL_PREDEFINED_ENTITY		6</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN5166"
 ></A
 ><H3
 ><A
 NAME="XMLENTITYPTR"
 ></A
 >xmlEntityPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEntity *xmlEntityPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6320"
+NAME="AEN5170"
 ></A
 ><H3
 ><A
@@ -509,7 +558,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ENTITIES_TABLE	32</PRE
+>#define     XML_MIN_ENTITIES_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -519,63 +568,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6325"
-></A
-><H3
-><A
-NAME="XMLENTITIESTABLE"
-></A
->struct xmlEntitiesTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlEntitiesTable {
-    int nb_entities;		/* number of elements stored */
-    int max_entities;		/* maximum number of elements */
-    xmlEntityPtr *table;	/* the table of entities */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6330"
+NAME="AEN5175"
 ></A
 ><H3
 ><A
 NAME="XMLENTITIESTABLEPTR"
 ></A
 >xmlEntitiesTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEntitiesTable *xmlEntitiesTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6335"
+NAME="AEN5179"
 ></A
 ><H3
 ><A
@@ -648,7 +654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -665,7 +671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -682,7 +688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -699,7 +705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -716,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -733,7 +739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -748,7 +754,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -758,7 +764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6380"
+NAME="AEN5224"
 ></A
 ><H3
 ><A
@@ -802,7 +808,7 @@
 ></TR
 ></TABLE
 ><P
->Register a new entity for this document DTD external subset.</P
+>Register a new entity for this document DTD.</P
 ><P
 ></P
 ><DIV
@@ -831,7 +837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -848,7 +854,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -865,7 +871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity type XML_xxx_yyy_ENTITY</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -882,7 +888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity external ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -899,7 +905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity system ID if available</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -916,7 +922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -931,7 +937,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the entity or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -941,7 +947,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6425"
+NAME="AEN5269"
 ></A
 ><H3
 ><A
@@ -997,7 +1003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1012,7 +1018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1022,7 +1028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6446"
+NAME="AEN5290"
 ></A
 ><H3
 ><A
@@ -1084,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1101,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1116,7 +1122,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1126,7 +1132,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6472"
+NAME="AEN5316"
 ></A
 ><H3
 ><A
@@ -1187,7 +1193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1204,7 +1210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1219,7 +1225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1229,7 +1235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6498"
+NAME="AEN5342"
 ></A
 ><H3
 ><A
@@ -1290,7 +1296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document referencing the entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1307,7 +1313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1322,7 +1328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A pointer to the entity structure or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1332,7 +1338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6524"
+NAME="AEN5368"
 ></A
 ><H3
 ><A
@@ -1399,7 +1405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1416,7 +1422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1431,7 +1437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1441,7 +1447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6552"
+NAME="AEN5396"
 ></A
 ><H3
 ><A
@@ -1507,7 +1513,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document containing the string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1524,7 +1530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A string to convert to XML.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1539,7 +1545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1549,7 +1555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6579"
+NAME="AEN5423"
 ></A
 ><H3
 ><A
@@ -1600,7 +1606,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntitiesTablePtr just created or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1610,7 +1616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6595"
+NAME="AEN5439"
 ></A
 ><H3
 ><A
@@ -1666,7 +1672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1681,7 +1687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlEntitiesTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1691,7 +1697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6616"
+NAME="AEN5460"
 ></A
 ><H3
 ><A
@@ -1744,7 +1750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1754,7 +1760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6632"
+NAME="AEN5476"
 ></A
 ><H3
 ><A
@@ -1811,7 +1817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An XML buffer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1828,221 +1834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An entity table</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6653"
-></A
-><H3
-><A
-NAME="XMLDUMPENTITYDECL"
-></A
->xmlDumpEntityDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDumpEntityDecl               (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-entities.html#XMLENTITYPTR"
->xmlEntityPtr</A
-> ent);</PRE
-></TD
-></TR
-></TABLE
-><P
->This will dump the content of the entity table as an XML DTD definition</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  An XML buffer.</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ent</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  An entity table</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6674"
-></A
-><H3
-><A
-NAME="XMLCLEANUPPREDEFINEDENTITIES"
-></A
->xmlCleanupPredefinedEntities ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlCleanupPredefinedEntities    (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Cleanup up the predefined entities table.</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6680"
-></A
-><H3
-><A
-NAME="XMLENTITYADDREFERENCE"
-></A
->xmlEntityAddReference ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlEntityAddReference           (<A
-HREF="gnome-xml-entities.html#XMLENTITYPTR"
->xmlEntityPtr</A
-> ent,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *to);</PRE
-></TD
-></TR
-></TABLE
-><P
->Function to register reuse of an existing entity from a (new) one
-Used to keep track of references and detect cycles (well formedness 
-errors !).</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
->ent</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an existing entity</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->to</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the entity name it's referencing</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 Okay, -1 in case of general error, 1 in case of loop 
-detection.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 0929868..77f49b9 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="AEN8848"
+NAME="AEN7286"
 ></A
 ><H2
 >Name</H2
->HTMLparser &#8212; </DIV
+>HTMLparser&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8851"
+NAME="AEN7289"
 ></A
 ><H2
 >Synopsis</H2
@@ -174,25 +180,9 @@
 HREF="gnome-xml-htmlparser.html#HTMLNODEPTR"
 >htmlNodePtr</A
 >;
-struct      <A
-HREF="gnome-xml-htmlparser.html#HTMLELEMDESC"
->htmlElemDesc</A
->;
-typedef     <A
-HREF="gnome-xml-htmlparser.html#HTMLELEMDESCPTR"
->htmlElemDescPtr</A
->;
-struct      <A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESC"
->htmlEntityDesc</A
->;
-typedef     <A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
->;
-<A
-HREF="gnome-xml-htmlparser.html#HTMLELEMDESCPTR"
->htmlElemDescPtr</A
+<GTKDOCLINK
+HREF="HTMLELEMDESCPTR"
+>htmlElemDescPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-htmlparser.html#HTMLTAGLOOKUP"
 >htmlTagLookup</A
@@ -200,9 +190,9 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *tag);
-<A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
+<GTKDOCLINK
+HREF="HTMLENTITYDESCPTR"
+>htmlEntityDescPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-htmlparser.html#HTMLENTITYLOOKUP"
 >htmlEntityLookup</A
@@ -210,35 +200,9 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *name);
-int         <A
-HREF="gnome-xml-htmlparser.html#HTMLISAUTOCLOSED"
->htmlIsAutoClosed</A
->                (<A
-HREF="gnome-xml-htmlparser.html#HTMLDOCPTR"
->htmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-htmlparser.html#HTMLNODEPTR"
->htmlNodePtr</A
-> elem);
-int         <A
-HREF="gnome-xml-htmlparser.html#HTMLAUTOCLOSETAG"
->htmlAutoCloseTag</A
->                (<A
-HREF="gnome-xml-htmlparser.html#HTMLDOCPTR"
->htmlDocPtr</A
-> doc,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             <A
-HREF="gnome-xml-htmlparser.html#HTMLNODEPTR"
->htmlNodePtr</A
-> elem);
-<A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
+<GTKDOCLINK
+HREF="HTMLENTITYDESCPTR"
+>htmlEntityDescPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-htmlparser.html#HTMLPARSEENTITYREF"
 >htmlParseEntityRef</A
@@ -311,42 +275,7 @@
 HREF="gnome-xml-htmlparser.html#HTMLPARSEFILE"
 >htmlParseFile</A
 >                   (const char *filename,
-                                             const char *encoding);
-void        <A
-HREF="gnome-xml-htmlparser.html#HTMLFREEPARSERCTXT"
->htmlFreeParserCtxt</A
->              (<A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> ctxt);
-<A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> <A
-HREF="gnome-xml-htmlparser.html#HTMLCREATEPUSHPARSERCTXT"
->htmlCreatePushParserCtxt</A
->  (<A
-HREF="gnome-xml-htmlparser.html#HTMLSAXHANDLERPTR"
->htmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);
-int         <A
-HREF="gnome-xml-htmlparser.html#HTMLPARSECHUNK"
->htmlParseChunk</A
->                  (<A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);</PRE
+                                             const char *encoding);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -354,7 +283,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8908"
+NAME="AEN7327"
 ></A
 ><H2
 >Description</H2
@@ -364,364 +293,131 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8911"
+NAME="AEN7330"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8913"
+NAME="AEN7332"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXT"
 ></A
 >htmlParserCtxt</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxt htmlParserCtxt;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8918"
+NAME="AEN7336"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERCTXTPTR"
 ></A
 >htmlParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxtPtr htmlParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8923"
+NAME="AEN7340"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERNODEINFO"
 ></A
 >htmlParserNodeInfo</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfo htmlParserNodeInfo;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8928"
+NAME="AEN7344"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLER"
 ></A
 >htmlSAXHandler</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandler htmlSAXHandler;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8933"
+NAME="AEN7348"
 ></A
 ><H3
 ><A
 NAME="HTMLSAXHANDLERPTR"
 ></A
 >htmlSAXHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8938"
+NAME="AEN7352"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUT"
 ></A
 >htmlParserInput</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInput htmlParserInput;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8943"
+NAME="AEN7356"
 ></A
 ><H3
 ><A
 NAME="HTMLPARSERINPUTPTR"
 ></A
 >htmlParserInputPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInputPtr htmlParserInputPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8948"
+NAME="AEN7360"
 ></A
 ><H3
 ><A
 NAME="HTMLDOCPTR"
 ></A
 >htmlDocPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlDocPtr htmlDocPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8953"
+NAME="AEN7364"
 ></A
 ><H3
 ><A
 NAME="HTMLNODEPTR"
 ></A
 >htmlNodePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNodePtr htmlNodePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8958"
-></A
-><H3
-><A
-NAME="HTMLELEMDESC"
-></A
->struct htmlElemDesc</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct htmlElemDesc {
-    const char *name;	/* The tag name */
-    int startTag;       /* Whether the start tag can be implied */
-    int endTag;         /* Whether the end tag can be implied */
-    int empty;          /* Is this an empty element ? */
-    int depr;           /* Is this a deprecated element ? */
-    int dtd;            /* 1: only in Loose DTD, 2: only Frameset one */
-    const char *desc;   /* the description */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8963"
-></A
-><H3
-><A
-NAME="HTMLELEMDESCPTR"
-></A
->htmlElemDescPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef htmlElemDesc *htmlElemDescPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8968"
-></A
-><H3
-><A
-NAME="HTMLENTITYDESC"
-></A
->struct htmlEntityDesc</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct htmlEntityDesc {
-    int value;		/* the UNICODE value for the character */
-    const char *name;	/* The entity name */
-    const char *desc;   /* the description */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8973"
-></A
-><H3
-><A
-NAME="HTMLENTITYDESCPTR"
-></A
->htmlEntityDescPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef htmlEntityDesc *htmlEntityDescPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8978"
+NAME="AEN7368"
 ></A
 ><H3
 ><A
@@ -737,9 +433,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-htmlparser.html#HTMLELEMDESCPTR"
->htmlElemDescPtr</A
+><GTKDOCLINK
+HREF="HTMLELEMDESCPTR"
+>htmlElemDescPtr</GTKDOCLINK
 > htmlTagLookup               (const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
@@ -777,7 +473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The tag name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -792,7 +488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the related htmlElemDescPtr or NULL if not found.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -802,7 +498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8999"
+NAME="AEN7389"
 ></A
 ><H3
 ><A
@@ -818,9 +514,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
+><GTKDOCLINK
+HREF="HTMLENTITYDESCPTR"
+>htmlEntityDescPtr</GTKDOCLINK
 > htmlEntityLookup          (const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
@@ -860,7 +556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -875,7 +571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -885,231 +581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9021"
-></A
-><H3
-><A
-NAME="HTMLISAUTOCLOSED"
-></A
->htmlIsAutoClosed ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         htmlIsAutoClosed                (<A
-HREF="gnome-xml-htmlparser.html#HTMLDOCPTR"
->htmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-htmlparser.html#HTMLNODEPTR"
->htmlNodePtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->The HTmL DtD allows a tag to implicitely close other tags.
-The list is kept in htmlStartClose array. This function checks
-if a tag is autoclosed by one of it's child</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the HTML document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the HTML element</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->1 if autoclosed, 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9046"
-></A
-><H3
-><A
-NAME="HTMLAUTOCLOSETAG"
-></A
->htmlAutoCloseTag ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         htmlAutoCloseTag                (<A
-HREF="gnome-xml-htmlparser.html#HTMLDOCPTR"
->htmlDocPtr</A
-> doc,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             <A
-HREF="gnome-xml-htmlparser.html#HTMLNODEPTR"
->htmlNodePtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->The HTmL DtD allows a tag to implicitely close other tags.
-The list is kept in htmlStartClose array. This function checks
-if the element or one of it's children would autoclose the
-given tag.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the HTML document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The tag name</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the HTML element</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->1 if autoclose, 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9076"
+NAME="AEN7411"
 ></A
 ><H3
 ><A
@@ -1125,9 +597,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
+><GTKDOCLINK
+HREF="HTMLENTITYDESCPTR"
+>htmlEntityDescPtr</GTKDOCLINK
 > htmlParseEntityRef        (<A
 HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
 >htmlParserCtxtPtr</A
@@ -1171,7 +643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1188,7 +660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  location to store the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1203,8 +675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the associated htmlEntityDescPtr if found, or NULL otherwise,
-if non-NULL *str will have to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1214,7 +685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9103"
+NAME="AEN7438"
 ></A
 ><H3
 ><A
@@ -1273,7 +744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1288,7 +759,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1298,7 +769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9125"
+NAME="AEN7460"
 ></A
 ><H3
 ><A
@@ -1355,7 +826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1365,7 +836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9143"
+NAME="AEN7478"
 ></A
 ><H3
 ><A
@@ -1429,7 +900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1446,7 +917,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1463,7 +934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1480,7 +951,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1495,7 +966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1505,7 +976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9177"
+NAME="AEN7512"
 ></A
 ><H3
 ><A
@@ -1562,7 +1033,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1579,7 +1050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1594,7 +1065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1604,7 +1075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9202"
+NAME="AEN7537"
 ></A
 ><H3
 ><A
@@ -1666,7 +1137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1683,7 +1154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1700,7 +1171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1717,7 +1188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> if using SAX, this pointer will be provided on callbacks. </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1732,7 +1203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1742,7 +1213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9235"
+NAME="AEN7570"
 ></A
 ><H3
 ><A
@@ -1797,7 +1268,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1814,7 +1285,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a free form C string describing the HTML document encoding, or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1829,390 +1300,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9259"
-></A
-><H3
-><A
-NAME="HTMLFREEPARSERCTXT"
-></A
->htmlFreeParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        htmlFreeParserCtxt              (<A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an HTML parser context</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9275"
-></A
-><H3
-><A
-NAME="HTMLCREATEPUSHPARSERCTXT"
-></A
->htmlCreatePushParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> htmlCreatePushParserCtxt  (<A
-HREF="gnome-xml-htmlparser.html#HTMLSAXHANDLERPTR"
->htmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a parser context for using the HTML parser in push mode
-To allow content encoding detection, <TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
-> should be &gt;= 4
-The value of <TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
-> is used for fetching external entities
-and error/warning reports.</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
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a SAX handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->chunk</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a pointer to an array of chars</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  number of chars in the array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an optional file name or URI</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an optional encoding</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser context or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9319"
-></A
-><H3
-><A
-NAME="HTMLPARSECHUNK"
-></A
->htmlParseChunk ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         htmlParseChunk                  (<A
-HREF="gnome-xml-htmlparser.html#HTMLPARSERCTXTPTR"
->htmlParserCtxtPtr</A
-> ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);</PRE
-></TD
-></TR
-></TABLE
-><P
->Parse a Chunk of memory</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->chunk</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an char array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size in byte of the chunk</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->terminate</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  last chunk indicator</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index 7a6f7f5..0b9746e 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="AEN9356"
+NAME="AEN7599"
 ></A
 ><H2
 >Name</H2
->HTMLtree &#8212; </DIV
+>HTMLtree&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9359"
+NAME="AEN7602"
 ></A
 ><H2
 >Synopsis</H2
@@ -180,36 +186,6 @@
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
-> cur);
-void        <A
-HREF="gnome-xml-htmltree.html#HTMLNODEDUMP"
->htmlNodeDump</A
->                    (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);
-void        <A
-HREF="gnome-xml-htmltree.html#HTMLNODEDUMPFILE"
->htmlNodeDumpFile</A
->                (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *out,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
 > cur);</PRE
 ></TD
 ></TR
@@ -218,7 +194,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9381"
+NAME="AEN7616"
 ></A
 ><H2
 >Description</H2
@@ -228,14 +204,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9384"
+NAME="AEN7619"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9386"
+NAME="AEN7621"
 ></A
 ><H3
 ><A
@@ -251,7 +227,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_TEXT_NODE		XML_TEXT_NODE</PRE
+>#define     HTML_TEXT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -261,7 +237,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9391"
+NAME="AEN7626"
 ></A
 ><H3
 ><A
@@ -277,7 +253,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE</PRE
+>#define     HTML_ENTITY_REF_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -287,7 +263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9396"
+NAME="AEN7631"
 ></A
 ><H3
 ><A
@@ -303,7 +279,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define HTML_COMMENT_NODE	XML_COMMENT_NODE</PRE
+>#define     HTML_COMMENT_NODE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -313,7 +289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9401"
+NAME="AEN7636"
 ></A
 ><H3
 ><A
@@ -372,7 +348,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -389,7 +365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -406,7 +382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -416,7 +392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9426"
+NAME="AEN7661"
 ></A
 ><H3
 ><A
@@ -473,7 +449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -490,7 +466,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -500,7 +476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9447"
+NAME="AEN7682"
 ></A
 ><H3
 ><A
@@ -554,7 +530,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -571,7 +547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -586,217 +562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of byte written or -1 in case of failure.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9471"
-></A
-><H3
-><A
-NAME="HTMLNODEDUMP"
-></A
->htmlNodeDump ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        htmlNodeDump                    (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Dump an HTML node, recursive behaviour,children are printed too.</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the HTML buffer output</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the current node</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9497"
-></A
-><H3
-><A
-NAME="HTMLNODEDUMPFILE"
-></A
->htmlNodeDumpFile ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        htmlNodeDumpFile                (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *out,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Dump an HTML node, recursive behaviour,children are printed too.</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
->out</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the FILE pointer</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index e90d0aa..16e5864 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="AEN10171"
+NAME="AEN8195"
 ></A
 ><H2
 >Name</H2
->nanoftp &#8212; </DIV
+>nanoftp&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10174"
+NAME="AEN8198"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +281,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10203"
+NAME="AEN8227"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +291,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10206"
+NAME="AEN8230"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10208"
+NAME="AEN8232"
 ></A
 ><H3
 ><A
@@ -551,7 +557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10267"
+NAME="AEN8291"
 ></A
 ><H3
 ><A
@@ -645,7 +651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10289"
+NAME="AEN8313"
 ></A
 ><H3
 ><A
@@ -675,7 +681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10295"
+NAME="AEN8319"
 ></A
 ><H3
 ><A
@@ -701,7 +707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10300"
+NAME="AEN8324"
 ></A
 ><H3
 ><A
@@ -751,7 +757,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to initialize the context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -761,7 +767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10315"
+NAME="AEN8339"
 ></A
 ><H3
 ><A
@@ -811,7 +817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -821,7 +827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10330"
+NAME="AEN8354"
 ></A
 ><H3
 ><A
@@ -872,7 +878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP server name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -899,7 +905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10349"
+NAME="AEN8373"
 ></A
 ><H3
 ><A
@@ -949,7 +955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the URL to the resource</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -959,7 +965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10364"
+NAME="AEN8388"
 ></A
 ><H3
 ><A
@@ -1009,7 +1015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1024,7 +1030,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1034,7 +1040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10383"
+NAME="AEN8407"
 ></A
 ><H3
 ><A
@@ -1084,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1099,7 +1105,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1109,7 +1115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10402"
+NAME="AEN8426"
 ></A
 ><H3
 ><A
@@ -1159,7 +1165,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1174,7 +1180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 in case of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1184,7 +1190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10421"
+NAME="AEN8445"
 ></A
 ><H3
 ><A
@@ -1237,7 +1243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The proxy URL used to initialize the proxy context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1247,7 +1253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10436"
+NAME="AEN8460"
 ></A
 ><H3
 ><A
@@ -1303,7 +1309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy host name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1320,7 +1326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy port</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1337,7 +1343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy user name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1354,7 +1360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the proxy password</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1371,12 +1377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of proxy 1 for using SITE, 2 for USER a<TT
-CLASS="PARAMETER"
-><I
->b</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1386,7 +1387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10468"
+NAME="AEN8491"
 ></A
 ><H3
 ><A
@@ -1441,7 +1442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1458,7 +1459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  The URL used to update the context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1473,7 +1474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if Ok, -1 in case of error (other host).</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1483,7 +1484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10491"
+NAME="AEN8514"
 ></A
 ><H3
 ><A
@@ -1533,7 +1534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1548,7 +1549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1558,7 +1559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10510"
+NAME="AEN8533"
 ></A
 ><H3
 ><A
@@ -1608,7 +1609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1623,7 +1624,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the code number, or 0</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1633,7 +1634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10529"
+NAME="AEN8552"
 ></A
 ><H3
 ><A
@@ -1724,7 +1725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10551"
+NAME="AEN8574"
 ></A
 ><H3
 ><A
@@ -1775,7 +1776,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1790,7 +1791,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1800,7 +1801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10570"
+NAME="AEN8593"
 ></A
 ><H3
 ><A
@@ -1850,7 +1851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1865,7 +1866,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1875,7 +1876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10589"
+NAME="AEN8612"
 ></A
 ><H3
 ><A
@@ -1932,7 +1933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1949,7 +1950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1966,7 +1967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1983,7 +1984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optional files to list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1998,7 +1999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2008,7 +2009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10621"
+NAME="AEN8644"
 ></A
 ><H3
 ><A
@@ -2059,7 +2060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2076,7 +2077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve (or NULL if path is in context).</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2091,7 +2092,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the socket for the data connection, or &lt;0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2101,7 +2102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10644"
+NAME="AEN8667"
 ></A
 ><H3
 ><A
@@ -2158,7 +2159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2175,7 +2176,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2192,7 +2193,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the user callback data</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2209,7 +2210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file to retrieve</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2224,7 +2225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 incase of error, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2234,7 +2235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10676"
+NAME="AEN8699"
 ></A
 ><H3
 ><A
@@ -2297,7 +2298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FTP context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2314,7 +2315,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2331,7 +2332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2346,8 +2347,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of byte read. 0 is an indication of an end of connection.
--1 indicates a parameter error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 61e8e87..717c987 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="AEN9955"
+NAME="AEN7979"
 ></A
 ><H2
 >Name</H2
->nanohttp &#8212; </DIV
+>nanohttp&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9958"
+NAME="AEN7982"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +201,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9971"
+NAME="AEN7995"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +211,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9974"
+NAME="AEN7998"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9976"
+NAME="AEN8000"
 ></A
 ><H3
 ><A
@@ -241,7 +247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9982"
+NAME="AEN8006"
 ></A
 ><H3
 ><A
@@ -267,7 +273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9987"
+NAME="AEN8011"
 ></A
 ><H3
 ><A
@@ -330,7 +336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10002"
+NAME="AEN8026"
 ></A
 ><H3
 ><A
@@ -444,7 +450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10029"
+NAME="AEN8053"
 ></A
 ><H3
 ><A
@@ -583,7 +589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10061"
+NAME="AEN8085"
 ></A
 ><H3
 ><A
@@ -663,7 +669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10080"
+NAME="AEN8104"
 ></A
 ><H3
 ><A
@@ -738,7 +744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10099"
+NAME="AEN8123"
 ></A
 ><H3
 ><A
@@ -861,7 +867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10128"
+NAME="AEN8152"
 ></A
 ><H3
 ><A
@@ -955,7 +961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10151"
+NAME="AEN8175"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index bd1c5b8..dcc4b3a 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
@@ -149,22 +155,27 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 >*);
-struct      <A
-HREF="gnome-xml-parser.html#XMLPARSERINPUT"
->xmlParserInput</A
->;
 typedef     <A
 HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
 >xmlParserInputPtr</A
 >;
+<A
+HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> (<A
+HREF="gnome-xml-parser.html#XMLEXTERNALENTITYLOADER"
+>*xmlExternalEntityLoader</A
+>)
+                                            (const char *URL,
+                                             const char *ID,
+                                             <A
+HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> context);
 struct      <A
 HREF="gnome-xml-parser.html#XMLPARSERNODEINFO"
 >xmlParserNodeInfo</A
 >;
-typedef     <A
-HREF="gnome-xml-parser.html#XMLPARSERNODEINFOPTR"
->xmlParserNodeInfoPtr</A
->;
 struct      <A
 HREF="gnome-xml-parser.html#XMLPARSERNODEINFOSEQ"
 >xmlParserNodeInfoSeq</A
@@ -224,22 +235,6 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *SystemID);
-void        (<A
-HREF="gnome-xml-parser.html#EXTERNALSUBSETSAXFUNC"
->*externalSubsetSAXFunc</A
->)        (void *ctx,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ExternalID,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *SystemID);
 <A
 HREF="gnome-xml-entities.html#XMLENTITYPTR"
 >xmlEntityPtr</A
@@ -487,27 +482,10 @@
 HREF="gnome-xml-parser.html#HASEXTERNALSUBSETSAXFUNC"
 >*hasExternalSubsetSAXFunc</A
 >)     (void *ctx);
-struct      <A
-HREF="gnome-xml-parser.html#XMLSAXHANDLER"
->xmlSAXHandler</A
->;
 typedef     <A
 HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 >;
-<A
-HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
->xmlParserInputPtr</A
-> (<A
-HREF="gnome-xml-parser.html#XMLEXTERNALENTITYLOADER"
->*xmlExternalEntityLoader</A
->)
-                                            (const char *URL,
-                                             const char *ID,
-                                             <A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> context);
 extern      const char *<A
 HREF="gnome-xml-parser.html#XMLPARSERVERSION"
 >xmlParserVersion</A
@@ -528,14 +506,6 @@
 HREF="gnome-xml-parser.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE"
 >xmlSubstituteEntitiesDefaultValue</A
 >;
-extern      int <A
-HREF="gnome-xml-parser.html#XMLGETWARNINGSDEFAULTVALUE"
->xmlGetWarningsDefaultValue</A
->;
-void        <A
-HREF="gnome-xml-parser.html#XMLCLEANUPPARSER"
->xmlCleanupParser</A
->                (void);
 int         <A
 HREF="gnome-xml-parser.html#XMLPARSERINPUTREAD"
 >xmlParserInputRead</A
@@ -701,10 +671,6 @@
 HREF="gnome-xml-parser.html#XMLSUBSTITUTEENTITIESDEFAULT"
 >xmlSubstituteEntitiesDefault</A
 >    (int val);
-int         <A
-HREF="gnome-xml-parser.html#XMLKEEPBLANKSDEFAULT"
->xmlKeepBlanksDefault</A
->            (int val);
 <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
@@ -752,25 +718,6 @@
 >xmlChar</A
 > *cur,
                                              int recovery);
-int         <A
-HREF="gnome-xml-parser.html#XMLSAXUSERPARSEFILE"
->xmlSAXUserParseFile</A
->             (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *filename);
-int         <A
-HREF="gnome-xml-parser.html#XMLSAXUSERPARSEMEMORY"
->xmlSAXUserParseMemory</A
->           (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             char *buffer,
-                                             int size);
 <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
@@ -828,60 +775,6 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *SystemID);
-int         <A
-HREF="gnome-xml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY"
->xmlParseBalancedChunkMemory</A
->     (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             int depth,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *string,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> *list);
-int         <A
-HREF="gnome-xml-parser.html#XMLPARSEEXTERNALENTITY"
->xmlParseExternalEntity</A
->          (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             int depth,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *URL,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ID,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> *list);
-void        <A
-HREF="gnome-xml-parser.html#XMLDEFAULTSAXHANDLERINIT"
->xmlDefaultSAXHandlerInit</A
->        (void);
-void        <A
-HREF="gnome-xml-parser.html#HTMLDEFAULTSAXHANDLERINIT"
->htmlDefaultSAXHandlerInit</A
->       (void);
 void        <A
 HREF="gnome-xml-parser.html#XMLINITPARSERCTXT"
 >xmlInitParserCtxt</A
@@ -897,13 +790,6 @@
 >xmlParserCtxtPtr</A
 > ctxt);
 void        <A
-HREF="gnome-xml-parser.html#XMLFREEPARSERCTXT"
->xmlFreeParserCtxt</A
->               (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);
-void        <A
 HREF="gnome-xml-parser.html#XMLSETUPPARSERFORBUFFER"
 >xmlSetupParserForBuffer</A
 >         (<A
@@ -915,82 +801,14 @@
 >xmlChar</A
 > *buffer,
                                              const char *filename);
-<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> <A
-HREF="gnome-xml-parser.html#XMLCREATEDOCPARSERCTXT"
->xmlCreateDocParserCtxt</A
->     (<A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *cur);
-<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> <A
-HREF="gnome-xml-parser.html#XMLCREATEPUSHPARSERCTXT"
->xmlCreatePushParserCtxt</A
->    (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename);
-int         <A
-HREF="gnome-xml-parser.html#XMLPARSECHUNK"
->xmlParseChunk</A
->                   (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);
-<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> <A
-HREF="gnome-xml-parser.html#XMLCREATEIOPARSERCTXT"
->xmlCreateIOParserCtxt</A
->      (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> ioread,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> ioclose,
-                                             void *ioctx,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);
-<A
-HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
->xmlParserInputPtr</A
-> <A
-HREF="gnome-xml-parser.html#XMLNEWIOINPUTSTREAM"
->xmlNewIOInputStream</A
->       (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> input,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);
+void        <A
+HREF="gnome-xml-parser.html#XMLDEFAULTSAXHANDLERINIT"
+>xmlDefaultSAXHandlerInit</A
+>        (void);
+void        <A
+HREF="gnome-xml-parser.html#HTMLDEFAULTSAXHANDLERINIT"
+>htmlDefaultSAXHandlerInit</A
+>       (void);
 const <A
 HREF="gnome-xml-parser.html#XMLPARSERNODEINFO"
 >xmlParserNodeInfo</A
@@ -1079,7 +897,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN275"
+NAME="AEN229"
 ></A
 ><H2
 >Description</H2
@@ -1089,14 +907,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN278"
+NAME="AEN232"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN280"
+NAME="AEN234"
 ></A
 ><H3
 ><A
@@ -1112,7 +930,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_DEFAULT_VERSION	"1.0"</PRE
+>#define     XML_DEFAULT_VERSION</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1122,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN285"
+NAME="AEN239"
 ></A
 ><H3
 ><A
@@ -1183,55 +1001,26 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN300"
-></A
-><H3
-><A
-NAME="XMLPARSERINPUT"
-></A
->struct xmlParserInput</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlParserInput {
-    /* Input buffer */
-    xmlParserInputBufferPtr buf;      /* UTF-8 encoded buffer */
-
-    const char *filename;             /* The file analyzed, if any */
-    const char *directory;            /* the directory/base of teh file */
-    const xmlChar *base;              /* Base of the array to parse */
-    const xmlChar *cur;               /* Current char being parsed */
-    int length;                       /* length if known */
-    int line;                         /* Current line */
-    int col;                          /* Current column */
-    int consumed;                     /* How many xmlChars already consumed */
-    xmlParserInputDeallocate free;    /* function to deallocate the base */
-    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
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN305"
+NAME="AEN254"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTPTR"
 ></A
 >xmlParserInputPtr</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN258"
+></A
+><H3
+><A
+NAME="XMLEXTERNALENTITYLOADER"
+></A
+>xmlExternalEntityLoader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1241,17 +1030,107 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef xmlParserInput *xmlParserInputPtr;</PRE
+><A
+HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
+>xmlParserInputPtr</A
+> (*xmlExternalEntityLoader)
+                                            (const char *URL,
+                                             const char *ID,
+                                             <A
+HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> context);</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
+>URL</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>context</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN310"
+NAME="AEN286"
 ></A
 ><H3
 ><A
@@ -1284,33 +1163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN315"
-></A
-><H3
-><A
-NAME="XMLPARSERNODEINFOPTR"
-></A
->xmlParserNodeInfoPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN320"
+NAME="AEN291"
 ></A
 ><H3
 ><A
@@ -1340,33 +1193,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN325"
+NAME="AEN296"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERNODEINFOSEQPTR"
 ></A
 >xmlParserNodeInfoSeqPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN330"
+NAME="AEN300"
 ></A
 ><H3
 ><A
@@ -1409,7 +1249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN335"
+NAME="AEN305"
 ></A
 ><H3
 ><A
@@ -1499,33 +1339,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN340"
+NAME="AEN310"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERCTXTPTR"
 ></A
 >xmlParserCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserCtxt *xmlParserCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN345"
+NAME="AEN314"
 ></A
 ><H3
 ><A
@@ -1556,33 +1383,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN350"
+NAME="AEN319"
 ></A
 ><H3
 ><A
 NAME="XMLSAXLOCATORPTR"
 ></A
 >xmlSAXLocatorPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXLocator *xmlSAXLocatorPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN355"
+NAME="AEN323"
 ></A
 ><H3
 ><A
@@ -1700,7 +1514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN384"
+NAME="AEN352"
 ></A
 ><H3
 ><A
@@ -1821,128 +1635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN413"
-></A
-><H3
-><A
-NAME="EXTERNALSUBSETSAXFUNC"
-></A
->externalSubsetSAXFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        (*externalSubsetSAXFunc)        (void *ctx,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ExternalID,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *SystemID);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctx</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ExternalID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->SystemID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN442"
+NAME="AEN381"
 ></A
 ><H3
 ><A
@@ -2039,7 +1732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN466"
+NAME="AEN405"
 ></A
 ><H3
 ><A
@@ -2136,7 +1829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN490"
+NAME="AEN429"
 ></A
 ><H3
 ><A
@@ -2296,7 +1989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN528"
+NAME="AEN467"
 ></A
 ><H3
 ><A
@@ -2417,7 +2110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN557"
+NAME="AEN496"
 ></A
 ><H3
 ><A
@@ -2595,7 +2288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN599"
+NAME="AEN538"
 ></A
 ><H3
 ><A
@@ -2713,7 +2406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN627"
+NAME="AEN566"
 ></A
 ><H3
 ><A
@@ -2855,7 +2548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN661"
+NAME="AEN600"
 ></A
 ><H3
 ><A
@@ -2934,7 +2627,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN680"
+NAME="AEN619"
 ></A
 ><H3
 ><A
@@ -2992,7 +2685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN694"
+NAME="AEN633"
 ></A
 ><H3
 ><A
@@ -3050,7 +2743,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN708"
+NAME="AEN647"
 ></A
 ><H3
 ><A
@@ -3150,7 +2843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN732"
+NAME="AEN671"
 ></A
 ><H3
 ><A
@@ -3229,7 +2922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN751"
+NAME="AEN690"
 ></A
 ><H3
 ><A
@@ -3329,7 +3022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN775"
+NAME="AEN714"
 ></A
 ><H3
 ><A
@@ -3408,7 +3101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN794"
+NAME="AEN733"
 ></A
 ><H3
 ><A
@@ -3505,7 +3198,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN817"
+NAME="AEN756"
 ></A
 ><H3
 ><A
@@ -3602,7 +3295,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN840"
+NAME="AEN779"
 ></A
 ><H3
 ><A
@@ -3702,7 +3395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN864"
+NAME="AEN803"
 ></A
 ><H3
 ><A
@@ -3781,7 +3474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN883"
+NAME="AEN822"
 ></A
 ><H3
 ><A
@@ -3878,7 +3571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN906"
+NAME="AEN845"
 ></A
 ><H3
 ><A
@@ -3972,7 +3665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN928"
+NAME="AEN867"
 ></A
 ><H3
 ><A
@@ -4066,7 +3759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN950"
+NAME="AEN889"
 ></A
 ><H3
 ><A
@@ -4160,7 +3853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN972"
+NAME="AEN911"
 ></A
 ><H3
 ><A
@@ -4233,7 +3926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN990"
+NAME="AEN929"
 ></A
 ><H3
 ><A
@@ -4306,7 +3999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1008"
+NAME="AEN947"
 ></A
 ><H3
 ><A
@@ -4379,203 +4072,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1026"
-></A
-><H3
-><A
-NAME="XMLSAXHANDLER"
-></A
->struct xmlSAXHandler</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlSAXHandler {
-    internalSubsetSAXFunc internalSubset;
-    isStandaloneSAXFunc isStandalone;
-    hasInternalSubsetSAXFunc hasInternalSubset;
-    hasExternalSubsetSAXFunc hasExternalSubset;
-    resolveEntitySAXFunc resolveEntity;
-    getEntitySAXFunc getEntity;
-    entityDeclSAXFunc entityDecl;
-    notationDeclSAXFunc notationDecl;
-    attributeDeclSAXFunc attributeDecl;
-    elementDeclSAXFunc elementDecl;
-    unparsedEntityDeclSAXFunc unparsedEntityDecl;
-    setDocumentLocatorSAXFunc setDocumentLocator;
-    startDocumentSAXFunc startDocument;
-    endDocumentSAXFunc endDocument;
-    startElementSAXFunc startElement;
-    endElementSAXFunc endElement;
-    referenceSAXFunc reference;
-    charactersSAXFunc characters;
-    ignorableWhitespaceSAXFunc ignorableWhitespace;
-    processingInstructionSAXFunc processingInstruction;
-    commentSAXFunc comment;
-    warningSAXFunc warning;
-    errorSAXFunc error;
-    fatalErrorSAXFunc fatalError;
-    getParameterEntitySAXFunc getParameterEntity;
-    cdataBlockSAXFunc cdataBlock;
-    externalSubsetSAXFunc externalSubset;
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1031"
+NAME="AEN965"
 ></A
 ><H3
 ><A
 NAME="XMLSAXHANDLERPTR"
 ></A
 >xmlSAXHandlerPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlSAXHandler *xmlSAXHandlerPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1036"
-></A
-><H3
-><A
-NAME="XMLEXTERNALENTITYLOADER"
-></A
->xmlExternalEntityLoader ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
->xmlParserInputPtr</A
-> (*xmlExternalEntityLoader)
-                                            (const char *URL,
-                                             const char *ID,
-                                             <A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> context);</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
->URL</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->context</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1064"
+NAME="AEN969"
 ></A
 ><H3
 ><A
@@ -4601,7 +4111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1069"
+NAME="AEN974"
 ></A
 ><H3
 ><A
@@ -4627,7 +4137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1074"
+NAME="AEN979"
 ></A
 ><H3
 ><A
@@ -4653,7 +4163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1079"
+NAME="AEN984"
 ></A
 ><H3
 ><A
@@ -4679,7 +4189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1084"
+NAME="AEN989"
 ></A
 ><H3
 ><A
@@ -4705,64 +4215,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1089"
-></A
-><H3
-><A
-NAME="XMLGETWARNINGSDEFAULTVALUE"
-></A
->xmlGetWarningsDefaultValue</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->extern int xmlGetWarningsDefaultValue;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1094"
-></A
-><H3
-><A
-NAME="XMLCLEANUPPARSER"
-></A
->xmlCleanupParser ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlCleanupParser                (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Cleanup function for the XML parser. It tries to reclaim all
-parsing related global memory allocated for the parser processing.
-It doesn't deallocate any document related memory. Calling this
-function should not prevent reusing the parser.</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1100"
+NAME="AEN994"
 ></A
 ><H3
 ><A
@@ -4817,7 +4270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4834,7 +4287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4849,8 +4302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4860,7 +4312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1124"
+NAME="AEN1018"
 ></A
 ><H3
 ><A
@@ -4915,7 +4367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4932,7 +4384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an indicative size for the lookahead</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4947,8 +4399,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChars read, or -1 in case of error, 0 indicate the
-end of this entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4958,7 +4409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1148"
+NAME="AEN1042"
 ></A
 ><H3
 ><A
@@ -4985,9 +4436,7 @@
 ></TR
 ></TABLE
 ><P
->a strdup for array of xmlChar's. Since they are supposed to be
-encoded in UTF-8 or an encoding with 8bit based chars, we assume
-a termination mark of '0'.</P
+>a strdup for array of xmlChar's</P
 ><P
 ></P
 ><DIV
@@ -5016,7 +4465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5031,7 +4480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5041,7 +4490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1169"
+NAME="AEN1063"
 ></A
 ><H3
 ><A
@@ -5098,7 +4547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the input xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5115,12 +4564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5135,7 +4579,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5145,7 +4589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1195"
+NAME="AEN1088"
 ></A
 ><H3
 ><A
@@ -5203,7 +4647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5220,7 +4664,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the index of the first char (zero based)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5237,7 +4681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the substring</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5252,7 +4696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5262,7 +4706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1224"
+NAME="AEN1117"
 ></A
 ><H3
 ><A
@@ -5322,7 +4766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5339,7 +4783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5354,7 +4798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5364,7 +4808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1250"
+NAME="AEN1143"
 ></A
 ><H3
 ><A
@@ -5424,7 +4868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array (haystack)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5441,7 +4885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar to search (needle)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5456,7 +4900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlChar * for the first occurence or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5466,7 +4910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1276"
+NAME="AEN1169"
 ></A
 ><H3
 ><A
@@ -5523,7 +4967,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5540,7 +4984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5555,7 +4999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5565,7 +5009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1301"
+NAME="AEN1194"
 ></A
 ><H3
 ><A
@@ -5623,7 +5067,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5640,7 +5084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second xmlChar *</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5657,7 +5101,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the max comparison length</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5672,7 +5116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the integer result of the comparison</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5682,7 +5126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1330"
+NAME="AEN1223"
 ></A
 ><H3
 ><A
@@ -5706,7 +5150,7 @@
 ></TR
 ></TABLE
 ><P
->length of a xmlChar's string</P
+>lenght of a xmlChar's string</P
 ><P
 ></P
 ><DIV
@@ -5735,7 +5179,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5750,7 +5194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar contained in the ARRAY.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5760,7 +5204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1350"
+NAME="AEN1243"
 ></A
 ><H3
 ><A
@@ -5791,9 +5235,7 @@
 ></TR
 ></TABLE
 ><P
->a strcat for array of xmlChar's. Since they are supposed to be
-encoded in UTF-8 or an encoding with 8bit based chars, we assume
-a termination mark of '0'.</P
+>a strcat for array of xmlChar's</P
 ><P
 ></P
 ><DIV
@@ -5822,7 +5264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5839,7 +5281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5854,7 +5296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5864,7 +5306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1376"
+NAME="AEN1269"
 ></A
 ><H3
 ><A
@@ -5925,7 +5367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the original xmlChar * array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5942,7 +5384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar * array added</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5959,12 +5401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of <TT
-CLASS="PARAMETER"
-><I
->add</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5979,7 +5416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * containing the concatenated string.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5989,7 +5426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1407"
+NAME="AEN1299"
 ></A
 ><H3
 ><A
@@ -6045,7 +5482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6060,7 +5497,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6070,7 +5507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1428"
+NAME="AEN1320"
 ></A
 ><H3
 ><A
@@ -6124,7 +5561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6141,7 +5578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6156,7 +5593,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6166,7 +5603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1452"
+NAME="AEN1344"
 ></A
 ><H3
 ><A
@@ -6220,7 +5657,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6235,7 +5672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6245,7 +5682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1472"
+NAME="AEN1364"
 ></A
 ><H3
 ><A
@@ -6303,7 +5740,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int 0 or 1 </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6318,7 +5755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last value for 0 for no substitution, 1 for substitution.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6328,109 +5765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1492"
-></A
-><H3
-><A
-NAME="XMLKEEPBLANKSDEFAULT"
-></A
->xmlKeepBlanksDefault ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlKeepBlanksDefault            (int val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Set and return the previous value for default blanks text nodes support.
-The 1.x version of the parser used an heuristic to try to detect
-ignorable white spaces. As a result the SAX callback was generating
-<A
-HREF="gnome-xml-sax.html#IGNORABLEWHITESPACE"
->ignorableWhitespace</A
->() callbacks instead of <A
-HREF="gnome-xml-sax.html#CHARACTERS"
->characters</A
->() one, and when
-using the DOM output text nodes containing those blanks were not generated.
-The 2.x and later version will switch to the XML standard way and
-<A
-HREF="gnome-xml-sax.html#IGNORABLEWHITESPACE"
->ignorableWhitespace</A
->() are only generated when running the parser in
-validating mode and when the current element doesn't allow CDATA or
-mixed content.
-This function is provided as a way to force the standard behaviour 
-on 1.X libs and to switch back to the old mode for compatibility when
-running 1.X client code on 2.X . Upgrade of 1.X code should be done
-by using <A
-HREF="gnome-xml-tree.html#XMLISBLANKNODE"
->xmlIsBlankNode</A
->() commodity function to detect the "empty"
-nodes generated.
-This value also affect autogeneration of indentation when saving code
-if blanks sections are kept, indentation is not generated.</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
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1515"
+NAME="AEN1384"
 ></A
 ><H3
 ><A
@@ -6487,7 +5822,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6502,7 +5837,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6512,7 +5847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1536"
+NAME="AEN1405"
 ></A
 ><H3
 ><A
@@ -6567,7 +5902,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6584,7 +5919,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6599,7 +5934,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6609,7 +5944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1560"
+NAME="AEN1429"
 ></A
 ><H3
 ><A
@@ -6664,7 +5999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6679,7 +6014,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6689,7 +6024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1580"
+NAME="AEN1449"
 ></A
 ><H3
 ><A
@@ -6747,7 +6082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6762,8 +6097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0, -1 in case of error. the parser context is augmented
-as a result of the parsing.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6773,7 +6107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1602"
+NAME="AEN1471"
 ></A
 ><H3
 ><A
@@ -6836,7 +6170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6853,7 +6187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to an array of xmlChar</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6870,8 +6204,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6886,7 +6219,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6896,255 +6229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1632"
-></A
-><H3
-><A
-NAME="XMLSAXUSERPARSEFILE"
-></A
->xmlSAXUserParseFile ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlSAXUserParseFile             (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *filename);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse an XML file and call the given SAX handler routines.
-Automatic support for ZLIB/Compress compressed document is provided</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
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a SAX handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a file name</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1660"
-></A
-><H3
-><A
-NAME="XMLSAXUSERPARSEMEMORY"
-></A
->xmlSAXUserParseMemory ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlSAXUserParseMemory           (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             char *buffer,
-                                             int size);</PRE
-></TD
-></TR
-></TABLE
-><P
->A better SAX parsing routine.
-parse an XML in-memory buffer and call the given SAX handler routines.</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
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a SAX handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->buffer</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an in-memory XML document input</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the length of the XML document in bytes</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 in case of success or a error number otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1692"
+NAME="AEN1501"
 ></A
 ><H3
 ><A
@@ -7205,7 +6290,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7222,7 +6307,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an pointer to a char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7239,7 +6324,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7256,8 +6341,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read not Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7272,7 +6356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7282,7 +6366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1725"
+NAME="AEN1534"
 ></A
 ><H3
 ><A
@@ -7343,7 +6427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7360,7 +6444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7377,8 +6461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  work in recovery mode, i.e. tries to read no Well Formed
-documents</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7393,7 +6476,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting document tree</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7403,7 +6486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1754"
+NAME="AEN1563"
 ></A
 ><H3
 ><A
@@ -7463,7 +6546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7480,7 +6563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7495,7 +6578,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7505,7 +6588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1780"
+NAME="AEN1589"
 ></A
 ><H3
 ><A
@@ -7569,7 +6652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the SAX handler block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7586,7 +6669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7603,181 +6686,6 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1811"
-></A
-><H3
-><A
-NAME="XMLPARSEBALANCEDCHUNKMEMORY"
-></A
->xmlParseBalancedChunkMemory ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParseBalancedChunkMemory     (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             int depth,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *string,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> *list);</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
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->depth</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->string</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->list</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
 >&nbsp;</TD
 ></TR
 ><TR
@@ -7803,266 +6711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1853"
-></A
-><H3
-><A
-NAME="XMLPARSEEXTERNALENTITY"
-></A
->xmlParseExternalEntity ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParseExternalEntity          (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             int depth,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *URL,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ID,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> *list);</PRE
-></TD
-></TR
-></TABLE
-><P
->Parse an external general entity
-An external general parsed entity is well-formed if it matches the
-production labeled extParsedEnt.</P
-><P
->[78] extParsedEnt ::= TextDecl? content</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document the chunk pertains to</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the SAX handler bloc (possibly NULL)</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks (possibly NULL)</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->depth</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  Used for loop detection, use 0</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->URL</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the URL for the entity to load</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the System ID for the entity to load</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->list</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the return value for the set of parsed nodes</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 the entity is well formed, -1 in case of args problem and
-the parser error code otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1902"
-></A
-><H3
-><A
-NAME="XMLDEFAULTSAXHANDLERINIT"
-></A
->xmlDefaultSAXHandlerInit ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDefaultSAXHandlerInit        (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the default SAX handler</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1908"
-></A
-><H3
-><A
-NAME="HTMLDEFAULTSAXHANDLERINIT"
-></A
->htmlDefaultSAXHandlerInit ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        htmlDefaultSAXHandlerInit       (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Initialize the default SAX handler</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1914"
+NAME="AEN1620"
 ></A
 ><H3
 ><A
@@ -8115,7 +6764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an HTML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8125,7 +6774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1930"
+NAME="AEN1636"
 ></A
 ><H3
 ><A
@@ -8178,7 +6827,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8188,71 +6837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1946"
-></A
-><H3
-><A
-NAME="XMLFREEPARSERCTXT"
-></A
->xmlFreeParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlFreeParserCtxt               (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free all the memory used by a parser context. However the parsed
-document in ctxt-&gt;myDoc is not freed.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN1962"
+NAME="AEN1652"
 ></A
 ><H3
 ><A
@@ -8312,7 +6897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8329,7 +6914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar * buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8346,7 +6931,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8356,13 +6941,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1987"
+NAME="AEN1677"
 ></A
 ><H3
 ><A
-NAME="XMLCREATEDOCPARSERCTXT"
+NAME="XMLDEFAULTSAXHANDLERINIT"
 ></A
->xmlCreateDocParserCtxt ()</H3
+>xmlDefaultSAXHandlerInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8372,78 +6957,25 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> xmlCreateDocParserCtxt     (<A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *cur);</PRE
+>void        xmlDefaultSAXHandlerInit        (void);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Create a parser context for an XML in-memory document.</P
+>Initialize the default SAX handler</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"
->  a pointer to an array of xmlChar</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser context or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2008"
+NAME="AEN1683"
 ></A
 ><H3
 ><A
-NAME="XMLCREATEPUSHPARSERCTXT"
+NAME="HTMLDEFAULTSAXHANDLERINIT"
 ></A
->xmlCreatePushParserCtxt ()</H3
+>htmlDefaultSAXHandlerInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8453,599 +6985,19 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> xmlCreatePushParserCtxt    (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             const char *chunk,
-                                             int size,
-                                             const char *filename);</PRE
+>void        htmlDefaultSAXHandlerInit       (void);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Create a parser context for using the XML parser in push mode
-To allow content encoding detection, <TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
-> should be &gt;= 4
-The value of <TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
-> is used for fetching external entities
-and error/warning reports.</P
+>Initialize the default SAX handler</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
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a SAX handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->chunk</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a pointer to an array of chars</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  number of chars in the array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an optional file name or URI</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser context or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2047"
-></A
-><H3
-><A
-NAME="XMLPARSECHUNK"
-></A
->xmlParseChunk ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParseChunk                   (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             const char *chunk,
-                                             int size,
-                                             int terminate);</PRE
-></TD
-></TR
-></TABLE
-><P
->Parse a Chunk of memory</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->chunk</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an char array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size in byte of the chunk</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->terminate</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  last chunk indicator</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->zero if no error, the xmlParserErrors otherwise.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN2079"
-></A
-><H3
-><A
-NAME="XMLCREATEIOPARSERCTXT"
-></A
->xmlCreateIOParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> xmlCreateIOParserCtxt      (<A
-HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             void *user_data,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> ioread,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> ioclose,
-                                             void *ioctx,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a parser context for using the XML parser with an existing
-I/O stream</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
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a SAX handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->user_data</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  The user data returned on SAX callbacks</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ioread</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O read function</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ioclose</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O close function</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ioctx</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the charset encoding if known</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser context or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN2123"
-></A
-><H3
-><A
-NAME="XMLNEWIOINPUTSTREAM"
-></A
->xmlNewIOInputStream ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERINPUTPTR"
->xmlParserInputPtr</A
-> xmlNewIOInputStream       (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> input,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new input stream structure encapsulating the <TT
-CLASS="PARAMETER"
-><I
->input</I
-></TT
-> into
-a stream suitable for the 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
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->input</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O Input</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the charset encoding if known</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new input stream or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN2155"
+NAME="AEN1689"
 ></A
 ><H3
 ><A
@@ -9106,7 +7058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9123,7 +7075,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node within the tree</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9138,7 +7090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an xmlParserNodeInfo block pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9148,7 +7100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2181"
+NAME="AEN1715"
 ></A
 ><H3
 ><A
@@ -9201,7 +7153,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9211,7 +7163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2197"
+NAME="AEN1731"
 ></A
 ><H3
 ><A
@@ -9265,7 +7217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9275,7 +7227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2213"
+NAME="AEN1747"
 ></A
 ><H3
 ><A
@@ -9336,7 +7288,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9353,7 +7305,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML node pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9368,7 +7320,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a long indicating the position of the record</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9378,7 +7330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2239"
+NAME="AEN1773"
 ></A
 ><H3
 ><A
@@ -9435,7 +7387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9452,7 +7404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node info sequence pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9462,7 +7414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2260"
+NAME="AEN1794"
 ></A
 ><H3
 ><A
@@ -9523,7 +7475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2275"
+NAME="AEN1809"
 ></A
 ><H3
 ><A
@@ -9583,7 +7535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2290"
+NAME="AEN1824"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index e1f6522..9bd27f6 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="AEN11123"
+NAME="AEN8929"
 ></A
 ><H2
 >Name</H2
->parserInternals &#8212; </DIV
+>parserInternals&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11126"
+NAME="AEN8932"
 ></A
 ><H2
 >Synopsis</H2
@@ -142,6 +148,18 @@
 HREF="gnome-xml-parserinternals.html#XML-MAX-NAMELEN"
 >XML_MAX_NAMELEN</A
 >
+typedef     <A
+HREF="gnome-xml-parserinternals.html#CHARVAL"
+>CHARVAL</A
+>;
+#define     <A
+HREF="gnome-xml-parserinternals.html#NEXTCHARVAL"
+>NEXTCHARVAL</A
+>                     (p)
+#define     <A
+HREF="gnome-xml-parserinternals.html#SKIPCHARVAL"
+>SKIPCHARVAL</A
+>                     (p)
 #define     <A
 HREF="gnome-xml-parserinternals.html#IS-CHAR"
 >IS_CHAR</A
@@ -194,7 +212,7 @@
 HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
 > <A
-HREF="gnome-xml-parser.html#XMLCREATEDOCPARSERCTXT"
+HREF="gnome-xml-parserinternals.html#XMLCREATEDOCPARSERCTXT"
 >xmlCreateDocParserCtxt</A
 >     (<A
 HREF="gnome-xml-tree.html#XMLCHAR"
@@ -215,6 +233,13 @@
 >xmlCreateMemoryParserCtxt</A
 >  (char *buffer,
                                              int size);
+void        <A
+HREF="gnome-xml-parserinternals.html#XMLFREEPARSERCTXT"
+>xmlFreeParserCtxt</A
+>               (<A
+HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt);
 <A
 HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
 >xmlParserCtxtPtr</A
@@ -222,24 +247,6 @@
 HREF="gnome-xml-parserinternals.html#XMLNEWPARSERCTXT"
 >xmlNewParserCtxt</A
 >           (void);
-<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> <A
-HREF="gnome-xml-parserinternals.html#XMLCREATEENTITYPARSERCTXT"
->xmlCreateEntityParserCtxt</A
->  (const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *URL,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ID,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *base);
 void        <A
 HREF="gnome-xml-parserinternals.html#XMLSWITCHENCODING"
 >xmlSwitchEncoding</A
@@ -252,13 +259,6 @@
 >xmlCharEncoding</A
 > enc);
 void        <A
-HREF="gnome-xml-parser.html#XMLFREEPARSERCTXT"
->xmlFreeParserCtxt</A
->               (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);
-void        <A
 HREF="gnome-xml-parserinternals.html#XMLHANDLEENTITY"
 >xmlHandleEntity</A
 >                 (<A
@@ -782,13 +782,6 @@
 >xmlParserCtxtPtr</A
 > ctxt);
 void        <A
-HREF="gnome-xml-parserinternals.html#XMLPARSETEXTDECL"
->xmlParseTextDecl</A
->                (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);
-void        <A
 HREF="gnome-xml-parserinternals.html#XMLPARSEMISC"
 >xmlParseMisc</A
 >                    (<A
@@ -850,33 +843,6 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > end3);
-<A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    <A
-HREF="gnome-xml-parserinternals.html#XMLSTRINGDECODEENTITIES"
->xmlStringDecodeEntities</A
->         (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *str,
-                                             int what,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end2,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end3);
 int         <A
 HREF="gnome-xml-parserinternals.html#NODEPUSH"
 >nodePush</A
@@ -926,7 +892,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11348"
+NAME="AEN9143"
 ></A
 ><H2
 >Description</H2
@@ -936,14 +902,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11351"
+NAME="AEN9146"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11353"
+NAME="AEN9148"
 ></A
 ><H3
 ><A
@@ -959,7 +925,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MAX_NAMELEN 1000</PRE
+>#define     XML_MAX_NAMELEN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -969,7 +935,136 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11358"
+NAME="AEN9153"
+></A
+><H3
+><A
+NAME="CHARVAL"
+></A
+>CHARVAL</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9157"
+></A
+><H3
+><A
+NAME="NEXTCHARVAL"
+></A
+>NEXTCHARVAL()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     NEXTCHARVAL(p)</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
+>p</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9171"
+></A
+><H3
+><A
+NAME="SKIPCHARVAL"
+></A
+>SKIPCHARVAL()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define SKIPCHARVAL(p) (p)++;</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
+>p</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9185"
 ></A
 ><H3
 ><A
@@ -1027,7 +1122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11372"
+NAME="AEN9199"
 ></A
 ><H3
 ><A
@@ -1085,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11386"
+NAME="AEN9213"
 ></A
 ><H3
 ><A
@@ -1143,7 +1238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11400"
+NAME="AEN9227"
 ></A
 ><H3
 ><A
@@ -1201,7 +1296,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11414"
+NAME="AEN9241"
 ></A
 ><H3
 ><A
@@ -1259,7 +1354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11428"
+NAME="AEN9255"
 ></A
 ><H3
 ><A
@@ -1317,7 +1412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11442"
+NAME="AEN9269"
 ></A
 ><H3
 ><A
@@ -1375,7 +1470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11456"
+NAME="AEN9283"
 ></A
 ><H3
 ><A
@@ -1391,7 +1486,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))</PRE
+>#define     IS_LETTER(c)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1433,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11470"
+NAME="AEN9297"
 ></A
 ><H3
 ><A
@@ -1491,7 +1586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11484"
+NAME="AEN9311"
 ></A
 ><H3
 ><A
@@ -1549,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11498"
+NAME="AEN9325"
 ></A
 ><H3
 ><A
@@ -1607,7 +1702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11512"
+NAME="AEN9339"
 ></A
 ><H3
 ><A
@@ -1665,7 +1760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11526"
+NAME="AEN9353"
 ></A
 ><H3
 ><A
@@ -1746,7 +1841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11547"
+NAME="AEN9374"
 ></A
 ><H3
 ><A
@@ -1801,7 +1896,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1816,7 +1911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1826,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11567"
+NAME="AEN9394"
 ></A
 ><H3
 ><A
@@ -1880,7 +1975,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to a zero terminated char array</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1897,7 +1992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of the array (without the trailing 0)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1912,7 +2007,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser context or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1922,278 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11591"
-></A
-><H3
-><A
-NAME="XMLNEWPARSERCTXT"
-></A
->xmlNewParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> xmlNewParserCtxt           (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Allocate and initialize a new parser context.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the xmlParserCtxtPtr or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN11607"
-></A
-><H3
-><A
-NAME="XMLCREATEENTITYPARSERCTXT"
-></A
->xmlCreateEntityParserCtxt ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> xmlCreateEntityParserCtxt  (const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *URL,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *ID,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *base);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a parser context for an external entity
-Automatic support for ZLIB/Compress compressed document is provided
-by default if found at compile-time.</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
->URL</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the entity URL</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the entity PUBLIC ID</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->base</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a posible base for the target URI</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser context or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN11638"
-></A
-><H3
-><A
-NAME="XMLSWITCHENCODING"
-></A
->xmlSwitchEncoding ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlSwitchEncoding               (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->change the input functions when discovering the character encoding
-of a given entity.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the encoding value (number)</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN11659"
+NAME="AEN9418"
 ></A
 ><H3
 ><A
@@ -2257,7 +2081,153 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11675"
+NAME="AEN9434"
+></A
+><H3
+><A
+NAME="XMLNEWPARSERCTXT"
+></A
+>xmlNewParserCtxt ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> xmlNewParserCtxt           (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Allocate and initialize a new parser context.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9450"
+></A
+><H3
+><A
+NAME="XMLSWITCHENCODING"
+></A
+>xmlSwitchEncoding ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlSwitchEncoding               (<A
+HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
+>xmlParserCtxtPtr</A
+> ctxt,
+                                             <A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> enc);</PRE
+></TD
+></TR
+></TABLE
+><P
+>change the input functions when discovering the character encoding
+of a given entity.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>enc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9471"
 ></A
 ><H3
 ><A
@@ -2317,7 +2287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2334,7 +2304,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML entity pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2344,7 +2314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11697"
+NAME="AEN9493"
 ></A
 ><H3
 ><A
@@ -2404,7 +2374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2421,7 +2391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an Entity pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2436,7 +2406,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2446,7 +2416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11723"
+NAME="AEN9519"
 ></A
 ><H3
 ><A
@@ -2504,7 +2474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2521,7 +2491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser input fragment (entity, XML fragment ...).</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2531,7 +2501,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11744"
+NAME="AEN9540"
 ></A
 ><H3
 ><A
@@ -2588,7 +2558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2603,7 +2573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the current xmlChar in the parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2613,7 +2583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11765"
+NAME="AEN9561"
 ></A
 ><H3
 ><A
@@ -2666,7 +2636,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2676,7 +2646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11781"
+NAME="AEN9577"
 ></A
 ><H3
 ><A
@@ -2733,7 +2703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2750,7 +2720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename to use as entity</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2765,7 +2735,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new input stream or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2775,7 +2745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11806"
+NAME="AEN9602"
 ></A
 ><H3
 ><A
@@ -2845,7 +2815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2862,7 +2832,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2879,7 +2849,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2894,8 +2864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2905,7 +2874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11840"
+NAME="AEN9636"
 ></A
 ><H3
 ><A
@@ -2966,7 +2935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2981,7 +2950,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2991,7 +2960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11863"
+NAME="AEN9659"
 ></A
 ><H3
 ><A
@@ -3057,7 +3026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3074,7 +3043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3089,8 +3058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the local part, and prefix is updated
-to get the Prefix if any.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3100,7 +3068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11892"
+NAME="AEN9688"
 ></A
 ><H3
 ><A
@@ -3160,7 +3128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3175,7 +3143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace name</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3185,7 +3153,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11915"
+NAME="AEN9711"
 ></A
 ><H3
 ><A
@@ -3242,7 +3210,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3257,7 +3225,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string parser or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3267,7 +3235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11936"
+NAME="AEN9732"
 ></A
 ><H3
 ><A
@@ -3295,7 +3263,7 @@
 ><P
 >This is what the older xml-name Working Draft specified, a bunch of
 other stuff may still rely on it, so support is still here as
-if it was declared on the root of the Tree:-(</P
+if ot was declared on the root of the Tree:-(</P
 ><P
 >To be removed at next drop of binary compatibility</P
 ><P
@@ -3326,7 +3294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3336,7 +3304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11954"
+NAME="AEN9750"
 ></A
 ><H3
 ><A
@@ -3400,7 +3368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3415,7 +3383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3425,7 +3393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11978"
+NAME="AEN9774"
 ></A
 ><H3
 ><A
@@ -3488,7 +3456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3503,7 +3471,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Name parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3513,7 +3481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12002"
+NAME="AEN9798"
 ></A
 ><H3
 ><A
@@ -3573,7 +3541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3588,7 +3556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the Nmtoken parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3598,7 +3566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12025"
+NAME="AEN9821"
 ></A
 ><H3
 ><A
@@ -3661,7 +3629,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3678,7 +3646,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if non-NULL store a copy of the original entity value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3693,7 +3661,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the EntityValue parsed with reference substitued or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3703,7 +3671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12052"
+NAME="AEN9848"
 ></A
 ><H3
 ><A
@@ -3737,58 +3705,6 @@
 >[10] AttValue ::= '"' ([^&lt;&amp;"] | Reference)* '"' |
 "'" ([^&lt;&amp;'] | Reference)* "'"</P
 ><P
->3.3.3 Attribute-Value Normalization:
-Before the value of an attribute is passed to the application or
-checked for validity, the XML processor must normalize it as follows: 
-- a character reference is processed by appending the referenced
-character to the attribute value
-- an entity reference is processed by recursively processing the
-replacement text of the entity 
-- a whitespace character (<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->, <GTKDOCLINK
-HREF="XD"
->xD</GTKDOCLINK
->, <GTKDOCLINK
-HREF="XA"
->xA</GTKDOCLINK
->, <GTKDOCLINK
-HREF="X9"
->x9</GTKDOCLINK
->) is processed by
-appending <GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
-> to the normalized value, except that only a single
-<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
-> is appended for a "<GTKDOCLINK
-HREF="XD"
->xD</GTKDOCLINK
-><GTKDOCLINK
-HREF="XA"
->xA</GTKDOCLINK
->" sequence that is part of an external
-parsed entity or the literal entity value of an internal parsed entity 
-- other characters are processed by appending them to the normalized value 
-If the declared value is not CDATA, then the XML processor must further
-process the normalized attribute value by discarding any leading and
-trailing space (<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) characters, and by replacing sequences of space
-(<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) characters by a single space (<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) character.  
-All attributes for which no declaration has been read should be treated
-by a non-validating parser as if declared CDATA.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -3816,7 +3732,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3831,7 +3747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the AttValue parsed or NULL. The value has to be freed by the caller.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3841,7 +3757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12086"
+NAME="AEN9870"
 ></A
 ><H3
 ><A
@@ -3899,7 +3815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3914,7 +3830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the SystemLiteral parsed or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3924,7 +3840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12108"
+NAME="AEN9892"
 ></A
 ><H3
 ><A
@@ -3982,7 +3898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3997,7 +3913,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PubidLiteral parsed or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4007,7 +3923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12130"
+NAME="AEN9914"
 ></A
 ><H3
 ><A
@@ -4035,11 +3951,6 @@
 >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
@@ -4069,7 +3980,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4086,7 +3997,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  int indicating whether we are within a CDATA section</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4096,7 +4007,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12152"
+NAME="AEN9935"
 ></A
 ><H3
 ><A
@@ -4165,7 +4076,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4182,7 +4093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar** receiving PubidLiteral</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4199,8 +4110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> indicate whether we should restrict parsing to only
-production [75], see NOTE below</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4215,9 +4125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the function returns SystemLiteral and in the second
-case publicID receives PubidLiteral, is strict is off
-it is possible to return NULL and have publicID set.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4227,7 +4135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12185"
+NAME="AEN9968"
 ></A
 ><H3
 ><A
@@ -4284,7 +4192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4294,7 +4202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12202"
+NAME="AEN9985"
 ></A
 ><H3
 ><A
@@ -4352,7 +4260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4367,7 +4275,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the PITarget name or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4377,7 +4285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12224"
+NAME="AEN10007"
 ></A
 ><H3
 ><A
@@ -4434,7 +4342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4444,7 +4352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12242"
+NAME="AEN10025"
 ></A
 ><H3
 ><A
@@ -4509,7 +4417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4519,7 +4427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12262"
+NAME="AEN10045"
 ></A
 ><H3
 ><A
@@ -4587,7 +4495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4597,7 +4505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12285"
+NAME="AEN10068"
 ></A
 ><H3
 ><A
@@ -4693,7 +4601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4710,7 +4618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  Receive a possible fixed default value for the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4725,8 +4633,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
-or XML_ATTRIBUTE_FIXED. </TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4736,7 +4643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12322"
+NAME="AEN10105"
 ></A
 ><H3
 ><A
@@ -4800,7 +4707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4815,7 +4722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the notation attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4825,7 +4732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12346"
+NAME="AEN10129"
 ></A
 ><H3
 ><A
@@ -4887,7 +4794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4902,7 +4809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the enumeration attribute tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4912,7 +4819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12369"
+NAME="AEN10152"
 ></A
 ><H3
 ><A
@@ -4973,7 +4880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4990,7 +4897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5005,7 +4912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> XML_ATTRIBUTE_ENUMERATION or XML_ATTRIBUTE_NOTATION</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5015,7 +4922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12396"
+NAME="AEN10179"
 ></A
 ><H3
 ><A
@@ -5077,13 +4984,13 @@
 ><P
 >[ VC: IDREF ]
 Values of type IDREF must match the Name production, and values
-of type IDREFS must match Names; each IDREF Name must match the value
+of type IDREFS must match Names; TODO each IDREF Name must match the value
 of an ID attribute on some element in the XML document; i.e. IDREF
 values must match the value of some ID attribute.</P
 ><P
 >[ VC: Entity Name ]
 Values of type ENTITY must match the Name production, values
-of type ENTITIES must match Names; each Entity Name must match the
+of type ENTITIES must match Names; TODO each Entity Name must match the
 name of an unparsed entity declared in the DTD.  </P
 ><P
 >[ VC: Name Token ]
@@ -5117,7 +5024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5134,7 +5041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration tree built while parsing</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5149,7 +5056,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute type</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5159,7 +5066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12434"
+NAME="AEN10217"
 ></A
 ><H3
 ><A
@@ -5216,7 +5123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5226,7 +5133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12452"
+NAME="AEN10235"
 ></A
 ><H3
 ><A
@@ -5299,7 +5206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5314,7 +5221,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the list of the xmlElementContentPtr describing the element choices</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5324,7 +5231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12478"
+NAME="AEN10261"
 ></A
 ><H3
 ><A
@@ -5401,7 +5308,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5416,8 +5323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the tree of xmlElementContentPtr describing the element 
-hierarchy.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5427,7 +5333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12504"
+NAME="AEN10287"
 ></A
 ><H3
 ><A
@@ -5491,7 +5397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5508,7 +5414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the element being defined.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5525,7 +5431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the Element Content pointer will be stored here if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5540,7 +5446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the type of element content XML_ELEMENT_TYPE_xxx</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5550,7 +5456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12535"
+NAME="AEN10318"
 ></A
 ><H3
 ><A
@@ -5608,7 +5514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5623,7 +5529,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the type of the element, or -1 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5633,7 +5539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12557"
+NAME="AEN10340"
 ></A
 ><H3
 ><A
@@ -5702,7 +5608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5712,7 +5618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12576"
+NAME="AEN10359"
 ></A
 ><H3
 ><A
@@ -5775,7 +5681,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5790,7 +5696,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the value parsed (as an int), 0 in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5800,7 +5706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12599"
+NAME="AEN10382"
 ></A
 ><H3
 ><A
@@ -5876,7 +5782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5891,7 +5797,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEntityPtr if found, or NULL otherwise.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5901,7 +5807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12623"
+NAME="AEN10406"
 ></A
 ><H3
 ><A
@@ -5965,7 +5871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5975,7 +5881,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12642"
+NAME="AEN10425"
 ></A
 ><H3
 ><A
@@ -6051,7 +5957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6061,7 +5967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12663"
+NAME="AEN10446"
 ></A
 ><H3
 ><A
@@ -6121,7 +6027,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6131,7 +6037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12681"
+NAME="AEN10464"
 ></A
 ><H3
 ><A
@@ -6214,7 +6120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6231,7 +6137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a xmlChar ** used to store the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6246,7 +6152,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute name, and the value in *value.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6256,7 +6162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12715"
+NAME="AEN10498"
 ></A
 ><H3
 ><A
@@ -6304,8 +6210,6 @@
 ><P
 >[NS 10] EmptyElement ::= '&lt;' QName (S Attribute)* S? '/&gt;'</P
 ><P
->Returne the element name parsed</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -6333,7 +6237,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6358,7 +6262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12744"
+NAME="AEN10526"
 ></A
 ><H3
 ><A
@@ -6417,7 +6321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6427,7 +6331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12763"
+NAME="AEN10545"
 ></A
 ><H3
 ><A
@@ -6488,7 +6392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6498,7 +6402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12783"
+NAME="AEN10565"
 ></A
 ><H3
 ><A
@@ -6553,7 +6457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6563,7 +6467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12800"
+NAME="AEN10582"
 ></A
 ><H3
 ><A
@@ -6635,7 +6539,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6645,7 +6549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12819"
+NAME="AEN10601"
 ></A
 ><H3
 ><A
@@ -6703,7 +6607,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6718,7 +6622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the string giving the XML version number, or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6728,7 +6632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12841"
+NAME="AEN10623"
 ></A
 ><H3
 ><A
@@ -6788,7 +6692,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6803,7 +6707,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the version string, e.g. "1.0"</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6813,7 +6717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12864"
+NAME="AEN10646"
 ></A
 ><H3
 ><A
@@ -6871,7 +6775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6886,7 +6790,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding name value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6896,7 +6800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12886"
+NAME="AEN10668"
 ></A
 ><H3
 ><A
@@ -6956,7 +6860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6971,7 +6875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the encoding value or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6981,7 +6885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12909"
+NAME="AEN10691"
 ></A
 ><H3
 ><A
@@ -7051,7 +6955,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7066,7 +6970,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if standalone, 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7076,7 +6980,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12931"
+NAME="AEN10713"
 ></A
 ><H3
 ><A
@@ -7131,7 +7035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7141,74 +7045,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12948"
-></A
-><H3
-><A
-NAME="XMLPARSETEXTDECL"
-></A
->xmlParseTextDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlParseTextDecl                (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt);</PRE
-></TD
-></TR
-></TABLE
-><P
->parse an XML declaration header for external entities</P
-><P
->[77] TextDecl ::= '&lt;?xml' VersionInfo? EncodingDecl S? '?&gt;'</P
-><P
->Question: Seems that EncodingDecl is mandatory ? Is that a typo ?</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an XML parser context</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN12966"
+NAME="AEN10730"
 ></A
 ><H3
 ><A
@@ -7263,7 +7100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7273,7 +7110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12983"
+NAME="AEN10747"
 ></A
 ><H3
 ><A
@@ -7338,7 +7175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7355,7 +7192,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the external identifier</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7372,7 +7209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the system identifier (or URL)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7382,7 +7219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13011"
+NAME="AEN10775"
 ></A
 ><H3
 ><A
@@ -7398,7 +7235,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_NONE	0</PRE
+>#define     XML_SUBSTITUTE_NONE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7408,7 +7245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13016"
+NAME="AEN10780"
 ></A
 ><H3
 ><A
@@ -7424,7 +7261,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_REF	1</PRE
+>#define     XML_SUBSTITUTE_REF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7434,7 +7271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13021"
+NAME="AEN10785"
 ></A
 ><H3
 ><A
@@ -7450,7 +7287,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_PEREF	2</PRE
+>#define     XML_SUBSTITUTE_PEREF</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7460,7 +7297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13026"
+NAME="AEN10790"
 ></A
 ><H3
 ><A
@@ -7476,7 +7313,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_SUBSTITUTE_BOTH 	3</PRE
+>#define     XML_SUBSTITUTE_BOTH</PRE
 ></TD
 ></TR
 ></TABLE
@@ -7486,7 +7323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13031"
+NAME="AEN10795"
 ></A
 ><H3
 ><A
@@ -7558,7 +7395,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7575,7 +7412,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the len to decode (in bytes !), -1 for no size limit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7592,7 +7429,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7609,7 +7446,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7626,7 +7463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7643,7 +7480,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7658,8 +7495,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7669,193 +7505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13076"
-></A
-><H3
-><A
-NAME="XMLSTRINGDECODEENTITIES"
-></A
->xmlStringDecodeEntities ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    xmlStringDecodeEntities         (<A
-HREF="gnome-xml-parser.html#XMLPARSERCTXTPTR"
->xmlParserCtxtPtr</A
-> ctxt,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *str,
-                                             int what,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end2,
-                                             <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> end3);</PRE
-></TD
-></TR
-></TABLE
-><P
->[67] Reference ::= EntityRef | CharRef</P
-><P
->[69] PEReference ::= '%' Name ';'</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the parser context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->str</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the input string</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->what</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  combination of XML_SUBSTITUTE_REF and XML_SUBSTITUTE_PEREF</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->end</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->end2</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->end3</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an end marker xmlChar, 0 if none</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->A newly allocated string with the substitution done. The caller
-must deallocate it !</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13122"
+NAME="AEN10840"
 ></A
 ><H3
 ><A
@@ -7952,7 +7602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13146"
+NAME="AEN10864"
 ></A
 ><H3
 ><A
@@ -8031,7 +7681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13166"
+NAME="AEN10884"
 ></A
 ><H3
 ><A
@@ -8128,7 +7778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13190"
+NAME="AEN10908"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-sax.html b/doc/html/gnome-xml-sax.html
index c1e7a5d..874df5f 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="AEN2323"
+NAME="AEN1857"
 ></A
 ><H2
 >Name</H2
->SAX &#8212; </DIV
+>SAX&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2326"
+NAME="AEN1860"
 ></A
 ><H2
 >Synopsis</H2
@@ -486,7 +492,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2414"
+NAME="AEN1948"
 ></A
 ><H2
 >Description</H2
@@ -496,14 +502,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2417"
+NAME="AEN1951"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2419"
+NAME="AEN1953"
 ></A
 ><H3
 ><A
@@ -529,7 +535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2424"
+NAME="AEN1958"
 ></A
 ><H3
 ><A
@@ -607,7 +613,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2444"
+NAME="AEN1978"
 ></A
 ><H3
 ><A
@@ -686,7 +692,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2464"
+NAME="AEN1998"
 ></A
 ><H3
 ><A
@@ -768,7 +774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2484"
+NAME="AEN2018"
 ></A
 ><H3
 ><A
@@ -843,7 +849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2503"
+NAME="AEN2037"
 ></A
 ><H3
 ><A
@@ -918,7 +924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2522"
+NAME="AEN2056"
 ></A
 ><H3
 ><A
@@ -993,7 +999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2541"
+NAME="AEN2075"
 ></A
 ><H3
 ><A
@@ -1068,7 +1074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2560"
+NAME="AEN2094"
 ></A
 ><H3
 ><A
@@ -1143,7 +1149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2579"
+NAME="AEN2113"
 ></A
 ><H3
 ><A
@@ -1176,7 +1182,7 @@
 ></TR
 ></TABLE
 ><P
->Callback on internal subset declaration.</P
+>Does this document has an internal subset</P
 ><P
 ></P
 ><DIV
@@ -1266,7 +1272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2609"
+NAME="AEN2143"
 ></A
 ><H3
 ><A
@@ -1365,7 +1371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2634"
+NAME="AEN2168"
 ></A
 ><H3
 ><A
@@ -1464,7 +1470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2659"
+NAME="AEN2193"
 ></A
 ><H3
 ><A
@@ -1496,17 +1502,11 @@
 ></TR
 ></TABLE
 ><P
->The entity loader, to control the loading of external entities,
-the application can either:
-- override this <A
-HREF="gnome-xml-sax.html#RESOLVEENTITY"
->resolveEntity</A
->() callback in the SAX block
-- or better use the <A
-HREF="gnome-xml-parser.html#XMLSETEXTERNALENTITYLOADER"
->xmlSetExternalEntityLoader</A
->() function to
-set up it's own entity resolution routine</P
+>Special entity resolver, better left to the parser, it has
+more context than the application layer.
+The default behaviour is to NOT resolve the entities, in that case
+the ENTITY_REF nodes are built in the structure (and the parameter
+values).</P
 ><P
 ></P
 ><DIV
@@ -1594,7 +1594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2691"
+NAME="AEN2223"
 ></A
 ><H3
 ><A
@@ -1756,7 +1756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2730"
+NAME="AEN2262"
 ></A
 ><H3
 ><A
@@ -1858,7 +1858,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name </TD
 ></TR
 ><TR
 ><TD
@@ -1936,7 +1936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2773"
+NAME="AEN2305"
 ></A
 ><H3
 ><A
@@ -2056,7 +2056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2802"
+NAME="AEN2334"
 ></A
 ><H3
 ><A
@@ -2179,7 +2179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2832"
+NAME="AEN2364"
 ></A
 ><H3
 ><A
@@ -2323,7 +2323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2867"
+NAME="AEN2399"
 ></A
 ><H3
 ><A
@@ -2383,7 +2383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2882"
+NAME="AEN2414"
 ></A
 ><H3
 ><A
@@ -2443,7 +2443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2897"
+NAME="AEN2429"
 ></A
 ><H3
 ><A
@@ -2548,7 +2548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2922"
+NAME="AEN2454"
 ></A
 ><H3
 ><A
@@ -2650,7 +2650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2947"
+NAME="AEN2479"
 ></A
 ><H3
 ><A
@@ -2731,7 +2731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2967"
+NAME="AEN2499"
 ></A
 ><H3
 ><A
@@ -2812,7 +2812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2987"
+NAME="AEN2519"
 ></A
 ><H3
 ><A
@@ -2912,7 +2912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3011"
+NAME="AEN2543"
 ></A
 ><H3
 ><A
@@ -3012,7 +3012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3035"
+NAME="AEN2567"
 ></A
 ><H3
 ><A
@@ -3114,7 +3114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3060"
+NAME="AEN2592"
 ></A
 ><H3
 ><A
@@ -3216,7 +3216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3085"
+NAME="AEN2617"
 ></A
 ><H3
 ><A
@@ -3297,7 +3297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3105"
+NAME="AEN2637"
 ></A
 ><H3
 ><A
@@ -3375,7 +3375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3125"
+NAME="AEN2657"
 ></A
 ><H3
 ><A
@@ -3472,7 +3472,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3149"
+NAME="AEN2681"
 ></A
 ><H3
 ><A
@@ -3574,7 +3574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3174"
+NAME="AEN2706"
 ></A
 ><H3
 ><A
@@ -3655,7 +3655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3194"
+NAME="AEN2726"
 ></A
 ><H3
 ><A
@@ -3754,7 +3754,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3218"
+NAME="AEN2750"
 ></A
 ><H3
 ><A
@@ -3782,7 +3782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3224"
+NAME="AEN2756"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index 014b07b..e334988 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="AEN3235"
+NAME="AEN2767"
 ></A
 ><H2
 >Name</H2
->tree &#8212; </DIV
+>tree&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3238"
+NAME="AEN2770"
 ></A
 ><H2
 >Synopsis</H2
@@ -154,10 +160,6 @@
 HREF="gnome-xml-tree.html#BAD-CAST"
 >BAD_CAST</A
 >
-struct      <A
-HREF="gnome-xml-tree.html#XMLNOTATION"
->xmlNotation</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLNOTATIONPTR"
 >xmlNotationPtr</A
@@ -170,18 +172,10 @@
 HREF="gnome-xml-tree.html#XMLATTRIBUTEDEFAULT"
 >xmlAttributeDefault</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLENUMERATION"
->xmlEnumeration</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLENUMERATIONPTR"
 >xmlEnumerationPtr</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLATTRIBUTE"
->xmlAttribute</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLATTRIBUTEPTR"
 >xmlAttributePtr</A
@@ -194,10 +188,6 @@
 HREF="gnome-xml-tree.html#XMLELEMENTCONTENTOCCUR"
 >xmlElementContentOccur</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLELEMENTCONTENT"
->xmlElementContent</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLELEMENTCONTENTPTR"
 >xmlElementContentPtr</A
@@ -206,10 +196,6 @@
 HREF="gnome-xml-tree.html#XMLELEMENTTYPEVAL"
 >xmlElementTypeVal</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLELEMENT"
->xmlElement</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
@@ -218,58 +204,26 @@
 HREF="gnome-xml-tree.html#XMLNSTYPE"
 >xmlNsType</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLNS"
->xmlNs</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLNSPTR"
 >xmlNsPtr</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLDTD"
->xmlDtd</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
 >xmlDtdPtr</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLATTR"
->xmlAttr</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLATTRPTR"
 >xmlAttrPtr</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLID"
->xmlID</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLIDPTR"
 >xmlIDPtr</A
 >;
-struct      <A
-HREF="gnome-xml-tree.html#XMLREF"
->xmlRef</A
->;
 typedef     <A
 HREF="gnome-xml-tree.html#XMLREFPTR"
 >xmlRefPtr</A
 >;
-enum        <A
-HREF="gnome-xml-tree.html#XMLBUFFERALLOCATIONSCHEME"
->xmlBufferAllocationScheme</A
->;
-struct      <A
-HREF="gnome-xml-tree.html#XMLBUFFER"
->xmlBuffer</A
->;
-typedef     <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
->;
 struct      <A
 HREF="gnome-xml-tree.html#XMLNODE"
 >xmlNode</A
@@ -286,6 +240,14 @@
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 >;
+struct      <A
+HREF="gnome-xml-tree.html#XMLBUFFER"
+>xmlBuffer</A
+>;
+typedef     <A
+HREF="gnome-xml-tree.html#XMLBUFFERPTR"
+>xmlBufferPtr</A
+>;
 extern      xmlNsPtr <A
 HREF="gnome-xml-tree.html#BASEDTD"
 >baseDTD</A
@@ -298,14 +260,6 @@
 HREF="gnome-xml-tree.html#XMLINDENTTREEOUTPUT"
 >xmlIndentTreeOutput</A
 >;
-extern      xmlBufferAllocationScheme <A
-HREF="gnome-xml-tree.html#XMLBUFFERALLOCSCHEME"
->xmlBufferAllocScheme</A
->;
-extern      int <A
-HREF="gnome-xml-tree.html#XMLSAVENOEMPTYTAGS"
->xmlSaveNoEmptyTags</A
->;
 <A
 HREF="gnome-xml-tree.html#XMLBUFFERPTR"
 >xmlBufferPtr</A
@@ -313,16 +267,6 @@
 HREF="gnome-xml-tree.html#XMLBUFFERCREATE"
 >xmlBufferCreate</A
 >                (void);
-<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> <A
-HREF="gnome-xml-tree.html#XMLBUFFERCREATESIZE"
->xmlBufferCreateSize</A
->            (<GTKDOCLINK
-HREF="SIZE-T"
->size_t</GTKDOCLINK
-> size);
 void        <A
 HREF="gnome-xml-tree.html#XMLBUFFERFREE"
 >xmlBufferFree</A
@@ -387,41 +331,6 @@
 HREF="gnome-xml-tree.html#XMLBUFFERPTR"
 >xmlBufferPtr</A
 > buf);
-const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->* <A
-HREF="gnome-xml-tree.html#XMLBUFFERCONTENT"
->xmlBufferContent</A
->             (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);
-int         <A
-HREF="gnome-xml-tree.html#XMLBUFFERUSE"
->xmlBufferUse</A
->                    (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);
-void        <A
-HREF="gnome-xml-tree.html#XMLBUFFERSETALLOCATIONSCHEME"
->xmlBufferSetAllocationScheme</A
->    (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLBUFFERALLOCATIONSCHEME"
->xmlBufferAllocationScheme</A
-> scheme);
-int         <A
-HREF="gnome-xml-tree.html#XMLBUFFERLENGTH"
->xmlBufferLength</A
->                 (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);
 <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
 >xmlDtdPtr</A
@@ -680,28 +589,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
-HREF="gnome-xml-tree.html#XMLNEWDOCRAWNODE"
->xmlNewDocRawNode</A
->                (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNSPTR"
->xmlNsPtr</A
-> ns,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *content);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
 HREF="gnome-xml-tree.html#XMLNEWNODE"
 >xmlNewNode</A
 >                      (<A
@@ -738,28 +625,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
-HREF="gnome-xml-tree.html#XMLNEWTEXTCHILD"
->xmlNewTextChild</A
->                 (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> parent,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNSPTR"
->xmlNsPtr</A
-> ns,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *content);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
 HREF="gnome-xml-tree.html#XMLNEWDOCTEXT"
 >xmlNewDocText</A
 >                   (<A
@@ -863,20 +728,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
-HREF="gnome-xml-tree.html#XMLNEWCHARREF"
->xmlNewCharRef</A
->                   (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
 HREF="gnome-xml-tree.html#XMLNEWREFERENCE"
 >xmlNewReference</A
 >                 (<A
@@ -912,26 +763,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
-HREF="gnome-xml-tree.html#XMLNEWDOCFRAGMENT"
->xmlNewDocFragment</A
->               (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
-HREF="gnome-xml-tree.html#XMLDOCGETROOTELEMENT"
->xmlDocGetRootElement</A
->            (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
 HREF="gnome-xml-tree.html#XMLGETLASTCHILD"
 >xmlGetLastChild</A
 >                 (<A
@@ -945,38 +776,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > node);
-int         <A
-HREF="gnome-xml-tree.html#XMLISBLANKNODE"
->xmlIsBlankNode</A
->                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
-HREF="gnome-xml-tree.html#XMLDOCSETROOTELEMENT"
->xmlDocSetRootElement</A
->            (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> root);
-void        <A
-HREF="gnome-xml-tree.html#XMLNODESETNAME"
->xmlNodeSetName</A
->                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name);
 <A
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
@@ -995,20 +794,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
-HREF="gnome-xml-tree.html#XMLREPLACENODE"
->xmlReplaceNode</A
->                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> old,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
 HREF="gnome-xml-tree.html#XMLADDSIBLING"
 >xmlAddSibling</A
 >                   (<A
@@ -1019,34 +804,6 @@
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 > elem);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
-HREF="gnome-xml-tree.html#XMLADDPREVSIBLING"
->xmlAddPrevSibling</A
->               (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);
-<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  <A
-HREF="gnome-xml-tree.html#XMLADDNEXTSIBLING"
->xmlAddNextSibling</A
->               (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);
 void        <A
 HREF="gnome-xml-tree.html#XMLUNLINKNODE"
 >xmlUnlinkNode</A
@@ -1094,13 +851,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
@@ -1215,24 +965,6 @@
 >xmlChar</A
 > *name);
 <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    <A
-HREF="gnome-xml-tree.html#XMLGETNSPROP"
->xmlGetNsProp</A
->                    (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *nameSpace);
-<A
 HREF="gnome-xml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >  <A
@@ -1354,26 +1086,12 @@
 >xmlChar</A
 > *lang);
 int         <A
-HREF="gnome-xml-tree.html#XMLNODEGETSPACEPRESERVE"
->xmlNodeGetSpacePreserve</A
->         (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);
-<A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    <A
-HREF="gnome-xml-tree.html#XMLNODEGETBASE"
->xmlNodeGetBase</A
->                  (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);
+HREF="gnome-xml-tree.html#XMLREMOVEPROP"
+>xmlRemoveProp</A
+>                   (<A
+HREF="gnome-xml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+> attr);
 int         <A
 HREF="gnome-xml-tree.html#XMLREMOVENODE"
 >xmlRemoveNode</A
@@ -1411,17 +1129,6 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *string);
-int         <A
-HREF="gnome-xml-tree.html#XMLRECONCILIATENS"
->xmlReconciliateNs</A
->               (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> tree);
 void        <A
 HREF="gnome-xml-tree.html#XMLDOCDUMPMEMORY"
 >xmlDocDumpMemory</A
@@ -1445,21 +1152,6 @@
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 > cur);
-void        <A
-HREF="gnome-xml-tree.html#XMLELEMDUMP"
->xmlElemDump</A
->                     (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *f,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);
 int         <A
 HREF="gnome-xml-tree.html#XMLSAVEFILE"
 >xmlSaveFile</A
@@ -1498,7 +1190,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3613"
+NAME="AEN3058"
 ></A
 ><H2
 >Description</H2
@@ -1508,14 +1200,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN3616"
+NAME="AEN3061"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3618"
+NAME="AEN3063"
 ></A
 ><H3
 ><A
@@ -1559,33 +1251,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3623"
+NAME="AEN3068"
 ></A
 ><H3
 ><A
 NAME="XMLCHAR"
 ></A
 >xmlChar</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef unsigned char xmlChar;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3628"
+NAME="AEN3072"
 ></A
 ><H3
 ><A
@@ -1601,7 +1280,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define CHAR xmlChar</PRE
+>#define     CHAR</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1611,7 +1290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3633"
+NAME="AEN3077"
 ></A
 ><H3
 ><A
@@ -1627,7 +1306,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define BAD_CAST (xmlChar *)</PRE
+>#define     BAD_CAST</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1637,63 +1316,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3638"
-></A
-><H3
-><A
-NAME="XMLNOTATION"
-></A
->struct xmlNotation</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlNotation {
-    const xmlChar               *name;	/* Notation name */
-    const xmlChar               *PublicID;	/* Public identifier, if any */
-    const xmlChar               *SystemID;	/* System identifier, if any */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3643"
+NAME="AEN3082"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONPTR"
 ></A
 >xmlNotationPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNotation *xmlNotationPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3648"
+NAME="AEN3086"
 ></A
 ><H3
 ><A
@@ -1730,7 +1366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3653"
+NAME="AEN3091"
 ></A
 ><H3
 ><A
@@ -1761,134 +1397,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3658"
-></A
-><H3
-><A
-NAME="XMLENUMERATION"
-></A
->struct xmlEnumeration</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlEnumeration {
-    struct _xmlEnumeration    *next;	/* next one */
-    const xmlChar            *name;	/* Enumeration name */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3663"
+NAME="AEN3096"
 ></A
 ><H3
 ><A
 NAME="XMLENUMERATIONPTR"
 ></A
 >xmlEnumerationPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlEnumeration *xmlEnumerationPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3668"
-></A
-><H3
-><A
-NAME="XMLATTRIBUTE"
-></A
->struct xmlAttribute</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlAttribute {
-#ifndef XML_WITHOUT_CORBA
-    void           *_private;	        /* for Corba, must be first ! */
-#endif
-    xmlElementType          type;       /* XML_ATTRIBUTE_DECL, must be second ! */
-    const xmlChar          *name;	/* Attribute name */
-    struct _xmlNode    *children;	/* NULL */
-    struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
-    struct _xmlNode        *next;	/* next sibling link  */
-    struct _xmlNode        *prev;	/* previous sibling link  */
-    struct _xmlDoc          *doc;       /* the containing document */
-
-    struct _xmlAttribute  *nexth;	/* next in hash table */
-    xmlAttributeType       atype;	/* The attribute type */
-    xmlAttributeDefault      def;	/* the default */
-    const xmlChar  *defaultValue;	/* or the default value */
-    xmlEnumerationPtr       tree;       /* or the enumeration tree if any */
-    const xmlChar        *prefix;	/* the namespace prefix if any */
-    const xmlChar          *elem;	/* Element holding the attribute */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3673"
+NAME="AEN3100"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTEPTR"
 ></A
 >xmlAttributePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttribute *xmlAttributePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3678"
+NAME="AEN3104"
 ></A
 ><H3
 ><A
@@ -1919,7 +1454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3683"
+NAME="AEN3109"
 ></A
 ><H3
 ><A
@@ -1950,65 +1485,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3688"
-></A
-><H3
-><A
-NAME="XMLELEMENTCONTENT"
-></A
->struct xmlElementContent</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlElementContent {
-    xmlElementContentType     type;	/* PCDATA, ELEMENT, SEQ or OR */
-    xmlElementContentOccur    ocur;	/* ONCE, OPT, MULT or PLUS */
-    const xmlChar            *name;	/* Element name */
-    struct _xmlElementContent *c1;	/* first child */
-    struct _xmlElementContent *c2;	/* second child */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3693"
+NAME="AEN3114"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTCONTENTPTR"
 ></A
 >xmlElementContentPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElementContent *xmlElementContentPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3698"
+NAME="AEN3118"
 ></A
 ><H3
 ><A
@@ -2039,75 +1529,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3703"
-></A
-><H3
-><A
-NAME="XMLELEMENT"
-></A
->struct xmlElement</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlElement {
-#ifndef XML_WITHOUT_CORBA
-    void           *_private;	        /* for Corba, must be first ! */
-#endif
-    xmlElementType          type;       /* XML_ELEMENT_DECL, must be second ! */
-    const xmlChar          *name;	/* Element name */
-    struct _xmlNode    *children;	/* NULL */
-    struct _xmlNode        *last;	/* NULL */
-    struct _xmlDtd       *parent;	/* -&gt; DTD */
-    struct _xmlNode        *next;	/* next sibling link  */
-    struct _xmlNode        *prev;	/* previous sibling link  */
-    struct _xmlDoc          *doc;       /* the containing document */
-
-    xmlElementTypeVal      etype;	/* The type */
-    xmlElementContentPtr content;	/* the allowed element content */
-    xmlAttributePtr   attributes;	/* List of the declared attributes */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3708"
+NAME="AEN3123"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTPTR"
 ></A
 >xmlElementPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElement *xmlElementPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3713"
+NAME="AEN3127"
 ></A
 ><H3
 ><A
@@ -2136,402 +1571,72 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3718"
-></A
-><H3
-><A
-NAME="XMLNS"
-></A
->struct xmlNs</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlNs {
-    struct _xmlNs  *next;	/* next Ns link for this node  */
-    xmlNsType      type;	/* global or local */
-    const xmlChar *href;	/* URL for the namespace */
-    const xmlChar *prefix;	/* prefix for the namespace */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3723"
+NAME="AEN3132"
 ></A
 ><H3
 ><A
 NAME="XMLNSPTR"
 ></A
 >xmlNsPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNs *xmlNsPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3728"
-></A
-><H3
-><A
-NAME="XMLDTD"
-></A
->struct xmlDtd</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlDtd {
-#ifndef XML_WITHOUT_CORBA
-    void           *_private;	/* for Corba, must be first ! */
-#endif
-    xmlElementType  type;       /* XML_DTD_NODE, must be second ! */
-    const xmlChar *name;	/* Name of the DTD */
-    struct _xmlNode *children;	/* the value of the property link */
-    struct _xmlNode *last;	/* last child link */
-    struct _xmlDoc  *parent;	/* child-&gt;parent link */
-    struct _xmlNode *next;	/* next sibling link  */
-    struct _xmlNode *prev;	/* previous sibling link  */
-    struct _xmlDoc  *doc;	/* the containing document */
-
-    /* End of common part */
-    void          *notations;   /* Hash table for notations if any */
-    void          *elements;    /* Hash table for elements if any */
-    void          *attributes;  /* Hash table for attributes if any */
-    void          *entities;    /* Hash table for entities if any */
-    const xmlChar *ExternalID;	/* External identifier for PUBLIC DTD */
-    const xmlChar *SystemID;	/* URI for a SYSTEM or PUBLIC DTD */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3733"
+NAME="AEN3136"
 ></A
 ><H3
 ><A
 NAME="XMLDTDPTR"
 ></A
 >xmlDtdPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlDtd *xmlDtdPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3738"
-></A
-><H3
-><A
-NAME="XMLATTR"
-></A
->struct xmlAttr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlAttr {
-#ifndef XML_WITHOUT_CORBA
-    void           *_private;	/* for Corba, must be first ! */
-#endif
-    xmlElementType   type;      /* XML_ATTRIBUTE_NODE, must be second ! */
-    const xmlChar   *name;      /* the name of the property */
-    struct _xmlNode *children;	/* the value of the property */
-    struct _xmlNode *last;	/* NULL */
-    struct _xmlNode *parent;	/* child-&gt;parent link */
-    struct _xmlAttr *next;	/* next sibling link  */
-    struct _xmlAttr *prev;	/* previous sibling link  */
-    struct _xmlDoc  *doc;	/* the containing document */
-    xmlNs           *ns;        /* pointer to the associated namespace */
-    xmlAttributeType atype;     /* the attribute type if validating */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3743"
+NAME="AEN3140"
 ></A
 ><H3
 ><A
 NAME="XMLATTRPTR"
 ></A
 >xmlAttrPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttr *xmlAttrPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3748"
-></A
-><H3
-><A
-NAME="XMLID"
-></A
->struct xmlID</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlID {
-    struct _xmlID    *next;	/* next ID */
-    const xmlChar    *value;	/* The ID name */
-    xmlAttrPtr        attr;	/* The attribut holding it */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3753"
+NAME="AEN3144"
 ></A
 ><H3
 ><A
 NAME="XMLIDPTR"
 ></A
 >xmlIDPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlID *xmlIDPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3758"
-></A
-><H3
-><A
-NAME="XMLREF"
-></A
->struct xmlRef</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlRef {
-    struct _xmlRef    *next;	/* next Ref */
-    const xmlChar     *value;	/* The Ref name */
-    xmlAttrPtr        attr;	/* The attribut holding it */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3763"
+NAME="AEN3148"
 ></A
 ><H3
 ><A
 NAME="XMLREFPTR"
 ></A
 >xmlRefPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRef *xmlRefPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3768"
-></A
-><H3
-><A
-NAME="XMLBUFFERALLOCATIONSCHEME"
-></A
->enum xmlBufferAllocationScheme</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef enum {
-    XML_BUFFER_ALLOC_DOUBLEIT,
-    XML_BUFFER_ALLOC_EXACT
-} xmlBufferAllocationScheme;</PRE
-></TD
-></TR
-></TABLE
-><P
->Sets the allocation scheme for this buffer</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3774"
-></A
-><H3
-><A
-NAME="XMLBUFFER"
-></A
->struct xmlBuffer</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlBuffer {
-    xmlChar *content;		/* The buffer content UTF8 */
-    unsigned int use;		/* The buffer size used */
-    unsigned int size;		/* The buffer size */
-    xmlBufferAllocationScheme alloc; /* The realloc method */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3779"
-></A
-><H3
-><A
-NAME="XMLBUFFERPTR"
-></A
->xmlBufferPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlBuffer *xmlBufferPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3784"
+NAME="AEN3152"
 ></A
 ><H3
 ><A
@@ -2579,33 +1684,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3789"
+NAME="AEN3157"
 ></A
 ><H3
 ><A
 NAME="XMLNODEPTR"
 ></A
 >xmlNodePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNode *xmlNodePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3794"
+NAME="AEN3161"
 ></A
 ><H3
 ><A
@@ -2655,13 +1747,26 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3799"
+NAME="AEN3166"
 ></A
 ><H3
 ><A
 NAME="XMLDOCPTR"
 ></A
 >xmlDocPtr</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3170"
+></A
+><H3
+><A
+NAME="XMLBUFFER"
+></A
+>struct xmlBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2671,7 +1776,12 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef xmlDoc *xmlDocPtr;</PRE
+>struct xmlBuffer {
+    xmlChar *content;		/* The buffer content UTF8 */
+    unsigned int use;		/* The buffer size used */
+    unsigned int size;		/* The buffer size */
+    xmlBufferAllocationScheme alloc; /* The realloc method */
+};</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2681,7 +1791,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3804"
+NAME="AEN3175"
+></A
+><H3
+><A
+NAME="XMLBUFFERPTR"
+></A
+>xmlBufferPtr</H3
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN3179"
 ></A
 ><H3
 ><A
@@ -2707,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3809"
+NAME="AEN3184"
 ></A
 ><H3
 ><A
@@ -2733,7 +1856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3814"
+NAME="AEN3189"
 ></A
 ><H3
 ><A
@@ -2759,59 +1882,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3819"
-></A
-><H3
-><A
-NAME="XMLBUFFERALLOCSCHEME"
-></A
->xmlBufferAllocScheme</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->extern xmlBufferAllocationScheme xmlBufferAllocScheme; /* alloc scheme to use */</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3824"
-></A
-><H3
-><A
-NAME="XMLSAVENOEMPTYTAGS"
-></A
->xmlSaveNoEmptyTags</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->extern int xmlSaveNoEmptyTags;   /* save empty tags as &lt;empty&gt;&lt;/empty&gt; */</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3829"
+NAME="AEN3194"
 ></A
 ><H3
 ><A
@@ -2862,7 +1933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2872,88 +1943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3845"
-></A
-><H3
-><A
-NAME="XMLBUFFERCREATESIZE"
-></A
->xmlBufferCreateSize ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> xmlBufferCreateSize            (<GTKDOCLINK
-HREF="SIZE-T"
->size_t</GTKDOCLINK
-> size);</PRE
-></TD
-></TR
-></TABLE
-><P
->routine to create an XML buffer.</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
->size</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> initial size of buffer</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new structure.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN3866"
+NAME="AEN3210"
 ></A
 ><H3
 ><A
@@ -3006,7 +1996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3016,7 +2006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3882"
+NAME="AEN3226"
 ></A
 ><H3
 ><A
@@ -3073,7 +2063,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3090,7 +2080,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3105,7 +2095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar written</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3115,7 +2105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3907"
+NAME="AEN3251"
 ></A
 ><H3
 ><A
@@ -3174,7 +2164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3191,7 +2181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3208,7 +2198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3218,7 +2208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3932"
+NAME="AEN3276"
 ></A
 ><H3
 ><A
@@ -3275,7 +2265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3292,7 +2282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the xmlChar string</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3302,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3953"
+NAME="AEN3297"
 ></A
 ><H3
 ><A
@@ -3356,7 +2346,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3373,7 +2363,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the C char string</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3383,7 +2373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3973"
+NAME="AEN3317"
 ></A
 ><H3
 ><A
@@ -3437,7 +2427,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer to dump</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3454,7 +2444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the number of xmlChar to remove</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3469,7 +2459,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of xmlChar removed, or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3479,7 +2469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3997"
+NAME="AEN3341"
 ></A
 ><H3
 ><A
@@ -3532,163 +2522,6 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the buffer</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4013"
-></A
-><H3
-><A
-NAME="XMLBUFFERCONTENT"
-></A
->xmlBufferContent ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->* xmlBufferContent             (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);</PRE
-></TD
-></TR
-></TABLE
-><P
-></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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the buffer to resize</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the internal content</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4034"
-></A
-><H3
-><A
-NAME="XMLBUFFERUSE"
-></A
->xmlBufferUse ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlBufferUse                    (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
 >&nbsp;</TD
 ></TR
 ></TABLE
@@ -3699,167 +2532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4053"
-></A
-><H3
-><A
-NAME="XMLBUFFERSETALLOCATIONSCHEME"
-></A
->xmlBufferSetAllocationScheme ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlBufferSetAllocationScheme    (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLBUFFERALLOCATIONSCHEME"
->xmlBufferAllocationScheme</A
-> scheme);</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->scheme</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4073"
-></A
-><H3
-><A
-NAME="XMLBUFFERLENGTH"
-></A
->xmlBufferLength ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlBufferLength                 (const <A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);</PRE
-></TD
-></TR
-></TABLE
-><P
-></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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the buffer </TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the length of data in the internal content</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4093"
+NAME="AEN3357"
 ></A
 ><H3
 ><A
@@ -3927,7 +2600,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3944,7 +2617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3961,7 +2634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3978,7 +2651,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3993,7 +2666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4003,7 +2676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4129"
+NAME="AEN3393"
 ></A
 ><H3
 ><A
@@ -4042,11 +2715,7 @@
 ></TR
 ></TABLE
 ><P
->Creation of a new DTD for the external subset. To create an
-internal subset, use <A
-HREF="gnome-xml-tree.html#XMLCREATEINTSUBSET"
->xmlCreateIntSubset</A
->().</P
+>Creation of a new DTD.</P
 ><P
 ></P
 ><DIV
@@ -4075,7 +2744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4092,7 +2761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4109,7 +2778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the external ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4126,7 +2795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4141,7 +2810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new DTD structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4151,7 +2820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4166"
+NAME="AEN3429"
 ></A
 ><H3
 ><A
@@ -4204,7 +2873,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the DTD structure to free up</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4214,7 +2883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4182"
+NAME="AEN3445"
 ></A
 ><H3
 ><A
@@ -4280,7 +2949,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4297,7 +2966,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4314,7 +2983,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4329,7 +2998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL this functionnality had been removed</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4339,7 +3008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4213"
+NAME="AEN3476"
 ></A
 ><H3
 ><A
@@ -4405,7 +3074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4422,7 +3091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI associated</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4439,7 +3108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the prefix for the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4454,7 +3123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->returns a new namespace pointer or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4464,7 +3133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4244"
+NAME="AEN3507"
 ></A
 ><H3
 ><A
@@ -4517,7 +3186,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4527,7 +3196,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4260"
+NAME="AEN3523"
 ></A
 ><H3
 ><A
@@ -4583,7 +3252,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  xmlChar string giving the version of XML "1.0"</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4598,7 +3267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new document</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4608,7 +3277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4281"
+NAME="AEN3544"
 ></A
 ><H3
 ><A
@@ -4661,8 +3330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document
-@:  </TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4672,7 +3340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4297"
+NAME="AEN3560"
 ></A
 ><H3
 ><A
@@ -4736,7 +3404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4753,7 +3421,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4770,7 +3438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4785,7 +3453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4795,7 +3463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4328"
+NAME="AEN3591"
 ></A
 ><H3
 ><A
@@ -4859,7 +3527,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4876,7 +3544,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4893,7 +3561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4908,7 +3576,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4918,7 +3586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4359"
+NAME="AEN3622"
 ></A
 ><H3
 ><A
@@ -4986,7 +3654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the holding node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5003,7 +3671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5020,7 +3688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5037,7 +3705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5052,7 +3720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5062,7 +3730,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4395"
+NAME="AEN3658"
 ></A
 ><H3
 ><A
@@ -5086,7 +3754,7 @@
 ></TR
 ></TABLE
 ><P
->Free a property and all its siblings, all the children are freed too.</P
+>Free a property and all its siblings, all the childs are freed too.</P
 ><P
 ></P
 ><DIV
@@ -5115,7 +3783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first property in the list</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5125,7 +3793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4411"
+NAME="AEN3674"
 ></A
 ><H3
 ><A
@@ -5178,7 +3846,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5188,7 +3856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4427"
+NAME="AEN3690"
 ></A
 ><H3
 ><A
@@ -5248,7 +3916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attribute will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5265,7 +3933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5280,7 +3948,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5290,7 +3958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4453"
+NAME="AEN3716"
 ></A
 ><H3
 ><A
@@ -5350,7 +4018,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element where the attributes will be grafted</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5367,7 +4035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5382,7 +4050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlAttrPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5392,7 +4060,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4479"
+NAME="AEN3742"
 ></A
 ><H3
 ><A
@@ -5448,7 +4116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the dtd</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5463,7 +4131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDtdPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5473,7 +4141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4500"
+NAME="AEN3763"
 ></A
 ><H3
 ><A
@@ -5531,7 +4199,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5548,7 +4216,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5563,7 +4231,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlDocPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5573,7 +4241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4525"
+NAME="AEN3788"
 ></A
 ><H3
 ><A
@@ -5634,9 +4302,9 @@
 <A
 HREF="gnome-xml-entities.html#XMLENCODEENTITIESREENTRANT"
 >xmlEncodeEntitiesReentrant</A
->(). Use <A
-HREF="gnome-xml-tree.html#XMLNEWDOCRAWNODE"
->xmlNewDocRawNode</A
+>(). Use <GTKDOCLINK
+HREF="XMLNEWDOCRAWNODE"
+>xmlNewDocRawNode</GTKDOCLINK
 >() if you don't
 need entities support.</P
 ><P
@@ -5667,7 +4335,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5684,7 +4352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5701,7 +4369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5718,7 +4386,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML text content if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5733,7 +4401,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5743,162 +4411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4566"
-></A
-><H3
-><A
-NAME="XMLNEWDOCRAWNODE"
-></A
->xmlNewDocRawNode ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlNewDocRawNode                (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNSPTR"
->xmlNsPtr</A
-> ns,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *content);</PRE
-></TD
-></TR
-></TABLE
-><P
->Creation of a new node element within a document. <TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->
-are optionnal (NULL).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  namespace if any</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node name</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the text content if any</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a pointer to the new node object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4604"
+NAME="AEN3829"
 ></A
 ><H3
 ><A
@@ -5970,7 +4483,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5987,7 +4500,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6002,7 +4515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6012,7 +4525,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4632"
+NAME="AEN3857"
 ></A
 ><H3
 ><A
@@ -6056,7 +4569,7 @@
 ><I
 >parent</I
 ></TT
-> children list.
+> childs list.
 <TT
 CLASS="PARAMETER"
 ><I
@@ -6079,9 +4592,9 @@
 <A
 HREF="gnome-xml-entities.html#XMLENCODEENTITIESREENTRANT"
 >xmlEncodeEntitiesReentrant</A
->(). Use <A
-HREF="gnome-xml-tree.html#XMLNEWTEXTCHILD"
->xmlNewTextChild</A
+>(). Use <GTKDOCLINK
+HREF="XMLNEWTEXTCHILD"
+>xmlNewTextChild</GTKDOCLINK
 >() if entities
 support is not needed.</P
 ><P
@@ -6112,7 +4625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6129,7 +4642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace if any</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6146,7 +4659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the name of the child</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6163,7 +4676,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML content of the child if any.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6178,7 +4691,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6188,168 +4701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4674"
-></A
-><H3
-><A
-NAME="XMLNEWTEXTCHILD"
-></A
->xmlNewTextChild ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlNewTextChild                 (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> parent,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNSPTR"
->xmlNsPtr</A
-> ns,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *content);</PRE
-></TD
-></TR
-></TABLE
-><P
->Creation of a new child element, added at the end of <TT
-CLASS="PARAMETER"
-><I
->parent</I
-></TT
-> children list.
-<TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
-> and <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-> parameters are optionnal (NULL). If content is non NULL,
-a child TEXT node will be created containing the string content.</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
->parent</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the parent node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ns</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a namespace if any</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the name of the child</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the text content of the child if any.</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a pointer to the new node object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4713"
+NAME="AEN3899"
 ></A
 ><H3
 ><A
@@ -6409,7 +4761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6426,7 +4778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6441,7 +4793,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6451,7 +4803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4739"
+NAME="AEN3925"
 ></A
 ><H3
 ><A
@@ -6507,7 +4859,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6522,7 +4874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6532,7 +4884,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4760"
+NAME="AEN3946"
 ></A
 ><H3
 ><A
@@ -6592,7 +4944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the processing instruction name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6609,7 +4961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the PI content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6624,7 +4976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6634,7 +4986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4786"
+NAME="AEN3972"
 ></A
 ><H3
 ><A
@@ -6696,7 +5048,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6713,7 +5065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6730,7 +5082,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6745,7 +5097,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6755,7 +5107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4816"
+NAME="AEN4002"
 ></A
 ><H3
 ><A
@@ -6812,7 +5164,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6829,7 +5181,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the text len.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6844,7 +5196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6854,7 +5206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4841"
+NAME="AEN4027"
 ></A
 ><H3
 ><A
@@ -6914,7 +5266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6931,7 +5283,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6946,7 +5298,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6956,7 +5308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4867"
+NAME="AEN4053"
 ></A
 ><H3
 ><A
@@ -7012,7 +5364,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the comment content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7027,7 +5379,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7037,7 +5389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4888"
+NAME="AEN4074"
 ></A
 ><H3
 ><A
@@ -7098,7 +5450,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7115,7 +5467,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the CData block content content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7132,7 +5484,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the block</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7147,7 +5499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7157,109 +5509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4918"
-></A
-><H3
-><A
-NAME="XMLNEWCHARREF"
-></A
->xmlNewCharRef ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlNewCharRef                   (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name);</PRE
-></TD
-></TR
-></TABLE
-><P
->Creation of a new character reference node.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the char ref string, starting with # or "&amp;# ... ;"</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a pointer to the new node object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4944"
+NAME="AEN4104"
 ></A
 ><H3
 ><A
@@ -7319,7 +5569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7336,7 +5586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the reference name, or the reference string with &amp; and ;</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7351,7 +5601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new node object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7361,7 +5611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4970"
+NAME="AEN4130"
 ></A
 ><H3
 ><A
@@ -7418,7 +5668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7435,7 +5685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if 1 do a recursive copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7450,7 +5700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7460,7 +5710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4995"
+NAME="AEN4155"
 ></A
 ><H3
 ><A
@@ -7516,7 +5766,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7531,7 +5781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNodePtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7541,170 +5791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5016"
-></A
-><H3
-><A
-NAME="XMLNEWDOCFRAGMENT"
-></A
->xmlNewDocFragment ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlNewDocFragment               (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Creation of a new Fragment node.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document owning the fragment</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a pointer to the new node object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5037"
-></A
-><H3
-><A
-NAME="XMLDOCGETROOTELEMENT"
-></A
->xmlDocGetRootElement ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlDocGetRootElement            (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Get the root element of the document (doc-&gt;children is a list
-containing possibly comments, PIs, etc ...).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the xmlNodePtr for the root or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5058"
+NAME="AEN4176"
 ></A
 ><H3
 ><A
@@ -7760,7 +5847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7775,7 +5862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the last child or NULL if none.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7785,7 +5872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5079"
+NAME="AEN4197"
 ></A
 ><H3
 ><A
@@ -7838,7 +5925,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -7853,7 +5940,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 yes, 0 no</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -7863,273 +5950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5099"
-></A
-><H3
-><A
-NAME="XMLISBLANKNODE"
-></A
->xmlIsBlankNode ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlIsBlankNode                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);</PRE
-></TD
-></TR
-></TABLE
-><P
->Is this node a Text node ?</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
->node</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->1 yes, 0 no</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5119"
-></A
-><H3
-><A
-NAME="XMLDOCSETROOTELEMENT"
-></A
->xmlDocSetRootElement ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlDocSetRootElement            (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> root);</PRE
-></TD
-></TR
-></TABLE
-><P
->Set the root element of the document (doc-&gt;children is a list
-containing possibly comments, PIs, etc ...).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->root</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new document root element</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the old root element if any was found</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5145"
-></A
-><H3
-><A
-NAME="XMLNODESETNAME"
-></A
->xmlNodeSetName ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlNodeSetName                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name);</PRE
-></TD
-></TR
-></TABLE
-><P
->Searches the language of a node, i.e. the values of the xml:lang
-attribute or the one carried by the nearest ancestor.</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"
->  the node being changed</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new tag name</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5166"
+NAME="AEN4217"
 ></A
 ><H3
 ><A
@@ -8194,7 +6015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the parent node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8211,7 +6032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8226,7 +6047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the child or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8236,111 +6057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5193"
-></A
-><H3
-><A
-NAME="XMLREPLACENODE"
-></A
->xmlReplaceNode ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlReplaceNode                  (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> old,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Unlink the old node from it's current context, prune the new one
-at the same place. If cur was already inserted in a document it is
-first unlinked from its existing context.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->old</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the old node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the old node</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5219"
+NAME="AEN4244"
 ></A
 ><H3
 ><A
@@ -8412,7 +6129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the child node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8429,7 +6146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8444,7 +6161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new element or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8454,235 +6171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5247"
-></A
-><H3
-><A
-NAME="XMLADDPREVSIBLING"
-></A
->xmlAddPrevSibling ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlAddPrevSibling               (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->Add a new element <TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
-> as the previous siblings of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->
-If the new element was already inserted in a document it is
-first unlinked from its existing context.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the child node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new element or NULL in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5275"
-></A
-><H3
-><A
-NAME="XMLADDNEXTSIBLING"
-></A
->xmlAddNextSibling ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlAddNextSibling               (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->Add a new element <TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
-> as the next siblings of <TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->
-If the new element was already inserted in a document it is
-first unlinked from its existing context.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the child node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the new node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new element or NULL in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5303"
+NAME="AEN4272"
 ></A
 ><H3
 ><A
@@ -8735,7 +6224,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8745,7 +6234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5319"
+NAME="AEN4288"
 ></A
 ><H3
 ><A
@@ -8805,7 +6294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first text node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8822,7 +6311,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the second text node being merged</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8837,7 +6326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the first text node augmented</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8847,7 +6336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5345"
+NAME="AEN4314"
 ></A
 ><H3
 ><A
@@ -8905,7 +6394,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8922,7 +6411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -8939,12 +6428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-> lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -8954,7 +6438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5371"
+NAME="AEN4339"
 ></A
 ><H3
 ><A
@@ -8979,7 +6463,7 @@
 ></TABLE
 ><P
 >Free a node and all its siblings, this is a recursive behaviour, all
-the children are freed too.</P
+the childs are freed too.</P
 ><P
 ></P
 ><DIV
@@ -9008,7 +6492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first node in the list</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9018,7 +6502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5387"
+NAME="AEN4355"
 ></A
 ><H3
 ><A
@@ -9042,11 +6526,7 @@
 ></TR
 ></TABLE
 ><P
->Free a node, this is a recursive behaviour, all the children are freed too.
-This doesn't unlink the child from the list, use <A
-HREF="gnome-xml-tree.html#XMLUNLINKNODE"
->xmlUnlinkNode</A
->() first.</P
+>Free a node, this is a recursive behaviour, all the childs are freed too.</P
 ><P
 ></P
 ><DIV
@@ -9075,7 +6555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9085,86 +6565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5404"
-></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="AEN5424"
+NAME="AEN4371"
 ></A
 ><H3
 ><A
@@ -9236,7 +6637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9253,7 +6654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9270,7 +6671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9285,7 +6686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9295,7 +6696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5456"
+NAME="AEN4403"
 ></A
 ><H3
 ><A
@@ -9360,7 +6761,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9377,7 +6778,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9394,7 +6795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9409,7 +6810,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the namespace pointer or NULL.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9419,7 +6820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5487"
+NAME="AEN4434"
 ></A
 ><H3
 ><A
@@ -9479,7 +6880,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9496,7 +6897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9511,9 +6912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an NULL terminated array of all the xmlNsPtr found
-that need to be freed by the caller or NULL if no
-namespace if defined</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9523,7 +6922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5513"
+NAME="AEN4460"
 ></A
 ><H3
 ><A
@@ -9580,7 +6979,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a node in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9597,7 +6996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a namespace pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9607,7 +7006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5534"
+NAME="AEN4481"
 ></A
 ><H3
 ><A
@@ -9663,7 +7062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9678,7 +7077,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9688,7 +7087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5555"
+NAME="AEN4502"
 ></A
 ><H3
 ><A
@@ -9744,7 +7143,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the first namespace</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9759,7 +7158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> a new xmlNsPtr, or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9769,7 +7168,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5576"
+NAME="AEN4523"
 ></A
 ><H3
 ><A
@@ -9833,7 +7232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9850,7 +7249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9867,7 +7266,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9882,7 +7281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute pointer.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -9892,7 +7291,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5607"
+NAME="AEN4554"
 ></A
 ><H3
 ><A
@@ -9958,7 +7357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9975,7 +7374,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -9990,8 +7389,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10001,138 +7399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5634"
-></A
-><H3
-><A
-NAME="XMLGETNSPROP"
-></A
->xmlGetNsProp ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    xmlGetNsProp                    (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *nameSpace);</PRE
-></TD
-></TR
-></TABLE
-><P
->Search and get the value of an attribute associated to a node
-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"
->FIXED</GTKDOCLINK
-> or
-default declaration values unless DTD use has been turned off.</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
->node</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the attribute name</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->nameSpace</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the URI of the namespace</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the attribute value or NULL if not found.
-It's up to the caller to free the memory.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5666"
+NAME="AEN4581"
 ></A
 ><H3
 ><A
@@ -10193,7 +7460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10210,7 +7477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10225,7 +7492,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10235,7 +7502,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5692"
+NAME="AEN4607"
 ></A
 ><H3
 ><A
@@ -10297,7 +7564,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10314,7 +7581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value of the text</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10331,7 +7598,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the length of the string value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10346,7 +7613,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the first child</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10356,7 +7623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5722"
+NAME="AEN4637"
 ></A
 ><H3
 ><A
@@ -10418,7 +7685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10435,7 +7702,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a Node list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10452,7 +7719,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  should we replace entity contents or show their external form</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10467,7 +7734,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the string copy, the calller must free it.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10477,7 +7744,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5752"
+NAME="AEN4667"
 ></A
 ><H3
 ><A
@@ -10534,7 +7801,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10551,7 +7818,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10561,7 +7828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5773"
+NAME="AEN4688"
 ></A
 ><H3
 ><A
@@ -10619,7 +7886,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10636,7 +7903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the new value of the content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10653,12 +7920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10668,7 +7930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5799"
+NAME="AEN4713"
 ></A
 ><H3
 ><A
@@ -10725,7 +7987,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10742,7 +8004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10752,7 +8014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5820"
+NAME="AEN4734"
 ></A
 ><H3
 ><A
@@ -10810,7 +8072,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being modified</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10827,7 +8089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra content</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10844,12 +8106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the size of <TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
-></TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10859,7 +8116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5846"
+NAME="AEN4759"
 ></A
 ><H3
 ><A
@@ -10918,7 +8175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -10933,8 +8190,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new xmlChar * or NULL if no content is available.
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -10944,7 +8200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5867"
+NAME="AEN4780"
 ></A
 ><H3
 ><A
@@ -11001,7 +8257,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11016,8 +8272,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the lang value, or NULL if not found
-It's up to the caller to free the memory.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11027,7 +8282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5888"
+NAME="AEN4801"
 ></A
 ><H3
 ><A
@@ -11085,7 +8340,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being changed</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11102,7 +8357,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the langage description</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11112,13 +8367,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5909"
+NAME="AEN4822"
 ></A
 ><H3
 ><A
-NAME="XMLNODEGETSPACEPRESERVE"
+NAME="XMLREMOVEPROP"
 ></A
->xmlNodeGetSpacePreserve ()</H3
+>xmlRemoveProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11128,16 +8383,16 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlNodeGetSpacePreserve         (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
+>int         xmlRemoveProp                   (<A
+HREF="gnome-xml-tree.html#XMLATTRPTR"
+>xmlAttrPtr</A
+> attr);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Searches the language of a node, i.e. the values of the xml:space
-attribute or the one carried by the nearest ancestor.</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
@@ -11159,14 +8414,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->cur</I
+>attr</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the node being checked</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11181,7 +8436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11191,111 +8446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5929"
-></A
-><H3
-><A
-NAME="XMLNODEGETBASE"
-></A
->xmlNodeGetBase ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    xmlNodeGetBase                  (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Searches for the BASE URL. The code should work on both XML
-and HTML document even if base mechanisms are completely different.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document the node pertains to</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the node being checked</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a pointer to the base URL, or NULL if not found
-It's up to the caller to free the memory.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN5955"
+NAME="AEN4842"
 ></A
 ><H3
 ><A
@@ -11371,7 +8522,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5974"
+NAME="AEN4861"
 ></A
 ><H3
 ><A
@@ -11429,7 +8580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11446,7 +8597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11456,7 +8607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5995"
+NAME="AEN4882"
 ></A
 ><H3
 ><A
@@ -11511,7 +8662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11528,7 +8679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11538,7 +8689,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6015"
+NAME="AEN4902"
 ></A
 ><H3
 ><A
@@ -11597,7 +8748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11614,7 +8765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to add</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11624,117 +8775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6036"
-></A
-><H3
-><A
-NAME="XMLRECONCILIATENS"
-></A
->xmlReconciliateNs ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlReconciliateNs               (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> tree);</PRE
-></TD
-></TR
-></TABLE
-><P
->This function checks that all the namespaces declared within the given
-tree are properly declared. This is needed for example after Copy or Cut
-and then paste operations. The subtree may still hold pointers to
-namespace declarations outside the subtree or invalid/masked. As much
-as possible the function try tu reuse the existing namespaces found in
-the new environment. If not possible the new namespaces are redeclared
-on <TT
-CLASS="PARAMETER"
-><I
->tree</I
-></TT
-> at the top of the given subtree.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->tree</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a node defining the subtree to reconciliate</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the number of namespace declarations created or -1 in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6062"
+NAME="AEN4923"
 ></A
 ><H3
 ><A
@@ -11793,7 +8834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11810,7 +8851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -11827,7 +8868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  OUT: the memory lenght</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -11837,7 +8878,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6087"
+NAME="AEN4948"
 ></A
 ><H3
 ><A
@@ -11894,94 +8935,6 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the FILE*</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->cur</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6108"
-></A
-><H3
-><A
-NAME="XMLELEMDUMP"
-></A
->xmlElemDump ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlElemDump                     (<GTKDOCLINK
-HREF="FILE"
->FILE</GTKDOCLINK
-> *f,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> cur,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->Dump an XML/HTML node, recursive behaviour,children are printed too.</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
->f</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
 >&nbsp;</TD
 ></TR
 ><TR
@@ -11999,23 +8952,6 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
 >&nbsp;</TD
 ></TR
 ></TABLE
@@ -12026,7 +8962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6134"
+NAME="AEN4969"
 ></A
 ><H3
 ><A
@@ -12087,7 +9023,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the filename</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12104,7 +9040,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12119,7 +9055,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the number of file written or -1 in case of failure.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12129,7 +9065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6159"
+NAME="AEN4994"
 ></A
 ><H3
 ><A
@@ -12182,7 +9118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12197,7 +9133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12207,7 +9143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6179"
+NAME="AEN5014"
 ></A
 ><H3
 ><A
@@ -12262,7 +9198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -12279,7 +9215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12289,7 +9225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6199"
+NAME="AEN5034"
 ></A
 ><H3
 ><A
@@ -12337,7 +9273,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 (uncompressed) to 9 (max compression)</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -12347,7 +9283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6214"
+NAME="AEN5049"
 ></A
 ><H3
 ><A
@@ -12398,7 +9334,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the compression ratio</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index 96a5d2e..143d52e 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="AEN6710"
+NAME="AEN5502"
 ></A
 ><H2
 >Name</H2
->valid &#8212; </DIV
+>valid&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6713"
+NAME="AEN5505"
 ></A
 ><H2
 >Synopsis</H2
@@ -150,22 +156,10 @@
 >)       (void *ctx,
                                              const char *msg,
                                              ...);
-struct      <A
-HREF="gnome-xml-valid.html#XMLVALIDCTXT"
->xmlValidCtxt</A
->;
-typedef     <A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
->;
 #define     <A
 HREF="gnome-xml-valid.html#XML-MIN-NOTATION-TABLE"
 >XML_MIN_NOTATION_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-valid.html#XMLNOTATIONTABLE"
->xmlNotationTable</A
->;
 typedef     <A
 HREF="gnome-xml-valid.html#XMLNOTATIONTABLEPTR"
 >xmlNotationTablePtr</A
@@ -174,10 +168,6 @@
 HREF="gnome-xml-valid.html#XML-MIN-ELEMENT-TABLE"
 >XML_MIN_ELEMENT_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-valid.html#XMLELEMENTTABLE"
->xmlElementTable</A
->;
 typedef     <A
 HREF="gnome-xml-valid.html#XMLELEMENTTABLEPTR"
 >xmlElementTablePtr</A
@@ -186,10 +176,6 @@
 HREF="gnome-xml-valid.html#XML-MIN-ATTRIBUTE-TABLE"
 >XML_MIN_ATTRIBUTE_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-valid.html#XMLATTRIBUTETABLE"
->xmlAttributeTable</A
->;
 typedef     <A
 HREF="gnome-xml-valid.html#XMLATTRIBUTETABLEPTR"
 >xmlAttributeTablePtr</A
@@ -198,10 +184,6 @@
 HREF="gnome-xml-valid.html#XML-MIN-ID-TABLE"
 >XML_MIN_ID_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-valid.html#XMLIDTABLE"
->xmlIDTable</A
->;
 typedef     <A
 HREF="gnome-xml-valid.html#XMLIDTABLEPTR"
 >xmlIDTablePtr</A
@@ -210,10 +192,6 @@
 HREF="gnome-xml-valid.html#XML-MIN-REF-TABLE"
 >XML_MIN_REF_TABLE</A
 >
-struct      <A
-HREF="gnome-xml-valid.html#XMLREFTABLE"
->xmlRefTable</A
->;
 typedef     <A
 HREF="gnome-xml-valid.html#XMLREFTABLEPTR"
 >xmlRefTablePtr</A
@@ -224,9 +202,9 @@
 > <A
 HREF="gnome-xml-valid.html#XMLADDNOTATIONDECL"
 >xmlAddNotationDecl</A
->           (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>           (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -262,17 +240,6 @@
 >xmlNotationTablePtr</A
 > table);
 void        <A
-HREF="gnome-xml-valid.html#XMLDUMPNOTATIONDECL"
->xmlDumpNotationDecl</A
->             (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNOTATIONPTR"
->xmlNotationPtr</A
-> nota);
-void        <A
 HREF="gnome-xml-valid.html#XMLDUMPNOTATIONTABLE"
 >xmlDumpNotationTable</A
 >            (<A
@@ -314,24 +281,15 @@
 HREF="gnome-xml-tree.html#XMLELEMENTCONTENTPTR"
 >xmlElementContentPtr</A
 > cur);
-void        <A
-HREF="gnome-xml-valid.html#XMLSPRINTFELEMENTCONTENT"
->xmlSprintfElementContent</A
->        (char *buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLELEMENTCONTENTPTR"
->xmlElementContentPtr</A
-> content,
-                                             int glob);
 <A
 HREF="gnome-xml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
 > <A
 HREF="gnome-xml-valid.html#XMLADDELEMENTDECL"
 >xmlAddElementDecl</A
->             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>             (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -377,17 +335,6 @@
 HREF="gnome-xml-valid.html#XMLELEMENTTABLEPTR"
 >xmlElementTablePtr</A
 > table);
-void        <A
-HREF="gnome-xml-valid.html#XMLDUMPELEMENTDECL"
->xmlDumpElementDecl</A
->              (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLELEMENTPTR"
->xmlElementPtr</A
-> elem);
 <A
 HREF="gnome-xml-tree.html#XMLENUMERATIONPTR"
 >xmlEnumerationPtr</A
@@ -421,9 +368,9 @@
 > <A
 HREF="gnome-xml-valid.html#XMLADDATTRIBUTEDECL"
 >xmlAddAttributeDecl</A
->         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -440,7 +387,7 @@
                                              const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
-> *prefix,
+> *ns,
                                              <A
 HREF="gnome-xml-tree.html#XMLATTRIBUTETYPE"
 >xmlAttributeType</A
@@ -485,26 +432,15 @@
 HREF="gnome-xml-valid.html#XMLATTRIBUTETABLEPTR"
 >xmlAttributeTablePtr</A
 > table);
-void        <A
-HREF="gnome-xml-valid.html#XMLDUMPATTRIBUTEDECL"
->xmlDumpAttributeDecl</A
->            (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRIBUTEPTR"
->xmlAttributePtr</A
-> attr);
 <A
 HREF="gnome-xml-tree.html#XMLIDPTR"
 >xmlIDPtr</A
 >    <A
 HREF="gnome-xml-valid.html#XMLADDID"
 >xmlAddID</A
->                        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>                        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -564,26 +500,15 @@
 HREF="gnome-xml-tree.html#XMLATTRPTR"
 >xmlAttrPtr</A
 > attr);
-int         <A
-HREF="gnome-xml-valid.html#XMLREMOVEID"
->xmlRemoveID</A
->                     (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> attr);
 <A
 HREF="gnome-xml-tree.html#XMLREFPTR"
 >xmlRefPtr</A
 >   <A
 HREF="gnome-xml-valid.html#XMLADDREF"
 >xmlAddRef</A
->                       (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>                       (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -630,22 +555,11 @@
 >xmlAttrPtr</A
 > attr);
 int         <A
-HREF="gnome-xml-valid.html#XMLREMOVEREF"
->xmlRemoveRef</A
->                    (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> attr);
-int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEROOT"
 >xmlValidateRoot</A
->                 (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>                 (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -654,9 +568,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEELEMENTDECL"
 >xmlValidateElementDecl</A
->          (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>          (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -666,34 +580,12 @@
 HREF="gnome-xml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
 > elem);
-<A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    <A
-HREF="gnome-xml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE"
->xmlValidNormalizeAttributeValue</A
-> (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *value);
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEATTRIBUTEDECL"
 >xmlValidateAttributeDecl</A
->        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -717,9 +609,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATENOTATIONDECL"
 >xmlValidateNotationDecl</A
->         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -732,9 +624,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEDTD"
 >xmlValidateDtd</A
->                  (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>                  (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -745,22 +637,11 @@
 >xmlDtdPtr</A
 > dtd);
 int         <A
-HREF="gnome-xml-valid.html#XMLVALIDATEDTDFINAL"
->xmlValidateDtdFinal</A
->             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);
-int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEDOCUMENT"
 >xmlValidateDocument</A
->             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>             (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -769,9 +650,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEELEMENT"
 >xmlValidateElement</A
->              (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>              (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -784,9 +665,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEONEELEMENT"
 >xmlValidateOneElement</A
->           (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>           (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -799,9 +680,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEONEATTRIBUTE"
 >xmlValidateOneAttribute</A
->         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -822,9 +703,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATEDOCUMENTFINAL"
 >xmlValidateDocumentFinal</A
->        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -833,9 +714,9 @@
 int         <A
 HREF="gnome-xml-valid.html#XMLVALIDATENOTATIONUSE"
 >xmlValidateNotationUse</A
->          (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>          (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -901,36 +782,7 @@
                                              const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
-> *name);
-int         <A
-HREF="gnome-xml-valid.html#XMLVALIDGETVALIDELEMENTS"
->xmlValidGetValidElements</A
->        (<A
-HREF="gnome-xml-tree.html#XMLNODE"
->xmlNode</A
-> *prev,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODE"
->xmlNode</A
-> *next,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> **list,
-                                             int max);
-int         <A
-HREF="gnome-xml-valid.html#XMLVALIDGETPOTENTIALCHILDREN"
->xmlValidGetPotentialChildren</A
->    (<A
-HREF="gnome-xml-tree.html#XMLELEMENTCONTENT"
->xmlElementContent</A
-> *ctree,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> **list,
-                                             int *len,
-                                             int max);</PRE
+> *name);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -938,7 +790,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6930"
+NAME="AEN5682"
 ></A
 ><H2
 >Description</H2
@@ -948,14 +800,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN6933"
+NAME="AEN5685"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6935"
+NAME="AEN5687"
 ></A
 ><H3
 ><A
@@ -1049,7 +901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6957"
+NAME="AEN5709"
 ></A
 ><H3
 ><A
@@ -1143,71 +995,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6979"
-></A
-><H3
-><A
-NAME="XMLVALIDCTXT"
-></A
->struct xmlValidCtxt</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlValidCtxt {
-    void *userData;			/* user specific data block */
-    xmlValidityErrorFunc error;		/* the callback in case of errors */
-    xmlValidityWarningFunc warning;	/* the callback in case of warning */
-
-    /* Node analysis stack used when validating within entities */
-    xmlNodePtr         node;          /* Current parsed Node */
-    int                nodeNr;        /* Depth of the parsing stack */
-    int                nodeMax;       /* Max depth of the parsing stack */
-    xmlNodePtr        *nodeTab;       /* array of nodes */
-
-    int              finishDtd;       /* finished validating the Dtd ? */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6984"
-></A
-><H3
-><A
-NAME="XMLVALIDCTXTPTR"
-></A
->xmlValidCtxtPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlValidCtxt *xmlValidCtxtPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6989"
+NAME="AEN5731"
 ></A
 ><H3
 ><A
@@ -1223,7 +1011,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_NOTATION_TABLE	32</PRE
+>#define     XML_MIN_NOTATION_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1233,63 +1021,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6994"
-></A
-><H3
-><A
-NAME="XMLNOTATIONTABLE"
-></A
->struct xmlNotationTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlNotationTable {
-    int nb_notations;		/* number of notations stored */
-    int max_notations;		/* maximum number of notations */
-    xmlNotationPtr *table;	/* the table of attributes */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6999"
+NAME="AEN5736"
 ></A
 ><H3
 ><A
 NAME="XMLNOTATIONTABLEPTR"
 ></A
 >xmlNotationTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNotationTable *xmlNotationTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7004"
+NAME="AEN5740"
 ></A
 ><H3
 ><A
@@ -1305,7 +1050,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ELEMENT_TABLE	32</PRE
+>#define     XML_MIN_ELEMENT_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1315,63 +1060,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7009"
-></A
-><H3
-><A
-NAME="XMLELEMENTTABLE"
-></A
->struct xmlElementTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlElementTable {
-    int nb_elements;		/* number of elements stored */
-    int max_elements;		/* maximum number of elements */
-    xmlElementPtr *table;	/* the table of elements */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7014"
+NAME="AEN5745"
 ></A
 ><H3
 ><A
 NAME="XMLELEMENTTABLEPTR"
 ></A
 >xmlElementTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlElementTable *xmlElementTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7019"
+NAME="AEN5749"
 ></A
 ><H3
 ><A
@@ -1387,7 +1089,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ATTRIBUTE_TABLE	32</PRE
+>#define     XML_MIN_ATTRIBUTE_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1397,63 +1099,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7024"
-></A
-><H3
-><A
-NAME="XMLATTRIBUTETABLE"
-></A
->struct xmlAttributeTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlAttributeTable {
-    int nb_attributes;		/* number of attributes stored */
-    int max_attributes;		/* maximum number of attributes */
-    xmlAttributePtr *table;	/* the table of attributes */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7029"
+NAME="AEN5754"
 ></A
 ><H3
 ><A
 NAME="XMLATTRIBUTETABLEPTR"
 ></A
 >xmlAttributeTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlAttributeTable *xmlAttributeTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7034"
+NAME="AEN5758"
 ></A
 ><H3
 ><A
@@ -1469,7 +1128,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_ID_TABLE	32</PRE
+>#define     XML_MIN_ID_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1479,63 +1138,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7039"
-></A
-><H3
-><A
-NAME="XMLIDTABLE"
-></A
->struct xmlIDTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlIDTable {
-    int nb_ids;			/* number of ids stored */
-    int max_ids;		/* maximum number of ids */
-    xmlIDPtr *table;		/* the table of ids */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7044"
+NAME="AEN5763"
 ></A
 ><H3
 ><A
 NAME="XMLIDTABLEPTR"
 ></A
 >xmlIDTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlIDTable *xmlIDTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7049"
+NAME="AEN5767"
 ></A
 ><H3
 ><A
@@ -1551,7 +1167,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XML_MIN_REF_TABLE	32</PRE
+>#define     XML_MIN_REF_TABLE</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1561,63 +1177,20 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7054"
-></A
-><H3
-><A
-NAME="XMLREFTABLE"
-></A
->struct xmlRefTable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlRefTable {
-    int nb_refs;			/* number of refs stored */
-    int max_refs;		/* maximum number of refs */
-    xmlRefPtr *table;		/* the table of refs */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7059"
+NAME="AEN5772"
 ></A
 ><H3
 ><A
 NAME="XMLREFTABLEPTR"
 ></A
 >xmlRefTablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlRefTable *xmlRefTablePtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7064"
+NAME="AEN5776"
 ></A
 ><H3
 ><A
@@ -1636,9 +1209,9 @@
 ><A
 HREF="gnome-xml-tree.html#XMLNOTATIONPTR"
 >xmlNotationPtr</A
-> xmlAddNotationDecl           (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+> xmlAddNotationDecl           (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -1689,7 +1262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1706,7 +1279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1723,7 +1296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1740,7 +1313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the public identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1757,7 +1330,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the system identifier or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1772,7 +1345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1782,7 +1355,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7105"
+NAME="AEN5817"
 ></A
 ><H3
 ><A
@@ -1838,7 +1411,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1853,7 +1426,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlNotationTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1863,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7126"
+NAME="AEN5838"
 ></A
 ><H3
 ><A
@@ -1916,7 +1489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An notation table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1926,91 +1499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7142"
-></A
-><H3
-><A
-NAME="XMLDUMPNOTATIONDECL"
-></A
->xmlDumpNotationDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDumpNotationDecl             (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNOTATIONPTR"
->xmlNotationPtr</A
-> nota);</PRE
-></TD
-></TR
-></TABLE
-><P
->This will dump the content the notation declaration as an XML DTD definition</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the XML buffer output</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->nota</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  A notation declaration</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7163"
+NAME="AEN5854"
 ></A
 ><H3
 ><A
@@ -2067,7 +1556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2084,7 +1573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  A notation table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2094,7 +1583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7184"
+NAME="AEN5875"
 ></A
 ><H3
 ><A
@@ -2154,7 +1643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the subelement name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2171,7 +1660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the type of element content decl</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2186,7 +1675,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new element content structure</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2196,7 +1685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7210"
+NAME="AEN5901"
 ></A
 ><H3
 ><A
@@ -2252,7 +1741,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element content pointer.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2267,7 +1756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementContentPtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2277,7 +1766,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7231"
+NAME="AEN5922"
 ></A
 ><H3
 ><A
@@ -2330,7 +1819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2340,107 +1829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7247"
-></A
-><H3
-><A
-NAME="XMLSPRINTFELEMENTCONTENT"
-></A
->xmlSprintfElementContent ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlSprintfElementContent        (char *buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLELEMENTCONTENTPTR"
->xmlElementContentPtr</A
-> content,
-                                             int glob);</PRE
-></TD
-></TR
-></TABLE
-><P
->This will dump the content of the element content definition
-Intended just for the debug routine</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an output buffer</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->content</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  An element table</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->glob</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> 1 if one must print the englobing parenthesis, 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7271"
+NAME="AEN5938"
 ></A
 ><H3
 ><A
@@ -2459,9 +1848,9 @@
 ><A
 HREF="gnome-xml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
-> xmlAddElementDecl             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+> xmlAddElementDecl             (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -2512,7 +1901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2529,7 +1918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2546,7 +1935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the entity name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2563,7 +1952,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2580,7 +1969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element content tree or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2595,7 +1984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2605,7 +1994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7312"
+NAME="AEN5979"
 ></A
 ><H3
 ><A
@@ -2661,7 +2050,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2676,7 +2065,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlElementTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2686,7 +2075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7333"
+NAME="AEN6000"
 ></A
 ><H3
 ><A
@@ -2739,7 +2128,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2749,7 +2138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7349"
+NAME="AEN6016"
 ></A
 ><H3
 ><A
@@ -2806,7 +2195,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2823,7 +2212,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An element table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -2833,92 +2222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7370"
-></A
-><H3
-><A
-NAME="XMLDUMPELEMENTDECL"
-></A
->xmlDumpElementDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDumpElementDecl              (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLELEMENTPTR"
->xmlElementPtr</A
-> elem);</PRE
-></TD
-></TR
-></TABLE
-><P
->This will dump the content of the element declaration as an XML
-DTD definition</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the XML buffer output</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  An element table</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7391"
+NAME="AEN6037"
 ></A
 ><H3
 ><A
@@ -2974,7 +2278,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the enumeration name or NULL</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -2989,8 +2293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3000,7 +2303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7412"
+NAME="AEN6058"
 ></A
 ><H3
 ><A
@@ -3053,7 +2356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to free.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3063,7 +2366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7428"
+NAME="AEN6074"
 ></A
 ><H3
 ><A
@@ -3119,7 +2422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the tree to copy.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3134,8 +2437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlEnumerationPtr just created or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3145,7 +2447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7449"
+NAME="AEN6095"
 ></A
 ><H3
 ><A
@@ -3164,9 +2466,9 @@
 ><A
 HREF="gnome-xml-tree.html#XMLATTRIBUTEPTR"
 >xmlAttributePtr</A
-> xmlAddAttributeDecl         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+> xmlAddAttributeDecl         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDTDPTR"
@@ -3183,7 +2485,7 @@
                                              const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
-> *prefix,
+> *ns,
                                              <A
 HREF="gnome-xml-tree.html#XMLATTRIBUTETYPE"
 >xmlAttributeType</A
@@ -3233,7 +2535,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3250,7 +2552,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the DTD</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3267,7 +2569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3284,7 +2586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3294,7 +2596,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->prefix</I
+>ns</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -3318,7 +2620,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3335,7 +2637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3352,7 +2654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute default value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3369,7 +2671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  if it's an enumeration, the associated list</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3384,7 +2686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the entity</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3394,7 +2696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7510"
+NAME="AEN6156"
 ></A
 ><H3
 ><A
@@ -3450,7 +2752,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3465,7 +2767,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new xmlAttributeTablePtr or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3475,7 +2777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7531"
+NAME="AEN6177"
 ></A
 ><H3
 ><A
@@ -3528,7 +2830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3538,7 +2840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7547"
+NAME="AEN6193"
 ></A
 ><H3
 ><A
@@ -3595,7 +2897,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML buffer output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3612,7 +2914,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An attribute table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3622,92 +2924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7568"
-></A
-><H3
-><A
-NAME="XMLDUMPATTRIBUTEDECL"
-></A
->xmlDumpAttributeDecl ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlDumpAttributeDecl            (<A
-HREF="gnome-xml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRIBUTEPTR"
->xmlAttributePtr</A
-> attr);</PRE
-></TD
-></TR
-></TABLE
-><P
->This will dump the content of the attribute declaration as an XML
-DTD definition</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
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the XML buffer output</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->attr</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  An attribute declaration</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7589"
+NAME="AEN6214"
 ></A
 ><H3
 ><A
@@ -3726,9 +2943,9 @@
 ><A
 HREF="gnome-xml-tree.html#XMLIDPTR"
 >xmlIDPtr</A
->    xmlAddID                        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>    xmlAddID                        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -3775,7 +2992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3792,7 +3009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3809,7 +3026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3826,7 +3043,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the ID</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -3841,7 +3058,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlIDPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3851,7 +3068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7625"
+NAME="AEN6250"
 ></A
 ><H3
 ><A
@@ -3930,7 +3147,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7645"
+NAME="AEN6270"
 ></A
 ><H3
 ><A
@@ -3983,7 +3200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An id table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -3993,7 +3210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7661"
+NAME="AEN6286"
 ></A
 ><H3
 ><A
@@ -4053,7 +3270,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4070,7 +3287,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the ID value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4085,7 +3302,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not found, otherwise the xmlAttrPtr defining the ID</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4095,7 +3312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7687"
+NAME="AEN6312"
 ></A
 ><H3
 ><A
@@ -4158,7 +3375,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4175,7 +3392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4192,7 +3409,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4207,7 +3424,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4217,106 +3434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7717"
-></A
-><H3
-><A
-NAME="XMLREMOVEID"
-></A
->xmlRemoveID ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRemoveID                     (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> attr);</PRE
-></TD
-></TR
-></TABLE
-><P
->Remove the given attribute from the ID table maintained internally.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->attr</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the attribute</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7742"
+NAME="AEN6342"
 ></A
 ><H3
 ><A
@@ -4335,9 +3453,9 @@
 ><A
 HREF="gnome-xml-tree.html#XMLREFPTR"
 >xmlRefPtr</A
->   xmlAddRef                       (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>   xmlAddRef                       (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -4384,7 +3502,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4401,7 +3519,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4418,7 +3536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the value name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4435,7 +3553,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute holding the Ref</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4450,7 +3568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->NULL if not, othervise the new xmlRefPtr</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4460,7 +3578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7778"
+NAME="AEN6378"
 ></A
 ><H3
 ><A
@@ -4539,7 +3657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7798"
+NAME="AEN6398"
 ></A
 ><H3
 ><A
@@ -4592,7 +3710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  An ref table</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4602,7 +3720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7814"
+NAME="AEN6414"
 ></A
 ><H3
 ><A
@@ -4665,7 +3783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4682,7 +3800,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element carrying the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4699,7 +3817,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4714,7 +3832,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or 1 depending on the lookup result</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4724,106 +3842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7844"
-></A
-><H3
-><A
-NAME="XMLREMOVEREF"
-></A
->xmlRemoveRef ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRemoveRef                    (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLATTRPTR"
->xmlAttrPtr</A
-> attr);</PRE
-></TD
-></TR
-></TABLE
-><P
->Remove the given attribute from the Ref table maintained internally.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->attr</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the attribute</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->-1 if the lookup failed and 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7869"
+NAME="AEN6444"
 ></A
 ><H3
 ><A
@@ -4839,9 +3858,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateRoot                 (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateRoot                 (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -4884,7 +3903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4901,7 +3920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -4916,7 +3935,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -4926,7 +3945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7894"
+NAME="AEN6469"
 ></A
 ><H3
 ><A
@@ -4942,9 +3961,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateElementDecl          (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateElementDecl          (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -4992,7 +4011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5009,7 +4028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5026,7 +4045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5041,7 +4060,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5051,167 +4070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7924"
-></A
-><H3
-><A
-NAME="XMLVALIDNORMALIZEATTRIBUTEVALUE"
-></A
->xmlValidNormalizeAttributeValue ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
->*    xmlValidNormalizeAttributeValue (<A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> elem,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *name,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> *value);</PRE
-></TD
-></TR
-></TABLE
-><P
->Does the validation related extra step of the normalization of attribute
-values:</P
-><P
->If the declared value is not CDATA, then the XML processor must further
-process the normalized attribute value by discarding any leading and
-trailing space (<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) characters, and by replacing sequences of space
-(<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) characters by single space (<GTKDOCLINK
-HREF="X20"
->x20</GTKDOCLINK
->) character.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the document</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->elem</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the parent</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->name</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the attribute name</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->value</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the attribute value</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->a new normalized string if normalization is needed, NULL otherwise
-the caller must free the returned value.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN7964"
+NAME="AEN6499"
 ></A
 ><H3
 ><A
@@ -5227,9 +4086,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateAttributeDecl        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateAttributeDecl        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -5279,7 +4138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5296,7 +4155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5313,7 +4172,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5328,7 +4187,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5338,7 +4197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7995"
+NAME="AEN6530"
 ></A
 ><H3
 ><A
@@ -5410,7 +4269,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute type</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5427,7 +4286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5442,7 +4301,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5452,7 +4311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8024"
+NAME="AEN6559"
 ></A
 ><H3
 ><A
@@ -5468,9 +4327,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateNotationDecl         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateNotationDecl         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -5517,7 +4376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5534,7 +4393,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5551,7 +4410,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a notation definition</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5566,7 +4425,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5576,7 +4435,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8054"
+NAME="AEN6589"
 ></A
 ><H3
 ><A
@@ -5592,9 +4451,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateDtd                  (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateDtd                  (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -5608,7 +4467,7 @@
 ></TR
 ></TABLE
 ><P
->Try to validate the document against the dtd instance</P
+>Try to validate the dtd instance</P
 ><P
 >basically it does check all the definitions in the DtD.</P
 ><P
@@ -5639,7 +4498,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5656,7 +4515,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5673,7 +4532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a dtd instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5688,7 +4547,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5698,113 +4557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8085"
-></A
-><H3
-><A
-NAME="XMLVALIDATEDTDFINAL"
-></A
->xmlValidateDtdFinal ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlValidateDtdFinal             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
-> ctxt,
-                                             <A
-HREF="gnome-xml-tree.html#XMLDOCPTR"
->xmlDocPtr</A
-> doc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Does the final step for the dtds validation once all the
-subsets have been parsed</P
-><P
->basically it does the following checks described by the XML Rec
-- check that ENTITY and ENTITIES type attributes default or 
-possible values matches one of the defined entities.
-- check that NOTATION type attributes default or 
-possible values matches one of the defined notations.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ctxt</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the validation context</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->doc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a document instance</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->1 if valid or 0 otherwise</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8111"
+NAME="AEN6620"
 ></A
 ><H3
 ><A
@@ -5820,9 +4573,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateDocument             (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateDocument             (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -5865,7 +4618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5882,7 +4635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5897,7 +4650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -5907,7 +4660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8137"
+NAME="AEN6646"
 ></A
 ><H3
 ><A
@@ -5923,9 +4676,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateElement              (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateElement              (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -5968,7 +4721,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -5985,7 +4738,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6002,7 +4755,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6017,7 +4770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6027,7 +4780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8167"
+NAME="AEN6676"
 ></A
 ><H3
 ><A
@@ -6043,9 +4796,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateOneElement           (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateOneElement           (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -6098,7 +4851,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6115,7 +4868,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6132,7 +4885,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6147,7 +4900,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6157,7 +4910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8199"
+NAME="AEN6708"
 ></A
 ><H3
 ><A
@@ -6173,9 +4926,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateOneAttribute         (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateOneAttribute         (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -6198,7 +4951,7 @@
 ></TABLE
 ><P
 >Try to validate a single attribute for an element
-basically it does the following checks as described by the
+basically it * does the following checks as described by the
 XML-1.0 recommendation:
 - [ VC: Attribute Value Type ]
 - [ VC: Fixed Attribute Default ]
@@ -6238,7 +4991,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6255,7 +5008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6272,7 +5025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an element instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6289,7 +5042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an attribute instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6306,7 +5059,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute value (without entities processing)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6321,7 +5074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6331,7 +5084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8240"
+NAME="AEN6749"
 ></A
 ><H3
 ><A
@@ -6347,9 +5100,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateDocumentFinal        (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateDocumentFinal        (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -6391,7 +5144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6408,7 +5161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a document instance</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6423,7 +5176,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6433,7 +5186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8266"
+NAME="AEN6775"
 ></A
 ><H3
 ><A
@@ -6449,9 +5202,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         xmlValidateNotationUse          (<A
-HREF="gnome-xml-valid.html#XMLVALIDCTXTPTR"
->xmlValidCtxtPtr</A
+>int         xmlValidateNotationUse          (<GTKDOCLINK
+HREF="XMLVALIDCTXTPTR"
+>xmlValidCtxtPtr</GTKDOCLINK
 > ctxt,
                                              <A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
@@ -6495,7 +5248,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the validation context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6512,7 +5265,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6529,7 +5282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name to check</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6544,7 +5297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->1 if valid or 0 otherwise</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6554,7 +5307,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8296"
+NAME="AEN6805"
 ></A
 ><H3
 ><A
@@ -6612,7 +5365,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6629,7 +5382,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6644,7 +5397,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 if no, 1 if yes, and -1 if no element description is available</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6654,7 +5407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8321"
+NAME="AEN6830"
 ></A
 ><H3
 ><A
@@ -6719,7 +5472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6736,7 +5489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6753,7 +5506,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the attribute name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6768,7 +5521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlAttributePtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6778,7 +5531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8352"
+NAME="AEN6861"
 ></A
 ><H3
 ><A
@@ -6838,7 +5591,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6855,7 +5608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the notation name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6870,7 +5623,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlNotationPtr if found or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -6880,7 +5633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8378"
+NAME="AEN6887"
 ></A
 ><H3
 ><A
@@ -6940,7 +5693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a pointer to the DtD to search</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6957,7 +5710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the element name</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -6972,308 +5725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlElementPtr if found or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8404"
-></A
-><H3
-><A
-NAME="XMLVALIDGETVALIDELEMENTS"
-></A
->xmlValidGetValidElements ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlValidGetValidElements        (<A
-HREF="gnome-xml-tree.html#XMLNODE"
->xmlNode</A
-> *prev,
-                                             <A
-HREF="gnome-xml-tree.html#XMLNODE"
->xmlNode</A
-> *next,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> **list,
-                                             int max);</PRE
-></TD
-></TR
-></TABLE
-><P
->This function returns the list of authorized children to insert
-within an existing tree while respecting the validity constraints
-forced by the Dtd. The insertion point is defined using <TT
-CLASS="PARAMETER"
-><I
->prev</I
-></TT
-> and
-<TT
-CLASS="PARAMETER"
-><I
->next</I
-></TT
-> in the following ways:
-to insert before 'node': xmlValidGetValidElements(node-&gt;prev, node, ...
-to insert next 'node': xmlValidGetValidElements(node, node-&gt;next, ...
-to replace 'node': xmlValidGetValidElements(node-&gt;prev, node-&gt;next, ...
-to prepend a child to 'node': xmlValidGetValidElements(NULL, node-&gt;childs,
-to append a child to 'node': xmlValidGetValidElements(node-&gt;last, NULL, ...</P
-><P
->pointers to the element names are inserted at the beginning of the array
-and do not need to be freed.</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
->prev</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an element to insert after</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->next</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an element to insert next</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->list</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an array to store the list of child names</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->max</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size of the array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the number of element in the list, or -1 in case of error. If
-the function returns the value <TT
-CLASS="PARAMETER"
-><I
->max</I
-></TT
-> the caller is invited to grow the
-receiving array and retry.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN8442"
-></A
-><H3
-><A
-NAME="XMLVALIDGETPOTENTIALCHILDREN"
-></A
->xmlValidGetPotentialChildren ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlValidGetPotentialChildren    (<A
-HREF="gnome-xml-tree.html#XMLELEMENTCONTENT"
->xmlElementContent</A
-> *ctree,
-                                             const <A
-HREF="gnome-xml-tree.html#XMLCHAR"
->xmlChar</A
-> **list,
-                                             int *len,
-                                             int max);</PRE
-></TD
-></TR
-></TABLE
-><P
->Build/extend a list of  potential children allowed by the content tree</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
->ctree</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an element content tree</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->list</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an array to store the list of child names</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a pointer to the number of element in the list</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->max</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size of the array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the number of element in the list, or -1 in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index 8a37266..6123053 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="AEN8694"
+NAME="AEN7132"
 ></A
 ><H2
 >Name</H2
->xml-error &#8212; </DIV
+>xml-error&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8697"
+NAME="AEN7135"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +193,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8709"
+NAME="AEN7147"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +203,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8712"
+NAME="AEN7150"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8714"
+NAME="AEN7152"
 ></A
 ><H3
 ><A
@@ -355,7 +361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8719"
+NAME="AEN7157"
 ></A
 ><H3
 ><A
@@ -408,7 +414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -425,7 +431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -442,7 +448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -452,7 +458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8742"
+NAME="AEN7180"
 ></A
 ><H3
 ><A
@@ -505,7 +511,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -522,7 +528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -539,7 +545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -549,7 +555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8765"
+NAME="AEN7203"
 ></A
 ><H3
 ><A
@@ -602,7 +608,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -619,7 +625,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -636,7 +642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -646,7 +652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8788"
+NAME="AEN7226"
 ></A
 ><H3
 ><A
@@ -699,7 +705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an XML parser context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -716,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the message to display/transmit</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -733,7 +739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  extra parameters for the message display</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -743,7 +749,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8811"
+NAME="AEN7249"
 ></A
 ><H3
 ><A
@@ -796,7 +802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -806,7 +812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8827"
+NAME="AEN7265"
 ></A
 ><H3
 ><A
@@ -859,7 +865,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an xmlParserInputPtr input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index ae6d255..3824252 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="AEN10710"
+NAME="AEN8733"
 ></A
 ><H2
 >Name</H2
->xmlIO &#8212; </DIV
+>xmlIO&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10713"
+NAME="AEN8736"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,28 +144,6 @@
 CLASS="SYNOPSIS"
 >&#13;
 
-int         (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTMATCHCALLBACK"
->*xmlInputMatchCallback</A
->)        (char const *filename);
-void*       (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTOPENCALLBACK"
->*xmlInputOpenCallback</A
->)         (char const *filename);
-int         (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->*xmlInputReadCallback</A
->)         (void *context,
-                                             char *buffer,
-                                             int len);
-void        (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->*xmlInputCloseCallback</A
->)        (void *context);
-struct      <A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFER"
->xmlParserInputBuffer</A
->;
 typedef     <A
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
 >xmlParserInputBufferPtr</A
@@ -168,21 +152,10 @@
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
 >xmlParserInputBufferPtr</A
 > <A
-HREF="gnome-xml-xmlio.html#XMLALLOCPARSERINPUTBUFFER"
->xmlAllocParserInputBuffer</A
->
-                                            (<A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);
-<A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> <A
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILENAME"
 >xmlParserInputBufferCreateFilename</A
 >
-                                            (const char *filename,
+                                            (const char *URI,
                                              <A
 HREF="gnome-xml-encoding.html#XMLCHARENCODING"
 >xmlCharEncoding</A
@@ -214,26 +187,6 @@
 HREF="gnome-xml-encoding.html#XMLCHARENCODING"
 >xmlCharEncoding</A
 > enc);
-<A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> <A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEIO"
->xmlParserInputBufferCreateIO</A
->
-                                            (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> ioread,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> ioclose,
-                                             void *ioctx,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);
 int         <A
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERREAD"
 >xmlParserInputBufferRead</A
@@ -250,15 +203,6 @@
 >xmlParserInputBufferPtr</A
 > in,
                                              int len);
-int         <A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPUSH"
->xmlParserInputBufferPush</A
->        (<A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> in,
-                                             int len,
-                                             const char *buf);
 void        <A
 HREF="gnome-xml-xmlio.html#XMLFREEPARSERINPUTBUFFER"
 >xmlFreeParserInputBuffer</A
@@ -269,26 +213,7 @@
 char*       <A
 HREF="gnome-xml-xmlio.html#XMLPARSERGETDIRECTORY"
 >xmlParserGetDirectory</A
->           (const char *filename);
-int         <A
-HREF="gnome-xml-xmlio.html#XMLREGISTERINPUTCALLBACKS"
->xmlRegisterInputCallbacks</A
->       (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTMATCHCALLBACK"
->xmlInputMatchCallback</A
-> match,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTOPENCALLBACK"
->xmlInputOpenCallback</A
-> open,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> read,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> close);</PRE
+>           (const char *filename);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -296,7 +221,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10754"
+NAME="AEN8757"
 ></A
 ><H2
 >Description</H2
@@ -306,454 +231,27 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10757"
+NAME="AEN8760"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10759"
-></A
-><H3
-><A
-NAME="XMLINPUTMATCHCALLBACK"
-></A
->xmlInputMatchCallback ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         (*xmlInputMatchCallback)        (char const *filename);</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
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10777"
-></A
-><H3
-><A
-NAME="XMLINPUTOPENCALLBACK"
-></A
->xmlInputOpenCallback ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void*       (*xmlInputOpenCallback)         (char const *filename);</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
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10791"
-></A
-><H3
-><A
-NAME="XMLINPUTREADCALLBACK"
-></A
->xmlInputReadCallback ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         (*xmlInputReadCallback)         (void *context,
-                                             char *buffer,
-                                             int len);</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
->context</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->buffer</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10817"
-></A
-><H3
-><A
-NAME="XMLINPUTCLOSECALLBACK"
-></A
->xmlInputCloseCallback ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        (*xmlInputCloseCallback)        (void *context);</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
->context</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10831"
-></A
-><H3
-><A
-NAME="XMLPARSERINPUTBUFFER"
-></A
->struct xmlParserInputBuffer</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlParserInputBuffer {
-    void*                  context;
-    xmlInputReadCallback   readcallback;
-    xmlInputCloseCallback  closecallback;
-    
-    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
-    
-    xmlBufferPtr buffer;    /* Local buffer encoded in  UTF-8 */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10836"
+NAME="AEN8762"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTBUFFERPTR"
 ></A
 >xmlParserInputBufferPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlParserInputBuffer *xmlParserInputBufferPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10841"
-></A
-><H3
-><A
-NAME="XMLALLOCPARSERINPUTBUFFER"
-></A
->xmlAllocParserInputBuffer ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> xmlAllocParserInputBuffer
-                                            (<A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a buffered parser input for progressive parsing</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
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the charset encoding if known</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser input or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10862"
+NAME="AEN8766"
 ></A
 ><H3
 ><A
@@ -773,7 +271,7 @@
 HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
 >xmlParserInputBufferPtr</A
 > xmlParserInputBufferCreateFilename
-                                            (const char *filename,
+                                            (const char *URI,
                                              <A
 HREF="gnome-xml-encoding.html#XMLCHARENCODING"
 >xmlCharEncoding</A
@@ -785,8 +283,7 @@
 >Create a buffered parser input for the progressive parsing of a file
 If filename is "-' then we use stdin as the input.
 Automatic support for ZLIB/Compress compressed document is provided
-by default if found at compile-time.
-Do an encoding check if enc == XML_CHAR_ENCODING_NONE</P
+by default if found at compile-time.</P
 ><P
 ></P
 ><DIV
@@ -808,7 +305,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->filename</I
+>URI</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -832,7 +329,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -847,7 +344,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -857,7 +354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10887"
+NAME="AEN8791"
 ></A
 ><H3
 ><A
@@ -919,7 +416,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* </TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -936,7 +433,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -951,7 +448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -961,7 +458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10913"
+NAME="AEN8817"
 ></A
 ><H3
 ><A
@@ -1020,7 +517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a file descriptor number</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1037,7 +534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the charset encoding if known</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1052,7 +549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new parser input or NULL</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1062,150 +559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10938"
-></A
-><H3
-><A
-NAME="XMLPARSERINPUTBUFFERCREATEIO"
-></A
->xmlParserInputBufferCreateIO ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> xmlParserInputBufferCreateIO
-                                            (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> ioread,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> ioclose,
-                                             void *ioctx,
-                                             <A
-HREF="gnome-xml-encoding.html#XMLCHARENCODING"
->xmlCharEncoding</A
-> enc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a buffered parser input for the progressive parsing for the input
-from a file descriptor</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
->ioread</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O read function</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ioclose</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O close function</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ioctx</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an I/O handler</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->enc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the charset encoding if known</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the new parser input or NULL</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN10973"
+NAME="AEN8842"
 ></A
 ><H3
 ><A
@@ -1261,7 +615,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1278,7 +632,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1293,8 +647,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1304,7 +657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10997"
+NAME="AEN8866"
 ></A
 ><H3
 ><A
@@ -1331,7 +684,6 @@
 ><P
 >Grow up the content of the input buffer, the old data are preserved
 This routine handle the I18N transcoding to internal UTF-8
-This routine is used when operating the parser in normal (pull) mode
 TODO: one should be able to remove one extra copy</P
 ><P
 ></P
@@ -1361,7 +713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1378,7 +730,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  indicative value of the amount of chars to read</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1393,8 +745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1404,124 +755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11021"
-></A
-><H3
-><A
-NAME="XMLPARSERINPUTBUFFERPUSH"
-></A
->xmlParserInputBufferPush ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlParserInputBufferPush        (<A
-HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
->xmlParserInputBufferPtr</A
-> in,
-                                             int len,
-                                             const char *buf);</PRE
-></TD
-></TR
-></TABLE
-><P
->Push the content of the arry in the input buffer
-This routine handle the I18N transcoding to internal UTF-8
-This is used when operating the parser in progressive (push) mode.</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
->in</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a buffered parser input</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->len</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the size in bytes of the array.</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an char array</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the number of chars read and stored in the buffer, or -1
-in case of error.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN11049"
+NAME="AEN8890"
 ></A
 ><H3
 ><A
@@ -1574,7 +808,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a buffered parser input</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1584,7 +818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11065"
+NAME="AEN8906"
 ></A
 ><H3
 ><A
@@ -1654,147 +888,6 @@
 ></P
 ></DIV
 ></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN11083"
-></A
-><H3
-><A
-NAME="XMLREGISTERINPUTCALLBACKS"
-></A
->xmlRegisterInputCallbacks ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRegisterInputCallbacks       (<A
-HREF="gnome-xml-xmlio.html#XMLINPUTMATCHCALLBACK"
->xmlInputMatchCallback</A
-> match,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTOPENCALLBACK"
->xmlInputOpenCallback</A
-> open,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTREADCALLBACK"
->xmlInputReadCallback</A
-> read,
-                                             <A
-HREF="gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK"
->xmlInputCloseCallback</A
-> close);</PRE
-></TD
-></TR
-></TABLE
-><P
->Register a new set of I/O callback for handling parser input.</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
->match</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the xmlInputMatchCallback</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->open</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the xmlInputOpenCallback</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->read</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the xmlInputReadCallback</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->close</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the xmlInputCloseCallback</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the registered handler number or -1 in case of error</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index 58e79e1..68ecd45 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="AEN13827"
+NAME="AEN11337"
 ></A
 ><H2
 >Name</H2
->xmlmemory &#8212; </DIV
+>xmlmemory&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13830"
+NAME="AEN11340"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,84 +133,26 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY"
->DEBUG_MEMORY</A
+HREF="gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY"
+>NO_DEBUG_MEMORY</A
 >
-#define     <A
-HREF="gnome-xml-xmlmemory.html#MEM-LIST"
->MEM_LIST</A
->
-void        (<A
-HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
->*xmlFreeFunc</A
->)                  (void*);
-void*       (<A
-HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
->*xmlMallocFunc</A
->)                (...);
-void*       (<A
-HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
->*xmlReallocFunc</A
->)               (void*,
-                                             ...);
-char*       (<A
-HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
->*xmlStrdupFunc</A
->)                (const char*);
-extern      xmlFreeFunc <A
+void        <A
 HREF="gnome-xml-xmlmemory.html#XMLFREE"
 >xmlFree</A
->;
-extern      xmlMallocFunc <A
+>                         (void *ptr);
+void*       <A
 HREF="gnome-xml-xmlmemory.html#XMLMALLOC"
 >xmlMalloc</A
->;
-extern      xmlReallocFunc <A
+>                       (int size);
+void*       <A
 HREF="gnome-xml-xmlmemory.html#XMLREALLOC"
 >xmlRealloc</A
->;
-extern      xmlStrdupFunc <A
+>                      (void *ptr,
+                                             int size);
+char*       <A
 HREF="gnome-xml-xmlmemory.html#XMLMEMSTRDUP"
 >xmlMemStrdup</A
->;
-int         <A
-HREF="gnome-xml-xmlmemory.html#XMLMEMSETUP"
->xmlMemSetup</A
->                     (<A
-HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
->xmlFreeFunc</A
-> freeFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
->xmlMallocFunc</A
-> mallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
->xmlReallocFunc</A
-> reallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
->xmlStrdupFunc</A
-> strdupFunc);
-int         <A
-HREF="gnome-xml-xmlmemory.html#XMLMEMGET"
->xmlMemGet</A
->                       (<A
-HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
->xmlFreeFunc</A
-> *freeFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
->xmlMallocFunc</A
-> *mallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
->xmlReallocFunc</A
-> *reallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
->xmlStrdupFunc</A
-> *strdupFunc);
+>                    (const char *str);
 int         <A
 HREF="gnome-xml-xmlmemory.html#XMLINITMEMORY"
 >xmlInitMemory</A
@@ -214,6 +162,10 @@
 >xmlMemUsed</A
 >                      (void);
 void        <A
+HREF="gnome-xml-xmlmemory.html#XMLMEMORYDUMP"
+>xmlMemoryDump</A
+>                   (void);
+void        <A
 HREF="gnome-xml-xmlmemory.html#XMLMEMDISPLAY"
 >xmlMemDisplay</A
 >                   (<GTKDOCLINK
@@ -228,10 +180,18 @@
 >FILE</GTKDOCLINK
 > *fp,
                                              int nr);
-void        <A
-HREF="gnome-xml-xmlmemory.html#XMLMEMORYDUMP"
->xmlMemoryDump</A
->                   (void);
+#define     <A
+HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION"
+>DEBUG_MEMORY_LOCATION</A
+>
+#define     <A
+HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY"
+>DEBUG_MEMORY</A
+>
+#define     <A
+HREF="gnome-xml-xmlmemory.html#MEM-LIST"
+>MEM_LIST</A
+>
 void*       <A
 HREF="gnome-xml-xmlmemory.html#XMLMALLOCLOC"
 >xmlMallocLoc</A
@@ -258,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13863"
+NAME="AEN11361"
 ></A
 ><H2
 >Description</H2
@@ -268,20 +228,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13866"
+NAME="AEN11364"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13868"
+NAME="AEN11366"
 ></A
 ><H3
 ><A
-NAME="DEBUG-MEMORY"
+NAME="NO-DEBUG-MEMORY"
 ></A
->DEBUG_MEMORY</H3
+>NO_DEBUG_MEMORY</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -291,7 +251,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY</PRE
+>#define NO_DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -301,304 +261,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13873"
-></A
-><H3
-><A
-NAME="MEM-LIST"
-></A
->MEM_LIST</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13878"
-></A
-><H3
-><A
-NAME="XMLFREEFUNC"
-></A
->xmlFreeFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        (*xmlFreeFunc)                  (void*);</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
->Param1</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13892"
-></A
-><H3
-><A
-NAME="XMLMALLOCFUNC"
-></A
->xmlMallocFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void*       (*xmlMallocFunc)                (...);</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
->...</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13906"
-></A
-><H3
-><A
-NAME="XMLREALLOCFUNC"
-></A
->xmlReallocFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void*       (*xmlReallocFunc)               (void*,
-                                             ...);</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
->Param1</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->...</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13924"
-></A
-><H3
-><A
-NAME="XMLSTRDUPFUNC"
-></A
->xmlStrdupFunc ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->char*       (*xmlStrdupFunc)                (const char*);</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
->Param1</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13942"
+NAME="AEN11371"
 ></A
 ><H3
 ><A
 NAME="XMLFREE"
 ></A
->xmlFree</H3
+>xmlFree ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -608,23 +277,60 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->extern xmlFreeFunc xmlFree;</PRE
+>void        xmlFree                         (void *ptr);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>a <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() equivalent, with error checking.</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
+>ptr</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
 ></P
 ></DIV
+></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13947"
+NAME="AEN11387"
 ></A
 ><H3
 ><A
 NAME="XMLMALLOC"
 ></A
->xmlMalloc</H3
+>xmlMalloc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -634,23 +340,60 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->extern xmlMallocFunc xmlMalloc;</PRE
+>void*       xmlMalloc                       (int size);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>a <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() equivalent, with logging of the allocation info.</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
+>size</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
 ></P
 ></DIV
+></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13952"
+NAME="AEN11403"
 ></A
 ><H3
 ><A
 NAME="XMLREALLOC"
 ></A
->xmlRealloc</H3
+>xmlRealloc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -660,23 +403,78 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->extern xmlReallocFunc xmlRealloc;</PRE
+>void*       xmlRealloc                      (void *ptr,
+                                             int size);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>a <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() equivalent, with logging of the allocation info.</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
+>ptr</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TABLE
+><P
 ></P
 ></DIV
+></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13957"
+NAME="AEN11423"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSTRDUP"
 ></A
->xmlMemStrdup</H3
+>xmlMemStrdup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -686,57 +484,15 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->extern xmlStrdupFunc xmlMemStrdup;</PRE
+>char*       xmlMemStrdup                    (const char *str);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13962"
-></A
-><H3
-><A
-NAME="XMLMEMSETUP"
-></A
->xmlMemSetup ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlMemSetup                     (<A
-HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
->xmlFreeFunc</A
-> freeFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
->xmlMallocFunc</A
-> mallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
->xmlReallocFunc</A
-> reallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
->xmlStrdupFunc</A
-> strdupFunc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Override the default memory access functions with a new set
-This has to be called before any other libxml routines !</P
-><P
->Should this be blocked if there was already some allocations
-done ?</P
+>a <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() equivalent, with logging of the allocation info.</P
 ><P
 ></P
 ><DIV
@@ -758,77 +514,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->freeFunc</I
+>str</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function to use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->mallocFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function to use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->reallocFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function to use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->strdupFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function to use</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -843,7 +536,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -853,160 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14002"
-></A
-><H3
-><A
-NAME="XMLMEMGET"
-></A
->xmlMemGet ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlMemGet                       (<A
-HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
->xmlFreeFunc</A
-> *freeFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
->xmlMallocFunc</A
-> *mallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
->xmlReallocFunc</A
-> *reallocFunc,
-                                             <A
-HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
->xmlStrdupFunc</A
-> *strdupFunc);</PRE
-></TD
-></TR
-></TABLE
-><P
->Return the memory access functions set currently in use</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
->freeFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() function in use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->mallocFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() function in use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->reallocFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() function in use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->strdupFunc</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
-> the <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() function in use</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 on success</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN14041"
+NAME="AEN11443"
 ></A
 ><H3
 ><A
@@ -1054,7 +594,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 on success</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1064,7 +604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14056"
+NAME="AEN11458"
 ></A
 ><H3
 ><A
@@ -1112,7 +652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an int representing the amount of memory allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1122,7 +662,35 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14071"
+NAME="AEN11473"
+></A
+><H3
+><A
+NAME="XMLMEMORYDUMP"
+></A
+>xmlMemoryDump ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlMemoryDump                   (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Dump in-extenso the memory blocks allocated to the file .memorylist</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11479"
 ></A
 ><H3
 ><A
@@ -1175,8 +743,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file, if NULL, the result is
-written to the file .memorylist</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1186,7 +753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14087"
+NAME="AEN11495"
 ></A
 ><H3
 ><A
@@ -1246,7 +813,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE descriptor used as the output file</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1263,7 +830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  number of entries to dump</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1273,13 +840,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14108"
+NAME="AEN11516"
 ></A
 ><H3
 ><A
-NAME="XMLMEMORYDUMP"
+NAME="DEBUG-MEMORY-LOCATION"
 ></A
->xmlMemoryDump ()</H3
+>DEBUG_MEMORY_LOCATION</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1289,19 +856,69 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        xmlMemoryDump                   (void);</PRE
+>#define     DEBUG_MEMORY_LOCATION</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->Dump in-extenso the memory blocks allocated to the file .memorylist</P
-><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14114"
+NAME="AEN11521"
+></A
+><H3
+><A
+NAME="DEBUG-MEMORY"
+></A
+>DEBUG_MEMORY</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     DEBUG_MEMORY</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11526"
+></A
+><H3
+><A
+NAME="MEM-LIST"
+></A
+>MEM_LIST</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     MEM_LIST</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11531"
 ></A
 ><H3
 ><A
@@ -1356,7 +973,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1373,13 +990,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL
-  <TT
-CLASS="PARAMETER"
-><I
->file</I
-></TT
->:  the line number</TD
+>  the line number</TD
 ></TR
 ><TR
 ><TD
@@ -1406,7 +1017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14139"
+NAME="AEN11555"
 ></A
 ><H3
 ><A
@@ -1462,7 +1073,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1479,7 +1090,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1496,7 +1107,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>  the line number</TD
 ></TR
 ><TR
 ><TD
@@ -1523,7 +1134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14167"
+NAME="AEN11583"
 ></A
 ><H3
 ><A
@@ -1595,7 +1206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the file name or NULL</TD
+>  the line number</TD
 ></TR
 ><TR
 ><TD
@@ -1627,7 +1238,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occured.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index 1f67f00..5fd98ba 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="AEN9528"
+NAME="AEN7711"
 ></A
 ><H2
 >Name</H2
->xpath &#8212; </DIV
+>xpath&nbsp;--&nbsp;</DIV
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9531"
+NAME="AEN7714"
 ></A
 ><H2
 >Synopsis</H2
@@ -138,30 +144,6 @@
 CLASS="SYNOPSIS"
 >&#13;
 
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXT"
->xmlXPathContext</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
->;
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXT"
->xmlXPathParserContext</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
->;
-struct      <A
-HREF="gnome-xml-xpath.html#XMLNODESET"
->xmlNodeSet</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
->;
 #define     <A
 HREF="gnome-xml-xpath.html#XPATH-UNDEFINED"
 >XPATH_UNDEFINED</A
@@ -186,87 +168,47 @@
 HREF="gnome-xml-xpath.html#XPATH-USERS"
 >XPATH_USERS</A
 >
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECT"
->xmlXPathObject</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
->;
 int         (<A
 HREF="gnome-xml-xpath.html#XMLXPATHCONVERTFUNC"
 >*xmlXPathConvertFunc</A
->)          (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+>)          (<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > obj,
                                              int type);
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHTYPE"
->xmlXPathType</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHTYPEPTR"
->xmlXPathTypePtr</A
->;
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHVARIABLE"
->xmlXPathVariable</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHVARIABLEPTR"
->xmlXPathVariablePtr</A
->;
 void        (<A
 HREF="gnome-xml-xpath.html#XMLXPATHEVALFUNC"
 >*xmlXPathEvalFunc</A
->)             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+>)             (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
                                              int nargs);
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHFUNCT"
->xmlXPathFunct</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHFUNCPTR"
->xmlXPathFuncPtr</A
->;
-<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > (<A
 HREF="gnome-xml-xpath.html#XMLXPATHAXISFUNC"
 >*xmlXPathAxisFunc</A
->)       (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+>)       (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+                                             <GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > cur);
-struct      <A
-HREF="gnome-xml-xpath.html#XMLXPATHAXIS"
->xmlXPathAxis</A
->;
-typedef     <A
-HREF="gnome-xml-xpath.html#XMLXPATHAXISPTR"
->xmlXPathAxisPtr</A
->;
 void        (<A
 HREF="gnome-xml-xpath.html#XMLXPATHFUNCTION"
 >*xmlXPathFunction</A
->)             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+>)             (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
                                              int nargs);
-<A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+<GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-xpath.html#XMLXPATHNEWCONTEXT"
 >xmlXPathNewContext</A
@@ -277,13 +219,13 @@
 void        <A
 HREF="gnome-xml-xpath.html#XMLXPATHFREECONTEXT"
 >xmlXPathFreeContext</A
->             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+>             (<GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > ctxt);
-<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-xpath.html#XMLXPATHEVAL"
 >xmlXPathEval</A
@@ -291,20 +233,20 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+                                             <GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > ctxt);
 void        <A
 HREF="gnome-xml-xpath.html#XMLXPATHFREEOBJECT"
 >xmlXPathFreeObject</A
->              (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+>              (<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > obj);
-<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > <A
 HREF="gnome-xml-xpath.html#XMLXPATHEVALEXPRESSION"
 >xmlXPathEvalExpression</A
@@ -312,34 +254,10 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
-> ctxt);
-<A
-HREF="gnome-xml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> <A
-HREF="gnome-xml-xpath.html#XMLXPATHNODESETCREATE"
->xmlXPathNodeSetCreate</A
->         (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);
-void        <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREENODESETLIST"
->xmlXPathFreeNodeSetList</A
->         (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);
-void        <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREENODESET"
->xmlXPathFreeNodeSet</A
->             (<A
-HREF="gnome-xml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> obj);</PRE
+                                             <GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
+> ctxt);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -347,7 +265,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9588"
+NAME="AEN7748"
 ></A
 ><H2
 >Description</H2
@@ -357,210 +275,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9591"
+NAME="AEN7751"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9593"
-></A
-><H3
-><A
-NAME="XMLXPATHCONTEXT"
-></A
->struct xmlXPathContext</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathContext {
-    xmlDocPtr doc;			/* The current document */
-    xmlNodePtr node;			/* The current node */
-    xmlNodeSetPtr nodelist;		/* The current node list */
-
-    int nb_variables;			/* number of defined variables */
-    int max_variables;			/* max number of variables */
-    xmlXPathVariablePtr *variables;	/* Array of defined variables */
-
-    int nb_types;			/* number of defined types */
-    int max_types;			/* max number of types */
-    xmlXPathTypePtr *types;		/* Array of defined types */
-
-    int nb_funcs;			/* number of defined funcs */
-    int max_funcs;			/* max number of funcs */
-    xmlXPathFuncPtr *funcs;		/* Array of defined funcs */
-
-    int nb_axis;			/* number of defined axis */
-    int max_axis;			/* max number of axis */
-    xmlXPathAxisPtr *axis;		/* Array of defined axis */
-
-    /* Namespace traversal should be implemented with user */
-    xmlNsPtr *namespaces;		/* The namespaces lookup */
-    int nsNr;				/* the current Namespace index */
-    void *user;				/* user defined extra info */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9598"
-></A
-><H3
-><A
-NAME="XMLXPATHCONTEXTPTR"
-></A
->xmlXPathContextPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathContext *xmlXPathContextPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9603"
-></A
-><H3
-><A
-NAME="XMLXPATHPARSERCONTEXT"
-></A
->struct xmlXPathParserContext</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathParserContext {
-    const xmlChar *cur;			/* the current char being parsed */
-    const xmlChar *base;			/* the full expression */
-
-    int error;				/* error code */
-
-    xmlXPathContextPtr  context;	/* the evaluation context */
-    xmlXPathObjectPtr     value;	/* the current value */
-    int                 valueNr;	/* number of values stacked */
-    int                valueMax;	/* max number of values stacked */
-    xmlXPathObjectPtr *valueTab;	/* stack of values */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9608"
-></A
-><H3
-><A
-NAME="XMLXPATHPARSERCONTEXTPTR"
-></A
->xmlXPathParserContextPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathParserContext *xmlXPathParserContextPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9613"
-></A
-><H3
-><A
-NAME="XMLNODESET"
-></A
->struct xmlNodeSet</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlNodeSet {
-    int nodeNr;			/* # of node in the set */
-    int nodeMax;		/* allocated space */
-    xmlNodePtr *nodeTab;	/* array of nodes in no particular order */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9618"
-></A
-><H3
-><A
-NAME="XMLNODESETPTR"
-></A
->xmlNodeSetPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlNodeSet *xmlNodeSetPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9623"
+NAME="AEN7753"
 ></A
 ><H3
 ><A
@@ -576,7 +298,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_UNDEFINED	0</PRE
+>#define     XPATH_UNDEFINED</PRE
 ></TD
 ></TR
 ></TABLE
@@ -586,7 +308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9628"
+NAME="AEN7758"
 ></A
 ><H3
 ><A
@@ -602,7 +324,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_NODESET	1</PRE
+>#define     XPATH_NODESET</PRE
 ></TD
 ></TR
 ></TABLE
@@ -612,7 +334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9633"
+NAME="AEN7763"
 ></A
 ><H3
 ><A
@@ -628,7 +350,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_BOOLEAN	2</PRE
+>#define     XPATH_BOOLEAN</PRE
 ></TD
 ></TR
 ></TABLE
@@ -638,7 +360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9638"
+NAME="AEN7768"
 ></A
 ><H3
 ><A
@@ -654,7 +376,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_NUMBER	3</PRE
+>#define     XPATH_NUMBER</PRE
 ></TD
 ></TR
 ></TABLE
@@ -664,7 +386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9643"
+NAME="AEN7773"
 ></A
 ><H3
 ><A
@@ -680,7 +402,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_STRING	4</PRE
+>#define     XPATH_STRING</PRE
 ></TD
 ></TR
 ></TABLE
@@ -690,7 +412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9648"
+NAME="AEN7778"
 ></A
 ><H3
 ><A
@@ -706,7 +428,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define XPATH_USERS	5</PRE
+>#define     XPATH_USERS</PRE
 ></TD
 ></TR
 ></TABLE
@@ -716,66 +438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9653"
-></A
-><H3
-><A
-NAME="XMLXPATHOBJECT"
-></A
->struct xmlXPathObject</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathObject {
-    int type;
-    xmlNodeSetPtr nodesetval;
-    int boolval;
-    double floatval;
-    xmlChar *stringval;
-    void *user;
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9658"
-></A
-><H3
-><A
-NAME="XMLXPATHOBJECTPTR"
-></A
->xmlXPathObjectPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathObject *xmlXPathObjectPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9663"
+NAME="AEN7783"
 ></A
 ><H3
 ><A
@@ -791,9 +454,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->int         (*xmlXPathConvertFunc)          (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+>int         (*xmlXPathConvertFunc)          (<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > obj,
                                              int type);</PRE
 ></TD
@@ -869,117 +532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9686"
-></A
-><H3
-><A
-NAME="XMLXPATHTYPE"
-></A
->struct xmlXPathType</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathType {
-    const xmlChar         *name;		/* the type name */
-    xmlXPathConvertFunc func;		/* the conversion function */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9691"
-></A
-><H3
-><A
-NAME="XMLXPATHTYPEPTR"
-></A
->xmlXPathTypePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathType *xmlXPathTypePtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9696"
-></A
-><H3
-><A
-NAME="XMLXPATHVARIABLE"
-></A
->struct xmlXPathVariable</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathVariable {
-    const xmlChar       *name;		/* the variable name */
-    xmlXPathObjectPtr value;		/* the value */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9701"
-></A
-><H3
-><A
-NAME="XMLXPATHVARIABLEPTR"
-></A
->xmlXPathVariablePtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathVariable *xmlXPathVariablePtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9706"
+NAME="AEN7806"
 ></A
 ><H3
 ><A
@@ -995,9 +548,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        (*xmlXPathEvalFunc)             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+>void        (*xmlXPathEvalFunc)             (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
                                              int nargs);</PRE
 ></TD
@@ -1058,62 +611,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9725"
-></A
-><H3
-><A
-NAME="XMLXPATHFUNCT"
-></A
->struct xmlXPathFunct</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathFunct {
-    const xmlChar      *name;		/* the function name */
-    xmlXPathEvalFunc func;		/* the evaluation function */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9730"
-></A
-><H3
-><A
-NAME="XMLXPATHFUNCPTR"
-></A
->xmlXPathFuncPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathFunct *xmlXPathFuncPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9735"
+NAME="AEN7825"
 ></A
 ><H3
 ><A
@@ -1129,16 +627,16 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> (*xmlXPathAxisFunc)       (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+><GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
+> (*xmlXPathAxisFunc)       (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+                                             <GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > cur);</PRE
 ></TD
 ></TR
@@ -1213,62 +711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9760"
-></A
-><H3
-><A
-NAME="XMLXPATHAXIS"
-></A
->struct xmlXPathAxis</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->struct xmlXPathAxis {
-    const xmlChar      *name;		/* the axis name */
-    xmlXPathAxisFunc func;		/* the search function */
-};</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9765"
-></A
-><H3
-><A
-NAME="XMLXPATHAXISPTR"
-></A
->xmlXPathAxisPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlXPathAxis *xmlXPathAxisPtr;</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9770"
+NAME="AEN7850"
 ></A
 ><H3
 ><A
@@ -1284,9 +727,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        (*xmlXPathFunction)             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
+>void        (*xmlXPathFunction)             (<GTKDOCLINK
+HREF="XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</GTKDOCLINK
 > ctxt,
                                              int nargs);</PRE
 ></TD
@@ -1347,7 +790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9789"
+NAME="AEN7869"
 ></A
 ><H3
 ><A
@@ -1363,9 +806,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+><GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > xmlXPathNewContext       (<A
 HREF="gnome-xml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
@@ -1403,7 +846,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XML document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1418,7 +861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1428,7 +871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9810"
+NAME="AEN7890"
 ></A
 ><H3
 ><A
@@ -1444,9 +887,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        xmlXPathFreeContext             (<A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+>void        xmlXPathFreeContext             (<GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > ctxt);</PRE
 ></TD
 ></TR
@@ -1481,7 +924,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the context to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1491,7 +934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9826"
+NAME="AEN7906"
 ></A
 ><H3
 ><A
@@ -1507,16 +950,16 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+><GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > xmlXPathEval              (const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+                                             <GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > ctxt);</PRE
 ></TD
 ></TR
@@ -1551,7 +994,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1568,7 +1011,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1583,8 +1026,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the eveluation or NULL.
-the caller has to free the object.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1594,7 +1036,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9852"
+NAME="AEN7932"
 ></A
 ><H3
 ><A
@@ -1610,9 +1052,9 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        xmlXPathFreeObject              (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+>void        xmlXPathFreeObject              (<GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > obj);</PRE
 ></TD
 ></TR
@@ -1647,7 +1089,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the object to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -1657,7 +1099,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9868"
+NAME="AEN7948"
 ></A
 ><H3
 ><A
@@ -1673,16 +1115,16 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
+><GTKDOCLINK
+HREF="XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</GTKDOCLINK
 > xmlXPathEvalExpression    (const <A
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *str,
-                                             <A
-HREF="gnome-xml-xpath.html#XMLXPATHCONTEXTPTR"
->xmlXPathContextPtr</A
+                                             <GTKDOCLINK
+HREF="XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</GTKDOCLINK
 > ctxt);</PRE
 ></TD
 ></TR
@@ -1717,7 +1159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath expression</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1734,7 +1176,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the XPath context</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1749,229 +1191,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathObjectPtr resulting from the evaluation or NULL.
-the caller has to free the object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9894"
-></A
-><H3
-><A
-NAME="XMLXPATHNODESETCREATE"
-></A
->xmlXPathNodeSetCreate ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="gnome-xml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> xmlXPathNodeSetCreate         (<A
-HREF="gnome-xml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> val);</PRE
-></TD
-></TR
-></TABLE
-><P
->Create a new xmlNodeSetPtr of type double and of value <TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
-></P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->val</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an initial xmlNodePtr, or NULL</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the newly created object.</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9916"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESETLIST"
-></A
->xmlXPathFreeNodeSetList ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeNodeSetList         (<A
-HREF="gnome-xml-xpath.html#XMLXPATHOBJECTPTR"
->xmlXPathObjectPtr</A
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free up the xmlXPathObjectPtr <TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
-> but don't deallocate the objects in
-the list contrary to <A
-HREF="gnome-xml-xpath.html#XMLXPATHFREEOBJECT"
->xmlXPathFreeObject</A
->().</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  an existing NodeSetList object</TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN9934"
-></A
-><H3
-><A
-NAME="XMLXPATHFREENODESET"
-></A
->xmlXPathFreeNodeSet ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlXPathFreeNodeSet             (<A
-HREF="gnome-xml-xpath.html#XMLNODESETPTR"
->xmlNodeSetPtr</A
-> obj);</PRE
-></TD
-></TR
-></TABLE
-><P
->Free the NodeSet compound (not the actual nodes !).</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->obj</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the xmlNodeSetPtr to free</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index c140829..6e884f0 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -1,10 +1,9 @@
 <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 ="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">
+<ANCHOR id ="XMLEXTERNALENTITYLOADER" href="gnome-xml/gnome-xml-parser.html#XMLEXTERNALENTITYLOADER">
 <ANCHOR id ="XMLPARSERNODEINFO" href="gnome-xml/gnome-xml-parser.html#XMLPARSERNODEINFO">
-<ANCHOR id ="XMLPARSERNODEINFOPTR" href="gnome-xml/gnome-xml-parser.html#XMLPARSERNODEINFOPTR">
 <ANCHOR id ="XMLPARSERNODEINFOSEQ" href="gnome-xml/gnome-xml-parser.html#XMLPARSERNODEINFOSEQ">
 <ANCHOR id ="XMLPARSERNODEINFOSEQPTR" href="gnome-xml/gnome-xml-parser.html#XMLPARSERNODEINFOSEQPTR">
 <ANCHOR id ="XMLPARSERINPUTSTATE" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUTSTATE">
@@ -14,7 +13,6 @@
 <ANCHOR id ="XMLSAXLOCATORPTR" href="gnome-xml/gnome-xml-parser.html#XMLSAXLOCATORPTR">
 <ANCHOR id ="RESOLVEENTITYSAXFUNC" href="gnome-xml/gnome-xml-parser.html#RESOLVEENTITYSAXFUNC">
 <ANCHOR id ="INTERNALSUBSETSAXFUNC" href="gnome-xml/gnome-xml-parser.html#INTERNALSUBSETSAXFUNC">
-<ANCHOR id ="EXTERNALSUBSETSAXFUNC" href="gnome-xml/gnome-xml-parser.html#EXTERNALSUBSETSAXFUNC">
 <ANCHOR id ="GETENTITYSAXFUNC" href="gnome-xml/gnome-xml-parser.html#GETENTITYSAXFUNC">
 <ANCHOR id ="GETPARAMETERENTITYSAXFUNC" href="gnome-xml/gnome-xml-parser.html#GETPARAMETERENTITYSAXFUNC">
 <ANCHOR id ="ENTITYDECLSAXFUNC" href="gnome-xml/gnome-xml-parser.html#ENTITYDECLSAXFUNC">
@@ -40,16 +38,12 @@
 <ANCHOR id ="ISSTANDALONESAXFUNC" href="gnome-xml/gnome-xml-parser.html#ISSTANDALONESAXFUNC">
 <ANCHOR id ="HASINTERNALSUBSETSAXFUNC" href="gnome-xml/gnome-xml-parser.html#HASINTERNALSUBSETSAXFUNC">
 <ANCHOR id ="HASEXTERNALSUBSETSAXFUNC" href="gnome-xml/gnome-xml-parser.html#HASEXTERNALSUBSETSAXFUNC">
-<ANCHOR id ="XMLSAXHANDLER" href="gnome-xml/gnome-xml-parser.html#XMLSAXHANDLER">
 <ANCHOR id ="XMLSAXHANDLERPTR" href="gnome-xml/gnome-xml-parser.html#XMLSAXHANDLERPTR">
-<ANCHOR id ="XMLEXTERNALENTITYLOADER" href="gnome-xml/gnome-xml-parser.html#XMLEXTERNALENTITYLOADER">
 <ANCHOR id ="XMLPARSERVERSION" href="gnome-xml/gnome-xml-parser.html#XMLPARSERVERSION">
 <ANCHOR id ="XMLDEFAULTSAXLOCATOR" href="gnome-xml/gnome-xml-parser.html#XMLDEFAULTSAXLOCATOR">
 <ANCHOR id ="XMLDEFAULTSAXHANDLER" href="gnome-xml/gnome-xml-parser.html#XMLDEFAULTSAXHANDLER">
 <ANCHOR id ="HTMLDEFAULTSAXHANDLER" href="gnome-xml/gnome-xml-parser.html#HTMLDEFAULTSAXHANDLER">
 <ANCHOR id ="XMLSUBSTITUTEENTITIESDEFAULTVALUE" href="gnome-xml/gnome-xml-parser.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE">
-<ANCHOR id ="XMLGETWARNINGSDEFAULTVALUE" href="gnome-xml/gnome-xml-parser.html#XMLGETWARNINGSDEFAULTVALUE">
-<ANCHOR id ="XMLCLEANUPPARSER" href="gnome-xml/gnome-xml-parser.html#XMLCLEANUPPARSER">
 <ANCHOR id ="XMLPARSERINPUTREAD" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUTREAD">
 <ANCHOR id ="XMLPARSERINPUTGROW" href="gnome-xml/gnome-xml-parser.html#XMLPARSERINPUTGROW">
 <ANCHOR id ="XMLSTRDUP" href="gnome-xml/gnome-xml-parser.html#XMLSTRDUP">
@@ -66,31 +60,20 @@
 <ANCHOR id ="XMLPARSEMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEMEMORY">
 <ANCHOR id ="XMLPARSEFILE" href="gnome-xml/gnome-xml-parser.html#XMLPARSEFILE">
 <ANCHOR id ="XMLSUBSTITUTEENTITIESDEFAULT" href="gnome-xml/gnome-xml-parser.html#XMLSUBSTITUTEENTITIESDEFAULT">
-<ANCHOR id ="XMLKEEPBLANKSDEFAULT" href="gnome-xml/gnome-xml-parser.html#XMLKEEPBLANKSDEFAULT">
 <ANCHOR id ="XMLRECOVERDOC" href="gnome-xml/gnome-xml-parser.html#XMLRECOVERDOC">
 <ANCHOR id ="XMLRECOVERMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLRECOVERMEMORY">
 <ANCHOR id ="XMLRECOVERFILE" href="gnome-xml/gnome-xml-parser.html#XMLRECOVERFILE">
 <ANCHOR id ="XMLPARSEDOCUMENT" href="gnome-xml/gnome-xml-parser.html#XMLPARSEDOCUMENT">
 <ANCHOR id ="XMLSAXPARSEDOC" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEDOC">
-<ANCHOR id ="XMLSAXUSERPARSEFILE" href="gnome-xml/gnome-xml-parser.html#XMLSAXUSERPARSEFILE">
-<ANCHOR id ="XMLSAXUSERPARSEMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLSAXUSERPARSEMEMORY">
 <ANCHOR id ="XMLSAXPARSEMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEMEMORY">
 <ANCHOR id ="XMLSAXPARSEFILE" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEFILE">
 <ANCHOR id ="XMLPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLPARSEDTD">
 <ANCHOR id ="XMLSAXPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEDTD">
-<ANCHOR id ="XMLPARSEBALANCEDCHUNKMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY">
-<ANCHOR id ="XMLPARSEEXTERNALENTITY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEEXTERNALENTITY">
-<ANCHOR id ="XMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-parser.html#XMLDEFAULTSAXHANDLERINIT">
-<ANCHOR id ="HTMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-parser.html#HTMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="XMLINITPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLINITPARSERCTXT">
 <ANCHOR id ="XMLCLEARPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLCLEARPARSERCTXT">
-<ANCHOR id ="XMLFREEPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLFREEPARSERCTXT">
 <ANCHOR id ="XMLSETUPPARSERFORBUFFER" href="gnome-xml/gnome-xml-parser.html#XMLSETUPPARSERFORBUFFER">
-<ANCHOR id ="XMLCREATEDOCPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLCREATEDOCPARSERCTXT">
-<ANCHOR id ="XMLCREATEPUSHPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLCREATEPUSHPARSERCTXT">
-<ANCHOR id ="XMLPARSECHUNK" href="gnome-xml/gnome-xml-parser.html#XMLPARSECHUNK">
-<ANCHOR id ="XMLCREATEIOPARSERCTXT" href="gnome-xml/gnome-xml-parser.html#XMLCREATEIOPARSERCTXT">
-<ANCHOR id ="XMLNEWIOINPUTSTREAM" href="gnome-xml/gnome-xml-parser.html#XMLNEWIOINPUTSTREAM">
+<ANCHOR id ="XMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-parser.html#XMLDEFAULTSAXHANDLERINIT">
+<ANCHOR id ="HTMLDEFAULTSAXHANDLERINIT" href="gnome-xml/gnome-xml-parser.html#HTMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="XMLPARSERFINDNODEINFO" href="gnome-xml/gnome-xml-parser.html#XMLPARSERFINDNODEINFO">
 <ANCHOR id ="XMLINITNODEINFOSEQ" href="gnome-xml/gnome-xml-parser.html#XMLINITNODEINFOSEQ">
 <ANCHOR id ="XMLCLEARNODEINFOSEQ" href="gnome-xml/gnome-xml-parser.html#XMLCLEARNODEINFOSEQ">
@@ -141,46 +124,32 @@
 <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 ="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">
 <ANCHOR id ="XMLATTRIBUTEDEFAULT" href="gnome-xml/gnome-xml-tree.html#XMLATTRIBUTEDEFAULT">
-<ANCHOR id ="XMLENUMERATION" href="gnome-xml/gnome-xml-tree.html#XMLENUMERATION">
 <ANCHOR id ="XMLENUMERATIONPTR" href="gnome-xml/gnome-xml-tree.html#XMLENUMERATIONPTR">
-<ANCHOR id ="XMLATTRIBUTE" href="gnome-xml/gnome-xml-tree.html#XMLATTRIBUTE">
 <ANCHOR id ="XMLATTRIBUTEPTR" href="gnome-xml/gnome-xml-tree.html#XMLATTRIBUTEPTR">
 <ANCHOR id ="XMLELEMENTCONTENTTYPE" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTCONTENTTYPE">
 <ANCHOR id ="XMLELEMENTCONTENTOCCUR" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTCONTENTOCCUR">
-<ANCHOR id ="XMLELEMENTCONTENT" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTCONTENT">
 <ANCHOR id ="XMLELEMENTCONTENTPTR" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTCONTENTPTR">
 <ANCHOR id ="XMLELEMENTTYPEVAL" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTTYPEVAL">
-<ANCHOR id ="XMLELEMENT" href="gnome-xml/gnome-xml-tree.html#XMLELEMENT">
 <ANCHOR id ="XMLELEMENTPTR" href="gnome-xml/gnome-xml-tree.html#XMLELEMENTPTR">
 <ANCHOR id ="XMLNSTYPE" href="gnome-xml/gnome-xml-tree.html#XMLNSTYPE">
-<ANCHOR id ="XMLNS" href="gnome-xml/gnome-xml-tree.html#XMLNS">
 <ANCHOR id ="XMLNSPTR" href="gnome-xml/gnome-xml-tree.html#XMLNSPTR">
-<ANCHOR id ="XMLDTD" href="gnome-xml/gnome-xml-tree.html#XMLDTD">
 <ANCHOR id ="XMLDTDPTR" href="gnome-xml/gnome-xml-tree.html#XMLDTDPTR">
-<ANCHOR id ="XMLATTR" href="gnome-xml/gnome-xml-tree.html#XMLATTR">
 <ANCHOR id ="XMLATTRPTR" href="gnome-xml/gnome-xml-tree.html#XMLATTRPTR">
-<ANCHOR id ="XMLID" href="gnome-xml/gnome-xml-tree.html#XMLID">
 <ANCHOR id ="XMLIDPTR" href="gnome-xml/gnome-xml-tree.html#XMLIDPTR">
-<ANCHOR id ="XMLREF" href="gnome-xml/gnome-xml-tree.html#XMLREF">
 <ANCHOR id ="XMLREFPTR" href="gnome-xml/gnome-xml-tree.html#XMLREFPTR">
-<ANCHOR id ="XMLBUFFERALLOCATIONSCHEME" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERALLOCATIONSCHEME">
-<ANCHOR id ="XMLBUFFER" href="gnome-xml/gnome-xml-tree.html#XMLBUFFER">
-<ANCHOR id ="XMLBUFFERPTR" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERPTR">
 <ANCHOR id ="XMLNODE" href="gnome-xml/gnome-xml-tree.html#XMLNODE">
 <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 ="XMLBUFFER" href="gnome-xml/gnome-xml-tree.html#XMLBUFFER">
+<ANCHOR id ="XMLBUFFERPTR" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERPTR">
 <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">
-<ANCHOR id ="XMLBUFFERALLOCSCHEME" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERALLOCSCHEME">
-<ANCHOR id ="XMLSAVENOEMPTYTAGS" href="gnome-xml/gnome-xml-tree.html#XMLSAVENOEMPTYTAGS">
 <ANCHOR id ="XMLBUFFERCREATE" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERCREATE">
-<ANCHOR id ="XMLBUFFERCREATESIZE" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERCREATESIZE">
 <ANCHOR id ="XMLBUFFERFREE" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERFREE">
 <ANCHOR id ="XMLBUFFERDUMP" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERDUMP">
 <ANCHOR id ="XMLBUFFERADD" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERADD">
@@ -188,10 +157,6 @@
 <ANCHOR id ="XMLBUFFERCCAT" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERCCAT">
 <ANCHOR id ="XMLBUFFERSHRINK" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERSHRINK">
 <ANCHOR id ="XMLBUFFEREMPTY" href="gnome-xml/gnome-xml-tree.html#XMLBUFFEREMPTY">
-<ANCHOR id ="XMLBUFFERCONTENT" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERCONTENT">
-<ANCHOR id ="XMLBUFFERUSE" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERUSE">
-<ANCHOR id ="XMLBUFFERSETALLOCATIONSCHEME" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERSETALLOCATIONSCHEME">
-<ANCHOR id ="XMLBUFFERLENGTH" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERLENGTH">
 <ANCHOR id ="XMLCREATEINTSUBSET" href="gnome-xml/gnome-xml-tree.html#XMLCREATEINTSUBSET">
 <ANCHOR id ="XMLNEWDTD" href="gnome-xml/gnome-xml-tree.html#XMLNEWDTD">
 <ANCHOR id ="XMLFREEDTD" href="gnome-xml/gnome-xml-tree.html#XMLFREEDTD">
@@ -210,10 +175,8 @@
 <ANCHOR id ="XMLCOPYDTD" href="gnome-xml/gnome-xml-tree.html#XMLCOPYDTD">
 <ANCHOR id ="XMLCOPYDOC" href="gnome-xml/gnome-xml-tree.html#XMLCOPYDOC">
 <ANCHOR id ="XMLNEWDOCNODE" href="gnome-xml/gnome-xml-tree.html#XMLNEWDOCNODE">
-<ANCHOR id ="XMLNEWDOCRAWNODE" href="gnome-xml/gnome-xml-tree.html#XMLNEWDOCRAWNODE">
 <ANCHOR id ="XMLNEWNODE" href="gnome-xml/gnome-xml-tree.html#XMLNEWNODE">
 <ANCHOR id ="XMLNEWCHILD" href="gnome-xml/gnome-xml-tree.html#XMLNEWCHILD">
-<ANCHOR id ="XMLNEWTEXTCHILD" href="gnome-xml/gnome-xml-tree.html#XMLNEWTEXTCHILD">
 <ANCHOR id ="XMLNEWDOCTEXT" href="gnome-xml/gnome-xml-tree.html#XMLNEWDOCTEXT">
 <ANCHOR id ="XMLNEWTEXT" href="gnome-xml/gnome-xml-tree.html#XMLNEWTEXT">
 <ANCHOR id ="XMLNEWPI" href="gnome-xml/gnome-xml-tree.html#XMLNEWPI">
@@ -222,28 +185,18 @@
 <ANCHOR id ="XMLNEWDOCCOMMENT" href="gnome-xml/gnome-xml-tree.html#XMLNEWDOCCOMMENT">
 <ANCHOR id ="XMLNEWCOMMENT" href="gnome-xml/gnome-xml-tree.html#XMLNEWCOMMENT">
 <ANCHOR id ="XMLNEWCDATABLOCK" href="gnome-xml/gnome-xml-tree.html#XMLNEWCDATABLOCK">
-<ANCHOR id ="XMLNEWCHARREF" href="gnome-xml/gnome-xml-tree.html#XMLNEWCHARREF">
 <ANCHOR id ="XMLNEWREFERENCE" href="gnome-xml/gnome-xml-tree.html#XMLNEWREFERENCE">
 <ANCHOR id ="XMLCOPYNODE" href="gnome-xml/gnome-xml-tree.html#XMLCOPYNODE">
 <ANCHOR id ="XMLCOPYNODELIST" href="gnome-xml/gnome-xml-tree.html#XMLCOPYNODELIST">
-<ANCHOR id ="XMLNEWDOCFRAGMENT" href="gnome-xml/gnome-xml-tree.html#XMLNEWDOCFRAGMENT">
-<ANCHOR id ="XMLDOCGETROOTELEMENT" href="gnome-xml/gnome-xml-tree.html#XMLDOCGETROOTELEMENT">
 <ANCHOR id ="XMLGETLASTCHILD" href="gnome-xml/gnome-xml-tree.html#XMLGETLASTCHILD">
 <ANCHOR id ="XMLNODEISTEXT" href="gnome-xml/gnome-xml-tree.html#XMLNODEISTEXT">
-<ANCHOR id ="XMLISBLANKNODE" href="gnome-xml/gnome-xml-tree.html#XMLISBLANKNODE">
-<ANCHOR id ="XMLDOCSETROOTELEMENT" href="gnome-xml/gnome-xml-tree.html#XMLDOCSETROOTELEMENT">
-<ANCHOR id ="XMLNODESETNAME" href="gnome-xml/gnome-xml-tree.html#XMLNODESETNAME">
 <ANCHOR id ="XMLADDCHILD" href="gnome-xml/gnome-xml-tree.html#XMLADDCHILD">
-<ANCHOR id ="XMLREPLACENODE" href="gnome-xml/gnome-xml-tree.html#XMLREPLACENODE">
 <ANCHOR id ="XMLADDSIBLING" href="gnome-xml/gnome-xml-tree.html#XMLADDSIBLING">
-<ANCHOR id ="XMLADDPREVSIBLING" href="gnome-xml/gnome-xml-tree.html#XMLADDPREVSIBLING">
-<ANCHOR id ="XMLADDNEXTSIBLING" href="gnome-xml/gnome-xml-tree.html#XMLADDNEXTSIBLING">
 <ANCHOR id ="XMLUNLINKNODE" href="gnome-xml/gnome-xml-tree.html#XMLUNLINKNODE">
 <ANCHOR id ="XMLTEXTMERGE" href="gnome-xml/gnome-xml-tree.html#XMLTEXTMERGE">
 <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">
@@ -252,7 +205,6 @@
 <ANCHOR id ="XMLCOPYNAMESPACELIST" href="gnome-xml/gnome-xml-tree.html#XMLCOPYNAMESPACELIST">
 <ANCHOR id ="XMLSETPROP" href="gnome-xml/gnome-xml-tree.html#XMLSETPROP">
 <ANCHOR id ="XMLGETPROP" href="gnome-xml/gnome-xml-tree.html#XMLGETPROP">
-<ANCHOR id ="XMLGETNSPROP" href="gnome-xml/gnome-xml-tree.html#XMLGETNSPROP">
 <ANCHOR id ="XMLSTRINGGETNODELIST" href="gnome-xml/gnome-xml-tree.html#XMLSTRINGGETNODELIST">
 <ANCHOR id ="XMLSTRINGLENGETNODELIST" href="gnome-xml/gnome-xml-tree.html#XMLSTRINGLENGETNODELIST">
 <ANCHOR id ="XMLNODELISTGETSTRING" href="gnome-xml/gnome-xml-tree.html#XMLNODELISTGETSTRING">
@@ -263,27 +215,27 @@
 <ANCHOR id ="XMLNODEGETCONTENT" href="gnome-xml/gnome-xml-tree.html#XMLNODEGETCONTENT">
 <ANCHOR id ="XMLNODEGETLANG" href="gnome-xml/gnome-xml-tree.html#XMLNODEGETLANG">
 <ANCHOR id ="XMLNODESETLANG" href="gnome-xml/gnome-xml-tree.html#XMLNODESETLANG">
-<ANCHOR id ="XMLNODEGETSPACEPRESERVE" href="gnome-xml/gnome-xml-tree.html#XMLNODEGETSPACEPRESERVE">
-<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">
 <ANCHOR id ="XMLBUFFERWRITEQUOTEDSTRING" href="gnome-xml/gnome-xml-tree.html#XMLBUFFERWRITEQUOTEDSTRING">
-<ANCHOR id ="XMLRECONCILIATENS" href="gnome-xml/gnome-xml-tree.html#XMLRECONCILIATENS">
 <ANCHOR id ="XMLDOCDUMPMEMORY" href="gnome-xml/gnome-xml-tree.html#XMLDOCDUMPMEMORY">
 <ANCHOR id ="XMLDOCDUMP" href="gnome-xml/gnome-xml-tree.html#XMLDOCDUMP">
-<ANCHOR id ="XMLELEMDUMP" href="gnome-xml/gnome-xml-tree.html#XMLELEMDUMP">
 <ANCHOR id ="XMLSAVEFILE" href="gnome-xml/gnome-xml-tree.html#XMLSAVEFILE">
 <ANCHOR id ="XMLGETDOCCOMPRESSMODE" href="gnome-xml/gnome-xml-tree.html#XMLGETDOCCOMPRESSMODE">
 <ANCHOR id ="XMLSETDOCCOMPRESSMODE" href="gnome-xml/gnome-xml-tree.html#XMLSETDOCCOMPRESSMODE">
 <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 ="XMLENTITYTYPE" href="gnome-xml/gnome-xml-entities.html#XMLENTITYTYPE">
-<ANCHOR id ="XMLENTITY" href="gnome-xml/gnome-xml-entities.html#XMLENTITY">
+<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 ="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 ="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">
 <ANCHOR id ="XMLADDDTDENTITY" href="gnome-xml/gnome-xml-entities.html#XMLADDDTDENTITY">
@@ -297,43 +249,30 @@
 <ANCHOR id ="XMLCOPYENTITIESTABLE" href="gnome-xml/gnome-xml-entities.html#XMLCOPYENTITIESTABLE">
 <ANCHOR id ="XMLFREEENTITIESTABLE" href="gnome-xml/gnome-xml-entities.html#XMLFREEENTITIESTABLE">
 <ANCHOR id ="XMLDUMPENTITIESTABLE" href="gnome-xml/gnome-xml-entities.html#XMLDUMPENTITIESTABLE">
-<ANCHOR id ="XMLDUMPENTITYDECL" href="gnome-xml/gnome-xml-entities.html#XMLDUMPENTITYDECL">
-<ANCHOR id ="XMLCLEANUPPREDEFINEDENTITIES" href="gnome-xml/gnome-xml-entities.html#XMLCLEANUPPREDEFINEDENTITIES">
-<ANCHOR id ="XMLENTITYADDREFERENCE" href="gnome-xml/gnome-xml-entities.html#XMLENTITYADDREFERENCE">
 <ANCHOR id ="GNOME-XML-VALID" href="gnome-xml/gnome-xml-valid.html">
 <ANCHOR id ="XMLVALIDITYERRORFUNC" href="gnome-xml/gnome-xml-valid.html#XMLVALIDITYERRORFUNC">
 <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 ="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 ="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 ="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 ="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 ="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">
 <ANCHOR id ="XMLCOPYNOTATIONTABLE" href="gnome-xml/gnome-xml-valid.html#XMLCOPYNOTATIONTABLE">
 <ANCHOR id ="XMLFREENOTATIONTABLE" href="gnome-xml/gnome-xml-valid.html#XMLFREENOTATIONTABLE">
-<ANCHOR id ="XMLDUMPNOTATIONDECL" href="gnome-xml/gnome-xml-valid.html#XMLDUMPNOTATIONDECL">
 <ANCHOR id ="XMLDUMPNOTATIONTABLE" href="gnome-xml/gnome-xml-valid.html#XMLDUMPNOTATIONTABLE">
 <ANCHOR id ="XMLNEWELEMENTCONTENT" href="gnome-xml/gnome-xml-valid.html#XMLNEWELEMENTCONTENT">
 <ANCHOR id ="XMLCOPYELEMENTCONTENT" href="gnome-xml/gnome-xml-valid.html#XMLCOPYELEMENTCONTENT">
 <ANCHOR id ="XMLFREEELEMENTCONTENT" href="gnome-xml/gnome-xml-valid.html#XMLFREEELEMENTCONTENT">
-<ANCHOR id ="XMLSPRINTFELEMENTCONTENT" href="gnome-xml/gnome-xml-valid.html#XMLSPRINTFELEMENTCONTENT">
 <ANCHOR id ="XMLADDELEMENTDECL" href="gnome-xml/gnome-xml-valid.html#XMLADDELEMENTDECL">
 <ANCHOR id ="XMLCOPYELEMENTTABLE" href="gnome-xml/gnome-xml-valid.html#XMLCOPYELEMENTTABLE">
 <ANCHOR id ="XMLFREEELEMENTTABLE" href="gnome-xml/gnome-xml-valid.html#XMLFREEELEMENTTABLE">
 <ANCHOR id ="XMLDUMPELEMENTTABLE" href="gnome-xml/gnome-xml-valid.html#XMLDUMPELEMENTTABLE">
-<ANCHOR id ="XMLDUMPELEMENTDECL" href="gnome-xml/gnome-xml-valid.html#XMLDUMPELEMENTDECL">
 <ANCHOR id ="XMLCREATEENUMERATION" href="gnome-xml/gnome-xml-valid.html#XMLCREATEENUMERATION">
 <ANCHOR id ="XMLFREEENUMERATION" href="gnome-xml/gnome-xml-valid.html#XMLFREEENUMERATION">
 <ANCHOR id ="XMLCOPYENUMERATION" href="gnome-xml/gnome-xml-valid.html#XMLCOPYENUMERATION">
@@ -341,26 +280,21 @@
 <ANCHOR id ="XMLCOPYATTRIBUTETABLE" href="gnome-xml/gnome-xml-valid.html#XMLCOPYATTRIBUTETABLE">
 <ANCHOR id ="XMLFREEATTRIBUTETABLE" href="gnome-xml/gnome-xml-valid.html#XMLFREEATTRIBUTETABLE">
 <ANCHOR id ="XMLDUMPATTRIBUTETABLE" href="gnome-xml/gnome-xml-valid.html#XMLDUMPATTRIBUTETABLE">
-<ANCHOR id ="XMLDUMPATTRIBUTEDECL" href="gnome-xml/gnome-xml-valid.html#XMLDUMPATTRIBUTEDECL">
 <ANCHOR id ="XMLADDID" href="gnome-xml/gnome-xml-valid.html#XMLADDID">
 <ANCHOR id ="XMLCOPYIDTABLE" href="gnome-xml/gnome-xml-valid.html#XMLCOPYIDTABLE">
 <ANCHOR id ="XMLFREEIDTABLE" href="gnome-xml/gnome-xml-valid.html#XMLFREEIDTABLE">
 <ANCHOR id ="XMLGETID" href="gnome-xml/gnome-xml-valid.html#XMLGETID">
 <ANCHOR id ="XMLISID" href="gnome-xml/gnome-xml-valid.html#XMLISID">
-<ANCHOR id ="XMLREMOVEID" href="gnome-xml/gnome-xml-valid.html#XMLREMOVEID">
 <ANCHOR id ="XMLADDREF" href="gnome-xml/gnome-xml-valid.html#XMLADDREF">
 <ANCHOR id ="XMLCOPYREFTABLE" href="gnome-xml/gnome-xml-valid.html#XMLCOPYREFTABLE">
 <ANCHOR id ="XMLFREEREFTABLE" href="gnome-xml/gnome-xml-valid.html#XMLFREEREFTABLE">
 <ANCHOR id ="XMLISREF" href="gnome-xml/gnome-xml-valid.html#XMLISREF">
-<ANCHOR id ="XMLREMOVEREF" href="gnome-xml/gnome-xml-valid.html#XMLREMOVEREF">
 <ANCHOR id ="XMLVALIDATEROOT" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEROOT">
 <ANCHOR id ="XMLVALIDATEELEMENTDECL" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEELEMENTDECL">
-<ANCHOR id ="XMLVALIDNORMALIZEATTRIBUTEVALUE" href="gnome-xml/gnome-xml-valid.html#XMLVALIDNORMALIZEATTRIBUTEVALUE">
 <ANCHOR id ="XMLVALIDATEATTRIBUTEDECL" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEATTRIBUTEDECL">
 <ANCHOR id ="XMLVALIDATEATTRIBUTEVALUE" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEATTRIBUTEVALUE">
 <ANCHOR id ="XMLVALIDATENOTATIONDECL" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATENOTATIONDECL">
 <ANCHOR id ="XMLVALIDATEDTD" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEDTD">
-<ANCHOR id ="XMLVALIDATEDTDFINAL" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEDTDFINAL">
 <ANCHOR id ="XMLVALIDATEDOCUMENT" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEDOCUMENT">
 <ANCHOR id ="XMLVALIDATEELEMENT" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEELEMENT">
 <ANCHOR id ="XMLVALIDATEONEELEMENT" href="gnome-xml/gnome-xml-valid.html#XMLVALIDATEONEELEMENT">
@@ -371,8 +305,6 @@
 <ANCHOR id ="XMLGETDTDATTRDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDATTRDESC">
 <ANCHOR id ="XMLGETDTDNOTATIONDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDNOTATIONDESC">
 <ANCHOR id ="XMLGETDTDELEMENTDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDELEMENTDESC">
-<ANCHOR id ="XMLVALIDGETVALIDELEMENTS" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETVALIDELEMENTS">
-<ANCHOR id ="XMLVALIDGETPOTENTIALCHILDREN" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">
 <ANCHOR id ="GNOME-XML-URI" href="gnome-xml/gnome-xml-uri.html">
 <ANCHOR id ="XMLURI" href="gnome-xml/gnome-xml-uri.html#XMLURI">
 <ANCHOR id ="XMLURIPTR" href="gnome-xml/gnome-xml-uri.html#XMLURIPTR">
@@ -402,14 +334,8 @@
 <ANCHOR id ="HTMLPARSERINPUTPTR" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSERINPUTPTR">
 <ANCHOR id ="HTMLDOCPTR" href="gnome-xml/gnome-xml-htmlparser.html#HTMLDOCPTR">
 <ANCHOR id ="HTMLNODEPTR" href="gnome-xml/gnome-xml-htmlparser.html#HTMLNODEPTR">
-<ANCHOR id ="HTMLELEMDESC" href="gnome-xml/gnome-xml-htmlparser.html#HTMLELEMDESC">
-<ANCHOR id ="HTMLELEMDESCPTR" href="gnome-xml/gnome-xml-htmlparser.html#HTMLELEMDESCPTR">
-<ANCHOR id ="HTMLENTITYDESC" href="gnome-xml/gnome-xml-htmlparser.html#HTMLENTITYDESC">
-<ANCHOR id ="HTMLENTITYDESCPTR" href="gnome-xml/gnome-xml-htmlparser.html#HTMLENTITYDESCPTR">
 <ANCHOR id ="HTMLTAGLOOKUP" href="gnome-xml/gnome-xml-htmlparser.html#HTMLTAGLOOKUP">
 <ANCHOR id ="HTMLENTITYLOOKUP" href="gnome-xml/gnome-xml-htmlparser.html#HTMLENTITYLOOKUP">
-<ANCHOR id ="HTMLISAUTOCLOSED" href="gnome-xml/gnome-xml-htmlparser.html#HTMLISAUTOCLOSED">
-<ANCHOR id ="HTMLAUTOCLOSETAG" href="gnome-xml/gnome-xml-htmlparser.html#HTMLAUTOCLOSETAG">
 <ANCHOR id ="HTMLPARSEENTITYREF" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSEENTITYREF">
 <ANCHOR id ="HTMLPARSECHARREF" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSECHARREF">
 <ANCHOR id ="HTMLPARSEELEMENT" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSEELEMENT">
@@ -417,9 +343,6 @@
 <ANCHOR id ="HTMLPARSEDOC" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSEDOC">
 <ANCHOR id ="HTMLSAXPARSEFILE" href="gnome-xml/gnome-xml-htmlparser.html#HTMLSAXPARSEFILE">
 <ANCHOR id ="HTMLPARSEFILE" href="gnome-xml/gnome-xml-htmlparser.html#HTMLPARSEFILE">
-<ANCHOR id ="HTMLFREEPARSERCTXT" href="gnome-xml/gnome-xml-htmlparser.html#HTMLFREEPARSERCTXT">
-<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">
@@ -427,43 +350,22 @@
 <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">
-<ANCHOR id ="HTMLNODEDUMP" href="gnome-xml/gnome-xml-htmltree.html#HTMLNODEDUMP">
-<ANCHOR id ="HTMLNODEDUMPFILE" href="gnome-xml/gnome-xml-htmltree.html#HTMLNODEDUMPFILE">
 <ANCHOR id ="GNOME-XML-XPATH" href="gnome-xml/gnome-xml-xpath.html">
-<ANCHOR id ="XMLXPATHCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHCONTEXT">
-<ANCHOR id ="XMLXPATHCONTEXTPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHCONTEXTPTR">
-<ANCHOR id ="XMLXPATHPARSERCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHPARSERCONTEXT">
-<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 ="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">
-<ANCHOR id ="XMLXPATHTYPE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHTYPE">
-<ANCHOR id ="XMLXPATHTYPEPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHTYPEPTR">
-<ANCHOR id ="XMLXPATHVARIABLE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHVARIABLE">
-<ANCHOR id ="XMLXPATHVARIABLEPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHVARIABLEPTR">
 <ANCHOR id ="XMLXPATHEVALFUNC" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALFUNC">
-<ANCHOR id ="XMLXPATHFUNCT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFUNCT">
-<ANCHOR id ="XMLXPATHFUNCPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFUNCPTR">
 <ANCHOR id ="XMLXPATHAXISFUNC" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHAXISFUNC">
-<ANCHOR id ="XMLXPATHAXIS" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHAXIS">
-<ANCHOR id ="XMLXPATHAXISPTR" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHAXISPTR">
 <ANCHOR id ="XMLXPATHFUNCTION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFUNCTION">
 <ANCHOR id ="XMLXPATHNEWCONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNEWCONTEXT">
 <ANCHOR id ="XMLXPATHFREECONTEXT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREECONTEXT">
 <ANCHOR id ="XMLXPATHEVAL" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVAL">
 <ANCHOR id ="XMLXPATHFREEOBJECT" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREEOBJECT">
 <ANCHOR id ="XMLXPATHEVALEXPRESSION" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHEVALEXPRESSION">
-<ANCHOR id ="XMLXPATHNODESETCREATE" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHNODESETCREATE">
-<ANCHOR id ="XMLXPATHFREENODESETLIST" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREENODESETLIST">
-<ANCHOR id ="XMLXPATHFREENODESET" href="gnome-xml/gnome-xml-xpath.html#XMLXPATHFREENODESET">
 <ANCHOR id ="GNOME-XML-NANOHTTP" href="gnome-xml/gnome-xml-nanohttp.html">
 <ANCHOR id ="XMLNANOHTTPINIT" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPINIT">
 <ANCHOR id ="XMLNANOHTTPCLEANUP" href="gnome-xml/gnome-xml-nanohttp.html#XMLNANOHTTPCLEANUP">
@@ -500,25 +402,19 @@
 <ANCHOR id ="XMLNANOFTPGET" href="gnome-xml/gnome-xml-nanoftp.html#XMLNANOFTPGET">
 <ANCHOR id ="XMLNANOFTPREAD" href="gnome-xml/gnome-xml-nanoftp.html#XMLNANOFTPREAD">
 <ANCHOR id ="GNOME-XML-XMLIO" href="gnome-xml/gnome-xml-xmlio.html">
-<ANCHOR id ="XMLINPUTMATCHCALLBACK" href="gnome-xml/gnome-xml-xmlio.html#XMLINPUTMATCHCALLBACK">
-<ANCHOR id ="XMLINPUTOPENCALLBACK" href="gnome-xml/gnome-xml-xmlio.html#XMLINPUTOPENCALLBACK">
-<ANCHOR id ="XMLINPUTREADCALLBACK" href="gnome-xml/gnome-xml-xmlio.html#XMLINPUTREADCALLBACK">
-<ANCHOR id ="XMLINPUTCLOSECALLBACK" href="gnome-xml/gnome-xml-xmlio.html#XMLINPUTCLOSECALLBACK">
-<ANCHOR id ="XMLPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERINPUTBUFFERPTR" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR">
-<ANCHOR id ="XMLALLOCPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLALLOCPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFILENAME" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILENAME">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFILE" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFILE">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFD" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFD">
-<ANCHOR id ="XMLPARSERINPUTBUFFERCREATEIO" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERCREATEIO">
 <ANCHOR id ="XMLPARSERINPUTBUFFERREAD" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERREAD">
 <ANCHOR id ="XMLPARSERINPUTBUFFERGROW" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERGROW">
-<ANCHOR id ="XMLPARSERINPUTBUFFERPUSH" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPUSH">
 <ANCHOR id ="XMLFREEPARSERINPUTBUFFER" href="gnome-xml/gnome-xml-xmlio.html#XMLFREEPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERGETDIRECTORY" href="gnome-xml/gnome-xml-xmlio.html#XMLPARSERGETDIRECTORY">
-<ANCHOR id ="XMLREGISTERINPUTCALLBACKS" href="gnome-xml/gnome-xml-xmlio.html#XMLREGISTERINPUTCALLBACKS">
 <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">
@@ -534,10 +430,9 @@
 <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">
-<ANCHOR id ="XMLNEWPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLNEWPARSERCTXT">
-<ANCHOR id ="XMLCREATEENTITYPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLCREATEENTITYPARSERCTXT">
-<ANCHOR id ="XMLSWITCHENCODING" href="gnome-xml/gnome-xml-parserinternals.html#XMLSWITCHENCODING">
 <ANCHOR id ="XMLFREEPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLFREEPARSERCTXT">
+<ANCHOR id ="XMLNEWPARSERCTXT" href="gnome-xml/gnome-xml-parserinternals.html#XMLNEWPARSERCTXT">
+<ANCHOR id ="XMLSWITCHENCODING" href="gnome-xml/gnome-xml-parserinternals.html#XMLSWITCHENCODING">
 <ANCHOR id ="XMLHANDLEENTITY" href="gnome-xml/gnome-xml-parserinternals.html#XMLHANDLEENTITY">
 <ANCHOR id ="XMLNEWENTITYINPUTSTREAM" href="gnome-xml/gnome-xml-parserinternals.html#XMLNEWENTITYINPUTSTREAM">
 <ANCHOR id ="XMLPUSHINPUT" href="gnome-xml/gnome-xml-parserinternals.html#XMLPUSHINPUT">
@@ -592,7 +487,6 @@
 <ANCHOR id ="XMLPARSEENCODINGDECL" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSEENCODINGDECL">
 <ANCHOR id ="XMLPARSESDDECL" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSESDDECL">
 <ANCHOR id ="XMLPARSEXMLDECL" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSEXMLDECL">
-<ANCHOR id ="XMLPARSETEXTDECL" href="gnome-xml/gnome-xml-parserinternals.html#XMLPARSETEXTDECL">
 <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">
@@ -600,7 +494,6 @@
 <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 ="XMLDECODEENTITIES" href="gnome-xml/gnome-xml-parserinternals.html#XMLDECODEENTITIES">
-<ANCHOR id ="XMLSTRINGDECODEENTITIES" href="gnome-xml/gnome-xml-parserinternals.html#XMLSTRINGDECODEENTITIES">
 <ANCHOR id ="NODEPUSH" href="gnome-xml/gnome-xml-parserinternals.html#NODEPUSH">
 <ANCHOR id ="NODEPOP" href="gnome-xml/gnome-xml-parserinternals.html#NODEPOP">
 <ANCHOR id ="INPUTPUSH" href="gnome-xml/gnome-xml-parserinternals.html#INPUTPUSH">
@@ -609,16 +502,13 @@
 <ANCHOR id ="XMLCHARENCODING" href="gnome-xml/gnome-xml-encoding.html#XMLCHARENCODING">
 <ANCHOR id ="XMLCHARENCODINGINPUTFUNC" href="gnome-xml/gnome-xml-encoding.html#XMLCHARENCODINGINPUTFUNC">
 <ANCHOR id ="XMLCHARENCODINGOUTPUTFUNC" href="gnome-xml/gnome-xml-encoding.html#XMLCHARENCODINGOUTPUTFUNC">
-<ANCHOR id ="XMLCHARENCODINGHANDLER" href="gnome-xml/gnome-xml-encoding.html#XMLCHARENCODINGHANDLER">
 <ANCHOR id ="XMLCHARENCODINGHANDLERPTR" href="gnome-xml/gnome-xml-encoding.html#XMLCHARENCODINGHANDLERPTR">
-<ANCHOR id ="XMLINITCHARENCODINGHANDLERS" href="gnome-xml/gnome-xml-encoding.html#XMLINITCHARENCODINGHANDLERS">
-<ANCHOR id ="XMLCLEANUPCHARENCODINGHANDLERS" href="gnome-xml/gnome-xml-encoding.html#XMLCLEANUPCHARENCODINGHANDLERS">
 <ANCHOR id ="XMLREGISTERCHARENCODINGHANDLER" href="gnome-xml/gnome-xml-encoding.html#XMLREGISTERCHARENCODINGHANDLER">
-<ANCHOR id ="XMLDETECTCHARENCODING" href="gnome-xml/gnome-xml-encoding.html#XMLDETECTCHARENCODING">
-<ANCHOR id ="XMLPARSECHARENCODING" href="gnome-xml/gnome-xml-encoding.html#XMLPARSECHARENCODING">
 <ANCHOR id ="XMLGETCHARENCODINGHANDLER" href="gnome-xml/gnome-xml-encoding.html#XMLGETCHARENCODINGHANDLER">
 <ANCHOR id ="XMLFINDCHARENCODINGHANDLER" href="gnome-xml/gnome-xml-encoding.html#XMLFINDCHARENCODINGHANDLER">
-<ANCHOR id ="XMLCHECKUTF8" href="gnome-xml/gnome-xml-encoding.html#XMLCHECKUTF8">
+<ANCHOR id ="XMLDETECTCHARENCODING" href="gnome-xml/gnome-xml-encoding.html#XMLDETECTCHARENCODING">
+<ANCHOR id ="XMLPARSECHARENCODING" href="gnome-xml/gnome-xml-encoding.html#XMLPARSECHARENCODING">
+<ANCHOR id ="XMLINITCHARENCODINGHANDLERS" href="gnome-xml/gnome-xml-encoding.html#XMLINITCHARENCODINGHANDLERS">
 <ANCHOR id ="GNOME-XML-DEBUGXML" href="gnome-xml/gnome-xml-debugxml.html">
 <ANCHOR id ="XMLDEBUGDUMPSTRING" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPSTRING">
 <ANCHOR id ="XMLDEBUGDUMPATTR" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPATTR">
@@ -626,33 +516,21 @@
 <ANCHOR id ="XMLDEBUGDUMPONENODE" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPONENODE">
 <ANCHOR id ="XMLDEBUGDUMPNODE" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPNODE">
 <ANCHOR id ="XMLDEBUGDUMPNODELIST" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPNODELIST">
-<ANCHOR id ="XMLDEBUGDUMPDOCUMENTHEAD" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENTHEAD">
 <ANCHOR id ="XMLDEBUGDUMPDOCUMENT" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPDOCUMENT">
-<ANCHOR id ="XMLDEBUGDUMPENTITIES" href="gnome-xml/gnome-xml-debugxml.html#XMLDEBUGDUMPENTITIES">
-<ANCHOR id ="XMLLSONENODE" href="gnome-xml/gnome-xml-debugxml.html#XMLLSONENODE">
-<ANCHOR id ="XMLSHELLREADLINEFUNC" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELLREADLINEFUNC">
-<ANCHOR id ="XMLSHELLCTXT" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELLCTXT">
-<ANCHOR id ="XMLSHELLCTXTPTR" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELLCTXTPTR">
-<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 ="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 ="XMLFREEFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLFREEFUNC">
-<ANCHOR id ="XMLMALLOCFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOCFUNC">
-<ANCHOR id ="XMLREALLOCFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOCFUNC">
-<ANCHOR id ="XMLSTRDUPFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLSTRDUPFUNC">
+<ANCHOR id ="NO-DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY">
 <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">
 <ANCHOR id ="XMLMEMSTRDUP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSTRDUP">
-<ANCHOR id ="XMLMEMSETUP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSETUP">
-<ANCHOR id ="XMLMEMGET" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMGET">
 <ANCHOR id ="XMLINITMEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#XMLINITMEMORY">
 <ANCHOR id ="XMLMEMUSED" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMUSED">
+<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 ="XMLMEMORYDUMP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMORYDUMP">
+<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 ="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 a896ee1..9ffb9df 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/include/libxml/tree.h b/include/libxml/tree.h
index a755962..1cb12e2 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -507,7 +507,6 @@
 					 int len);
 void		xmlFreeNodeList		(xmlNodePtr cur);
 void		xmlFreeNode		(xmlNodePtr cur);
-int		xmlRemoveProp		(xmlAttrPtr cur);
 
 /*
  * Namespaces
@@ -593,8 +592,8 @@
 void		xmlDocDump		(FILE *f,
 					 xmlDocPtr cur);
 void		xmlElemDump		(FILE *f,
-					 xmlDocPtr cur,
-					 xmlNodePtr elem);
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
 int		xmlSaveFile		(const char *filename,
 					 xmlDocPtr cur);
 
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index ef65907..6849b97 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -159,7 +159,7 @@
 					     xmlDtdPtr dtd,
 					     const xmlChar *elem,
 					     const xmlChar *name,
-					     const xmlChar *prefix,
+					     const xmlChar *ns,
 					     xmlAttributeType type,
 					     xmlAttributeDefault def,
 					     const xmlChar *defaultValue,
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index bc1c63b..8f9b7e0 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -44,7 +44,7 @@
 	xmlAllocParserInputBuffer		(xmlCharEncoding enc);
 
 xmlParserInputBufferPtr
-	xmlParserInputBufferCreateFilename	(const char *filename,
+	xmlParserInputBufferCreateFilename	(const char *URI,
                                                  xmlCharEncoding enc);
 xmlParserInputBufferPtr
 	xmlParserInputBufferCreateFile		(FILE *file,
diff --git a/nanoftp.c b/nanoftp.c
index 2f5a418..6ca3701 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -1,5 +1,5 @@
-/**
- * ftp.c: basic handling of an FTP command connection to check for
+/*
+ * nanoftp.c: basic handling of an FTP command connection to check for
  *        directory availability. No transfer is needed.
  *
  *  Reference: RFC 959
@@ -11,23 +11,19 @@
 #else
 #include "config.h"
 #endif
+
 #include "xmlversion.h"
 
 #ifdef LIBXML_FTP_ENABLED
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -52,12 +48,6 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -448,7 +438,7 @@
  * Returns an FTP context or NULL in case of error.
  */
 
-void *
+void*
 xmlNanoFTPNewCtxt(const char *URL) {
     xmlNanoFTPCtxtPtr ret;
 
@@ -487,8 +477,14 @@
 }
 
 /**
+ * xmlNanoFTPParseResponse:
+ * @ctx:  the FTP connection context
+ * @buf:  the buffer containing the response
+ * @len:  the buffer length
+ * 
  * Parsing of the server answer, we just extract the code.
- * return 0 for errors
+ *
+ * returns 0 for errors
  *     +XXX for last line of response
  *     -XXX for response to be continued
  */
@@ -1064,15 +1060,14 @@
 /**
  * xmlNanoFTPConnectTo:
  * @server:  an FTP server name
- * @directory:  the port (use 21 if 0)
+ * @port:  the port (use 21 if 0)
  *
  * Tries to open a control connection to the given server/port
  *
- * Returns and fTP context or NULL if it failed
+ * Returns an fTP context or NULL if it failed
  */
 
-
-void *
+void*
 xmlNanoFTPConnectTo(const char *server, int port) {
     xmlNanoFTPCtxtPtr ctxt;
     int res;
@@ -1713,7 +1708,7 @@
  * Returns an FTP context, or NULL 
  */
 
-void *
+void*
 xmlNanoFTPOpen(const char *URL) {
     xmlNanoFTPCtxtPtr ctxt;
     int sock;
diff --git a/nanohttp.c b/nanohttp.c
index 7f5a153..a94d6bb 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -714,7 +714,7 @@
  *     The contentType, if provided must be freed by the caller
  */
 
-void *
+void*
 xmlNanoHTTPOpen(const char *URL, char **contentType) {
     xmlNanoHTTPCtxtPtr ctxt;
     char buf[4096];
@@ -914,7 +914,7 @@
  *     The contentType, if provided must be freed by the caller
  */
 
-void *
+void*
 xmlNanoHTTPMethod(const char *URL, const char *method, const char *input,
                   char **contentType, const char *headers) {
     xmlNanoHTTPCtxtPtr ctxt;
diff --git a/parser.c b/parser.c
index 9b6ec39..a8e6ff4 100644
--- a/parser.c
+++ b/parser.c
@@ -7360,7 +7360,7 @@
  *
  * [NS 10] EmptyElement ::= '<' QName (S Attribute)* S? '/>'
  *
- * Returne the element name parsed
+ * Returns the element name parsed
  */
 
 xmlChar *
@@ -9618,7 +9618,7 @@
  * xmlCreateDocParserCtxt:
  * @cur:  a pointer to an array of xmlChar
  *
- * Create a parser context for an XML in-memory document.
+ * Creates a parser context for an XML in-memory document.
  *
  * Returns the new parser context or NULL
  */
@@ -9768,12 +9768,16 @@
     /*
      * let's parse that entity knowing it's an external subset.
      */
+    ctxt->inSubset = 2;
+    ctxt->myDoc = xmlNewDoc(BAD_CAST "1.0");
+    ctxt->myDoc->extSubset = xmlNewDtd(ctxt->myDoc, BAD_CAST "none",
+	                               ExternalID, SystemID);
     xmlParseExternalSubset(ctxt, ExternalID, SystemID);
 
     if (ctxt->myDoc != NULL) {
 	if (ctxt->wellFormed) {
-	    ret = ctxt->myDoc->intSubset;
-	    ctxt->myDoc->intSubset = NULL;
+	    ret = ctxt->myDoc->extSubset;
+	    ctxt->myDoc->extSubset = NULL;
 	} else {
 	    ret = NULL;
 	}
diff --git a/testSAX.c b/testSAX.c
index 0702f01..8b43517 100644
--- a/testSAX.c
+++ b/testSAX.c
@@ -132,7 +132,7 @@
 }
 
 /**
- * hasInternalSubsetDebug:
+ * internalSubsetDebug:
  * @ctxt:  An XML parser context
  *
  * Does this document has an internal subset
diff --git a/tree.c b/tree.c
index b067876..2cc4b51 100644
--- a/tree.c
+++ b/tree.c
@@ -2282,17 +2282,13 @@
 
     while (node != NULL) {
         q = xmlStaticCopyNode(node, doc, parent, 1);
-	if (parent == NULL) {
-	    if (ret == NULL) ret = q;
+	if (ret == NULL) {
+	    q->prev = NULL;
+	    ret = p = q;
 	} else {
-	    if (ret == NULL) {
-		q->prev = NULL;
-		ret = p = q;
-	    } else {
-		p->next = q;
-		q->prev = p;
-		p = q;
-	    }
+	    p->next = q;
+	    q->prev = p;
+	    p = q;
 	}
 	node = node->next;
     }
@@ -2415,7 +2411,8 @@
     if (doc->oldNs != NULL)
         ret->oldNs = xmlCopyNamespaceList(doc->oldNs);
     if (doc->children != NULL)
-        ret->children = xmlStaticCopyNodeList(doc->children, ret, NULL);
+        ret->children = xmlStaticCopyNodeList(doc->children, ret,
+		                              (xmlNodePtr)ret);
     return(ret);
 }
 
@@ -3696,7 +3693,7 @@
 }
 
 /**
- * xmlBufferAllocationScheme:
+ * xmlBufferSetAllocationScheme:
  * @buf:  the buffer to free
  * @scheme:  allocation scheme to use
  *
@@ -4426,7 +4423,7 @@
 
 /**
  * xmlElemDump:
- * @buf:  the XML buffer output
+ * @f:  the FILE * for the output
  * @doc:  the document
  * @cur:  the current node
  *
diff --git a/tree.h b/tree.h
index a755962..1cb12e2 100644
--- a/tree.h
+++ b/tree.h
@@ -507,7 +507,6 @@
 					 int len);
 void		xmlFreeNodeList		(xmlNodePtr cur);
 void		xmlFreeNode		(xmlNodePtr cur);
-int		xmlRemoveProp		(xmlAttrPtr cur);
 
 /*
  * Namespaces
@@ -593,8 +592,8 @@
 void		xmlDocDump		(FILE *f,
 					 xmlDocPtr cur);
 void		xmlElemDump		(FILE *f,
-					 xmlDocPtr cur,
-					 xmlNodePtr elem);
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
 int		xmlSaveFile		(const char *filename,
 					 xmlDocPtr cur);
 
diff --git a/uri.c b/uri.c
index 6bac167..1a48113 100644
--- a/uri.c
+++ b/uri.c
@@ -21,13 +21,13 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/uri.h>
 
-/**
+/*
  * alpha    = lowalpha | upalpha
  */
 #define IS_ALPHA(x) (IS_LOWALPHA(x) || IS_UPALPHA(x))
 
 
-/**
+/*
  * lowalpha = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" |
  *            "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" |
  *            "u" | "v" | "w" | "x" | "y" | "z"
@@ -35,34 +35,34 @@
 
 #define IS_LOWALPHA(x) (((x) >= 'a') && ((x) <= 'z'))
 
-/**
+/*
  * upalpha = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | "J" |
  *           "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | "S" | "T" |
  *           "U" | "V" | "W" | "X" | "Y" | "Z"
  */
 #define IS_UPALPHA(x) (((x) >= 'A') && ((x) <= 'Z'))
 
-/**
+/*
  * digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
  */
 
 #define IS_DIGIT(x) (((x) >= '0') && ((x) <= '9'))
 
-/**
+/*
  * alphanum = alpha | digit
  */
 
 #define IS_ALPHANUM(x) (IS_ALPHA(x) || IS_DIGIT(x))
 
-/**
- * he(x) = digit | "A" | "B" | "C" | "D" | "E" | "F" |
+/*
+ * hex = digit | "A" | "B" | "C" | "D" | "E" | "F" |
  *               "a" | "b" | "c" | "d" | "e" | "f"
  */
 
 #define IS_HEX(x) ((IS_DIGIT(x)) || (((x) >= 'a') && ((x) <= 'f')) || \
 	    (((x) >= 'A') && ((x) <= 'F')))
 
-/**
+/*
  * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
  */
 
@@ -71,7 +71,7 @@
     ((x) == '(') || ((x) == ')'))
 
 
-/**
+/*
  * reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
  */
 
@@ -79,20 +79,20 @@
         ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') ||	\
 	((x) == '+') || ((x) == '$') || ((x) == ','))
 
-/**
+/*
  * unreserved = alphanum | mark
  */
 
 #define IS_UNRESERVED(x) (IS_ALPHANUM(x) || IS_MARK(x))
 
-/**
+/*
  * escaped = "%" hex hex
  */
 
 #define IS_ESCAPED(p) ((*(p) == '%') && (IS_HEX((p)[1])) &&		\
 	    (IS_HEX((p)[2])))
 
-/**
+/*
  * uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
  *                        "&" | "=" | "+" | "$" | ","
  */
@@ -101,7 +101,7 @@
 	        ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||\
 	        ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ',')))
 
-/**
+/*
  * pchar = unreserved | escaped | ":" | "@" | "&" | "=" | "+" | "$" | ","
  */
 #define IS_PCHAR(p) ((IS_UNRESERVED(*(p))) || (IS_ESCAPED(p)) ||	\
@@ -109,7 +109,7 @@
 	        ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||\
 	        ((*(p) == ',')))
 
-/**
+/*
  * rel_segment   = 1*( unreserved | escaped |
  *                 ";" | "@" | "&" | "=" | "+" | "$" | "," )
  */
@@ -119,14 +119,14 @@
 	  ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||	\
 	  ((*(p) == ',')))
 
-/**
+/*
  * scheme = alpha *( alpha | digit | "+" | "-" | "." )
  */
 
 #define IS_SCHEME(x) ((IS_ALPHA(x)) || (IS_DIGIT(x)) ||			\
 	              ((x) == '+') || ((x) == '-') || ((x) == '.'))
 
-/**
+/*
  * reg_name = 1*( unreserved | escaped | "$" | "," |
  *                ";" | ":" | "@" | "&" | "=" | "+" )
  */
@@ -136,7 +136,7 @@
        ((*(p) == ':')) || ((*(p) == '@')) || ((*(p) == '&')) ||		\
        ((*(p) == '=')) || ((*(p) == '+')))
 
-/**
+/*
  * userinfo = *( unreserved | escaped | ";" | ":" | "&" | "=" |
  *                      "+" | "$" | "," )
  */
@@ -145,20 +145,20 @@
        ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||		\
        ((*(p) == ',')))
 
-/**
+/*
  * uric = reserved | unreserved | escaped
  */
 
 #define IS_URIC(p) ((IS_UNRESERVED(*(p))) || (IS_ESCAPED(p)) ||		\
 	            (IS_RESERVED(*(p))))
 
-/**
+/*
  * Skip to next pointer char, handle escaped sequences
  */
 
 #define NEXT(p) ((*p == '%')? p += 3 : p++)
 
-/**
+/*
  * Productions from the spec.
  *
  *    authority     = server | reg_name
diff --git a/valid.h b/valid.h
index ef65907..6849b97 100644
--- a/valid.h
+++ b/valid.h
@@ -159,7 +159,7 @@
 					     xmlDtdPtr dtd,
 					     const xmlChar *elem,
 					     const xmlChar *name,
-					     const xmlChar *prefix,
+					     const xmlChar *ns,
 					     xmlAttributeType type,
 					     xmlAttributeDefault def,
 					     const xmlChar *defaultValue,
diff --git a/xlink.c b/xlink.c
index 1467343..6ac7947 100644
--- a/xlink.c
+++ b/xlink.c
@@ -67,7 +67,7 @@
 
 
 /**
- * xlinkGetDefaultHandler:
+ * xlinkSetDefaultHandler:
  * @handler:  the new value for the xlink handler block
  *
  * Set the default xlink handlers
diff --git a/xmlIO.h b/xmlIO.h
index bc1c63b..8f9b7e0 100644
--- a/xmlIO.h
+++ b/xmlIO.h
@@ -44,7 +44,7 @@
 	xmlAllocParserInputBuffer		(xmlCharEncoding enc);
 
 xmlParserInputBufferPtr
-	xmlParserInputBufferCreateFilename	(const char *filename,
+	xmlParserInputBufferCreateFilename	(const char *URI,
                                                  xmlCharEncoding enc);
 xmlParserInputBufferPtr
 	xmlParserInputBufferCreateFile		(FILE *file,
diff --git a/xmlmemory.c b/xmlmemory.c
index 3cadd9e..e03e51d 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -118,7 +118,7 @@
  * xmlMallocLoc:
  * @size:  an int specifying the size in byte to allocate.
  * @file:  the file name or NULL
-  @file:  the line number
+ * @line:  the line number
  *
  * a malloc() equivalent, with logging of the allocation info.
  *
@@ -187,7 +187,7 @@
  * @ptr:  the initial memory block pointer
  * @size:  an int specifying the size in byte to allocate.
  * @file:  the file name or NULL
- * @file:  the line number
+ * @line:  the line number
  *
  * a realloc() equivalent, with logging of the allocation info.
  *
@@ -293,7 +293,7 @@
  * xmlMemStrdupLoc:
  * @ptr:  the initial string pointer
  * @file:  the file name or NULL
- * @file:  the line number
+ * @line:  the line number
  *
  * a strdup() equivalent, with logging of the allocation info.
  *