- xmlmemory.[ch] commiting the files finally
- rebuilt/uploaded docs,
Daniel
diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml
index 1a08f31..29e3098 100644
--- a/doc/gnome-xml.sgml
+++ b/doc/gnome-xml.sgml
@@ -9,6 +9,7 @@
 <!entity HTMLtree SYSTEM "sgml/HTMLtree.sgml">
 <!entity debugXML SYSTEM "sgml/debugXML.sgml">
 <!entity tree SYSTEM "sgml/tree.sgml">
+<!entity uri SYSTEM "sgml/uri.sgml">
 <!entity xpath SYSTEM "sgml/xpath.sgml">
 <!entity xmlIO SYSTEM "sgml/xmlIO.sgml">
 <!entity xmlmemory SYSTEM "sgml/xmlmemory.sgml">
@@ -78,6 +79,7 @@
     &tree;
     &entities;
     &valid;
+    &uri;
     &error;
     &HTMLparser;
     &HTMLtree;
diff --git a/doc/html/book1.html b/doc/html/book1.html
index c5097bf..e066da6 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -138,6 +138,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="gnome-xml-uri.html"
+>uri</A
+> &#8212; </DT
+><DT
+><A
 HREF="gnome-xml-xml-error.html"
 >xml-error</A
 > &#8212; </DT
diff --git a/doc/html/gnome-xml-debugxml.html b/doc/html/gnome-xml-debugxml.html
index addee22..d488c34 100644
--- a/doc/html/gnome-xml-debugxml.html
+++ b/doc/html/gnome-xml-debugxml.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13002"
+NAME="AEN13082"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13005"
+NAME="AEN13085"
 ></A
 ><H2
 >Synopsis</H2
@@ -304,7 +304,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13049"
+NAME="AEN13129"
 ></A
 ><H2
 >Description</H2
@@ -314,14 +314,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13052"
+NAME="AEN13132"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13054"
+NAME="AEN13134"
 ></A
 ><H3
 ><A
@@ -403,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13074"
+NAME="AEN13154"
 ></A
 ><H3
 ><A
@@ -503,7 +503,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13098"
+NAME="AEN13178"
 ></A
 ><H3
 ><A
@@ -603,7 +603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13122"
+NAME="AEN13202"
 ></A
 ><H3
 ><A
@@ -703,7 +703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13146"
+NAME="AEN13226"
 ></A
 ><H3
 ><A
@@ -803,7 +803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13170"
+NAME="AEN13250"
 ></A
 ><H3
 ><A
@@ -903,7 +903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13194"
+NAME="AEN13274"
 ></A
 ><H3
 ><A
@@ -985,7 +985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13214"
+NAME="AEN13294"
 ></A
 ><H3
 ><A
@@ -1067,7 +1067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13234"
+NAME="AEN13314"
 ></A
 ><H3
 ><A
@@ -1149,7 +1149,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13254"
+NAME="AEN13334"
 ></A
 ><H3
 ><A
@@ -1231,7 +1231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13274"
+NAME="AEN13354"
 ></A
 ><H3
 ><A
@@ -1304,7 +1304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13292"
+NAME="AEN13372"
 ></A
 ><H3
 ><A
@@ -1338,7 +1338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13297"
+NAME="AEN13377"
 ></A
 ><H3
 ><A
@@ -1364,7 +1364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13302"
+NAME="AEN13382"
 ></A
 ><H3
 ><A
@@ -1500,7 +1500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13335"
+NAME="AEN13415"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-encoding.html b/doc/html/gnome-xml-encoding.html
index 2591484..86b4142 100644
--- a/doc/html/gnome-xml-encoding.html
+++ b/doc/html/gnome-xml-encoding.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12758"
+NAME="AEN12838"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12761"
+NAME="AEN12841"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12783"
+NAME="AEN12863"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +234,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12786"
+NAME="AEN12866"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12788"
+NAME="AEN12868"
 ></A
 ><H3
 ><A
@@ -291,7 +291,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12793"
+NAME="AEN12873"
 ></A
 ><H3
 ><A
@@ -418,7 +418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12823"
+NAME="AEN12903"
 ></A
 ><H3
 ><A
@@ -545,7 +545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12853"
+NAME="AEN12933"
 ></A
 ><H3
 ><A
@@ -575,7 +575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12858"
+NAME="AEN12938"
 ></A
 ><H3
 ><A
@@ -601,7 +601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12863"
+NAME="AEN12943"
 ></A
 ><H3
 ><A
@@ -632,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12869"
+NAME="AEN12949"
 ></A
 ><H3
 ><A
@@ -661,7 +661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12875"
+NAME="AEN12955"
 ></A
 ><H3
 ><A
@@ -724,7 +724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12891"
+NAME="AEN12971"
 ></A
 ><H3
 ><A
@@ -822,7 +822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12915"
+NAME="AEN12995"
 ></A
 ><H3
 ><A
@@ -903,7 +903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12935"
+NAME="AEN13015"
 ></A
 ><H3
 ><A
@@ -985,7 +985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12956"
+NAME="AEN13036"
 ></A
 ><H3
 ><A
@@ -1062,7 +1062,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12975"
+NAME="AEN13055"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmlparser.html b/doc/html/gnome-xml-htmlparser.html
index 8e63df4..25c781b 100644
--- a/doc/html/gnome-xml-htmlparser.html
+++ b/doc/html/gnome-xml-htmlparser.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8547"
+NAME="AEN8627"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8550"
+NAME="AEN8630"
 ></A
 ><H2
 >Synopsis</H2
@@ -354,7 +354,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8607"
+NAME="AEN8687"
 ></A
 ><H2
 >Description</H2
@@ -364,14 +364,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8610"
+NAME="AEN8690"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8612"
+NAME="AEN8692"
 ></A
 ><H3
 ><A
@@ -397,7 +397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8617"
+NAME="AEN8697"
 ></A
 ><H3
 ><A
@@ -423,7 +423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8622"
+NAME="AEN8702"
 ></A
 ><H3
 ><A
@@ -449,7 +449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8627"
+NAME="AEN8707"
 ></A
 ><H3
 ><A
@@ -475,7 +475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8632"
+NAME="AEN8712"
 ></A
 ><H3
 ><A
@@ -501,7 +501,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8637"
+NAME="AEN8717"
 ></A
 ><H3
 ><A
