- HTMLparser.c: fixed loop on invalid char in scripts
- parser.c: update to description of xmlIOParseDTD()
- libxml.m4 xmlversion.h.in: changes contributed by
  Michael Schmeing <m.schmeing@internet-factory.de>
- configure.in: preparing for 2.2.7
- Makefile.am: trying to avoid  config.h and acconfig.h
  being included in the distrib
- rebuilt the docs
- configure.in: released 2.2.7
Daniel
diff --git a/ChangeLog b/ChangeLog
index f352092..44038b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Oct 31 14:14:13 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* HTMLparser.c: fixed loop on invalid char in scripts
+	* parser.c: update to description of xmlIOParseDTD()
+	* libxml.m4 xmlversion.h.in: changes contributed by
+	  Michael Schmeing <m.schmeing@internet-factory.de>
+	* configure.in: preparing for 2.2.7
+	* Makefile.am: trying to avoid  config.h and acconfig.h
+	  being included in the distrib
+	* configure.in: released 2.2.7
+
+Mon Oct 30 17:08:10 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* tree.[ch] debugXML.c parserInternals.c xpath.c: Deprecated Pi's
+	  like namespaces for good. Unified xmlNs and xmlNode somewhat.
+
 Mon Oct 30 16:26:49 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* parser.[ch]: added xmlIOParseDTD()
diff --git a/HTMLparser.c b/HTMLparser.c
index b5e46fc..0e2d4cc 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -2329,6 +2329,14 @@
 	NEXT;
 	cur = CUR;
     }
