diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html
index 3ef6390..0621785 100644
--- a/doc/html/gnome-xml-entities.html
+++ b/doc/html/gnome-xml-entities.html
@@ -9,8 +9,8 @@
 TITLE="Gnome XML Library Reference Manual"
 HREF="book1.html"><LINK
 REL="UP"
-TITLE="Gnome XML Library"
-HREF="libxml.html"><LINK
+TITLE="Libxml Library Reference"
+HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
 TITLE="tree"
 HREF="gnome-xml-tree.html"><LINK
@@ -82,7 +82,7 @@
 SIZE="3"
 ><B
 ><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -115,7 +115,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN4122"
+NAME="AEN4236"
 ></A
 ><H2
 >Name</H2
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN4125"
+NAME="AEN4239"
 ></A
 ><H2
 >Synopsis</H2
@@ -344,7 +344,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4182"
+NAME="AEN4296"
 ></A
 ><H2
 >Description</H2
@@ -354,14 +354,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4185"
+NAME="AEN4299"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4187"
+NAME="AEN4301"
 ></A
 ><H3
 ><A
@@ -377,7 +377,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_INTERNAL_GENERAL_ENTITY</PRE
+>#define XML_INTERNAL_GENERAL_ENTITY		1</PRE
 ></TD
 ></TR
 ></TABLE
@@ -387,7 +387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4192"
+NAME="AEN4306"
 ></A
 ><H3
 ><A
@@ -403,7 +403,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_EXTERNAL_GENERAL_PARSED_ENTITY</PRE
+>#define XML_EXTERNAL_GENERAL_PARSED_ENTITY	2</PRE
 ></TD
 ></TR
 ></TABLE
@@ -413,7 +413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4197"
+NAME="AEN4311"
 ></A
 ><H3
 ><A
@@ -429,7 +429,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_EXTERNAL_GENERAL_UNPARSED_ENTITY</PRE
+>#define XML_EXTERNAL_GENERAL_UNPARSED_ENTITY	3</PRE
 ></TD
 ></TR
 ></TABLE
@@ -439,7 +439,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4202"
+NAME="AEN4316"
 ></A
 ><H3
 ><A
@@ -455,7 +455,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_INTERNAL_PARAMETER_ENTITY</PRE
+>#define XML_INTERNAL_PARAMETER_ENTITY		4</PRE
 ></TD
 ></TR
 ></TABLE
@@ -465,7 +465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4207"
+NAME="AEN4321"
 ></A
 ><H3
 ><A
@@ -481,7 +481,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_EXTERNAL_PARAMETER_ENTITY</PRE
+>#define XML_EXTERNAL_PARAMETER_ENTITY		5</PRE
 ></TD
 ></TR
 ></TABLE
@@ -491,7 +491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4212"
+NAME="AEN4326"
 ></A
 ><H3
 ><A
@@ -507,7 +507,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_INTERNAL_PREDEFINED_ENTITY</PRE
+>#define XML_INTERNAL_PREDEFINED_ENTITY		6</PRE
 ></TD
 ></TR
 ></TABLE
@@ -517,20 +517,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4217"
+NAME="AEN4331"
 ></A
 ><H3
 ><A
 NAME="XMLENTITYPTR"
 ></A
 >xmlEntityPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntity *xmlEntityPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4221"
+NAME="AEN4336"
 ></A
 ><H3
 ><A
@@ -546,7 +559,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_MIN_ENTITIES_TABLE</PRE
+>#define XML_MIN_ENTITIES_TABLE	32</PRE
 ></TD
 ></TR
 ></TABLE
@@ -556,20 +569,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4226"
+NAME="AEN4341"
 ></A
 ><H3
 ><A
 NAME="XMLENTITIESTABLEPTR"
 ></A
 >xmlEntitiesTablePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEntitiesTable *xmlEntitiesTablePtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4230"
+NAME="AEN4346"
 ></A
 ><H3
 ><A
@@ -639,7 +665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -656,7 +682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -673,7 +699,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -690,7 +716,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -707,7 +733,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -724,7 +750,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ></TABLE
 ><P
@@ -734,7 +760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4270"
+NAME="AEN4386"
 ></A
 ><H3
 ><A
@@ -804,7 +830,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -821,7 +847,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -838,7 +864,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity type XML_xxx_yyy_ENTITY</TD
 ></TR
 ><TR
 ><TD
@@ -855,7 +881,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity external ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -872,7 +898,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity system ID if available</TD
 ></TR
 ><TR
 ><TD
@@ -889,7 +915,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity content</TD
 ></TR
 ></TABLE
 ><P
@@ -899,7 +925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4310"
+NAME="AEN4426"
 ></A
 ><H3
 ><A
@@ -955,7 +981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -970,7 +996,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL if not, othervise the entity</TD
 ></TR
 ></TABLE
 ><P
@@ -980,7 +1006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4331"
+NAME="AEN4447"
 ></A
 ><H3
 ><A
@@ -1042,7 +1068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1059,7 +1085,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1074,7 +1100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1084,7 +1110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4357"
+NAME="AEN4473"
 ></A
 ><H3
 ><A
@@ -1145,7 +1171,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1162,7 +1188,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1177,7 +1203,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1187,7 +1213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4383"
+NAME="AEN4499"
 ></A
 ><H3
 ><A
@@ -1248,7 +1274,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document referencing the entity</TD
 ></TR
 ><TR
 ><TD
@@ -1265,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the entity name</TD
 ></TR
 ><TR
 ><TD
@@ -1280,7 +1306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A pointer to the entity structure or NULL if not found.</TD
 ></TR
 ></TABLE
 ><P
@@ -1290,7 +1316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4409"
+NAME="AEN4525"
 ></A
 ><H3
 ><A
@@ -1357,7 +1383,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1374,7 +1400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1389,7 +1415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TABLE
 ><P
@@ -1399,7 +1425,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4437"
+NAME="AEN4553"
 ></A
 ><H3
 ><A
@@ -1465,7 +1491,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document containing the string</TD
 ></TR
 ><TR
 ><TD
@@ -1482,7 +1508,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  A string to convert to XML.</TD
 ></TR
 ><TR
 ><TD
@@ -1497,7 +1523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>A newly allocated string with the substitution done.</TD
 ></TR
 ></TABLE
 ><P
@@ -1507,7 +1533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4464"
+NAME="AEN4580"
 ></A
 ><H3
 ><A
@@ -1558,7 +1584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlEntitiesTablePtr just created or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1568,7 +1594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4480"
+NAME="AEN4596"
 ></A
 ><H3
 ><A
@@ -1624,7 +1650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ><TR
 ><TD
@@ -1639,7 +1665,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new xmlEntitiesTablePtr or NULL in case of error.</TD
 ></TR
 ></TABLE
 ><P
@@ -1649,7 +1675,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4501"
+NAME="AEN4617"
 ></A
 ><H3
 ><A
@@ -1702,7 +1728,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TABLE
 ><P
@@ -1712,7 +1738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4517"
+NAME="AEN4633"
 ></A
 ><H3
 ><A
@@ -1769,7 +1795,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An XML buffer.</TD
 ></TR
 ><TR
 ><TD
@@ -1786,7 +1812,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  An entity table</TD
 ></TR
 ></TABLE
 ><P
@@ -1847,7 +1873,7 @@
 SIZE="3"
 ><B
 ><A
-HREF="libxml.html"
+HREF="libxml-lib.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"