@@ -527,7 +527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8642"
+NAME="AEN8722"
 ></A
 ><H3
 ><A
@@ -553,7 +553,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8647"
+NAME="AEN8727"
 ></A
 ><H3
 ><A
@@ -579,7 +579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8652"
+NAME="AEN8732"
 ></A
 ><H3
 ><A
@@ -605,7 +605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8657"
+NAME="AEN8737"
 ></A
 ><H3
 ><A
@@ -639,7 +639,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8662"
+NAME="AEN8742"
 ></A
 ><H3
 ><A
@@ -665,7 +665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8667"
+NAME="AEN8747"
 ></A
 ><H3
 ><A
@@ -695,7 +695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8672"
+NAME="AEN8752"
 ></A
 ><H3
 ><A
@@ -721,7 +721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8677"
+NAME="AEN8757"
 ></A
 ><H3
 ><A
@@ -802,7 +802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8698"
+NAME="AEN8778"
 ></A
 ><H3
 ><A
@@ -885,7 +885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8720"
+NAME="AEN8800"
 ></A
 ><H3
 ><A
@@ -986,7 +986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8745"
+NAME="AEN8825"
 ></A
 ><H3
 ><A
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8775"
+NAME="AEN8855"
 ></A
 ><H3
 ><A
@@ -1214,7 +1214,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8802"
+NAME="AEN8882"
 ></A
 ><H3
 ><A
@@ -1298,7 +1298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8824"
+NAME="AEN8904"
 ></A
 ><H3
 ><A
@@ -1365,7 +1365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8842"
+NAME="AEN8922"
 ></A
 ><H3
 ><A
@@ -1505,7 +1505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8876"
+NAME="AEN8956"
 ></A
 ><H3
 ><A
@@ -1604,7 +1604,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8901"
+NAME="AEN8981"
 ></A
 ><H3
 ><A
@@ -1742,7 +1742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8934"
+NAME="AEN9014"
 ></A
 ><H3
 ><A
@@ -1839,7 +1839,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8958"
+NAME="AEN9038"
 ></A
 ><H3
 ><A
@@ -1903,7 +1903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8974"
+NAME="AEN9054"
 ></A
 ><H3
 ><A
@@ -2090,7 +2090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9018"
+NAME="AEN9098"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-htmltree.html b/doc/html/gnome-xml-htmltree.html
index f4fcbc5..765d4c9 100644
--- a/doc/html/gnome-xml-htmltree.html
+++ b/doc/html/gnome-xml-htmltree.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9055"
+NAME="AEN9135"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9058"
+NAME="AEN9138"
 ></A
 ><H2
 >Synopsis</H2
@@ -218,7 +218,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9080"
+NAME="AEN9160"
 ></A
 ><H2
 >Description</H2
@@ -228,14 +228,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9083"
+NAME="AEN9163"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9085"
+NAME="AEN9165"
 ></A
 ><H3
 ><A
@@ -261,7 +261,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9090"
+NAME="AEN9170"
 ></A
 ><H3
 ><A
@@ -287,7 +287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9095"
+NAME="AEN9175"
 ></A
 ><H3
 ><A
@@ -313,7 +313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9100"
+NAME="AEN9180"
 ></A
 ><H3
 ><A
@@ -416,7 +416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9125"
+NAME="AEN9205"
 ></A
 ><H3
 ><A
@@ -500,7 +500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9146"
+NAME="AEN9226"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9170"
+NAME="AEN9250"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9196"
+NAME="AEN9276"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-nanoftp.html b/doc/html/gnome-xml-nanoftp.html
index 22822bd..bf45c08 100644
--- a/doc/html/gnome-xml-nanoftp.html
+++ b/doc/html/gnome-xml-nanoftp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9870"
+NAME="AEN9950"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9873"
+NAME="AEN9953"
 ></A
 ><H2
 >Synopsis</H2
@@ -275,7 +275,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9902"
+NAME="AEN9982"
 ></A
 ><H2
 >Description</H2
@@ -285,14 +285,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9905"
+NAME="AEN9985"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9907"
+NAME="AEN9987"
 ></A
 ><H3
 ><A
@@ -551,7 +551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9966"
+NAME="AEN10046"
 ></A
 ><H3
 ><A
@@ -645,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9988"
+NAME="AEN10068"
 ></A
 ><H3
 ><A
@@ -675,7 +675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9994"
+NAME="AEN10074"
 ></A
 ><H3
 ><A
@@ -701,7 +701,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9999"
+NAME="AEN10079"
 ></A
 ><H3
 ><A
@@ -761,7 +761,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10014"
+NAME="AEN10094"
 ></A
 ><H3
 ><A
@@ -821,7 +821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10029"
+NAME="AEN10109"
 ></A
 ><H3
 ><A
@@ -899,7 +899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10048"
+NAME="AEN10128"
 ></A
 ><H3
 ><A
@@ -959,7 +959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10063"
+NAME="AEN10143"
 ></A
 ><H3
 ><A
@@ -1034,7 +1034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10082"
+NAME="AEN10162"
 ></A
 ><H3
 ><A
@@ -1109,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10101"
+NAME="AEN10181"
 ></A
 ><H3
 ><A
@@ -1184,7 +1184,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10120"
+NAME="AEN10200"
 ></A
 ><H3
 ><A
@@ -1247,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10135"
+NAME="AEN10215"
 ></A
 ><H3
 ><A
@@ -1386,7 +1386,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10167"
+NAME="AEN10247"
 ></A
 ><H3
 ><A
@@ -1483,7 +1483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10190"
+NAME="AEN10270"
 ></A
 ><H3
 ><A
@@ -1558,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10209"
+NAME="AEN10289"
 ></A
 ><H3
 ><A
@@ -1633,7 +1633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10228"
+NAME="AEN10308"
 ></A
 ><H3
 ><A
@@ -1724,7 +1724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10250"
+NAME="AEN10330"
 ></A
 ><H3
 ><A
@@ -1800,7 +1800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10269"
+NAME="AEN10349"
 ></A
 ><H3
 ><A
@@ -1875,7 +1875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10288"
+NAME="AEN10368"
 ></A
 ><H3
 ><A
@@ -2008,7 +2008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10320"
+NAME="AEN10400"
 ></A
 ><H3
 ><A