+    if (!(IS_CHAR(cur))) {
+	if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
+	    ctxt->sax->error(ctxt->userData,
+		"Invalid char in CDATA 0x%X\n", cur);
+	ctxt->wellFormed = 0;
+	NEXT;
+    }
+
     if ((nbchar != 0) && (ctxt->sax != NULL) && (!ctxt->disableSAX)) {
 	if (ctxt->sax->cdataBlock!= NULL) {
 	    /*
diff --git a/Makefile.am b/Makefile.am
index 713ecd2..e8cd50e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,7 +363,7 @@
 confexec_DATA = xmlConf.sh
 EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
              example/Makefile.am example/gjobread.c example/gjobs.xml \
-	     $(man_MANS) libxml-2.0.pc.in include/libxml/*.h xmlversion.h.in \
+	     $(man_MANS) libxml-2.0.pc.in xmlversion.h.in \
 	     win32/README.MSDev win32/Makefile.mingw win32/libxml2/libxml2.dsp
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.in b/configure.in
index 0b7c321..df3b7e3 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=2
-LIBXML_MICRO_VERSION=6
+LIBXML_MICRO_VERSION=7
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 
diff --git a/debugXML.c b/debugXML.c
index 6873d71..4a1ce5b 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -377,8 +377,10 @@
     shift[2 * i] = shift[2 * i + 1] = 0;
 
     fprintf(output, shift);
-    if (ns->type == XML_GLOBAL_NAMESPACE)
-        fprintf(output, "old ");
+    if (ns->type != XML_NAMESPACE_DECL) {
+        fprintf(output, "invalid namespace node %d\n", ns->type);
+	return;
+    }
     if (ns->href == NULL) {
 	if (ns->prefix != NULL)
 	    fprintf(output, "incomplete namespace %s href=NULL\n", ns->prefix);
@@ -571,6 +573,9 @@
         case XML_ENTITY_DECL:
 	    xmlDebugDumpEntityDecl(output, (xmlEntityPtr) node, depth);
 	    return;
+        case XML_NAMESPACE_DECL:
+	    xmlDebugDumpNamespace(output, (xmlNsPtr) node, depth);
+	    return;
 	default:
 	    fprintf(output, shift);
 	    fprintf(output, "NODE_%d !!!\n", node->type);
@@ -911,6 +916,7 @@
         case XML_ELEMENT_DECL:
         case XML_ATTRIBUTE_DECL:
         case XML_ENTITY_DECL:
+	case XML_NAMESPACE_DECL:
 	    ret = 1;
 	    break;
     }
diff --git a/doc/html/gnome-xml-debugxml.html b/doc/html/gnome-xml-debugxml.html
index 4572780..18999f1 100644
--- a/doc/html/gnome-xml-debugxml.html
+++ b/doc/html/gnome-xml-debugxml.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17550"
+NAME="AEN17812"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17553"
+NAME="AEN17815"
 ></A
 ><H2
 >Synopsis</H2
@@ -315,7 +315,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17600"
+NAME="AEN17862"
 ></A
 ><H2
 >Description</H2
@@ -325,14 +325,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17603"
+NAME="AEN17865"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17605"
+NAME="AEN17867"
 ></A
 ><H3
 ><A
@@ -414,7 +414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17625"
+NAME="AEN17887"
 ></A
 ><H3
 ><A
@@ -514,7 +514,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17649"
+NAME="AEN17911"
 ></A
 ><H3
 ><A
@@ -614,7 +614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17673"
+NAME="AEN17935"
 ></A
 ><H3
 ><A
@@ -714,7 +714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17697"
+NAME="AEN17959"
 ></A
 ><H3
 ><A
@@ -814,7 +814,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17721"
+NAME="AEN17983"
 ></A
 ><H3
 ><A
@@ -914,7 +914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17745"
+NAME="AEN18007"
 ></A
 ><H3
 ><A
@@ -996,7 +996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17765"
+NAME="AEN18027"
 ></A
 ><H3
 ><A
@@ -1078,7 +1078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17785"
+NAME="AEN18047"
 ></A
 ><H3
 ><A
@@ -1160,7 +1160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17805"
+NAME="AEN18067"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17825"
+NAME="AEN18087"
 ></A
 ><H3
 ><A
@@ -1324,7 +1324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17845"
+NAME="AEN18107"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17863"
+NAME="AEN18125"
 ></A
 ><H3
 ><A
@@ -1431,7 +1431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17868"
+NAME="AEN18130"
 ></A
 ><H3
 ><A
@@ -1457,7 +1457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17873"
+NAME="AEN18135"
 ></A
 ><H3
 ><A
@@ -1593,7 +1593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17906"
+NAME="AEN18168"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index 5db8545..e227bab 100644
--- a/doc/html/gnome-xml-encoding.html
+++ b/doc/html/gnome-xml-encoding.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17084"
+NAME="AEN17346"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17087"
+NAME="AEN17349"
 ></A
 ><H2
 >Synopsis</H2
@@ -300,7 +300,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17129"
+NAME="AEN17391"
 ></A
 ><H2
 >Description</H2
@@ -310,14 +310,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17132"
+NAME="AEN17394"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17134"
+NAME="AEN17396"
 ></A
 ><H3
 ><A
@@ -368,7 +368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17139"
+NAME="AEN17401"
 ></A
 ><H3
 ><A
@@ -495,7 +495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17169"
+NAME="AEN17431"
 ></A
 ><H3
 ><A
@@ -622,7 +622,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17199"
+NAME="AEN17461"
 ></A
 ><H3
 ><A
@@ -656,7 +656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17204"
+NAME="AEN17466"
 ></A
 ><H3
 ><A
@@ -682,7 +682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17209"
+NAME="AEN17471"
 ></A
 ><H3
 ><A
@@ -713,7 +713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17215"
+NAME="AEN17477"
 ></A
 ><H3
 ><A
@@ -742,7 +742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17221"
+NAME="AEN17483"
 ></A
 ><H3
 ><A
@@ -805,7 +805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17237"
+NAME="AEN17499"
 ></A
 ><H3
 ><A
@@ -887,7 +887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17258"
+NAME="AEN17520"
 ></A
 ><H3
 ><A
@@ -964,7 +964,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17277"
+NAME="AEN17539"
 ></A
 ><H3
 ><A
@@ -1068,7 +1068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17302"
+NAME="AEN17564"
 ></A
 ><H3
 ><A
@@ -1148,7 +1148,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17322"
+NAME="AEN17584"
 ></A
 ><H3
 ><A
@@ -1223,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17341"
+NAME="AEN17603"
 ></A
 ><H3
 ><A
@@ -1251,7 +1251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17347"
+NAME="AEN17609"
 ></A
 ><H3
 ><A
@@ -1332,7 +1332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17367"
+NAME="AEN17629"
 ></A
 ><H3
 ><A
@@ -1415,7 +1415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17388"
+NAME="AEN17650"
 ></A
 ><H3
 ><A
@@ -1513,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17412"
+NAME="AEN17674"
 ></A
 ><H3
 ><A
@@ -1608,7 +1608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17434"
+NAME="AEN17696"
 ></A
 ><H3
 ><A
@@ -1741,7 +1741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17465"
+NAME="AEN17727"
 ></A
 ><H3
 ><A
@@ -1864,7 +1864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17495"
+NAME="AEN17757"
 ></A
 ><H3
 ><A
@@ -1988,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17525"
+NAME="AEN17787"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index 67e321c..887f174 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN6949"
+NAME="AEN6992"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN6952"
+NAME="AEN6995"
 ></A
 ><H2
 >Synopsis</H2
@@ -363,7 +363,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7015"
+NAME="AEN7058"
 ></A
 ><H2
 >Description</H2
@@ -373,14 +373,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7018"
+NAME="AEN7061"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7020"
+NAME="AEN7063"
 ></A
 ><H3
 ><A
@@ -413,7 +413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7025"
+NAME="AEN7068"
 ></A
 ><H3
 ><A
@@ -461,7 +461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7030"
+NAME="AEN7073"
 ></A
 ><H3
 ><A
@@ -487,7 +487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7035"
+NAME="AEN7078"
 ></A
 ><H3
 ><A
@@ -513,7 +513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7040"
+NAME="AEN7083"
 ></A
 ><H3
 ><A
@@ -541,7 +541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7046"
+NAME="AEN7089"
 ></A
 ><H3
 ><A
@@ -724,7 +724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7091"
+NAME="AEN7134"
 ></A
 ><H3
 ><A
@@ -907,7 +907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7136"
+NAME="AEN7179"
 ></A
 ><H3
 ><A
@@ -988,7 +988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7157"
+NAME="AEN7200"
 ></A
 ><H3
 ><A
@@ -1092,7 +1092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7183"
+NAME="AEN7226"
 ></A
 ><H3
 ><A
@@ -1195,7 +1195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7209"
+NAME="AEN7252"
 ></A
 ><H3
 ><A
@@ -1298,7 +1298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7235"
+NAME="AEN7278"
 ></A
 ><H3
 ><A
@@ -1407,7 +1407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7263"
+NAME="AEN7306"
 ></A
 ><H3
 ><A
@@ -1512,7 +1512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7289"
+NAME="AEN7332"
 ></A
 ><H3
 ><A
@@ -1615,7 +1615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7315"
+NAME="AEN7358"
 ></A
 ><H3
 ><A
@@ -1676,7 +1676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7331"
+NAME="AEN7374"
 ></A
 ><H3
 ><A
@@ -1757,7 +1757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7352"
+NAME="AEN7395"
 ></A
 ><H3
 ><A
@@ -1820,7 +1820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7368"
+NAME="AEN7411"
 ></A
 ><H3
 ><A
@@ -1904,7 +1904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7389"
+NAME="AEN7432"
 ></A
 ><H3
 ><A
@@ -1988,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7410"
+NAME="AEN7453"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 59655ff..73a7b21 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9530"
+NAME="AEN9573"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9533"
+NAME="AEN9576"
 ></A
 ><H2
 >Synopsis</H2
@@ -383,7 +383,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9596"
+NAME="AEN9639"
 ></A
 ><H2
 >Description</H2
@@ -393,14 +393,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9599"
+NAME="AEN9642"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9601"
+NAME="AEN9644"
 ></A
 ><H3
 ><A
@@ -426,7 +426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9606"
+NAME="AEN9649"
 ></A
 ><H3
 ><A
@@ -452,7 +452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9611"
+NAME="AEN9654"
 ></A
 ><H3
 ><A
@@ -478,7 +478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9616"
+NAME="AEN9659"
 ></A
 ><H3
 ><A
@@ -504,7 +504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9621"
+NAME="AEN9664"
 ></A
 ><H3
 ><A
@@ -530,7 +530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9626"
+NAME="AEN9669"
 ></A
 ><H3
 ><A
@@ -556,7 +556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9631"
+NAME="AEN9674"
 ></A
 ><H3
 ><A
@@ -582,7 +582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9636"
+NAME="AEN9679"
 ></A
 ><H3
 ><A
@@ -608,7 +608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9641"
+NAME="AEN9684"
 ></A
 ><H3
 ><A
@@ -634,7 +634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9646"
+NAME="AEN9689"
 ></A
 ><H3
 ><A
@@ -668,7 +668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9651"
+NAME="AEN9694"
 ></A
 ><H3
 ><A
@@ -694,7 +694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9656"
+NAME="AEN9699"
 ></A
 ><H3
 ><A
@@ -724,7 +724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9661"
+NAME="AEN9704"
 ></A
 ><H3
 ><A
@@ -750,7 +750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9666"
+NAME="AEN9709"
 ></A
 ><H3
 ><A
@@ -831,7 +831,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9687"
+NAME="AEN9730"
 ></A
 ><H3
 ><A
@@ -914,7 +914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9709"
+NAME="AEN9752"
 ></A
 ><H3
 ><A
@@ -994,7 +994,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9730"
+NAME="AEN9773"
 ></A
 ><H3
 ><A
@@ -1095,7 +1095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9755"
+NAME="AEN9798"
 ></A
 ><H3
 ><A
@@ -1218,7 +1218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9785"
+NAME="AEN9828"
 ></A
 ><H3
 ><A
@@ -1323,7 +1323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9812"
+NAME="AEN9855"
 ></A
 ><H3
 ><A
@@ -1407,7 +1407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9834"
+NAME="AEN9877"
 ></A
 ><H3
 ><A
@@ -1474,7 +1474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9852"
+NAME="AEN9895"
 ></A
 ><H3
 ><A
@@ -1614,7 +1614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9886"
+NAME="AEN9929"
 ></A
 ><H3
 ><A
@@ -1713,7 +1713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9911"
+NAME="AEN9954"
 ></A
 ><H3
 ><A
@@ -1851,7 +1851,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9944"
+NAME="AEN9987"
 ></A
 ><H3
 ><A
@@ -1948,7 +1948,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9968"
+NAME="AEN10011"
 ></A
 ><H3
 ><A
@@ -2101,7 +2101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10003"
+NAME="AEN10046"
 ></A
 ><H3
 ><A
@@ -2272,7 +2272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10042"
+NAME="AEN10085"
 ></A
 ><H3
 ><A
@@ -2350,7 +2350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10062"
+NAME="AEN10105"
 ></A
 ><H3
 ><A
@@ -2414,7 +2414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10078"
+NAME="AEN10121"
 ></A
 ><H3
 ><A
@@ -2601,7 +2601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10122"
+NAME="AEN10165"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index 584b906..1595189 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10159"
+NAME="AEN10202"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10162"
+NAME="AEN10205"
 ></A
 ><H2
 >Synopsis</H2
@@ -280,7 +280,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10201"
+NAME="AEN10244"
 ></A
 ><H2
 >Description</H2
@@ -290,14 +290,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10204"
+NAME="AEN10247"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10206"
+NAME="AEN10249"
 ></A
 ><H3
 ><A
@@ -323,7 +323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10211"
+NAME="AEN10254"
 ></A
 ><H3
 ><A
@@ -349,7 +349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10216"
+NAME="AEN10259"
 ></A
 ><H3
 ><A
@@ -375,7 +375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10221"
+NAME="AEN10264"
 ></A
 ><H3
 ><A
@@ -401,7 +401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10226"
+NAME="AEN10269"
 ></A
 ><H3
 ><A
@@ -503,7 +503,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10252"
+NAME="AEN10295"
 ></A
 ><H3
 ><A
@@ -605,7 +605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10278"
+NAME="AEN10321"
 ></A
 ><H3
 ><A
@@ -686,7 +686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10299"
+NAME="AEN10342"
 ></A
 ><H3
 ><A
@@ -787,7 +787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10324"
+NAME="AEN10367"
 ></A
 ><H3
 ><A
@@ -890,7 +890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10349"
+NAME="AEN10392"
 ></A
 ><H3
 ><A
@@ -989,7 +989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10374"
+NAME="AEN10417"
 ></A
 ><H3
 ><A
@@ -1091,7 +1091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10399"
+NAME="AEN10442"
 ></A
 ><H3
 ><A
@@ -1196,7 +1196,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10425"
+NAME="AEN10468"
 ></A
 ><H3
 ><A
@@ -1301,7 +1301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10451"
+NAME="AEN10494"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index 42609eb..b8c09d2 100644
--- a/doc/html/gnome-xml-nanoftp.html
+++ b/doc/html/gnome-xml-nanoftp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12956"
+NAME="AEN13218"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12959"
+NAME="AEN13221"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12988"
+NAME="AEN13250"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +285,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12991"
+NAME="AEN13253"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12993"
+NAME="AEN13255"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13052"
+NAME="AEN13314"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13074"
+NAME="AEN13336"
 ></A
 ><H3
 ><A
@@ -675,7 +675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13080"
+NAME="AEN13342"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13085"
+NAME="AEN13347"
 ></A
 ><H3
 ><A
@@ -761,7 +761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13100"
+NAME="AEN13362"
 ></A
 ><H3
 ><A
@@ -821,7 +821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13115"
+NAME="AEN13377"
 ></A
 ><H3
 ><A
@@ -899,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13134"
+NAME="AEN13396"
 ></A
 ><H3
 ><A
@@ -959,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13149"
+NAME="AEN13411"
 ></A
 ><H3
 ><A
@@ -1034,7 +1034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13168"
+NAME="AEN13430"
 ></A
 ><H3
 ><A
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13187"
+NAME="AEN13449"
 ></A
 ><H3
 ><A
@@ -1184,7 +1184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13206"
+NAME="AEN13468"
 ></A
 ><H3
 ><A
@@ -1247,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13221"
+NAME="AEN13483"
 ></A
 ><H3
 ><A
@@ -1386,7 +1386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13253"
+NAME="AEN13515"
 ></A
 ><H3
 ><A
@@ -1483,7 +1483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13276"
+NAME="AEN13538"
 ></A
 ><H3
 ><A
@@ -1558,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13295"
+NAME="AEN13557"
 ></A
 ><H3
 ><A
@@ -1633,7 +1633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13314"
+NAME="AEN13576"
 ></A
 ><H3
 ><A
@@ -1726,7 +1726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13337"
+NAME="AEN13599"
 ></A
 ><H3
 ><A
@@ -1802,7 +1802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13356"
+NAME="AEN13618"
 ></A
 ><H3
 ><A
@@ -1877,7 +1877,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13375"
+NAME="AEN13637"
 ></A
 ><H3
 ><A
@@ -2010,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13407"
+NAME="AEN13669"
 ></A
 ><H3
 ><A
@@ -2103,7 +2103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13430"
+NAME="AEN13692"
 ></A
 ><H3
 ><A
@@ -2236,7 +2236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13462"
+NAME="AEN13724"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 55d3baf..9663223 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12740"
+NAME="AEN13002"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12743"
+NAME="AEN13005"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12756"
+NAME="AEN13018"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +205,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12759"
+NAME="AEN13021"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12761"
+NAME="AEN13023"
 ></A
 ><H3
 ><A
@@ -241,7 +241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12767"
+NAME="AEN13029"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12772"
+NAME="AEN13034"
 ></A
 ><H3
 ><A
@@ -330,7 +330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12787"
+NAME="AEN13049"
 ></A
 ><H3
 ><A
@@ -444,7 +444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12814"
+NAME="AEN13076"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12846"
+NAME="AEN13108"
 ></A
 ><H3
 ><A
@@ -663,7 +663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12865"
+NAME="AEN13127"
 ></A
 ><H3
 ><A
@@ -738,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12884"
+NAME="AEN13146"
 ></A
 ><H3
 ><A
@@ -861,7 +861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12913"
+NAME="AEN13175"
 ></A
 ><H3
 ><A
@@ -955,7 +955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12936"
+NAME="AEN13198"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parser.html b/doc/html/gnome-xml-parser.html
index 16bba33..15243b3 100644
--- a/doc/html/gnome-xml-parser.html
+++ b/doc/html/gnome-xml-parser.html
@@ -920,6 +920,24 @@
 HREF="gnome-xml-tree.html#XMLCHAR"
 >xmlChar</A
 > *SystemID);
+<A
+HREF="gnome-xml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+>   <A
+HREF="gnome-xml-parser.html#XMLIOPARSEDTD"
+>xmlIOParseDTD</A
+>                   (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+                                             <A
+HREF="gnome-xml-xmlio.html#XMLPARSERINPUTBUFFERPTR"
+>xmlParserInputBufferPtr</A
+> input,
+                                             <A
+HREF="gnome-xml-encoding.html#XMLCHARENCODING"
+>xmlCharEncoding</A
+> enc);
 int         <A
 HREF="gnome-xml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY"
 >xmlParseBalancedChunkMemory</A
@@ -1213,7 +1231,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN310"
+NAME="AEN315"
 ></A
 ><H2
 >Description</H2
@@ -1223,14 +1241,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN313"
+NAME="AEN318"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN315"
+NAME="AEN320"
 ></A
 ><H3
 ><A
@@ -1256,7 +1274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN320"
+NAME="AEN325"
 ></A
 ><H3
 ><A
@@ -1317,7 +1335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN335"
+NAME="AEN340"
 ></A
 ><H3
 ><A
@@ -1359,7 +1377,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN340"
+NAME="AEN345"
 ></A
 ><H3
 ><A
@@ -1385,7 +1403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN345"
+NAME="AEN350"
 ></A
 ><H3
 ><A
@@ -1418,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN350"
+NAME="AEN355"
 ></A
 ><H3
 ><A
@@ -1444,7 +1462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN355"
+NAME="AEN360"
 ></A
 ><H3
 ><A
@@ -1474,7 +1492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN360"
+NAME="AEN365"
 ></A
 ><H3
 ><A
@@ -1500,7 +1518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN365"
+NAME="AEN370"
 ></A
 ><H3
 ><A
@@ -1543,7 +1561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN370"
+NAME="AEN375"
 ></A
 ><H3
 ><A
@@ -1639,7 +1657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN375"
+NAME="AEN380"
 ></A
 ><H3
 ><A
@@ -1665,7 +1683,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN380"
+NAME="AEN385"
 ></A
 ><H3
 ><A
@@ -1696,7 +1714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN385"
+NAME="AEN390"
 ></A
 ><H3
 ><A
@@ -1722,7 +1740,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN390"
+NAME="AEN395"
 ></A
 ><H3
 ><A
@@ -1840,7 +1858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN419"
+NAME="AEN424"
 ></A
 ><H3
 ><A
@@ -1961,7 +1979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN448"
+NAME="AEN453"
 ></A
 ><H3
 ><A
@@ -2082,7 +2100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN477"
+NAME="AEN482"
 ></A
 ><H3
 ><A
@@ -2179,7 +2197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN501"
+NAME="AEN506"
 ></A
 ><H3
 ><A
@@ -2276,7 +2294,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN525"
+NAME="AEN530"
 ></A
 ><H3
 ><A
@@ -2436,7 +2454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN563"
+NAME="AEN568"
 ></A
 ><H3
 ><A
@@ -2557,7 +2575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN592"
+NAME="AEN597"
 ></A
 ><H3
 ><A
@@ -2735,7 +2753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN634"
+NAME="AEN639"
 ></A
 ><H3
 ><A
@@ -2853,7 +2871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN662"
+NAME="AEN667"
 ></A
 ><H3
 ><A
@@ -2995,7 +3013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN696"
+NAME="AEN701"
 ></A
 ><H3
 ><A
@@ -3074,7 +3092,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN715"
+NAME="AEN720"
 ></A
 ><H3
 ><A
@@ -3132,7 +3150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN729"
+NAME="AEN734"
 ></A
 ><H3
 ><A
@@ -3190,7 +3208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN743"
+NAME="AEN748"
 ></A
 ><H3
 ><A
@@ -3290,7 +3308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN767"
+NAME="AEN772"
 ></A
 ><H3
 ><A
@@ -3369,7 +3387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN786"
+NAME="AEN791"
 ></A
 ><H3
 ><A
@@ -3469,7 +3487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN810"
+NAME="AEN815"
 ></A
 ><H3
 ><A
@@ -3548,7 +3566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN829"
+NAME="AEN834"
 ></A
 ><H3
 ><A
@@ -3645,7 +3663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN852"
+NAME="AEN857"
 ></A
 ><H3
 ><A
@@ -3742,7 +3760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN875"
+NAME="AEN880"
 ></A
 ><H3
 ><A
@@ -3842,7 +3860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN899"
+NAME="AEN904"
 ></A
 ><H3
 ><A
@@ -3921,7 +3939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN918"
+NAME="AEN923"
 ></A
 ><H3
 ><A
@@ -4018,7 +4036,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN941"
+NAME="AEN946"
 ></A
 ><H3
 ><A
@@ -4112,7 +4130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN963"
+NAME="AEN968"
 ></A
 ><H3
 ><A
@@ -4206,7 +4224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN985"
+NAME="AEN990"
 ></A
 ><H3
 ><A
@@ -4300,7 +4318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1007"
+NAME="AEN1012"
 ></A
 ><H3
 ><A
@@ -4373,7 +4391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1025"
+NAME="AEN1030"
 ></A
 ><H3
 ><A
@@ -4446,7 +4464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1043"
+NAME="AEN1048"
 ></A
 ><H3
 ><A
@@ -4519,7 +4537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1061"
+NAME="AEN1066"
 ></A
 ><H3
 ><A
@@ -4573,7 +4591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1066"
+NAME="AEN1071"
 ></A
 ><H3
 ><A
@@ -4599,7 +4617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1071"
+NAME="AEN1076"
 ></A
 ><H3
 ><A
@@ -4715,7 +4733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1099"
+NAME="AEN1104"
 ></A
 ><H3
 ><A
@@ -4741,7 +4759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1104"
+NAME="AEN1109"
 ></A
 ><H3
 ><A
@@ -4767,7 +4785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1109"
+NAME="AEN1114"
 ></A
 ><H3
 ><A
@@ -4793,7 +4811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1114"
+NAME="AEN1119"
 ></A
 ><H3
 ><A
@@ -4819,7 +4837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1119"
+NAME="AEN1124"
 ></A
 ><H3
 ><A
@@ -4845,7 +4863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1124"
+NAME="AEN1129"
 ></A
 ><H3
 ><A
@@ -4871,7 +4889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1129"
+NAME="AEN1134"
 ></A
 ><H3
 ><A
@@ -4897,7 +4915,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1134"
+NAME="AEN1139"
 ></A
 ><H3
 ><A
@@ -4927,7 +4945,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1140"
+NAME="AEN1145"
 ></A
 ><H3
 ><A
@@ -4958,7 +4976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1146"
+NAME="AEN1151"
 ></A
 ><H3
 ><A
@@ -5056,7 +5074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1170"
+NAME="AEN1175"
 ></A
 ><H3
 ><A
@@ -5154,7 +5172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1194"
+NAME="AEN1199"
 ></A
 ><H3
 ><A
@@ -5237,7 +5255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1215"
+NAME="AEN1220"
 ></A
 ><H3
 ><A
@@ -5341,7 +5359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1241"
+NAME="AEN1246"
 ></A
 ><H3
 ><A
@@ -5458,7 +5476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1270"
+NAME="AEN1275"
 ></A
 ><H3
 ><A
@@ -5560,7 +5578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1296"
+NAME="AEN1301"
 ></A
 ><H3
 ><A
@@ -5662,7 +5680,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1322"
+NAME="AEN1327"
 ></A
 ><H3
 ><A
@@ -5764,7 +5782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1348"
+NAME="AEN1353"
 ></A
 ><H3
 ><A
@@ -5863,7 +5881,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1373"
+NAME="AEN1378"
 ></A
 ><H3
 ><A
@@ -5980,7 +5998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1402"
+NAME="AEN1407"
 ></A
 ><H3
 ><A
@@ -6079,7 +6097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1427"
+NAME="AEN1432"
 ></A
 ><H3
 ><A
@@ -6196,7 +6214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1456"
+NAME="AEN1461"
 ></A
 ><H3
 ><A
@@ -6299,7 +6317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1482"
+NAME="AEN1487"
 ></A
 ><H3
 ><A
@@ -6377,7 +6395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1502"
+NAME="AEN1507"
 ></A
 ><H3
 ><A
@@ -6481,7 +6499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1528"
+NAME="AEN1533"
 ></A
 ><H3
 ><A
@@ -6606,7 +6624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1559"
+NAME="AEN1564"
 ></A
 ><H3
 ><A
@@ -6687,7 +6705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1580"
+NAME="AEN1585"
 ></A
 ><H3
 ><A
@@ -6783,7 +6801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1604"
+NAME="AEN1609"
 ></A
 ><H3
 ><A
@@ -6862,7 +6880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1624"
+NAME="AEN1629"
 ></A
 ><H3
 ><A
@@ -6945,7 +6963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1644"
+NAME="AEN1649"
 ></A
 ><H3
 ><A
@@ -7047,7 +7065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1667"
+NAME="AEN1672"
 ></A
 ><H3
 ><A
@@ -7110,7 +7128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1683"
+NAME="AEN1688"
 ></A
 ><H3
 ><A
@@ -7185,7 +7203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1702"
+NAME="AEN1707"
 ></A
 ><H3
 ><A
@@ -7267,7 +7285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1723"
+NAME="AEN1728"
 ></A
 ><H3
 ><A
@@ -7364,7 +7382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1747"
+NAME="AEN1752"
 ></A
 ><H3
 ><A
@@ -7444,7 +7462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1767"
+NAME="AEN1772"
 ></A
 ><H3
 ><A
@@ -7528,7 +7546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1789"
+NAME="AEN1794"
 ></A
 ><H3
 ><A
@@ -7611,7 +7629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1810"
+NAME="AEN1815"
 ></A
 ><H3
 ><A
@@ -7734,7 +7752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1840"
+NAME="AEN1845"
 ></A
 ><H3
 ><A
@@ -7849,7 +7867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1868"
+NAME="AEN1873"
 ></A
 ><H3
 ><A
@@ -7982,7 +8000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1900"
+NAME="AEN1905"
 ></A
 ><H3
 ><A
@@ -8120,7 +8138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1933"
+NAME="AEN1938"
 ></A
 ><H3
 ><A
@@ -8241,7 +8259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1962"
+NAME="AEN1967"
 ></A
 ><H3
 ><A
@@ -8346,7 +8364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1989"
+NAME="AEN1994"
 ></A
 ><H3
 ><A
@@ -8428,7 +8446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2011"
+NAME="AEN2016"
 ></A
 ><H3
 ><A
@@ -8530,7 +8548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2037"
+NAME="AEN2042"
 ></A
 ><H3
 ><A
@@ -8653,7 +8671,136 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2068"
+NAME="AEN2073"
+></A
+><H3
+><A
+NAME="XMLIOPARSEDTD"
+></A
+>xmlIOParseDTD ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="gnome-xml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+>   xmlIOParseDTD                   (<A
+HREF="gnome-xml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+                                             <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
+>Load and parse a DTD</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"
+>  the SAX handler block or NULL</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 Input Buffer</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 resulting xmlDtdPtr or NULL in case of error.
+<TT
+CLASS="PARAMETER"
+><I
+>input</I
+></TT
+> will be freed at parsing end.</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN2105"
 ></A
 ><H3
 ><A
@@ -8828,7 +8975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2110"
+NAME="AEN2147"
 ></A
 ><H3
 ><A
@@ -9031,7 +9178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2159"
+NAME="AEN2196"
 ></A
 ><H3
 ><A
@@ -9177,7 +9324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2195"
+NAME="AEN2232"
 ></A
 ><H3
 ><A
@@ -9205,7 +9352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2201"
+NAME="AEN2238"
 ></A
 ><H3
 ><A
@@ -9233,7 +9380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2207"
+NAME="AEN2244"
 ></A
 ><H3
 ><A
@@ -9296,7 +9443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2223"
+NAME="AEN2260"
 ></A
 ><H3
 ><A
@@ -9359,7 +9506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2239"
+NAME="AEN2276"
 ></A
 ><H3
 ><A
@@ -9423,7 +9570,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2255"
+NAME="AEN2292"
 ></A
 ><H3
 ><A
@@ -9527,7 +9674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2280"
+NAME="AEN2317"
 ></A
 ><H3
 ><A
@@ -9608,7 +9755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2301"
+NAME="AEN2338"
 ></A
 ><H3
 ><A
@@ -9699,7 +9846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2323"
+NAME="AEN2360"
 ></A
 ><H3
 ><A
@@ -9811,7 +9958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2350"
+NAME="AEN2387"
 ></A
 ><H3
 ><A
@@ -9923,7 +10070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2377"
+NAME="AEN2414"
 ></A
 ><H3
 ><A
@@ -10089,7 +10236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2416"
+NAME="AEN2453"
 ></A
 ><H3
 ><A
@@ -10221,7 +10368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2448"
+NAME="AEN2485"
 ></A
 ><H3
 ><A
@@ -10402,7 +10549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2492"
+NAME="AEN2529"
 ></A
 ><H3
 ><A
@@ -10531,7 +10678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2524"
+NAME="AEN2561"
 ></A
 ><H3
 ><A
@@ -10634,7 +10781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2550"
+NAME="AEN2587"
 ></A
 ><H3
 ><A
@@ -10697,7 +10844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2566"
+NAME="AEN2603"
 ></A
 ><H3
 ><A
@@ -10761,7 +10908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2582"
+NAME="AEN2619"
 ></A
 ><H3
 ><A
@@ -10864,7 +11011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2608"
+NAME="AEN2645"
 ></A
 ><H3
 ><A
@@ -10948,7 +11095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2629"
+NAME="AEN2666"
 ></A
 ><H3
 ><A
@@ -11009,7 +11156,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2644"
+NAME="AEN2681"
 ></A
 ><H3
 ><A
@@ -11069,7 +11216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2659"
+NAME="AEN2696"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index 2b58bb0..aa562ac 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN14412"
+NAME="AEN14674"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN14415"
+NAME="AEN14677"
 ></A
 ><H2
 >Synopsis</H2
@@ -1096,7 +1096,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14682"
+NAME="AEN14944"
 ></A
 ><H2
 >Description</H2
@@ -1106,14 +1106,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN14685"
+NAME="AEN14947"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14687"
+NAME="AEN14949"
 ></A
 ><H3
 ><A
@@ -1139,7 +1139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14692"
+NAME="AEN14954"
 ></A
 ><H3
 ><A
@@ -1165,7 +1165,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14697"
+NAME="AEN14959"
 ></A
 ><H3
 ><A
@@ -1223,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14711"
+NAME="AEN14973"
 ></A
 ><H3
 ><A
@@ -1281,7 +1281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14725"
+NAME="AEN14987"
 ></A
 ><H3
 ><A
@@ -1339,7 +1339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14739"
+NAME="AEN15001"
 ></A
 ><H3
 ><A
@@ -1397,7 +1397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14753"
+NAME="AEN15015"
 ></A
 ><H3
 ><A
@@ -1455,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14767"
+NAME="AEN15029"
 ></A
 ><H3
 ><A
@@ -1513,7 +1513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14781"
+NAME="AEN15043"
 ></A
 ><H3
 ><A
@@ -1571,7 +1571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14795"
+NAME="AEN15057"
 ></A
 ><H3
 ><A
@@ -1629,7 +1629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14809"
+NAME="AEN15071"
 ></A
 ><H3
 ><A
@@ -1687,7 +1687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14823"
+NAME="AEN15085"
 ></A
 ><H3
 ><A
@@ -1745,7 +1745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14837"
+NAME="AEN15099"
 ></A
 ><H3
 ><A
@@ -1803,7 +1803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14851"
+NAME="AEN15113"
 ></A
 ><H3
 ><A
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14865"
+NAME="AEN15127"
 ></A
 ><H3
 ><A
@@ -1887,7 +1887,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14870"
+NAME="AEN15132"
 ></A
 ><H3
 ><A
@@ -1913,7 +1913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14875"
+NAME="AEN15137"
 ></A
 ><H3
 ><A
@@ -1939,7 +1939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14880"
+NAME="AEN15142"
 ></A
 ><H3
 ><A
@@ -1965,7 +1965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14885"
+NAME="AEN15147"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14890"
+NAME="AEN15152"
 ></A
 ><H3
 ><A
@@ -2017,7 +2017,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14895"
+NAME="AEN15157"
 ></A
 ><H3
 ><A
@@ -2107,7 +2107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14918"
+NAME="AEN15180"
 ></A
 ><H3
 ><A
@@ -2199,7 +2199,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14942"
+NAME="AEN15204"
 ></A
 ><H3
 ><A
@@ -2284,7 +2284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14964"
+NAME="AEN15226"
 ></A
 ><H3
 ><A
@@ -2360,7 +2360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14983"
+NAME="AEN15245"
 ></A
 ><H3
 ><A
@@ -2436,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15002"
+NAME="AEN15264"
 ></A
 ><H3
 ><A
@@ -2527,7 +2527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15026"
+NAME="AEN15288"
 ></A
 ><H3
 ><A
@@ -2603,7 +2603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15045"
+NAME="AEN15307"
 ></A
 ><H3
 ><A
@@ -2723,7 +2723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15078"
+NAME="AEN15340"
 ></A
 ><H3
 ><A
@@ -2832,7 +2832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15107"
+NAME="AEN15369"
 ></A
 ><H3
 ><A
@@ -2913,7 +2913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15128"
+NAME="AEN15390"
 ></A
 ><H3
 ><A
@@ -2993,7 +2993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15148"
+NAME="AEN15410"
 ></A
 ><H3
 ><A
@@ -3089,7 +3089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15172"
+NAME="AEN15434"
 ></A
 ><H3
 ><A
@@ -3150,7 +3150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15188"
+NAME="AEN15450"
 ></A
 ><H3
 ><A
@@ -3275,7 +3275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15219"
+NAME="AEN15481"
 ></A
 ><H3
 ><A
@@ -3375,7 +3375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15244"
+NAME="AEN15506"
 ></A
 ><H3
 ><A
@@ -3475,7 +3475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15269"
+NAME="AEN15531"
 ></A
 ><H3
 ><A
@@ -3539,7 +3539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15285"
+NAME="AEN15547"
 ></A
 ><H3
 ><A
@@ -3626,7 +3626,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15307"
+NAME="AEN15569"
 ></A
 ><H3
 ><A
@@ -3728,7 +3728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15333"
+NAME="AEN15595"
 ></A
 ><H3
 ><A
@@ -3813,7 +3813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15354"
+NAME="AEN15616"
 ></A
 ><H3
 ><A
@@ -3895,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15375"
+NAME="AEN15637"
 ></A
 ><H3
 ><A
@@ -3958,7 +3958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15391"
+NAME="AEN15653"
 ></A
 ><H3
 ><A
@@ -4057,7 +4057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15416"
+NAME="AEN15678"
 ></A
 ><H3
 ><A
@@ -4138,7 +4138,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15437"
+NAME="AEN15699"
 ></A
 ><H3
 ><A
@@ -4268,7 +4268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15471"
+NAME="AEN15733"
 ></A
 ><H3
 ><A
@@ -4357,7 +4357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15495"
+NAME="AEN15757"
 ></A
 ><H3
 ><A
@@ -4469,7 +4469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15525"
+NAME="AEN15787"
 ></A
 ><H3
 ><A
@@ -4557,7 +4557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15549"
+NAME="AEN15811"
 ></A
 ><H3
 ><A
@@ -4640,7 +4640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15571"
+NAME="AEN15833"
 ></A
 ><H3
 ><A
@@ -4711,7 +4711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15590"
+NAME="AEN15852"
 ></A
 ><H3
 ><A
@@ -4803,7 +4803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15615"
+NAME="AEN15877"
 ></A
 ><H3
 ><A
@@ -4891,7 +4891,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15639"
+NAME="AEN15901"
 ></A
 ><H3
 ><A
@@ -4976,7 +4976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15662"
+NAME="AEN15924"
 ></A
 ><H3
 ><A
@@ -5081,7 +5081,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15689"
+NAME="AEN15951"
 ></A
 ><H3
 ><A
@@ -5219,7 +5219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15723"
+NAME="AEN15985"
 ></A
 ><H3
 ><A
@@ -5302,7 +5302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15745"
+NAME="AEN16007"
 ></A
 ><H3
 ><A
@@ -5385,7 +5385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15767"
+NAME="AEN16029"
 ></A
 ><H3
 ><A
@@ -5474,7 +5474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15789"
+NAME="AEN16051"
 ></A
 ><H3
 ><A
@@ -5605,7 +5605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15822"
+NAME="AEN16084"
 ></A
 ><H3
 ><A
@@ -5672,7 +5672,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15839"
+NAME="AEN16101"
 ></A
 ><H3
 ><A
@@ -5755,7 +5755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15861"
+NAME="AEN16123"
 ></A
 ><H3
 ><A
@@ -5822,7 +5822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15879"
+NAME="AEN16141"
 ></A
 ><H3
 ><A
@@ -5897,7 +5897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15899"
+NAME="AEN16161"
 ></A
 ><H3
 ><A
@@ -5975,7 +5975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15922"
+NAME="AEN16184"
 ></A
 ><H3
 ><A
@@ -6114,7 +6114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15959"
+NAME="AEN16221"
 ></A
 ><H3
 ><A
@@ -6203,7 +6203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15983"
+NAME="AEN16245"
 ></A
 ><H3
 ><A
@@ -6290,7 +6290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16006"
+NAME="AEN16268"
 ></A
 ><H3
 ><A
@@ -6393,7 +6393,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16033"
+NAME="AEN16295"
 ></A
 ><H3
 ><A
@@ -6537,7 +6537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16071"
+NAME="AEN16333"
 ></A
 ><H3
 ><A
@@ -6604,7 +6604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16089"
+NAME="AEN16351"
 ></A
 ><H3
 ><A
@@ -6702,7 +6702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16115"
+NAME="AEN16377"
 ></A
 ><H3
 ><A
@@ -6805,7 +6805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16141"
+NAME="AEN16403"
 ></A
 ><H3
 ><A
@@ -6928,7 +6928,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16172"
+NAME="AEN16434"
 ></A
 ><H3
 ><A
@@ -7011,7 +7011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16194"
+NAME="AEN16456"
 ></A
 ><H3
 ><A
@@ -7090,7 +7090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16213"
+NAME="AEN16475"
 ></A
 ><H3
 ><A
@@ -7178,7 +7178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16236"
+NAME="AEN16498"
 ></A
 ><H3
 ><A
@@ -7279,7 +7279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16260"
+NAME="AEN16522"
 ></A
 ><H3
 ><A
@@ -7353,7 +7353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16279"
+NAME="AEN16541"
 ></A
 ><H3
 ><A
@@ -7439,7 +7439,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16300"
+NAME="AEN16562"
 ></A
 ><H3
 ><A
@@ -7509,7 +7509,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16318"
+NAME="AEN16580"
 ></A
 ><H3
 ><A
@@ -7634,7 +7634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16352"
+NAME="AEN16614"
 ></A
 ><H3
 ><A
@@ -7734,7 +7734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16380"
+NAME="AEN16642"
 ></A
 ><H3
 ><A
@@ -7803,7 +7803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16399"
+NAME="AEN16661"
 ></A
 ><H3
 ><A
@@ -7874,7 +7874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16419"
+NAME="AEN16681"
 ></A
 ><H3
 ><A
@@ -7939,7 +7939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16436"
+NAME="AEN16698"
 ></A
 ><H3
 ><A
@@ -8021,7 +8021,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16455"
+NAME="AEN16717"
 ></A
 ><H3
 ><A
@@ -8104,7 +8104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16477"
+NAME="AEN16739"
 ></A
 ><H3
 ><A
@@ -8189,7 +8189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16500"
+NAME="AEN16762"
 ></A
 ><H3
 ><A
@@ -8272,7 +8272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16522"
+NAME="AEN16784"
 ></A
 ><H3
 ><A
@@ -8357,7 +8357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16545"
+NAME="AEN16807"
 ></A
 ><H3
 ><A
@@ -8452,7 +8452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16567"
+NAME="AEN16829"
 ></A
 ><H3
 ><A
@@ -8517,7 +8517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16584"
+NAME="AEN16846"
 ></A
 ><H3
 ><A
@@ -8584,7 +8584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16602"
+NAME="AEN16864"
 ></A
 ><H3
 ><A
@@ -8649,7 +8649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16619"
+NAME="AEN16881"
 ></A
 ><H3
 ><A
@@ -8758,7 +8758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16647"
+NAME="AEN16909"
 ></A
 ><H3
 ><A
@@ -8784,7 +8784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16652"
+NAME="AEN16914"
 ></A
 ><H3
 ><A
@@ -8810,7 +8810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16657"
+NAME="AEN16919"
 ></A
 ><H3
 ><A
@@ -8836,7 +8836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16662"
+NAME="AEN16924"
 ></A
 ><H3
 ><A
@@ -8862,7 +8862,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16667"
+NAME="AEN16929"
 ></A
 ><H3
 ><A
@@ -9050,7 +9050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16714"
+NAME="AEN16976"
 ></A
 ><H3
 ><A
@@ -9238,7 +9238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16761"
+NAME="AEN17023"
 ></A
 ><H3
 ><A
@@ -9335,7 +9335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16785"
+NAME="AEN17047"
 ></A
 ><H3
 ><A
@@ -9414,7 +9414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16805"
+NAME="AEN17067"
 ></A
 ><H3
 ><A
@@ -9511,7 +9511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16829"
+NAME="AEN17091"
 ></A
 ><H3
 ><A
@@ -9590,7 +9590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16849"
+NAME="AEN17111"
 ></A
 ><H3
 ><A
@@ -9669,7 +9669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16869"
+NAME="AEN17131"
 ></A
 ><H3
 ><A
@@ -9787,7 +9787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16898"
+NAME="AEN17160"
 ></A
 ><H3
 ><A
@@ -9879,7 +9879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16920"
+NAME="AEN17182"
 ></A
 ><H3
 ><A
@@ -9969,7 +9969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16944"
+NAME="AEN17206"
 ></A
 ><H3
 ><A
@@ -10048,7 +10048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16964"
+NAME="AEN17226"
 ></A
 ><H3
 ><A
@@ -10124,7 +10124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16983"
+NAME="AEN17245"
 ></A
 ><H3
 ><A
@@ -10243,7 +10243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17012"
+NAME="AEN17274"
 ></A
 ><H3
 ><A
@@ -10357,7 +10357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17040"
+NAME="AEN17302"
 ></A
 ><H3
 ><A
@@ -10420,7 +10420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17056"
+NAME="AEN17318"
 ></A
 ><H3
 ><A
@@ -10483,7 +10483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17072"
+NAME="AEN17334"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-sax.html b/doc/html/gnome-xml-sax.html
index ccc8d36..402ef37 100644
--- a/doc/html/gnome-xml-sax.html
+++ b/doc/html/gnome-xml-sax.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2692"
+NAME="AEN2729"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2695"
+NAME="AEN2732"
 ></A
 ><H2
 >Synopsis</H2
@@ -502,7 +502,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2787"
+NAME="AEN2824"
 ></A
 ><H2
 >Description</H2
@@ -512,14 +512,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2790"
+NAME="AEN2827"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2792"
+NAME="AEN2829"
 ></A
 ><H3
 ><A
@@ -597,7 +597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2812"
+NAME="AEN2849"
 ></A
 ><H3
 ><A
@@ -676,7 +676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2832"
+NAME="AEN2869"
 ></A
 ><H3
 ><A
@@ -758,7 +758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2852"
+NAME="AEN2889"
 ></A
 ><H3
 ><A
@@ -833,7 +833,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2871"
+NAME="AEN2908"
 ></A
 ><H3
 ><A
@@ -908,7 +908,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2890"
+NAME="AEN2927"
 ></A
 ><H3
 ><A
@@ -983,7 +983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2909"
+NAME="AEN2946"
 ></A
 ><H3
 ><A
@@ -1058,7 +1058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2928"
+NAME="AEN2965"
 ></A
 ><H3
 ><A
@@ -1133,7 +1133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2947"
+NAME="AEN2984"
 ></A
 ><H3
 ><A
@@ -1256,7 +1256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2977"
+NAME="AEN3014"
 ></A
 ><H3
 ><A
@@ -1379,7 +1379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3007"
+NAME="AEN3044"
 ></A
 ><H3
 ><A
@@ -1478,7 +1478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3032"
+NAME="AEN3069"
 ></A
 ><H3
 ><A
@@ -1577,7 +1577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3057"
+NAME="AEN3094"
 ></A
 ><H3
 ><A
@@ -1707,7 +1707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3089"
+NAME="AEN3126"
 ></A
 ><H3
 ><A
@@ -1869,7 +1869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3128"
+NAME="AEN3165"
 ></A
 ><H3
 ><A
@@ -2049,7 +2049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3171"
+NAME="AEN3208"
 ></A
 ><H3
 ><A
@@ -2169,7 +2169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3200"
+NAME="AEN3237"
 ></A
 ><H3
 ><A
@@ -2292,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3230"
+NAME="AEN3267"
 ></A
 ><H3
 ><A
@@ -2436,7 +2436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3265"
+NAME="AEN3302"
 ></A
 ><H3
 ><A
@@ -2496,7 +2496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3280"
+NAME="AEN3317"
 ></A
 ><H3
 ><A
@@ -2556,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3295"
+NAME="AEN3332"
 ></A
 ><H3
 ><A
@@ -2661,7 +2661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3320"
+NAME="AEN3357"
 ></A
 ><H3
 ><A
@@ -2763,7 +2763,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3345"
+NAME="AEN3382"
 ></A
 ><H3
 ><A
@@ -2844,7 +2844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3365"
+NAME="AEN3402"
 ></A
 ><H3
 ><A
@@ -2925,7 +2925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3385"
+NAME="AEN3422"
 ></A
 ><H3
 ><A
@@ -3025,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3409"
+NAME="AEN3446"
 ></A
 ><H3
 ><A
@@ -3125,7 +3125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3433"
+NAME="AEN3470"
 ></A
 ><H3
 ><A
@@ -3227,7 +3227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3458"
+NAME="AEN3495"
 ></A
 ><H3
 ><A
@@ -3329,7 +3329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3483"
+NAME="AEN3520"
 ></A
 ><H3
 ><A
@@ -3410,7 +3410,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3503"
+NAME="AEN3540"
 ></A
 ><H3
 ><A
@@ -3488,7 +3488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3523"
+NAME="AEN3560"
 ></A
 ><H3
 ><A
@@ -3585,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3547"
+NAME="AEN3584"
 ></A
 ><H3
 ><A
@@ -3687,7 +3687,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3572"
+NAME="AEN3609"
 ></A
 ><H3
 ><A
@@ -3768,7 +3768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3592"
+NAME="AEN3629"
 ></A
 ><H3
 ><A
@@ -3867,7 +3867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3616"
+NAME="AEN3653"
 ></A
 ><H3
 ><A
@@ -3895,7 +3895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3622"
+NAME="AEN3659"
 ></A
 ><H3
 ><A
@@ -3923,7 +3923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3628"
+NAME="AEN3665"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-tree.html b/doc/html/gnome-xml-tree.html
index f004fb4..d42797c 100644
--- a/doc/html/gnome-xml-tree.html
+++ b/doc/html/gnome-xml-tree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3639"
+NAME="AEN3676"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3642"
+NAME="AEN3679"
 ></A
 ><H2
 >Synopsis</H2
@@ -214,7 +214,11 @@
 HREF="gnome-xml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
 >;
-enum        <A
+#define     <A
+HREF="gnome-xml-tree.html#XML-LOCAL-NAMESPACE"
+>XML_LOCAL_NAMESPACE</A
+>
+typedef     <A
 HREF="gnome-xml-tree.html#XMLNSTYPE"
 >xmlNsType</A
 >;
@@ -1627,7 +1631,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4051"
+NAME="AEN4089"
 ></A
 ><H2
 >Description</H2
@@ -1637,14 +1641,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4054"
+NAME="AEN4092"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4056"
+NAME="AEN4094"
 ></A
 ><H3
 ><A
@@ -1677,11 +1681,10 @@
     XML_DTD_NODE=		14,
     XML_ELEMENT_DECL=		15,
     XML_ATTRIBUTE_DECL=		16,
-#ifdef LIBXML_SGML_ENABLED
     XML_ENTITY_DECL=		17,
-    XML_SGML_DOCUMENT_NODE=	18
-#else
-    XML_ENTITY_DECL=		17
+    XML_NAMESPACE_DECL=		18
+#ifdef LIBXML_SGML_ENABLED
+   ,XML_SGML_DOCUMENT_NODE=	19
 #endif
 } xmlElementType;</PRE
 ></TD
@@ -1693,7 +1696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4061"
+NAME="AEN4099"
 ></A
 ><H3
 ><A
@@ -1719,7 +1722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4066"
+NAME="AEN4104"
 ></A
 ><H3
 ><A
@@ -1745,7 +1748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4071"
+NAME="AEN4109"
 ></A
 ><H3
 ><A
@@ -1771,7 +1774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4076"
+NAME="AEN4114"
 ></A
 ><H3
 ><A
@@ -1801,7 +1804,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4081"
+NAME="AEN4119"
 ></A
 ><H3
 ><A
@@ -1827,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4086"
+NAME="AEN4124"
 ></A
 ><H3
 ><A
@@ -1864,7 +1867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4091"
+NAME="AEN4129"
 ></A
 ><H3
 ><A
@@ -1895,7 +1898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4096"
+NAME="AEN4134"
 ></A
 ><H3
 ><A
@@ -1924,7 +1927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4101"
+NAME="AEN4139"
 ></A
 ><H3
 ><A
@@ -1950,7 +1953,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4106"
+NAME="AEN4144"
 ></A
 ><H3
 ><A
@@ -1996,7 +1999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4111"
+NAME="AEN4149"
 ></A
 ><H3
 ><A
@@ -2022,7 +2025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4116"
+NAME="AEN4154"
 ></A
 ><H3
 ><A
@@ -2053,7 +2056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4121"
+NAME="AEN4159"
 ></A
 ><H3
 ><A
@@ -2084,7 +2087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4126"
+NAME="AEN4164"
 ></A
 ><H3
 ><A
@@ -2116,7 +2119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4131"
+NAME="AEN4169"
 ></A
 ><H3
 ><A
@@ -2142,7 +2145,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4136"
+NAME="AEN4174"
 ></A
 ><H3
 ><A
@@ -2173,7 +2176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4141"
+NAME="AEN4179"
 ></A
 ><H3
 ><A
@@ -2216,7 +2219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4146"
+NAME="AEN4184"
 ></A
 ><H3
 ><A
@@ -2242,13 +2245,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4151"
+NAME="AEN4189"
 ></A
 ><H3
 ><A
-NAME="XMLNSTYPE"
+NAME="XML-LOCAL-NAMESPACE"
 ></A
->enum xmlNsType</H3
+>XML_LOCAL_NAMESPACE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2258,10 +2261,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->typedef enum {
-    XML_GLOBAL_NAMESPACE = 1,	/* old style global namespace */
-    XML_LOCAL_NAMESPACE		/* new style local scoping */
-} xmlNsType;</PRE
+>#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2271,7 +2271,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4156"
+NAME="AEN4194"
+></A
+><H3
+><A
+NAME="XMLNSTYPE"
+></A
+>xmlNsType</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementType xmlNsType;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4199"
 ></A
 ><H3
 ><A
@@ -2302,7 +2328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4161"
+NAME="AEN4204"
 ></A
 ><H3
 ><A
@@ -2328,7 +2354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4166"
+NAME="AEN4209"
 ></A
 ><H3
 ><A
@@ -2375,7 +2401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4171"
+NAME="AEN4214"
 ></A
 ><H3
 ><A
@@ -2401,7 +2427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4176"
+NAME="AEN4219"
 ></A
 ><H3
 ><A
@@ -2441,7 +2467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4181"
+NAME="AEN4224"
 ></A
 ><H3
 ><A
@@ -2467,7 +2493,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4186"
+NAME="AEN4229"
 ></A
 ><H3
 ><A
@@ -2497,7 +2523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4191"
+NAME="AEN4234"
 ></A
 ><H3
 ><A
@@ -2523,7 +2549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4196"
+NAME="AEN4239"
 ></A
 ><H3
 ><A
@@ -2553,7 +2579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4201"
+NAME="AEN4244"
 ></A
 ><H3
 ><A
@@ -2579,7 +2605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4206"
+NAME="AEN4249"
 ></A
 ><H3
 ><A
@@ -2608,7 +2634,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4211"
+NAME="AEN4254"
 ></A
 ><H3
 ><A
@@ -2639,7 +2665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4216"
+NAME="AEN4259"
 ></A
 ><H3
 ><A
@@ -2665,7 +2691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4221"
+NAME="AEN4264"
 ></A
 ><H3
 ><A
@@ -2713,7 +2739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4226"
+NAME="AEN4269"
 ></A
 ><H3
 ><A
@@ -2739,7 +2765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4231"
+NAME="AEN4274"
 ></A
 ><H3
 ><A
@@ -2791,7 +2817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4236"
+NAME="AEN4279"
 ></A
 ><H3
 ><A
@@ -2817,7 +2843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4241"
+NAME="AEN4284"
 ></A
 ><H3
 ><A
@@ -2843,7 +2869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4246"
+NAME="AEN4289"
 ></A
 ><H3
 ><A
@@ -2869,7 +2895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4251"
+NAME="AEN4294"
 ></A
 ><H3
 ><A
@@ -2895,7 +2921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4256"
+NAME="AEN4299"
 ></A
 ><H3
 ><A
@@ -2921,7 +2947,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4261"
+NAME="AEN4304"
 ></A
 ><H3
 ><A
@@ -2947,7 +2973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4266"
+NAME="AEN4309"
 ></A
 ><H3
 ><A
@@ -2973,7 +2999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4271"
+NAME="AEN4314"
 ></A
 ><H3
 ><A
@@ -2999,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4276"
+NAME="AEN4319"
 ></A
 ><H3
 ><A
@@ -3060,7 +3086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4292"
+NAME="AEN4335"
 ></A
 ><H3
 ><A
@@ -3141,7 +3167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4313"
+NAME="AEN4356"
 ></A
 ><H3
 ><A
@@ -3204,7 +3230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4329"
+NAME="AEN4372"
 ></A
 ><H3
 ><A
@@ -3303,7 +3329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4354"
+NAME="AEN4397"
 ></A
 ><H3
 ><A
@@ -3406,7 +3432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4379"
+NAME="AEN4422"
 ></A
 ><H3
 ><A
@@ -3514,7 +3540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4405"
+NAME="AEN4448"
 ></A
 ><H3
 ><A
@@ -3598,7 +3624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4426"
+NAME="AEN4469"
 ></A
 ><H3
 ><A
@@ -3679,7 +3705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4446"
+NAME="AEN4489"
 ></A
 ><H3
 ><A
@@ -3775,7 +3801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4470"
+NAME="AEN4513"
 ></A
 ><H3
 ><A
@@ -3871,7 +3897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4494"
+NAME="AEN4537"
 ></A
 ><H3
 ><A
@@ -3934,7 +3960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4510"
+NAME="AEN4553"
 ></A
 ><H3
 ><A
@@ -4015,7 +4041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4531"
+NAME="AEN4574"
 ></A
 ><H3
 ><A
@@ -4091,7 +4117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4550"
+NAME="AEN4593"
 ></A
 ><H3
 ><A
@@ -4175,7 +4201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4571"
+NAME="AEN4614"
 ></A
 ><H3
 ><A
@@ -4253,7 +4279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4591"
+NAME="AEN4634"
 ></A
 ><H3
 ><A
@@ -4397,7 +4423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4627"
+NAME="AEN4670"
 ></A
 ><H3
 ><A
@@ -4545,7 +4571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4664"
+NAME="AEN4707"
 ></A
 ><H3
 ><A
@@ -4626,7 +4652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4685"
+NAME="AEN4728"
 ></A
 ><H3
 ><A
@@ -4689,7 +4715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4701"
+NAME="AEN4744"
 ></A
 ><H3
 ><A
@@ -4814,7 +4840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4732"
+NAME="AEN4775"
 ></A
 ><H3
 ><A
@@ -4941,7 +4967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4763"
+NAME="AEN4806"
 ></A
 ><H3
 ><A
@@ -5004,7 +5030,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4779"
+NAME="AEN4822"
 ></A
 ><H3
 ><A
@@ -5085,7 +5111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4800"
+NAME="AEN4843"
 ></A
 ><H3
 ><A
@@ -5149,7 +5175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4816"
+NAME="AEN4859"
 ></A
 ><H3
 ><A
@@ -5272,7 +5298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4847"
+NAME="AEN4890"
 ></A
 ><H3
 ><A
@@ -5395,7 +5421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4878"
+NAME="AEN4921"
 ></A
 ><H3
 ><A
@@ -5539,7 +5565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4914"
+NAME="AEN4957"
 ></A
 ><H3
 ><A
@@ -5602,7 +5628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4930"
+NAME="AEN4973"
 ></A
 ><H3
 ><A
@@ -5665,7 +5691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4946"
+NAME="AEN4989"
 ></A
 ><H3
 ><A
@@ -5767,7 +5793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4972"
+NAME="AEN5015"
 ></A
 ><H3
 ><A
@@ -5869,7 +5895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4998"
+NAME="AEN5041"
 ></A
 ><H3
 ><A
@@ -5950,7 +5976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5019"
+NAME="AEN5062"
 ></A
 ><H3
 ><A
@@ -6050,7 +6076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5044"
+NAME="AEN5087"
 ></A
 ><H3
 ><A
@@ -6220,7 +6246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5085"
+NAME="AEN5128"
 ></A
 ><H3
 ><A
@@ -6375,7 +6401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5123"
+NAME="AEN5166"
 ></A
 ><H3
 ><A
@@ -6482,7 +6508,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5150"
+NAME="AEN5193"
 ></A
 ><H3
 ><A
@@ -6658,7 +6684,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5192"
+NAME="AEN5235"
 ></A
 ><H3
 ><A
@@ -6819,7 +6845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5231"
+NAME="AEN5274"
 ></A
 ><H3
 ><A
@@ -6921,7 +6947,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5257"
+NAME="AEN5300"
 ></A
 ><H3
 ><A
@@ -7002,7 +7028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5278"
+NAME="AEN5321"
 ></A
 ><H3
 ><A
@@ -7104,7 +7130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5304"
+NAME="AEN5347"
 ></A
 ><H3
 ><A
@@ -7225,7 +7251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5334"
+NAME="AEN5377"
 ></A
 ><H3
 ><A
@@ -7324,7 +7350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5359"
+NAME="AEN5402"
 ></A
 ><H3
 ><A
@@ -7426,7 +7452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5385"
+NAME="AEN5428"
 ></A
 ><H3
 ><A
@@ -7507,7 +7533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5406"
+NAME="AEN5449"
 ></A
 ><H3
 ><A
@@ -7627,7 +7653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5436"
+NAME="AEN5479"
 ></A
 ><H3
 ><A
@@ -7729,7 +7755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5462"
+NAME="AEN5505"
 ></A
 ><H3
 ><A
@@ -7831,7 +7857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5488"
+NAME="AEN5531"
 ></A
 ><H3
 ><A
@@ -7930,7 +7956,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5513"
+NAME="AEN5556"
 ></A
 ><H3
 ><A
@@ -8011,7 +8037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5534"
+NAME="AEN5577"
 ></A
 ><H3
 ><A
@@ -8092,7 +8118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5555"
+NAME="AEN5598"
 ></A
 ><H3
 ><A
@@ -8174,7 +8200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5576"
+NAME="AEN5619"
 ></A
 ><H3
 ><A
@@ -8255,7 +8281,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5597"
+NAME="AEN5640"
 ></A
 ><H3
 ><A
@@ -8333,7 +8359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5617"
+NAME="AEN5660"
 ></A
 ><H3
 ><A
@@ -8412,7 +8438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5637"
+NAME="AEN5680"
 ></A
 ><H3
 ><A
@@ -8515,7 +8541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5663"
+NAME="AEN5706"
 ></A
 ><H3
 ><A
@@ -8599,7 +8625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5684"
+NAME="AEN5727"
 ></A
 ><H3
 ><A
@@ -8712,7 +8738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5712"
+NAME="AEN5755"
 ></A
 ><H3
 ><A
@@ -8820,7 +8846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5739"
+NAME="AEN5782"
 ></A
 ><H3
 ><A
@@ -8924,7 +8950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5765"
+NAME="AEN5808"
 ></A
 ><H3
 ><A
@@ -9044,7 +9070,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5794"
+NAME="AEN5837"
 ></A
 ><H3
 ><A
@@ -9164,7 +9190,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5823"
+NAME="AEN5866"
 ></A
 ><H3
 ><A
@@ -9284,7 +9310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5852"
+NAME="AEN5895"
 ></A
 ><H3
 ><A
@@ -9347,7 +9373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5868"
+NAME="AEN5911"
 ></A
 ><H3
 ><A
@@ -9449,7 +9475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5894"
+NAME="AEN5937"
 ></A
 ><H3
 ><A
@@ -9556,7 +9582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5920"
+NAME="AEN5963"
 ></A
 ><H3
 ><A
@@ -9620,7 +9646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5936"
+NAME="AEN5979"
 ></A
 ><H3
 ><A
@@ -9687,7 +9713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5953"
+NAME="AEN5996"
 ></A
 ><H3
 ><A
@@ -9821,7 +9847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5985"
+NAME="AEN6028"
 ></A
 ><H3
 ><A
@@ -9945,7 +9971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6016"
+NAME="AEN6059"
 ></A
 ><H3
 ><A
@@ -10049,7 +10075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6042"
+NAME="AEN6085"
 ></A
 ><H3
 ><A
@@ -10133,7 +10159,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6063"
+NAME="AEN6106"
 ></A
 ><H3
 ><A
@@ -10214,7 +10240,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6084"
+NAME="AEN6127"
 ></A
 ><H3
 ><A
@@ -10295,7 +10321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6105"
+NAME="AEN6148"
 ></A
 ><H3
 ><A
@@ -10418,7 +10444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6136"
+NAME="AEN6179"
 ></A
 ><H3
 ><A
@@ -10527,7 +10553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6163"
+NAME="AEN6206"
 ></A
 ><H3
 ><A
@@ -10635,7 +10661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6190"
+NAME="AEN6233"
 ></A
 ><H3
 ><A
@@ -10766,7 +10792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6222"
+NAME="AEN6265"
 ></A
 ><H3
 ><A
@@ -10869,7 +10895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6248"
+NAME="AEN6291"
 ></A
 ><H3
 ><A
@@ -10990,7 +11016,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6278"
+NAME="AEN6321"
 ></A
 ><H3
 ><A
@@ -11111,7 +11137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6308"
+NAME="AEN6351"
 ></A
 ><H3
 ><A
@@ -11236,7 +11262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6339"
+NAME="AEN6382"
 ></A
 ><H3
 ><A
@@ -11320,7 +11346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6360"
+NAME="AEN6403"
 ></A
 ><H3
 ><A
@@ -11427,7 +11453,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6386"
+NAME="AEN6429"
 ></A
 ><H3
 ><A
@@ -11511,7 +11537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6407"
+NAME="AEN6450"
 ></A
 ><H3
 ><A
@@ -11618,7 +11644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6433"
+NAME="AEN6476"
 ></A
 ><H3
 ><A
@@ -11703,7 +11729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6454"
+NAME="AEN6497"
 ></A
 ><H3
 ><A
@@ -11786,7 +11812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6475"
+NAME="AEN6518"
 ></A
 ><H3
 ><A
@@ -11871,7 +11897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6496"
+NAME="AEN6539"
 ></A
 ><H3
 ><A
@@ -11951,7 +11977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6516"
+NAME="AEN6559"
 ></A
 ><H3
 ><A
@@ -12036,7 +12062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6537"
+NAME="AEN6580"
 ></A
 ><H3
 ><A
@@ -12140,7 +12166,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6563"
+NAME="AEN6606"
 ></A
 ><H3
 ><A
@@ -12225,7 +12251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6584"
+NAME="AEN6627"
 ></A
 ><H3
 ><A
@@ -12304,7 +12330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6604"
+NAME="AEN6647"
 ></A
 ><H3
 ><A
@@ -12380,7 +12406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6623"
+NAME="AEN6666"
 ></A
 ><H3
 ><A
@@ -12465,7 +12491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6644"
+NAME="AEN6687"
 ></A
 ><H3
 ><A
@@ -12547,7 +12573,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6664"
+NAME="AEN6707"
 ></A
 ><H3
 ><A
@@ -12633,7 +12659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6685"
+NAME="AEN6728"
 ></A
 ><H3
 ><A
@@ -12743,7 +12769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6711"
+NAME="AEN6754"
 ></A
 ><H3
 ><A
@@ -12846,7 +12872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6736"
+NAME="AEN6779"
 ></A
 ><H3
 ><A
@@ -12945,7 +12971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6761"
+NAME="AEN6804"
 ></A
 ><H3
 ><A
@@ -13050,7 +13076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6787"
+NAME="AEN6830"
 ></A
 ><H3
 ><A
@@ -13153,7 +13179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6812"
+NAME="AEN6855"
 ></A
 ><H3
 ><A
@@ -13294,7 +13320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6846"
+NAME="AEN6889"
 ></A
 ><H3
 ><A
@@ -13408,7 +13434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6874"
+NAME="AEN6917"
 ></A
 ><H3
 ><A
@@ -13486,7 +13512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6894"
+NAME="AEN6937"
 ></A
 ><H3
 ><A
@@ -13568,7 +13594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6914"
+NAME="AEN6957"
 ></A
 ><H3
 ><A
@@ -13626,7 +13652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6929"
+NAME="AEN6972"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-uri.html b/doc/html/gnome-xml-uri.html
index 58d22bf..0702d0a 100644
--- a/doc/html/gnome-xml-uri.html
+++ b/doc/html/gnome-xml-uri.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9132"
+NAME="AEN9175"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9135"
+NAME="AEN9178"
 ></A
 ><H2
 >Synopsis</H2
@@ -227,7 +227,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9160"
+NAME="AEN9203"
 ></A
 ><H2
 >Description</H2
@@ -237,14 +237,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9163"
+NAME="AEN9206"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9165"
+NAME="AEN9208"
 ></A
 ><H3
 ><A
@@ -280,7 +280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9170"
+NAME="AEN9213"
 ></A
 ><H3
 ><A
@@ -306,7 +306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9175"
+NAME="AEN9218"
 ></A
 ><H3
 ><A
@@ -367,7 +367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9191"
+NAME="AEN9234"
 ></A
 ><H3
 ><A
@@ -475,7 +475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9218"
+NAME="AEN9261"
 ></A
 ><H3
 ><A
@@ -555,7 +555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9239"
+NAME="AEN9282"
 ></A
 ><H3
 ><A
@@ -659,7 +659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9265"
+NAME="AEN9308"
 ></A
 ><H3
 ><A
@@ -740,7 +740,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9286"
+NAME="AEN9329"
 ></A
 ><H3
 ><A
@@ -829,7 +829,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9308"
+NAME="AEN9351"
 ></A
 ><H3
 ><A
@@ -944,7 +944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9336"
+NAME="AEN9379"
 ></A
 ><H3
 ><A
@@ -1020,7 +1020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9355"
+NAME="AEN9398"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index aa7cd90..f3e6c83 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7421"
+NAME="AEN7464"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7424"
+NAME="AEN7467"
 ></A
 ><H2
 >Synopsis</H2
@@ -898,7 +898,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7631"
+NAME="AEN7674"
 ></A
 ><H2
 >Description</H2
@@ -908,14 +908,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7634"
+NAME="AEN7677"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7636"
+NAME="AEN7679"
 ></A
 ><H3
 ><A
@@ -1009,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7658"
+NAME="AEN7701"
 ></A
 ><H3
 ><A
@@ -1103,7 +1103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7680"
+NAME="AEN7723"
 ></A
 ><H3
 ><A
@@ -1143,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7685"
+NAME="AEN7728"
 ></A
 ><H3
 ><A
@@ -1169,7 +1169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7690"
+NAME="AEN7733"
 ></A
 ><H3
 ><A
@@ -1195,7 +1195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7695"
+NAME="AEN7738"
 ></A
 ><H3
 ><A
@@ -1221,7 +1221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7700"
+NAME="AEN7743"
 ></A
 ><H3
 ><A
@@ -1247,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7705"
+NAME="AEN7748"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7710"
+NAME="AEN7753"
 ></A
 ><H3
 ><A
@@ -1299,7 +1299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7715"
+NAME="AEN7758"
 ></A
 ><H3
 ><A
@@ -1464,7 +1464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7756"
+NAME="AEN7799"
 ></A
 ><H3
 ><A
@@ -1545,7 +1545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7777"
+NAME="AEN7820"
 ></A
 ><H3
 ><A
@@ -1608,7 +1608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7793"
+NAME="AEN7836"
 ></A
 ><H3
 ><A
@@ -1692,7 +1692,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7814"
+NAME="AEN7857"
 ></A
 ><H3
 ><A
@@ -1776,7 +1776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7835"
+NAME="AEN7878"
 ></A
 ><H3
 ><A
@@ -1878,7 +1878,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7861"
+NAME="AEN7904"
 ></A
 ><H3
 ><A
@@ -1959,7 +1959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7882"
+NAME="AEN7925"
 ></A
 ><H3
 ><A
@@ -2022,7 +2022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7898"
+NAME="AEN7941"
 ></A
 ><H3
 ><A
@@ -2122,7 +2122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7922"
+NAME="AEN7965"
 ></A
 ><H3
 ><A
@@ -2287,7 +2287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7963"
+NAME="AEN8006"
 ></A
 ><H3
 ><A
@@ -2368,7 +2368,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7984"
+NAME="AEN8027"
 ></A
 ><H3
 ><A
@@ -2431,7 +2431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8000"
+NAME="AEN8043"
 ></A
 ><H3
 ><A
@@ -2515,7 +2515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8021"
+NAME="AEN8064"
 ></A
 ><H3
 ><A
@@ -2600,7 +2600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8042"
+NAME="AEN8085"
 ></A
 ><H3
 ><A
@@ -2682,7 +2682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8063"
+NAME="AEN8106"
 ></A
 ><H3
 ><A
@@ -2745,7 +2745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8079"
+NAME="AEN8122"
 ></A
 ><H3
 ><A
@@ -2827,7 +2827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8100"
+NAME="AEN8143"
 ></A
 ><H3
 ><A
@@ -3082,7 +3082,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8162"
+NAME="AEN8205"
 ></A
 ><H3
 ><A
@@ -3163,7 +3163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8183"
+NAME="AEN8226"
 ></A
 ><H3
 ><A
@@ -3226,7 +3226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8199"
+NAME="AEN8242"
 ></A
 ><H3
 ><A
@@ -3310,7 +3310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8220"
+NAME="AEN8263"
 ></A
 ><H3
 ><A
@@ -3395,7 +3395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8241"
+NAME="AEN8284"
 ></A
 ><H3
 ><A
@@ -3539,7 +3539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8277"
+NAME="AEN8320"
 ></A
 ><H3
 ><A
@@ -3618,7 +3618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8297"
+NAME="AEN8340"
 ></A
 ><H3
 ><A
@@ -3681,7 +3681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8313"
+NAME="AEN8356"
 ></A
 ><H3
 ><A
@@ -3783,7 +3783,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8339"
+NAME="AEN8382"
 ></A
 ><H3
 ><A
@@ -3905,7 +3905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8369"
+NAME="AEN8412"
 ></A
 ><H3
 ><A
@@ -4004,7 +4004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8394"
+NAME="AEN8437"
 ></A
 ><H3
 ><A
@@ -4148,7 +4148,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8430"
+NAME="AEN8473"
 ></A
 ><H3
 ><A
@@ -4227,7 +4227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8450"
+NAME="AEN8493"
 ></A
 ><H3
 ><A
@@ -4290,7 +4290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8466"
+NAME="AEN8509"
 ></A
 ><H3
 ><A
@@ -4412,7 +4412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8496"
+NAME="AEN8539"
 ></A
 ><H3
 ><A
@@ -4511,7 +4511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8521"
+NAME="AEN8564"
 ></A
 ><H3
 ><A
@@ -4614,7 +4614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8546"
+NAME="AEN8589"
 ></A
 ><H3
 ><A
@@ -4739,7 +4739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8576"
+NAME="AEN8619"
 ></A
 ><H3
 ><A
@@ -4899,7 +4899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8616"
+NAME="AEN8659"
 ></A
 ><H3
 ><A
@@ -5026,7 +5026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8647"
+NAME="AEN8690"
 ></A
 ><H3
 ><A
@@ -5140,7 +5140,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8676"
+NAME="AEN8719"
 ></A
 ><H3
 ><A
@@ -5264,7 +5264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8706"
+NAME="AEN8749"
 ></A
 ><H3
 ><A
@@ -5386,7 +5386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8737"
+NAME="AEN8780"
 ></A
 ><H3
 ><A
@@ -5492,7 +5492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8763"
+NAME="AEN8806"
 ></A
 ><H3
 ><A
@@ -5595,7 +5595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8789"
+NAME="AEN8832"
 ></A
 ><H3
 ><A
@@ -5715,7 +5715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8819"
+NAME="AEN8862"
 ></A
 ><H3
 ><A
@@ -5845,7 +5845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8851"
+NAME="AEN8894"
 ></A
 ><H3
 ><A
@@ -6019,7 +6019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8892"
+NAME="AEN8935"
 ></A
 ><H3
 ><A
@@ -6121,7 +6121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8918"
+NAME="AEN8961"
 ></A
 ><H3
 ><A
@@ -6242,7 +6242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8948"
+NAME="AEN8991"
 ></A
 ><H3
 ><A
@@ -6342,7 +6342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8973"
+NAME="AEN9016"
 ></A
 ><H3
 ><A
@@ -6466,7 +6466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9004"
+NAME="AEN9047"
 ></A
 ><H3
 ><A
@@ -6568,7 +6568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9030"
+NAME="AEN9073"
 ></A
 ><H3
 ><A
@@ -6670,7 +6670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9056"
+NAME="AEN9099"
 ></A
 ><H3
 ><A
@@ -6836,7 +6836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9094"
+NAME="AEN9137"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index 6c6e9af..163a295 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9376"
+NAME="AEN9419"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9379"
+NAME="AEN9422"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9391"
+NAME="AEN9434"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +197,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9394"
+NAME="AEN9437"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9396"
+NAME="AEN9439"
 ></A
 ><H3
 ><A
@@ -357,7 +357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9401"
+NAME="AEN9444"
 ></A
 ><H3
 ><A
@@ -454,7 +454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9424"
+NAME="AEN9467"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9447"
+NAME="AEN9490"
 ></A
 ><H3
 ><A
@@ -648,7 +648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9470"
+NAME="AEN9513"
 ></A
 ><H3
 ><A
@@ -745,7 +745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9493"
+NAME="AEN9536"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9509"
+NAME="AEN9552"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index 58b913d..8048337 100644
--- a/doc/html/gnome-xml-xmlio.html
+++ b/doc/html/gnome-xml-xmlio.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13496"
+NAME="AEN13758"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13499"
+NAME="AEN13761"
 ></A
 ><H2
 >Synopsis</H2
@@ -493,7 +493,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13589"
+NAME="AEN13851"
 ></A
 ><H2
 >Description</H2
@@ -503,14 +503,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13592"
+NAME="AEN13854"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13594"
+NAME="AEN13856"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13612"
+NAME="AEN13874"
 ></A
 ><H3
 ><A
@@ -641,7 +641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13626"
+NAME="AEN13888"
 ></A
 ><H3
 ><A
@@ -750,7 +750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13652"
+NAME="AEN13914"
 ></A
 ><H3
 ><A
@@ -808,7 +808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13666"
+NAME="AEN13928"
 ></A
 ><H3
 ><A
@@ -843,7 +843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13671"
+NAME="AEN13933"
 ></A
 ><H3
 ><A
@@ -869,7 +869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13676"
+NAME="AEN13938"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13694"
+NAME="AEN13956"
 ></A
 ><H3
 ><A
@@ -1000,7 +1000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13708"
+NAME="AEN13970"
 ></A
 ><H3
 ><A
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13734"
+NAME="AEN13996"
 ></A
 ><H3
 ><A
@@ -1167,7 +1167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13748"
+NAME="AEN14010"
 ></A
 ><H3
 ><A
@@ -1203,7 +1203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13753"
+NAME="AEN14015"
 ></A
 ><H3
 ><A
@@ -1229,7 +1229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13758"
+NAME="AEN14020"
 ></A
 ><H3
 ><A
@@ -1258,7 +1258,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13764"
+NAME="AEN14026"
 ></A
 ><H3
 ><A
@@ -1340,7 +1340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13785"
+NAME="AEN14047"
 ></A
 ><H3
 ><A
@@ -1444,7 +1444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13810"
+NAME="AEN14072"
 ></A
 ><H3
 ><A
@@ -1548,7 +1548,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13836"
+NAME="AEN14098"
 ></A
 ><H3
 ><A
@@ -1649,7 +1649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13861"
+NAME="AEN14123"
 ></A
 ><H3
 ><A
@@ -1768,7 +1768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13890"
+NAME="AEN14152"
 ></A
 ><H3
 ><A
@@ -1911,7 +1911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13925"
+NAME="AEN14187"
 ></A
 ><H3
 ><A
@@ -2010,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13949"
+NAME="AEN14211"
 ></A
 ><H3
 ><A
@@ -2112,7 +2112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13974"
+NAME="AEN14236"
 ></A
 ><H3
 ><A
@@ -2229,7 +2229,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14002"
+NAME="AEN14264"
 ></A
 ><H3
 ><A
@@ -2292,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14018"
+NAME="AEN14280"
 ></A
 ><H3
 ><A
@@ -2365,7 +2365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14036"
+NAME="AEN14298"
 ></A
 ><H3
 ><A
@@ -2506,7 +2506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14071"
+NAME="AEN14333"
 ></A
 ><H3
 ><A
@@ -2535,7 +2535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14077"
+NAME="AEN14339"
 ></A
 ><H3
 ><A
@@ -2616,7 +2616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14098"
+NAME="AEN14360"
 ></A
 ><H3
 ><A
@@ -2739,7 +2739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14127"
+NAME="AEN14389"
 ></A
 ><H3
 ><A
@@ -2843,7 +2843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14153"
+NAME="AEN14415"
 ></A
 ><H3
 ><A
@@ -2943,7 +2943,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14178"
+NAME="AEN14440"
 ></A
 ><H3
 ><A
@@ -3085,7 +3085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14213"
+NAME="AEN14475"
 ></A
 ><H3
 ><A
@@ -3203,7 +3203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14241"
+NAME="AEN14503"
 ></A
 ><H3
 ><A
@@ -3303,7 +3303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14265"
+NAME="AEN14527"
 ></A
 ><H3
 ><A
@@ -3381,7 +3381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14285"
+NAME="AEN14547"
 ></A
 ><H3
 ><A
@@ -3460,7 +3460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14305"
+NAME="AEN14567"
 ></A
 ><H3
 ><A
@@ -3601,7 +3601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14340"
+NAME="AEN14602"
 ></A
 ><H3
 ><A
@@ -3718,7 +3718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14369"
+NAME="AEN14631"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index 31d7453..1891f9f 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17941"
+NAME="AEN18203"
 ></A
 ><H2
 >Name</H2
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17944"
+NAME="AEN18206"
 ></A
 ><H2
 >Synopsis</H2
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17977"
+NAME="AEN18239"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17980"
+NAME="AEN18242"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17982"
+NAME="AEN18244"
 ></A
 ><H3
 ><A
@@ -301,7 +301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17987"
+NAME="AEN18249"
 ></A
 ><H3
 ><A
@@ -327,7 +327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17992"
+NAME="AEN18254"
 ></A
 ><H3
 ><A
@@ -385,7 +385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18006"
+NAME="AEN18268"
 ></A
 ><H3
 ><A
@@ -443,7 +443,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18020"
+NAME="AEN18282"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18038"
+NAME="AEN18300"
 ></A
 ><H3
 ><A
@@ -592,7 +592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18056"
+NAME="AEN18318"
 ></A
 ><H3
 ><A
@@ -618,7 +618,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18061"
+NAME="AEN18323"
 ></A
 ><H3
 ><A
@@ -644,7 +644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18066"
+NAME="AEN18328"
 ></A
 ><H3
 ><A
@@ -670,7 +670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18071"
+NAME="AEN18333"
 ></A
 ><H3
 ><A
@@ -696,7 +696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18076"
+NAME="AEN18338"
 ></A
 ><H3
 ><A
@@ -853,7 +853,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18116"
+NAME="AEN18378"
 ></A
 ><H3
 ><A
@@ -1006,7 +1006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18155"
+NAME="AEN18417"
 ></A
 ><H3
 ><A
@@ -1064,7 +1064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18170"
+NAME="AEN18432"
 ></A
 ><H3
 ><A
@@ -1122,7 +1122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18185"
+NAME="AEN18447"
 ></A
 ><H3
 ><A
@@ -1186,7 +1186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18201"
+NAME="AEN18463"
 ></A
 ><H3
 ><A
@@ -1273,7 +1273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18222"
+NAME="AEN18484"
 ></A
 ><H3
 ><A
@@ -1301,7 +1301,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18228"
+NAME="AEN18490"
 ></A
 ><H3
 ><A
@@ -1400,7 +1400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18252"
+NAME="AEN18514"
 ></A
 ><H3
 ><A
@@ -1517,7 +1517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18280"
+NAME="AEN18542"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index 58c75f9..59a2271 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10484"
+NAME="AEN10527"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10487"
+NAME="AEN10530"
 ></A
 ><H2
 >Synopsis</H2
@@ -359,7 +359,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10548"
+NAME="AEN10591"
 ></A
 ><H2
 >Description</H2
@@ -369,14 +369,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10551"
+NAME="AEN10594"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10553"
+NAME="AEN10596"
 ></A
 ><H3
 ><A
@@ -435,7 +435,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10558"
+NAME="AEN10601"
 ></A
 ><H3
 ><A
@@ -461,7 +461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10563"
+NAME="AEN10606"
 ></A
 ><H3
 ><A
@@ -498,7 +498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10568"
+NAME="AEN10611"
 ></A
 ><H3
 ><A
@@ -524,7 +524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10573"
+NAME="AEN10616"
 ></A
 ><H3
 ><A
@@ -577,7 +577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10580"
+NAME="AEN10623"
 ></A
 ><H3
 ><A
@@ -607,7 +607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10585"
+NAME="AEN10628"
 ></A
 ><H3
 ><A
@@ -633,7 +633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10590"
+NAME="AEN10633"
 ></A
 ><H3
 ><A
@@ -669,7 +669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10595"
+NAME="AEN10638"
 ></A
 ><H3
 ><A
@@ -705,7 +705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10600"
+NAME="AEN10643"
 ></A
 ><H3
 ><A
@@ -731,7 +731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10605"
+NAME="AEN10648"
 ></A
 ><H3
 ><A
@@ -825,7 +825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10628"
+NAME="AEN10671"
 ></A
 ><H3
 ><A
@@ -854,7 +854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10633"
+NAME="AEN10676"
 ></A
 ><H3
 ><A
@@ -880,7 +880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10638"
+NAME="AEN10681"
 ></A
 ><H3
 ><A
@@ -909,7 +909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10643"
+NAME="AEN10686"
 ></A
 ><H3
 ><A
@@ -935,7 +935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10648"
+NAME="AEN10691"
 ></A
 ><H3
 ><A
@@ -1014,7 +1014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10667"
+NAME="AEN10710"
 ></A
 ><H3
 ><A
@@ -1043,7 +1043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10672"
+NAME="AEN10715"
 ></A
 ><H3
 ><A
@@ -1069,7 +1069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10677"
+NAME="AEN10720"
 ></A
 ><H3
 ><A
@@ -1169,7 +1169,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10702"
+NAME="AEN10745"
 ></A
 ><H3
 ><A
@@ -1198,7 +1198,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10707"
+NAME="AEN10750"
 ></A
 ><H3
 ><A
@@ -1224,7 +1224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10712"
+NAME="AEN10755"
 ></A
 ><H3
 ><A
@@ -1303,7 +1303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10731"
+NAME="AEN10774"
 ></A
 ><H3
 ><A
@@ -1331,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10737"
+NAME="AEN10780"
 ></A
 ><H3
 ><A
@@ -1412,7 +1412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10758"
+NAME="AEN10801"
 ></A
 ><H3
 ><A
@@ -1475,7 +1475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10774"
+NAME="AEN10817"
 ></A
 ><H3
 ><A
@@ -1578,7 +1578,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10800"
+NAME="AEN10843"
 ></A
 ><H3
 ><A
@@ -1678,7 +1678,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10825"
+NAME="AEN10868"
 ></A
 ><H3
 ><A
@@ -1741,7 +1741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10841"
+NAME="AEN10884"
 ></A
 ><H3
 ><A
@@ -1844,7 +1844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10867"
+NAME="AEN10910"
 ></A
 ><H3
 ><A
@@ -1930,7 +1930,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10889"
+NAME="AEN10932"
 ></A
 ><H3
 ><A
@@ -2002,7 +2002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10907"
+NAME="AEN10950"
 ></A
 ><H3
 ><A
@@ -2065,7 +2065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10923"
+NAME="AEN10966"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xpointer.html b/doc/html/gnome-xml-xpointer.html
index f0075fb..b4d10d7 100644
--- a/doc/html/gnome-xml-xpointer.html
+++ b/doc/html/gnome-xml-xpointer.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12573"
+NAME="AEN12835"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12576"
+NAME="AEN12838"
 ></A
 ><H2
 >Synopsis</H2
@@ -214,7 +214,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12598"
+NAME="AEN12860"
 ></A
 ><H2
 >Description</H2
@@ -224,14 +224,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12601"
+NAME="AEN12863"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12603"
+NAME="AEN12865"
 ></A
 ><H3
 ><A
@@ -261,7 +261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12608"
+NAME="AEN12870"
 ></A
 ><H3
 ><A
@@ -287,7 +287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12613"
+NAME="AEN12875"
 ></A
 ><H3
 ><A
@@ -350,7 +350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12629"
+NAME="AEN12891"
 ></A
 ><H3
 ><A
@@ -462,7 +462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12657"
+NAME="AEN12919"
 ></A
 ><H3
 ><A
@@ -586,7 +586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12688"
+NAME="AEN12950"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12714"
+NAME="AEN12976"
 ></A
 ><H3
 ><A
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index e1681a8..b4fda3a 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -89,6 +89,7 @@
 <ANCHOR id ="XMLPARSEENTITY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEENTITY">
 <ANCHOR id ="XMLPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLPARSEDTD">
 <ANCHOR id ="XMLSAXPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLSAXPARSEDTD">
+<ANCHOR id ="XMLIOPARSEDTD" href="gnome-xml/gnome-xml-parser.html#XMLIOPARSEDTD">
 <ANCHOR id ="XMLPARSEBALANCEDCHUNKMEMORY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEBALANCEDCHUNKMEMORY">
 <ANCHOR id ="XMLPARSEEXTERNALENTITY" href="gnome-xml/gnome-xml-parser.html#XMLPARSEEXTERNALENTITY">
 <ANCHOR id ="XMLPARSECTXTEXTERNALENTITY" href="gnome-xml/gnome-xml-parser.html#XMLPARSECTXTEXTERNALENTITY">
@@ -172,6 +173,7 @@
 <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 ="XML-LOCAL-NAMESPACE" href="gnome-xml/gnome-xml-tree.html#XML-LOCAL-NAMESPACE">
 <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">
@@ -497,12 +499,21 @@
 <ANCHOR id ="XP-ERROR" href="gnome-xml/gnome-xml-xpathinternals.html#XP-ERROR">
 <ANCHOR id ="XP-ERROR0" href="gnome-xml/gnome-xml-xpathinternals.html#XP-ERROR0">
 <ANCHOR id ="CHECK-TYPE" href="gnome-xml/gnome-xml-xpathinternals.html#CHECK-TYPE">
+<ANCHOR id ="CHECK-ARITY" href="gnome-xml/gnome-xml-xpathinternals.html#CHECK-ARITY">
+<ANCHOR id ="CAST-TO-STRING" href="gnome-xml/gnome-xml-xpathinternals.html#CAST-TO-STRING">
+<ANCHOR id ="CAST-TO-NUMBER" href="gnome-xml/gnome-xml-xpathinternals.html#CAST-TO-NUMBER">
+<ANCHOR id ="CAST-TO-BOOLEAN" href="gnome-xml/gnome-xml-xpathinternals.html#CAST-TO-BOOLEAN">
+<ANCHOR id ="XMLXPATHERROR" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHERROR">
 <ANCHOR id ="XMLXPATHDEBUGDUMPOBJECT" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">
 <ANCHOR id ="XMLXPATHREGISTERFUNC" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTERFUNC">
+<ANCHOR id ="XMLXPATHREGISTERFUNCNS" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTERFUNCNS">
 <ANCHOR id ="XMLXPATHREGISTERVARIABLE" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTERVARIABLE">
+<ANCHOR id ="XMLXPATHREGISTERVARIABLENS" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTERVARIABLENS">
 <ANCHOR id ="XMLXPATHFUNCTIONLOOKUP" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHFUNCTIONLOOKUP">
+<ANCHOR id ="XMLXPATHFUNCTIONLOOKUPNS" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHFUNCTIONLOOKUPNS">
 <ANCHOR id ="XMLXPATHREGISTEREDFUNCSCLEANUP" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTEREDFUNCSCLEANUP">
 <ANCHOR id ="XMLXPATHVARIABLELOOKUP" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHVARIABLELOOKUP">
+<ANCHOR id ="XMLXPATHVARIABLELOOKUPNS" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHVARIABLELOOKUPNS">
 <ANCHOR id ="XMLXPATHREGISTEREDVARIABLESCLEANUP" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHREGISTEREDVARIABLESCLEANUP">
 <ANCHOR id ="XMLXPATHNEWPARSERCONTEXT" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHNEWPARSERCONTEXT">
 <ANCHOR id ="XMLXPATHFREEPARSERCONTEXT" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHFREEPARSERCONTEXT">
@@ -544,8 +555,8 @@
 <ANCHOR id ="XMLXPATHLASTFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHLASTFUNCTION">
 <ANCHOR id ="XMLXPATHPOSITIONFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHPOSITIONFUNCTION">
 <ANCHOR id ="XMLXPATHCOUNTFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHCOUNTFUNCTION">
-<ANCHOR id ="XMLXPATHLOCALPARTFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHLOCALPARTFUNCTION">
-<ANCHOR id ="XMLXPATHNAMESPACEFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHNAMESPACEFUNCTION">
+<ANCHOR id ="XMLXPATHLOCALNAMEFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHLOCALNAMEFUNCTION">
+<ANCHOR id ="XMLXPATHNAMESPACEURIFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHNAMESPACEURIFUNCTION">
 <ANCHOR id ="XMLXPATHSTRINGLENGTHFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHSTRINGLENGTHFUNCTION">
 <ANCHOR id ="XMLXPATHCONCATFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHCONCATFUNCTION">
 <ANCHOR id ="XMLXPATHCONTAINSFUNCTION" href="gnome-xml/gnome-xml-xpathinternals.html#XMLXPATHCONTAINSFUNCTION">
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index bcca976..8c4f708 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -40,11 +40,10 @@
     XML_DTD_NODE=		14,
     XML_ELEMENT_DECL=		15,
     XML_ATTRIBUTE_DECL=		16,
-#ifdef LIBXML_SGML_ENABLED
     XML_ENTITY_DECL=		17,
-    XML_SGML_DOCUMENT_NODE=	18
-#else
-    XML_ENTITY_DECL=		17
+    XML_NAMESPACE_DECL=		18
+#ifdef LIBXML_SGML_ENABLED
+   ,XML_SGML_DOCUMENT_NODE=	19
 #endif
 } xmlElementType;
 