@@ -2101,7 +2101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10343"
+NAME="AEN10423"
 ></A
 ><H3
 ><A
@@ -2234,7 +2234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10375"
+NAME="AEN10455"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-nanohttp.html b/doc/html/gnome-xml-nanohttp.html
index 7cb66a0..1a28f68 100644
--- a/doc/html/gnome-xml-nanohttp.html
+++ b/doc/html/gnome-xml-nanohttp.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9654"
+NAME="AEN9734"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9657"
+NAME="AEN9737"
 ></A
 ><H2
 >Synopsis</H2
@@ -195,7 +195,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9670"
+NAME="AEN9750"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +205,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9673"
+NAME="AEN9753"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9675"
+NAME="AEN9755"
 ></A
 ><H3
 ><A
@@ -241,7 +241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9681"
+NAME="AEN9761"
 ></A
 ><H3
 ><A
@@ -267,7 +267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9686"
+NAME="AEN9766"
 ></A
 ><H3
 ><A
@@ -330,7 +330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9701"
+NAME="AEN9781"
 ></A
 ><H3
 ><A
@@ -444,7 +444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9728"
+NAME="AEN9808"
 ></A
 ><H3
 ><A
@@ -583,7 +583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9760"
+NAME="AEN9840"
 ></A
 ><H3
 ><A
@@ -663,7 +663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9779"
+NAME="AEN9859"
 ></A
 ><H3
 ><A
@@ -738,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9798"
+NAME="AEN9878"
 ></A
 ><H3
 ><A
@@ -861,7 +861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9827"
+NAME="AEN9907"
 ></A
 ><H3
 ><A
@@ -955,7 +955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9850"
+NAME="AEN9930"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-parserinternals.html b/doc/html/gnome-xml-parserinternals.html
index 19bc64c..0b1b003 100644
--- a/doc/html/gnome-xml-parserinternals.html
+++ b/doc/html/gnome-xml-parserinternals.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10666"
+NAME="AEN10746"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10669"
+NAME="AEN10749"
 ></A
 ><H2
 >Synopsis</H2
@@ -926,7 +926,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10891"
+NAME="AEN10971"
 ></A
 ><H2
 >Description</H2
@@ -936,14 +936,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10894"
+NAME="AEN10974"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10896"
+NAME="AEN10976"
 ></A
 ><H3
 ><A
@@ -969,7 +969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10901"
+NAME="AEN10981"
 ></A
 ><H3
 ><A
@@ -1027,7 +1027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10915"
+NAME="AEN10995"
 ></A
 ><H3
 ><A
@@ -1085,7 +1085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10929"
+NAME="AEN11009"
 ></A
 ><H3
 ><A
@@ -1143,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10943"
+NAME="AEN11023"
 ></A
 ><H3
 ><A
@@ -1201,7 +1201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10957"
+NAME="AEN11037"
 ></A
 ><H3
 ><A
@@ -1259,7 +1259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10971"
+NAME="AEN11051"
 ></A
 ><H3
 ><A
@@ -1317,7 +1317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10985"
+NAME="AEN11065"
 ></A
 ><H3
 ><A
@@ -1375,7 +1375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10999"
+NAME="AEN11079"
 ></A
 ><H3
 ><A
@@ -1433,7 +1433,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11013"
+NAME="AEN11093"
 ></A
 ><H3
 ><A
@@ -1491,7 +1491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11027"
+NAME="AEN11107"
 ></A
 ><H3
 ><A
@@ -1549,7 +1549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11041"
+NAME="AEN11121"
 ></A
 ><H3
 ><A
@@ -1607,7 +1607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11055"
+NAME="AEN11135"
 ></A
 ><H3
 ><A
@@ -1665,7 +1665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11069"
+NAME="AEN11149"
 ></A
 ><H3
 ><A
@@ -1746,7 +1746,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11090"
+NAME="AEN11170"
 ></A
 ><H3
 ><A
@@ -1826,7 +1826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11110"
+NAME="AEN11190"
 ></A
 ><H3
 ><A
@@ -1922,7 +1922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11134"
+NAME="AEN11214"
 ></A
 ><H3
 ><A
@@ -1983,7 +1983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11150"
+NAME="AEN11230"
 ></A
 ><H3
 ><A
@@ -2108,7 +2108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11181"
+NAME="AEN11261"
 ></A
 ><H3
 ><A
@@ -2193,7 +2193,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11202"
+NAME="AEN11282"
 ></A
 ><H3
 ><A
@@ -2257,7 +2257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11218"
+NAME="AEN11298"
 ></A
 ><H3
 ><A
@@ -2344,7 +2344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11240"
+NAME="AEN11320"
 ></A
 ><H3
 ><A
@@ -2446,7 +2446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11266"
+NAME="AEN11346"
 ></A
 ><H3
 ><A
@@ -2531,7 +2531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11287"
+NAME="AEN11367"
 ></A
 ><H3
 ><A
@@ -2613,7 +2613,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11308"
+NAME="AEN11388"
 ></A
 ><H3
 ><A
@@ -2676,7 +2676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11324"
+NAME="AEN11404"
 ></A
 ><H3
 ><A
@@ -2775,7 +2775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11349"
+NAME="AEN11429"
 ></A
 ><H3
 ><A
@@ -2905,7 +2905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11383"
+NAME="AEN11463"
 ></A
 ><H3
 ><A
@@ -2991,7 +2991,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11406"
+NAME="AEN11486"
 ></A
 ><H3
 ><A
@@ -3100,7 +3100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11435"
+NAME="AEN11515"
 ></A
 ><H3
 ><A
@@ -3185,7 +3185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11458"
+NAME="AEN11538"
 ></A
 ><H3
 ><A
@@ -3267,7 +3267,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11479"
+NAME="AEN11559"
 ></A
 ><H3
 ><A
@@ -3336,7 +3336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11497"
+NAME="AEN11577"
 ></A
 ><H3
 ><A
@@ -3425,7 +3425,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11521"
+NAME="AEN11601"
 ></A
 ><H3
 ><A
@@ -3513,7 +3513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11545"
+NAME="AEN11625"
 ></A
 ><H3
 ><A
@@ -3598,7 +3598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11568"
+NAME="AEN11648"
 ></A
 ><H3
 ><A
@@ -3703,7 +3703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11595"
+NAME="AEN11675"
 ></A
 ><H3
 ><A
@@ -3841,7 +3841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11629"
+NAME="AEN11709"
 ></A
 ><H3
 ><A
@@ -3924,7 +3924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11651"
+NAME="AEN11731"
 ></A
 ><H3
 ><A
@@ -4007,7 +4007,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11673"
+NAME="AEN11753"
 ></A
 ><H3
 ><A
@@ -4096,7 +4096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11695"
+NAME="AEN11775"
 ></A
 ><H3
 ><A
@@ -4227,7 +4227,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11728"
+NAME="AEN11808"
 ></A
 ><H3
 ><A
@@ -4294,7 +4294,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11745"
+NAME="AEN11825"
 ></A
 ><H3
 ><A
@@ -4377,7 +4377,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11767"
+NAME="AEN11847"
 ></A
 ><H3
 ><A
@@ -4444,7 +4444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11785"
+NAME="AEN11865"
 ></A
 ><H3
 ><A
@@ -4519,7 +4519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11805"
+NAME="AEN11885"
 ></A
 ><H3
 ><A
@@ -4597,7 +4597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11828"
+NAME="AEN11908"
 ></A
 ><H3
 ><A
@@ -4736,7 +4736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11865"
+NAME="AEN11945"
 ></A
 ><H3
 ><A
@@ -4825,7 +4825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11889"
+NAME="AEN11969"
 ></A
 ><H3
 ><A
@@ -4912,7 +4912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11912"
+NAME="AEN11992"
 ></A
 ><H3
 ><A
@@ -5015,7 +5015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11939"
+NAME="AEN12019"
 ></A
 ><H3
 ><A
@@ -5159,7 +5159,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11977"
+NAME="AEN12057"
 ></A
 ><H3
 ><A
@@ -5226,7 +5226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11995"
+NAME="AEN12075"
 ></A
 ><H3
 ><A
@@ -5324,7 +5324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12021"
+NAME="AEN12101"
 ></A
 ><H3
 ><A
@@ -5427,7 +5427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12047"
+NAME="AEN12127"
 ></A
 ><H3
 ><A
@@ -5550,7 +5550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12078"
+NAME="AEN12158"
 ></A
 ><H3
 ><A
@@ -5633,7 +5633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12100"
+NAME="AEN12180"
 ></A
 ><H3
 ><A
@@ -5712,7 +5712,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12119"
+NAME="AEN12199"
 ></A
 ><H3
 ><A
@@ -5800,7 +5800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12142"
+NAME="AEN12222"
 ></A
 ><H3
 ><A
@@ -5901,7 +5901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12166"
+NAME="AEN12246"
 ></A
 ><H3
 ><A
@@ -5975,7 +5975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12185"
+NAME="AEN12265"
 ></A
 ><H3
 ><A
@@ -6061,7 +6061,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12206"
+NAME="AEN12286"
 ></A
 ><H3
 ><A
@@ -6131,7 +6131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12224"
+NAME="AEN12304"
 ></A
 ><H3
 ><A
@@ -6256,7 +6256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12258"
+NAME="AEN12338"
 ></A
 ><H3
 ><A
@@ -6358,7 +6358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12287"
+NAME="AEN12367"
 ></A
 ><H3
 ><A
@@ -6427,7 +6427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12306"
+NAME="AEN12386"
 ></A
 ><H3
 ><A
@@ -6498,7 +6498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12326"
+NAME="AEN12406"
 ></A
 ><H3
 ><A
@@ -6563,7 +6563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12343"
+NAME="AEN12423"
 ></A
 ><H3
 ><A
@@ -6645,7 +6645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12362"
+NAME="AEN12442"
 ></A
 ><H3
 ><A
@@ -6728,7 +6728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12384"
+NAME="AEN12464"
 ></A
 ><H3
 ><A
@@ -6813,7 +6813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12407"
+NAME="AEN12487"
 ></A
 ><H3
 ><A
@@ -6896,7 +6896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12429"
+NAME="AEN12509"
 ></A
 ><H3
 ><A
@@ -6981,7 +6981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12452"
+NAME="AEN12532"
 ></A
 ><H3
 ><A
@@ -7076,7 +7076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12474"
+NAME="AEN12554"
 ></A
 ><H3
 ><A
@@ -7141,7 +7141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12491"
+NAME="AEN12571"
 ></A
 ><H3
 ><A
@@ -7208,7 +7208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12509"
+NAME="AEN12589"
 ></A
 ><H3
 ><A
@@ -7273,7 +7273,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12526"
+NAME="AEN12606"
 ></A
 ><H3
 ><A
@@ -7382,7 +7382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12554"
+NAME="AEN12634"
 ></A
 ><H3
 ><A
@@ -7408,7 +7408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12559"
+NAME="AEN12639"
 ></A
 ><H3
 ><A
@@ -7434,7 +7434,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12564"
+NAME="AEN12644"
 ></A
 ><H3
 ><A
@@ -7460,7 +7460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12569"
+NAME="AEN12649"
 ></A
 ><H3
 ><A
@@ -7486,7 +7486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12574"
+NAME="AEN12654"
 ></A
 ><H3
 ><A
@@ -7669,7 +7669,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12619"
+NAME="AEN12699"
 ></A
 ><H3
 ><A
@@ -7855,7 +7855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12665"
+NAME="AEN12745"
 ></A
 ><H3
 ><A
@@ -7952,7 +7952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12689"
+NAME="AEN12769"
 ></A
 ><H3
 ><A
@@ -8031,7 +8031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12709"
+NAME="AEN12789"
 ></A
 ><H3
 ><A
@@ -8128,7 +8128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12733"
+NAME="AEN12813"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-valid.html b/doc/html/gnome-xml-valid.html
index 5c472c2..5b28361 100644
--- a/doc/html/gnome-xml-valid.html
+++ b/doc/html/gnome-xml-valid.html
@@ -15,8 +15,8 @@
 TITLE="entities"
 HREF="gnome-xml-entities.html"><LINK
 REL="NEXT"
-TITLE="xml-error"
-HREF="gnome-xml-xml-error.html"></HEAD
+TITLE="uri"
+HREF="gnome-xml-uri.html"></HEAD
 ><BODY
 BGCOLOR="#FFFFFF"
 TEXT="#000000"