@@ -192,12 +191,13 @@
  * An XML namespace.
  * Note that prefix == NULL is valid, it defines the default namespace
  * within the subtree (until overriden).
+ *
+ * XML_GLOBAL_NAMESPACE is now deprecated for good
+ * xmlNsType is unified with xmlElementType
  */
 
-typedef enum {
-    XML_GLOBAL_NAMESPACE = 1,	/* old style global namespace */
-    XML_LOCAL_NAMESPACE		/* new style local scoping */
-} xmlNsType;
+#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL
+typedef xmlElementType xmlNsType;
 
 typedef struct _xmlNs xmlNs;
 typedef xmlNs *xmlNsPtr;
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index 74484b4..01b1ea1 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -18,6 +18,7 @@
  * your library and includes mismatch
  */
 extern void xmlCheckVersion(int version);
+#define LIBXML_DOTTED_VERSION "@VERSION@"
 #define LIBXML_VERSION @LIBXML_VERSION_NUMBER@
 #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
 #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
diff --git a/libxml.m4 b/libxml.m4
index 1a03d57..1401af5 100644
--- a/libxml.m4
+++ b/libxml.m4
@@ -42,25 +42,30 @@
       AC_TRY_RUN([
 #include <stdlib.h>
 #include <stdio.h>
-#include <glib.h>
+#include <xmlversion.h>
 #include <parser.h>
 
 int
 main()
 {
+  int xml_major_version, xml_minor_version, xml_micro_version;
   int major, minor, micro;
   char *tmp_version;
 
   system("touch conf.xmltest");
 
-  tmp_version = g_strdup("$min_xml_version");
+  tmp_version = xmlStrdup("$min_xml_version");
   if(sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
     printf("%s, bad version string\n", "$min_xml_version");
     exit(1);
   }
 
-  return 0; /* FIXME */
-#if 0 /* FIXME */
+  tmp_version = xmlStrdup(LIBXML_DOTTED_VERSION);
+  if(sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) {
+    printf("%s, bad version string\n", "$min_xml_version");
+    exit(1);
+  }
+
   if((xml_major_version != $xml_config_major_version) ||
      (xml_minor_version != $xml_config_minor_version) ||
      (xml_micro_version != $xml_config_micro_version))
@@ -103,7 +108,6 @@
           printf("*** so that the correct libraries are found at run-time))\n");
         }
     }
-#endif
   return 1;
 }
 ],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