@@ -98,7 +98,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="gnome-xml-xml-error.html"
+HREF="gnome-xml-uri.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -7350,7 +7350,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="gnome-xml-xml-error.html"
+HREF="gnome-xml-uri.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -7378,7 +7378,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->xml-error</B
+>uri</B
 ></FONT
 ></TD
 ></TR
diff --git a/doc/html/gnome-xml-xml-error.html b/doc/html/gnome-xml-xml-error.html
index c7b1c21..9d27c30 100644
--- a/doc/html/gnome-xml-xml-error.html
+++ b/doc/html/gnome-xml-xml-error.html
@@ -12,8 +12,8 @@
 TITLE="Libxml Library Reference"
 HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
-TITLE="valid"
-HREF="gnome-xml-valid.html"><LINK
+TITLE="uri"
+HREF="gnome-xml-uri.html"><LINK
 REL="NEXT"
 TITLE="HTMLparser"
 HREF="gnome-xml-htmlparser.html"></HEAD
@@ -44,7 +44,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="gnome-xml-valid.html"
+HREF="gnome-xml-uri.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8393"
+NAME="AEN8473"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8396"
+NAME="AEN8476"
 ></A
 ><H2
 >Synopsis</H2
@@ -187,7 +187,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8408"
+NAME="AEN8488"
 ></A
 ><H2
 >Description</H2
@@ -197,14 +197,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8411"
+NAME="AEN8491"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8413"
+NAME="AEN8493"
 ></A
 ><H3
 ><A
@@ -355,7 +355,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8418"
+NAME="AEN8498"
 ></A
 ><H3
 ><A
@@ -452,7 +452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8441"
+NAME="AEN8521"
 ></A
 ><H3
 ><A
@@ -549,7 +549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8464"
+NAME="AEN8544"
 ></A
 ><H3
 ><A
@@ -646,7 +646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8487"
+NAME="AEN8567"
 ></A
 ><H3
 ><A
@@ -743,7 +743,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8510"
+NAME="AEN8590"
 ></A
 ><H3
 ><A
@@ -806,7 +806,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8526"
+NAME="AEN8606"
 ></A
 ><H3
 ><A
@@ -882,7 +882,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="gnome-xml-valid.html"
+HREF="gnome-xml-uri.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -954,7 +954,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->valid</B
+>uri</B
 ></FONT
 ></TD
 ><TD
diff --git a/doc/html/gnome-xml-xmlio.html b/doc/html/gnome-xml-xmlio.html
index 14d4c07..d3e4f98 100644
--- a/doc/html/gnome-xml-xmlio.html
+++ b/doc/html/gnome-xml-xmlio.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10409"
+NAME="AEN10489"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10412"
+NAME="AEN10492"
 ></A
 ><H2
 >Synopsis</H2
@@ -239,7 +239,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10439"
+NAME="AEN10519"
 ></A
 ><H2
 >Description</H2
@@ -249,14 +249,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10442"
+NAME="AEN10522"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10444"
+NAME="AEN10524"
 ></A
 ><H3
 ><A
@@ -293,7 +293,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10449"
+NAME="AEN10529"
 ></A
 ><H3
 ><A
@@ -319,7 +319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10454"
+NAME="AEN10534"
 ></A
 ><H3
 ><A
@@ -401,7 +401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10475"
+NAME="AEN10555"
 ></A
 ><H3
 ><A
@@ -505,7 +505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10500"
+NAME="AEN10580"
 ></A
 ><H3
 ><A
@@ -609,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10526"
+NAME="AEN10606"
 ></A
 ><H3
 ><A
@@ -710,7 +710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10551"
+NAME="AEN10631"
 ></A
 ><H3
 ><A
@@ -809,7 +809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10575"
+NAME="AEN10655"
 ></A
 ><H3
 ><A
@@ -909,7 +909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10599"
+NAME="AEN10679"
 ></A
 ><H3
 ><A
@@ -1026,7 +1026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10627"
+NAME="AEN10707"
 ></A
 ><H3
 ><A
@@ -1089,7 +1089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10643"
+NAME="AEN10723"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xmlmemory.html b/doc/html/gnome-xml-xmlmemory.html
index 98d075e..3ebfcf5 100644
--- a/doc/html/gnome-xml-xmlmemory.html
+++ b/doc/html/gnome-xml-xmlmemory.html
@@ -103,7 +103,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN13370"
+NAME="AEN13450"
 ></A
 ><H2
 >Name</H2
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN13373"
+NAME="AEN13453"
 ></A
 ><H2
 >Synopsis</H2
@@ -127,26 +127,84 @@
 >&#13;
 
 #define     <A
-HREF="gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY"
->NO_DEBUG_MEMORY</A
+HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY"
+>DEBUG_MEMORY</A
 >
-void        <A
+#define     <A
+HREF="gnome-xml-xmlmemory.html#MEM-LIST"
+>MEM_LIST</A
+>
+void        (<A
+HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
+>*xmlFreeFunc</A
+>)                  (void*);
+void*       (<A
+HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
+>*xmlMallocFunc</A
+>)                (...);
+void*       (<A
+HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
+>*xmlReallocFunc</A
+>)               (void*,
+                                             ...);
+char*       (<A
+HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
+>*xmlStrdupFunc</A
+>)                (const char*);
+extern      xmlFreeFunc <A
 HREF="gnome-xml-xmlmemory.html#XMLFREE"
 >xmlFree</A
->                         (void *ptr);
-void*       <A
+>;
+extern      xmlMallocFunc <A
 HREF="gnome-xml-xmlmemory.html#XMLMALLOC"
 >xmlMalloc</A
->                       (int size);
-void*       <A
+>;
+extern      xmlReallocFunc <A
 HREF="gnome-xml-xmlmemory.html#XMLREALLOC"
 >xmlRealloc</A
->                      (void *ptr,
-                                             int size);
-char*       <A
+>;
+extern      xmlStrdupFunc <A
 HREF="gnome-xml-xmlmemory.html#XMLMEMSTRDUP"
 >xmlMemStrdup</A
->                    (const char *str);
+>;
+int         <A
+HREF="gnome-xml-xmlmemory.html#XMLMEMSETUP"
+>xmlMemSetup</A
+>                     (<A
+HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
+>xmlFreeFunc</A
+> freeFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
+>xmlMallocFunc</A
+> mallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
+>xmlReallocFunc</A
+> reallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
+>xmlStrdupFunc</A
+> strdupFunc);
+int         <A
+HREF="gnome-xml-xmlmemory.html#XMLMEMGET"
+>xmlMemGet</A
+>                       (<A
+HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
+>xmlFreeFunc</A
+> *freeFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
+>xmlMallocFunc</A
+> *mallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
+>xmlReallocFunc</A
+> *reallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
+>xmlStrdupFunc</A
+> *strdupFunc);
 int         <A
 HREF="gnome-xml-xmlmemory.html#XMLINITMEMORY"
 >xmlInitMemory</A
@@ -156,10 +214,6 @@
 >xmlMemUsed</A
 >                      (void);
 void        <A
-HREF="gnome-xml-xmlmemory.html#XMLMEMORYDUMP"
->xmlMemoryDump</A
->                   (void);
-void        <A
 HREF="gnome-xml-xmlmemory.html#XMLMEMDISPLAY"
 >xmlMemDisplay</A
 >                   (<GTKDOCLINK
@@ -174,18 +228,10 @@
 >FILE</GTKDOCLINK
 > *fp,
                                              int nr);
-#define     <A
-HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION"
->DEBUG_MEMORY_LOCATION</A
->
-#define     <A
-HREF="gnome-xml-xmlmemory.html#DEBUG-MEMORY"
->DEBUG_MEMORY</A
->
-#define     <A
-HREF="gnome-xml-xmlmemory.html#MEM-LIST"
->MEM_LIST</A
->
+void        <A
+HREF="gnome-xml-xmlmemory.html#XMLMEMORYDUMP"
+>xmlMemoryDump</A
+>                   (void);
 void*       <A
 HREF="gnome-xml-xmlmemory.html#XMLMALLOCLOC"
 >xmlMallocLoc</A
@@ -212,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13394"
+NAME="AEN13486"
 ></A
 ><H2
 >Description</H2
@@ -222,20 +268,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN13397"
+NAME="AEN13489"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13399"
+NAME="AEN13491"
 ></A
 ><H3
 ><A
-NAME="NO-DEBUG-MEMORY"
+NAME="DEBUG-MEMORY"
 ></A
->NO_DEBUG_MEMORY</H3
+>DEBUG_MEMORY</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -245,7 +291,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define NO_DEBUG_MEMORY</PRE
+>#define DEBUG_MEMORY</PRE
 ></TD
 ></TR
 ></TABLE
@@ -255,13 +301,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13404"
+NAME="AEN13496"
 ></A
 ><H3
 ><A
-NAME="XMLFREE"
+NAME="MEM-LIST"
 ></A
->xmlFree ()</H3
+>MEM_LIST</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -271,15 +317,36 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        xmlFree                         (void *ptr);</PRE
+>#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->a <GTKDOCLINK
-HREF="FREE"
->free</GTKDOCLINK
->() equivalent, with error checking.</P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13501"
+></A
+><H3
+><A
+NAME="XMLFREEFUNC"
+></A
+>xmlFreeFunc ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        (*xmlFreeFunc)                  (void*);</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ><DIV
@@ -301,14 +368,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->ptr</I
+>Param1</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -318,13 +385,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13420"
+NAME="AEN13515"
 ></A
 ><H3
 ><A
-NAME="XMLMALLOC"
+NAME="XMLMALLOCFUNC"
 ></A
->xmlMalloc ()</H3
+>xmlMallocFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -334,16 +401,11 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void*       xmlMalloc                       (int size);</PRE
+>void*       (*xmlMallocFunc)                (...);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->a <GTKDOCLINK
-HREF="MALLOC"
->malloc</GTKDOCLINK
->() equivalent, with logging of the allocation info.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -364,14 +426,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->size</I
+>...</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -381,13 +443,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13436"
+NAME="AEN13529"
 ></A
 ><H3
 ><A
-NAME="XMLREALLOC"
+NAME="XMLREALLOCFUNC"
 ></A
->xmlRealloc ()</H3
+>xmlReallocFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -397,17 +459,12 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void*       xmlRealloc                      (void *ptr,
-                                             int size);</PRE
+>void*       (*xmlReallocFunc)               (void*,
+                                             ...);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->a <GTKDOCLINK
-HREF="REALLOC"
->realloc</GTKDOCLINK
->() equivalent, with logging of the allocation info.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -428,14 +485,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->ptr</I
+>Param1</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the initial memory block pointer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -445,14 +502,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->size</I
+>...</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  an int specifying the size in byte to allocate.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -462,13 +519,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13456"
+NAME="AEN13547"
 ></A
 ><H3
 ><A
-NAME="XMLMEMSTRDUP"
+NAME="XMLSTRDUPFUNC"
 ></A
->xmlMemStrdup ()</H3
+>xmlStrdupFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -478,16 +535,11 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->char*       xmlMemStrdup                    (const char *str);</PRE
+>char*       (*xmlStrdupFunc)                (const char*);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
->a <GTKDOCLINK
-HREF="STRDUP"
->strdup</GTKDOCLINK
->() equivalent, with logging of the allocation info.</P
-><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
@@ -508,7 +560,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->str</I
+>Param1</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -530,7 +582,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a pointer to the new string or NULL if allocation error occured.</TD
+>&nbsp;</TD
 ></TR
 ></TABLE
 ><P