diff --git a/parser.c b/parser.c
index 425ef57..ea8170f 100644
--- a/parser.c
+++ b/parser.c
@@ -8369,6 +8369,7 @@
  * Load and parse a DTD
  * 
  * Returns the resulting xmlDtdPtr or NULL in case of error.
+ * @input will be freed at parsing end.
  */
 
 xmlDtdPtr
diff --git a/parserInternals.c b/parserInternals.c
index b7b54bb..6ab5c5b 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -3403,3 +3403,107 @@
 #endif
 }
 
+/**
+ * xmlNewGlobalNs:
+ * @doc:  the document carrying the namespace
+ * @href:  the URI associated
+ * @prefix:  the prefix for the namespace
+ *
+ * Creation of a Namespace, the old way using PI and without scoping
+ *   DEPRECATED !!!
+ * It now create a namespace on the root element of the document if found.
+ * Returns NULL this functionnality had been removed
+ */
+xmlNsPtr
+xmlNewGlobalNs(xmlDocPtr doc, const xmlChar *href, const xmlChar *prefix) {
+    static int deprecated = 0;
+    if (!deprecated) {
+	xmlGenericError(xmlGenericErrorContext,
+		"xmlNewGlobalNs() deprecated function reached\n");
+	deprecated = 1;
+    }
+    return(NULL);
+#if 0
+    xmlNodePtr root;
+
+    xmlNsPtr cur;
+ 
+    root = xmlDocGetRootElement(doc);
+    if (root != NULL)
+	return(xmlNewNs(root, href, prefix));
+	
+    /*
+     * if there is no root element yet, create an old Namespace type
+     * and it will be moved to the root at save time.
+     */
+    cur = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
+    if (cur == NULL) {
+        xmlGenericError(xmlGenericErrorContext,
+		"xmlNewGlobalNs : malloc failed\n");
+	return(NULL);
+    }
+    memset(cur, 0, sizeof(xmlNs));
+    cur->type = XML_GLOBAL_NAMESPACE;
+
+    if (href != NULL)
+	cur->href = xmlStrdup(href); 
+    if (prefix != NULL)
+	cur->prefix = xmlStrdup(prefix); 
+
+    /*
+     * Add it at the end to preserve parsing order ...
+     */
+    if (doc != NULL) {
+	if (doc->oldNs == NULL) {
+	    doc->oldNs = cur;
+	} else {
+	    xmlNsPtr prev = doc->oldNs;
+
+	    while (prev->next != NULL) prev = prev->next;
+	    prev->next = cur;
+	}
+    }
+
+  return(NULL);
+#endif
+}
+
+/**
+ * xmlUpgradeOldNs:
+ * @doc:  a document pointer
+ * 
+ * Upgrade old style Namespaces (PI) and move them to the root of the document.
+ * DEPRECATED
+ */
+void
+xmlUpgradeOldNs(xmlDocPtr doc) {
+    static int deprecated = 0;
+    if (!deprecated) {
+	xmlGenericError(xmlGenericErrorContext,
+		"xmlNewGlobalNs() deprecated function reached\n");
+	deprecated = 1;
+    }
+#if 0
+    xmlNsPtr cur;
+
+    if ((doc == NULL) || (doc->oldNs == NULL)) return;
+    if (doc->children == NULL) {
+#ifdef DEBUG_TREE
+        xmlGenericError(xmlGenericErrorContext,
+		"xmlUpgradeOldNs: failed no root !\n");
+#endif
+	return;
+    }
+
+    cur = doc->oldNs;
+    while (cur->next != NULL) {
+	cur->type = XML_LOCAL_NAMESPACE;
+        cur = cur->next;
+    }
+    cur->type = XML_LOCAL_NAMESPACE;
+    cur->next = doc->children->nsDef;
+    doc->children->nsDef = doc->oldNs;
+    doc->oldNs = NULL;
+#endif
+}
+
diff --git a/tree.c b/tree.c
index 0ef82a4..ff7d768 100644
--- a/tree.c
+++ b/tree.c
@@ -93,36 +93,6 @@
 }
 
 /**
- * xmlUpgradeOldNs:
- * @doc:  a document pointer
- * 
- * Upgrade old style Namespaces (PI) and move them to the root of the document.
- */
-void
-xmlUpgradeOldNs(xmlDocPtr doc) {
-    xmlNsPtr cur;
-
-    if ((doc == NULL) || (doc->oldNs == NULL)) return;
-    if (doc->children == NULL) {
-#ifdef DEBUG_TREE
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlUpgradeOldNs: failed no root !\n");
-#endif
-	return;
-    }
-
-    cur = doc->oldNs;
-    while (cur->next != NULL) {
-	cur->type = XML_LOCAL_NAMESPACE;
-        cur = cur->next;
-    }
-    cur->type = XML_LOCAL_NAMESPACE;
-    cur->next = doc->children->nsDef;
-    doc->children->nsDef = doc->oldNs;
-    doc->oldNs = NULL;
-}
-
-/**
  * xmlNewNs:
  * @node:  the element carrying the namespace
  * @href:  the URI associated
@@ -186,62 +156,6 @@
 }
 
 /**
- * xmlNewGlobalNs:
- * @doc:  the document carrying the namespace
- * @href:  the URI associated
- * @prefix:  the prefix for the namespace
- *
- * Creation of a Namespace, the old way using PI and without scoping
- *   DEPRECATED !!!
- * It now create a namespace on the root element of the document if found.
- * Returns NULL this functionnality had been removed
- */
-xmlNsPtr
-xmlNewGlobalNs(xmlDocPtr doc, const xmlChar *href, const xmlChar *prefix) {
-    xmlNodePtr root;
-
-    xmlNsPtr cur;
- 
-    root = xmlDocGetRootElement(doc);
-    if (root != NULL)
-	return(xmlNewNs(root, href, prefix));
-	
-    /*
-     * if there is no root element yet, create an old Namespace type
-     * and it will be moved to the root at save time.
-     */
-    cur = (xmlNsPtr) xmlMalloc(sizeof(xmlNs));
-    if (cur == NULL) {
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlNewGlobalNs : malloc failed\n");
-	return(NULL);
-    }
-    memset(cur, 0, sizeof(xmlNs));
-    cur->type = XML_GLOBAL_NAMESPACE;
-
-    if (href != NULL)
-	cur->href = xmlStrdup(href); 
-    if (prefix != NULL)
-	cur->prefix = xmlStrdup(prefix); 
-
-    /*
-     * Add it at the end to preserve parsing order ...
-     */
-    if (doc != NULL) {
-	if (doc->oldNs == NULL) {
-	    doc->oldNs = cur;
-	} else {
-	    xmlNsPtr prev = doc->oldNs;
-
-	    while (prev->next != NULL) prev = prev->next;
-	    prev->next = cur;
-	}
-    }
-
-  return(NULL);
-}
-
-/**
  * xmlSetNs:
  * @node:  a node in the document
  * @ns:  a namespace pointer
@@ -2390,16 +2304,13 @@
 
     if (cur == NULL) return(NULL);
     switch (cur->type) {
-        case XML_GLOBAL_NAMESPACE:
-	    ret = xmlNewGlobalNs(NULL, cur->href, cur->prefix);
-	    break;
 	case XML_LOCAL_NAMESPACE:
 	    ret = xmlNewNs(NULL, cur->href, cur->prefix);
 	    break;
 	default:
 #ifdef DEBUG_TREE
 	    xmlGenericError(xmlGenericErrorContext,
-		    "xmlCopyNamespace: unknown type %d\n", cur->type);
+		    "xmlCopyNamespace: invalid type %d\n", cur->type);
 #endif
 	    return(NULL);
     }
@@ -2817,6 +2728,7 @@
         case XML_PI_NODE:
         case XML_ENTITY_REF_NODE:
         case XML_ENTITY_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -2879,6 +2791,7 @@
         case XML_PI_NODE:
         case XML_ENTITY_REF_NODE:
         case XML_ENTITY_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -2949,6 +2862,7 @@
         case XML_DOCUMENT_FRAG_NODE:
         case XML_NOTATION_NODE:
         case XML_HTML_DOCUMENT_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -2996,6 +2910,7 @@
         case XML_PI_NODE:
         case XML_ENTITY_REF_NODE:
         case XML_ENTITY_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -3115,6 +3030,9 @@
 	case XML_SGML_DOCUMENT_NODE:
 #endif
 	    return(NULL);
+	case XML_NAMESPACE_DECL:
+	    /* TODO !!! */
+	    return(NULL);
         case XML_ELEMENT_DECL:
 	    /* TODO !!! */
 	    return(NULL);
@@ -3208,6 +3126,8 @@
 	    break;
         case XML_DTD_NODE:
 	    break;
+	case XML_NAMESPACE_DECL:
+	    break;
         case XML_ELEMENT_DECL:
 	    /* TODO !!! */
 	    break;
@@ -3286,6 +3206,7 @@
         case XML_DTD_NODE:
         case XML_HTML_DOCUMENT_NODE:
         case XML_DOCUMENT_TYPE_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -3374,6 +3295,7 @@
         case XML_DTD_NODE:
         case XML_HTML_DOCUMENT_NODE:
         case XML_DOCUMENT_TYPE_NODE:
+	case XML_NAMESPACE_DECL:
 #ifdef LIBXML_SGML_ENABLED
 	case XML_SGML_DOCUMENT_NODE:
 #endif
@@ -4618,51 +4540,6 @@
 htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur);
 
 /**
- * xmlGlobalNsDump:
- * @buf:  the XML buffer output
- * @cur:  a namespace
- *
- * Dump a global Namespace, this is the old version based on PIs.
- */
-static void
-xmlGlobalNsDump(xmlBufferPtr buf, xmlNsPtr cur) {
-    if (cur == NULL) {
-#ifdef DEBUG_TREE
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlGlobalNsDump : Ns == NULL\n");
-#endif
-	return;
-    }
-    if (cur->type == XML_GLOBAL_NAMESPACE) {
-	xmlBufferWriteChar(buf, "<?namespace");
-	if (cur->href != NULL) {
-	    xmlBufferWriteChar(buf, " href=");
-	    xmlBufferWriteQuotedString(buf, cur->href);
-	}
-	if (cur->prefix != NULL) {
-	    xmlBufferWriteChar(buf, " AS=");
-	    xmlBufferWriteQuotedString(buf, cur->prefix);
-	}
-	xmlBufferWriteChar(buf, "?>\n");
-    }
-}
-
-/**
- * xmlGlobalNsListDump:
- * @buf:  the XML buffer output
- * @cur:  the first namespace
- *
- * Dump a list of global Namespace, this is the old version based on PIs.
- */
-static void
-xmlGlobalNsListDump(xmlBufferPtr buf, xmlNsPtr cur) {
-    while (cur != NULL) {
-        xmlGlobalNsDump(buf, cur);
-	cur = cur->next;
-    }
-}
-
-/**
  * xmlNsDump:
  * @buf:  the XML buffer output
  * @cur:  a namespace
@@ -5087,12 +4964,6 @@
     if (cur->children != NULL) {
         xmlNodePtr child = cur->children;
 
-	/* global namespace definitions, the old way */
-	if (oldXMLWDcompatibility)
-	    xmlGlobalNsListDump(buf, cur->oldNs);
-	else 
-	    xmlUpgradeOldNs(cur);
-	
 	while (child != NULL) {
 	    xmlNodeDump(buf, cur, child, 0, 1);
 	    xmlBufferWriteChar(buf, "\n");
@@ -5114,51 +4985,6 @@
 xmlNodeListDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur,
                   int level, int format, const char *encoding);
 /**
- * xmlGlobalNsDumpOutput:
- * @buf:  the XML buffer output
- * @cur:  a namespace
- *
- * Dump a global Namespace, this is the old version based on PIs.
- */
-static void
-xmlGlobalNsDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur) {
-    if (cur == NULL) {
-#ifdef DEBUG_TREE
-        xmlGenericError(xmlGenericErrorContext,
-		"xmlGlobalNsDump : Ns == NULL\n");
-#endif
-	return;
-    }
-    if (cur->type == XML_GLOBAL_NAMESPACE) {
-	xmlOutputBufferWriteString(buf, "<?namespace");
-	if (cur->href != NULL) {
-	    xmlOutputBufferWriteString(buf, " href=");
-	    xmlBufferWriteQuotedString(buf->buffer, cur->href);
-	}
-	if (cur->prefix != NULL) {
-	    xmlOutputBufferWriteString(buf, " AS=");
-	    xmlBufferWriteQuotedString(buf->buffer, cur->prefix);
-	}
-	xmlOutputBufferWriteString(buf, "?>\n");
-    }
-}
-
-/**
- * xmlGlobalNsListDumpOutput:
- * @buf:  the XML buffer output
- * @cur:  the first namespace
- *
- * Dump a list of global Namespace, this is the old version based on PIs.
- */
-static void
-xmlGlobalNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur) {
-    while (cur != NULL) {
-        xmlGlobalNsDumpOutput(buf, cur);
-	cur = cur->next;
-    }
-}
-
-/**
  * xmlNsDumpOutput:
  * @buf:  the XML buffer output
  * @cur:  a namespace
@@ -5571,12 +5397,6 @@
     if (cur->children != NULL) {
         xmlNodePtr child = cur->children;
 
-	/* global namespace definitions, the old way */
-	if (oldXMLWDcompatibility)
-	    xmlGlobalNsListDumpOutput(buf, cur->oldNs);
-	else 
-	    xmlUpgradeOldNs(cur);
-	
 	while (child != NULL) {
 	    xmlNodeDumpOutput(buf, cur, child, 0, 1, encoding);
 	    xmlOutputBufferWriteString(buf, "\n");
diff --git a/tree.h b/tree.h
index bcca976..8c4f708 100644
--- a/tree.h
+++ b/tree.h
@@ -40,11 +40,10 @@
     XML_DTD_NODE=		14,
     XML_ELEMENT_DECL=		15,
     XML_ATTRIBUTE_DECL=		16,
-#ifdef LIBXML_SGML_ENABLED
     XML_ENTITY_DECL=		17,
-    XML_SGML_DOCUMENT_NODE=	18
-#else
-    XML_ENTITY_DECL=		17
+    XML_NAMESPACE_DECL=		18
+#ifdef LIBXML_SGML_ENABLED
+   ,XML_SGML_DOCUMENT_NODE=	19
 #endif
 } xmlElementType;
 