@@ -540,7 +592,421 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13476"
+NAME="AEN13565"
+></A
+><H3
+><A
+NAME="XMLFREE"
+></A
+>xmlFree</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern xmlFreeFunc xmlFree;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13570"
+></A
+><H3
+><A
+NAME="XMLMALLOC"
+></A
+>xmlMalloc</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern xmlMallocFunc xmlMalloc;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13575"
+></A
+><H3
+><A
+NAME="XMLREALLOC"
+></A
+>xmlRealloc</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern xmlReallocFunc xmlRealloc;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13580"
+></A
+><H3
+><A
+NAME="XMLMEMSTRDUP"
+></A
+>xmlMemStrdup</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>extern xmlStrdupFunc xmlMemStrdup;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13585"
+></A
+><H3
+><A
+NAME="XMLMEMSETUP"
+></A
+>xmlMemSetup ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlMemSetup                     (<A
+HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
+>xmlFreeFunc</A
+> freeFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
+>xmlMallocFunc</A
+> mallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
+>xmlReallocFunc</A
+> reallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
+>xmlStrdupFunc</A
+> strdupFunc);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Override the default memory access functions with a new set
+This has to be called before any other libxml routines !</P
+><P
+>Should this be blocked if there was already some allocations
+done ?</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>freeFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function to use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>mallocFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function to use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>reallocFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function to use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>strdupFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function to use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 on success</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13625"
+></A
+><H3
+><A
+NAME="XMLMEMGET"
+></A
+>xmlMemGet ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlMemGet                       (<A
+HREF="gnome-xml-xmlmemory.html#XMLFREEFUNC"
+>xmlFreeFunc</A
+> *freeFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLMALLOCFUNC"
+>xmlMallocFunc</A
+> *mallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLREALLOCFUNC"
+>xmlReallocFunc</A
+> *reallocFunc,
+                                             <A
+HREF="gnome-xml-xmlmemory.html#XMLSTRDUPFUNC"
+>xmlStrdupFunc</A
+> *strdupFunc);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Return the memory access functions set currently in use</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>freeFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="FREE"
+>free</GTKDOCLINK
+>() function in use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>mallocFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function in use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>reallocFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function in use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>strdupFunc</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function in use</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 on success</TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13664"
 ></A
 ><H3
 ><A
@@ -598,7 +1064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13491"
+NAME="AEN13679"
 ></A
 ><H3
 ><A
@@ -656,35 +1122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13506"
-></A
-><H3
-><A
-NAME="XMLMEMORYDUMP"
-></A
->xmlMemoryDump ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->void        xmlMemoryDump                   (void);</PRE
-></TD
-></TR
-></TABLE
-><P
->Dump in-extenso the memory blocks allocated to the file .memorylist</P
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13512"
+NAME="AEN13694"
 ></A
 ><H3
 ><A
@@ -748,7 +1186,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13528"
+NAME="AEN13710"
 ></A
 ><H3
 ><A
@@ -835,13 +1273,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13549"
+NAME="AEN13731"
 ></A
 ><H3
 ><A
-NAME="DEBUG-MEMORY-LOCATION"
+NAME="XMLMEMORYDUMP"
 ></A
->DEBUG_MEMORY_LOCATION</H3
+>xmlMemoryDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -851,69 +1289,19 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY_LOCATION</PRE
+>void        xmlMemoryDump                   (void);</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Dump in-extenso the memory blocks allocated to the file .memorylist</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13554"
-></A
-><H3
-><A
-NAME="DEBUG-MEMORY"
-></A
->DEBUG_MEMORY</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define DEBUG_MEMORY</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13559"
-></A
-><H3
-><A
-NAME="MEM-LIST"
-></A
->MEM_LIST</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->#define MEM_LIST /* keep a list of all the allocated memory blocks */</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN13564"
+NAME="AEN13737"
 ></A
 ><H3
 ><A
@@ -1018,7 +1406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13589"
+NAME="AEN13762"
 ></A
 ><H3
 ><A
@@ -1135,7 +1523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13617"
+NAME="AEN13790"
 ></A
 ><H3
 ><A
diff --git a/doc/html/gnome-xml-xpath.html b/doc/html/gnome-xml-xpath.html
index ca37590..3460070 100644
--- a/doc/html/gnome-xml-xpath.html
+++ b/doc/html/gnome-xml-xpath.html
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9227"
+NAME="AEN9307"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9230"
+NAME="AEN9310"
 ></A
 ><H2
 >Synopsis</H2
@@ -347,7 +347,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9287"
+NAME="AEN9367"
 ></A
 ><H2
 >Description</H2
@@ -357,14 +357,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9290"
+NAME="AEN9370"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9292"
+NAME="AEN9372"
 ></A
 ><H3
 ><A
@@ -415,7 +415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9297"
+NAME="AEN9377"
 ></A
 ><H3
 ><A
@@ -441,7 +441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9302"
+NAME="AEN9382"
 ></A
 ><H3
 ><A
@@ -478,7 +478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9307"
+NAME="AEN9387"
 ></A
 ><H3
 ><A
@@ -504,7 +504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9312"
+NAME="AEN9392"
 ></A
 ><H3
 ><A
@@ -534,7 +534,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9317"
+NAME="AEN9397"
 ></A
 ><H3
 ><A
@@ -560,7 +560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9322"
+NAME="AEN9402"
 ></A
 ><H3
 ><A
@@ -586,7 +586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9327"
+NAME="AEN9407"
 ></A
 ><H3
 ><A
@@ -612,7 +612,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9332"
+NAME="AEN9412"
 ></A
 ><H3
 ><A
@@ -638,7 +638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9337"
+NAME="AEN9417"
 ></A
 ><H3
 ><A
@@ -664,7 +664,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9342"
+NAME="AEN9422"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9347"
+NAME="AEN9427"
 ></A
 ><H3
 ><A
@@ -716,7 +716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9352"
+NAME="AEN9432"
 ></A
 ><H3
 ><A
@@ -749,7 +749,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9357"
+NAME="AEN9437"
 ></A
 ><H3
 ><A
@@ -775,7 +775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9362"
+NAME="AEN9442"
 ></A
 ><H3
 ><A
@@ -869,7 +869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9385"
+NAME="AEN9465"
 ></A
 ><H3
 ><A
@@ -898,7 +898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9390"
+NAME="AEN9470"
 ></A
 ><H3
 ><A
@@ -924,7 +924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9395"
+NAME="AEN9475"
 ></A
 ><H3
 ><A
@@ -953,7 +953,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9400"
+NAME="AEN9480"
 ></A
 ><H3
 ><A
@@ -979,7 +979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9405"
+NAME="AEN9485"
 ></A
 ><H3
 ><A
@@ -1058,7 +1058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9424"
+NAME="AEN9504"
 ></A
 ><H3
 ><A
@@ -1087,7 +1087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9429"
+NAME="AEN9509"
 ></A
 ><H3
 ><A
@@ -1113,7 +1113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9434"
+NAME="AEN9514"
 ></A
 ><H3
 ><A
@@ -1213,7 +1213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9459"
+NAME="AEN9539"
 ></A
 ><H3
 ><A