@@ -192,12 +191,13 @@
  * An XML namespace.
  * Note that prefix == NULL is valid, it defines the default namespace
  * within the subtree (until overriden).
+ *
+ * XML_GLOBAL_NAMESPACE is now deprecated for good
+ * xmlNsType is unified with xmlElementType
  */
 
-typedef enum {
-    XML_GLOBAL_NAMESPACE = 1,	/* old style global namespace */
-    XML_LOCAL_NAMESPACE		/* new style local scoping */
-} xmlNsType;
+#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL
+typedef xmlElementType xmlNsType;
 
 typedef struct _xmlNs xmlNs;
 typedef xmlNs *xmlNsPtr;
diff --git a/xmlversion.h.in b/xmlversion.h.in
index 74484b4..01b1ea1 100644
--- a/xmlversion.h.in
+++ b/xmlversion.h.in
@@ -18,6 +18,7 @@
  * your library and includes mismatch
  */
 extern void xmlCheckVersion(int version);
+#define LIBXML_DOTTED_VERSION "@VERSION@"
 #define LIBXML_VERSION @LIBXML_VERSION_NUMBER@
 #define LIBXML_VERSION_STRING "@LIBXML_VERSION_NUMBER@"
 #define LIBXML_TEST_VERSION xmlCheckVersion(@LIBXML_VERSION_NUMBER@);
diff --git a/xpath.c b/xpath.c
index 0e79c94..dbffba6 100644
--- a/xpath.c
+++ b/xpath.c
@@ -1975,6 +1975,7 @@
 	    case XML_ATTRIBUTE_DECL:
 	    case XML_ENTITY_DECL:
             case XML_ATTRIBUTE_NODE:
+	    case XML_NAMESPACE_DECL:
 		return(NULL);
 	}
 	return(NULL);
@@ -2102,6 +2103,13 @@
 	    case XML_SGML_DOCUMENT_NODE:
 #endif
                 return(NULL);
+	    case XML_NAMESPACE_DECL:
+		/*
+		 * TODO !!! may require extending struct _xmlNs with
+		 * parent field
+		 * C.f. Infoset case...
+		 */
+                return(NULL);
 	}
     }
     return(NULL);
@@ -2159,6 +2167,13 @@
 	    case XML_SGML_DOCUMENT_NODE:
 #endif
                 return(NULL);
+	    case XML_NAMESPACE_DECL:
+		/*
+		 * TODO !!! may require extending struct _xmlNs with
+		 * parent field
+		 * C.f. Infoset case...
+		 */
+                return(NULL);
 	}
 	return(NULL);
     }
@@ -2193,6 +2208,13 @@
 	case XML_SGML_DOCUMENT_NODE:
 #endif
 	    return(NULL);
+	case XML_NAMESPACE_DECL:
+	    /*
+	     * TODO !!! may require extending struct _xmlNs with
+	     * parent field
+	     * C.f. Infoset case...
+	     */
+	    return(NULL);
     }
     return(NULL);
 }