@@ -1242,7 +1242,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9464"
+NAME="AEN9544"
 ></A
 ><H3
 ><A
@@ -1268,7 +1268,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9469"
+NAME="AEN9549"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9488"
+NAME="AEN9568"
 ></A
 ><H3
 ><A
@@ -1428,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9509"
+NAME="AEN9589"
 ></A
 ><H3
 ><A
@@ -1491,7 +1491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9525"
+NAME="AEN9605"
 ></A
 ><H3
 ><A
@@ -1594,7 +1594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9551"
+NAME="AEN9631"
 ></A
 ><H3
 ><A
@@ -1657,7 +1657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9567"
+NAME="AEN9647"
 ></A
 ><H3
 ><A
@@ -1760,7 +1760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9593"
+NAME="AEN9673"
 ></A
 ><H3
 ><A
@@ -1846,7 +1846,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9615"
+NAME="AEN9695"
 ></A
 ><H3
 ><A
@@ -1918,7 +1918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9633"
+NAME="AEN9713"
 ></A
 ><H3
 ><A
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index b462123..02fb367 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -371,6 +371,11 @@
 <ANCHOR id ="XMLGETDTDELEMENTDESC" href="gnome-xml/gnome-xml-valid.html#XMLGETDTDELEMENTDESC">
 <ANCHOR id ="XMLVALIDGETVALIDELEMENTS" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETVALIDELEMENTS">
 <ANCHOR id ="XMLVALIDGETPOTENTIALCHILDREN" href="gnome-xml/gnome-xml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">
+<ANCHOR id ="GNOME-XML-URI" href="gnome-xml/gnome-xml-uri.html">
+<ANCHOR id ="XMLURI" href="gnome-xml/gnome-xml-uri.html#XMLURI">
+<ANCHOR id ="XMLURIPTR" href="gnome-xml/gnome-xml-uri.html#XMLURIPTR">
+<ANCHOR id ="XMLBUILDURI" href="gnome-xml/gnome-xml-uri.html#XMLBUILDURI">
+<ANCHOR id ="XMLPARSEURI" href="gnome-xml/gnome-xml-uri.html#XMLPARSEURI">
 <ANCHOR id ="GNOME-XML-XML-ERROR" href="gnome-xml/gnome-xml-xml-error.html">
 <ANCHOR id ="XMLPARSERERRORS" href="gnome-xml/gnome-xml-xml-error.html#XMLPARSERERRORS">
 <ANCHOR id ="XMLPARSERERROR" href="gnome-xml/gnome-xml-xml-error.html#XMLPARSERERROR">
@@ -617,19 +622,23 @@
 <ANCHOR id ="XMLSHELLCMD" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELLCMD">
 <ANCHOR id ="XMLSHELL" href="gnome-xml/gnome-xml-debugxml.html#XMLSHELL">
 <ANCHOR id ="GNOME-XML-XMLMEMORY" href="gnome-xml/gnome-xml-xmlmemory.html">
-<ANCHOR id ="NO-DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#NO-DEBUG-MEMORY">
+<ANCHOR id ="DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY">
+<ANCHOR id ="MEM-LIST" href="gnome-xml/gnome-xml-xmlmemory.html#MEM-LIST">
+<ANCHOR id ="XMLFREEFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLFREEFUNC">
+<ANCHOR id ="XMLMALLOCFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOCFUNC">
+<ANCHOR id ="XMLREALLOCFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOCFUNC">
+<ANCHOR id ="XMLSTRDUPFUNC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLSTRDUPFUNC">
 <ANCHOR id ="XMLFREE" href="gnome-xml/gnome-xml-xmlmemory.html#XMLFREE">
 <ANCHOR id ="XMLMALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOC">
 <ANCHOR id ="XMLREALLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOC">
 <ANCHOR id ="XMLMEMSTRDUP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSTRDUP">
+<ANCHOR id ="XMLMEMSETUP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSETUP">
+<ANCHOR id ="XMLMEMGET" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMGET">
 <ANCHOR id ="XMLINITMEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#XMLINITMEMORY">
 <ANCHOR id ="XMLMEMUSED" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMUSED">
-<ANCHOR id ="XMLMEMORYDUMP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMORYDUMP">
 <ANCHOR id ="XMLMEMDISPLAY" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMDISPLAY">
 <ANCHOR id ="XMLMEMSHOW" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSHOW">
-<ANCHOR id ="DEBUG-MEMORY-LOCATION" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY-LOCATION">
-<ANCHOR id ="DEBUG-MEMORY" href="gnome-xml/gnome-xml-xmlmemory.html#DEBUG-MEMORY">
-<ANCHOR id ="MEM-LIST" href="gnome-xml/gnome-xml-xmlmemory.html#MEM-LIST">
+<ANCHOR id ="XMLMEMORYDUMP" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMORYDUMP">
 <ANCHOR id ="XMLMALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMALLOCLOC">
 <ANCHOR id ="XMLREALLOCLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLREALLOCLOC">
 <ANCHOR id ="XMLMEMSTRDUPLOC" href="gnome-xml/gnome-xml-xmlmemory.html#XMLMEMSTRDUPLOC">
diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index 20f46d7..a896ee1 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -139,6 +139,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="gnome-xml-uri.html"
+>uri</A
+> &#8212; </DT
+><DT
+><A
 HREF="gnome-xml-xml-error.html"
 >xml-error</A
 > &#8212; </DT
diff --git a/doc/xml.html b/doc/xml.html
index e0403f3..4bdc915 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -163,6 +163,10 @@
 <ul>
   <li>working on HTML and XML links recognition layers, get in touch with me
     if you want to test those.</li>
+  <li>a new URI module for parsing URIs and following strictly RFC 2396</li>
+  <li>the memory allocation routines used by libxml can now be overloaded
+    dynamically by using xmlMemSetup()</li>
+  <li>So far the feedback on the libxml2 beta is positive</li>
 </ul>
 
 <h3>2.0.0beta: Mar 14 2000</h3>
@@ -1078,6 +1082,6 @@
 
 <p><a href="mailto:Daniel.Veillard@w3.org">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.28 2000/03/06 07:41:49 veillard Exp $</p>
+<p>$Id: xml.html,v 1.29 2000/03/14 19:59:03 veillard Exp $</p>
 </body>
 </html>