diff --git a/ChangeLog b/ChangeLog
index 61a6c52..78c0354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar  8 15:49:10 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: preparing 2.4.17 release
+	* doc/*: updated and rebuilt the docs
+	* xpath.c: fixed a comment
+	* python/libxml.c: fixed a possible reentrancy problem
+
 Thu Mar  7 23:19:28 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* tree.c python/tests/Makefile.am python/tests/attribs.py:
diff --git a/configure.in b/configure.in
index 6efb524..785f9d1 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=4
-LIBXML_MICRO_VERSION=16
+LIBXML_MICRO_VERSION=17
 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/doc/FAQ.html b/doc/FAQ.html
index 8aa8959..a906e39 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -113,8 +113,7 @@
     library requiring it,  <strong><span style="background-color: #FF0000">Do
     Not Use libxml1</span></strong>, use libxml2</li>
 <li>
-<em>Where can I get libxml</em>
-     ?
+<em>Where can I get libxml</em> ?
     <p>The original distribution comes from <a href="ftp://rpmfind.net/pub/libxml/">rpmfind.net</a> or <a href="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/">gnome.org</a>
 </p>
 <p>Most linux and Bsd distribution includes libxml, this is probably the
@@ -182,8 +181,8 @@
     following libs:</p>
 <ul>
 <li>
-<a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a>
-         : a highly portable and available widely compression library</li>
+<a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a> : a
+        highly portable and available widely compression library</li>
 <li>iconv: a powerful character encoding conversion library. It's
         included by default on recent glibc libraries, so it doesn't need to
         be installed specifically on linux. It seems it's now <a href="http://www.opennc.org/onlinepubs/7908799/xsh/iconv.html">part
@@ -307,9 +306,8 @@
 </li>
 <li>
 <a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&amp;dir=gnome-xml">Browse
-        the libxml source</a>
-         , I try to write code as clean and documented as possible, so
-        looking at it may be helpful</li>
+        the libxml source</a> , I try to write code as clean and documented
+        as possible, so looking at it may be helpful</li>
 </ul>
 </li>
 <li>What about C++ ?
diff --git a/doc/catalog.html b/doc/catalog.html
index 60fbec7..87d4f31 100644
--- a/doc/catalog.html
+++ b/doc/catalog.html
@@ -134,9 +134,8 @@
     operation of libxml.</li>
 <li>
 <a href="http://www.oasis-open.org/committees/entity/spec.html">XML
-    Catalogs</a>
-     is far more flexible, more recent, uses an XML syntax and should scale
-    quite better. This is the default option of libxml.</li>
+    Catalogs</a> is far more flexible, more recent, uses an XML syntax and
+    should scale quite better. This is the default option of libxml.</li>
 </ul>
 <p>
 <h3><a name="Simple">Using catalog</a></h3>
diff --git a/doc/contribs.html b/doc/contribs.html
index d3ad65b..19f98a7 100644
--- a/doc/contribs.html
+++ b/doc/contribs.html
@@ -89,43 +89,39 @@
     and Solaris port.</li>
 <li>John Fleck helps maintaining the documentation and man pages.</li>
 <li>
-<a href="mailto:ari@lusis.org">Ari Johnson</a>
-     provides a  C++ wrapper for libxml:<br>
+<a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
+    for libxml:<br>
     Website: <a href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
     Download: <a href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
 </li>
 <li>
-<a href="mailto:izlatkovic@daenet.de">Igor  Zlatkovic</a>
-     is now the maintainer of the Windows port, <a href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
+<a href="mailto:izlatkovic@daenet.de">Igor  Zlatkovic</a> is now the
+    maintainer of the Windows port, <a href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
     provides binaries</a>
 </li>
 <li>
-<a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a>
-     provides <a href="http://garypennington.net/libxml2/">Solaris
-    binaries</a>
+<a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a> provides
+    <a href="http://garypennington.net/libxml2/">Solaris binaries</a>
 </li>
 <li>
 <a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
-    Sergeant</a>
-     developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl
-    wrapper for libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML application server</a>
+    Sergeant</a> developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
+    libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML
+    application server</a>
 </li>
 <li>
-<a href="mailto:fnatter@gmx.net">Felix Natter</a>
-     and <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions
+<a href="mailto:fnatter@gmx.net">Felix Natter</a> and <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions
     documentation</li>
 <li>
-<a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a>
-     provided <a href="http://xmlsoft.org/messages/0488.html">man
-  pages</a>
+<a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a> provided <a href="http://xmlsoft.org/messages/0488.html">man pages</a>
 </li>
 <li>there is a module for <a href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxslt support
     in OpenNSD/AOLServer</a>
 </li>
 <li>
-<a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a>
-     provides libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers
-    for Python</a>
+<a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides
+    libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for
+    Python</a>
 </li>
 <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue
     libxml2</a> with Kylix and Delphi and other Pascal compilers</li>
diff --git a/doc/docs.html b/doc/docs.html
index 2d278be..abc8577 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -96,8 +96,7 @@
 <li>This page provides a global overview and <a href="example.html">some
     examples</a> on how to use libxml.</li>
 <li>
-<a href="mailto:james@daa.com.au">James Henstridge</a>
-     wrote <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">some nice
+<a href="mailto:james@daa.com.au">James Henstridge</a> wrote <a href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">some nice
     documentation</a> explaining how to use the libxml SAX interface.</li>
 <li>George Lebl wrote <a href="http://www-4.ibm.com/software/developer/library/gnome3/">an article
     for IBM developerWorks</a> about using libxml.</li>
diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml
index 4eb0464..109e254 100644
--- a/doc/gnome-xml.sgml
+++ b/doc/gnome-xml.sgml
@@ -16,6 +16,7 @@
 <!entity xinclude SYSTEM "sgml/xinclude.sgml">
 <!entity xmlIO SYSTEM "sgml/xmlIO.sgml">
 <!entity catalog SYSTEM "sgml/catalog.sgml">
+<!entity c14n SYSTEM "sgml/c14n.sgml">
 <!entity DOCBparser SYSTEM "sgml/DOCBparser.sgml">
 <!entity xmlmemory SYSTEM "sgml/xmlmemory.sgml">
 <!entity nanohttp SYSTEM "sgml/nanohttp.sgml">
@@ -100,6 +101,7 @@
     &nanoftp;
     &xmlIO;
     &catalog;
+    &c14n;
     &threads;
     &globals;
     &global_functions;
diff --git a/doc/html/book1.html b/doc/html/book1.html
index 7fbbcbc..6ac6182 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -209,6 +209,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-c14n.html"
+>c14n</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-threads.html"
 >threads</A
 > &#8212; </DT
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index aa07101..050eb05 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -860,6 +860,10 @@
 <ANCHOR id ="XMLCATALOGGETDEFAULTS" href="libxml/libxml-catalog.html#XMLCATALOGGETDEFAULTS">
 <ANCHOR id ="XMLCATALOGGETSYSTEM" href="libxml/libxml-catalog.html#XMLCATALOGGETSYSTEM">
 <ANCHOR id ="XMLCATALOGGETPUBLIC" href="libxml/libxml-catalog.html#XMLCATALOGGETPUBLIC">
+<ANCHOR id ="LIBXML-C14N" href="libxml/libxml-c14n.html">
+<ANCHOR id ="XMLC14NDOCSAVETO" href="libxml/libxml-c14n.html#XMLC14NDOCSAVETO">
+<ANCHOR id ="XMLC14NDOCDUMPMEMORY" href="libxml/libxml-c14n.html#XMLC14NDOCDUMPMEMORY">
+<ANCHOR id ="XMLC14NDOCSAVE" href="libxml/libxml-c14n.html#XMLC14NDOCSAVE">
 <ANCHOR id ="LIBXML-THREADS" href="libxml/libxml-threads.html">
 <ANCHOR id ="XMLMUTEX" href="libxml/libxml-threads.html#XMLMUTEX">
 <ANCHOR id ="XMLMUTEXPTR" href="libxml/libxml-threads.html#XMLMUTEXPTR">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 2c5fd91..aa96cab 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -16,8 +16,8 @@
 TITLE="xmlIO"
 HREF="libxml-xmlio.html"><LINK
 REL="NEXT"
-TITLE="threads"
-HREF="libxml-threads.html"></HEAD
+TITLE="c14n"
+HREF="libxml-c14n.html"></HEAD
 ><BODY
 CLASS="REFENTRY"
 BGCOLOR="#FFFFFF"
@@ -103,7 +103,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-threads.html"
+HREF="libxml-c14n.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -529,7 +529,7 @@
 ><A
 NAME="XML-CATALOGS-NAMESPACE-CAPS"
 ></A
->&#62;XML_CATALOGS_NAMESPACE</H3
+>XML_CATALOGS_NAMESPACE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -557,7 +557,7 @@
 ><A
 NAME="XML-CATALOG-PI-CAPS"
 ></A
->&#62;XML_CATALOG_PI</H3
+>XML_CATALOG_PI</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -585,7 +585,7 @@
 ><A
 NAME="XMLCATALOGPREFER"
 ></A
->&#62;enum xmlCatalogPrefer</H3
+>enum xmlCatalogPrefer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -615,7 +615,7 @@
 ><A
 NAME="XMLCATALOGALLOW"
 ></A
->&#62;enum xmlCatalogAllow</H3
+>enum xmlCatalogAllow</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -646,7 +646,7 @@
 ><A
 NAME="XMLCATALOG"
 ></A
->&#62;struct xmlCatalog</H3
+>struct xmlCatalog</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -672,7 +672,7 @@
 ><A
 NAME="XMLCATALOGPTR"
 ></A
->&#62;xmlCatalogPtr</H3
+>xmlCatalogPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -698,7 +698,7 @@
 ><A
 NAME="XMLNEWCATALOG"
 ></A
->&#62;xmlNewCatalog ()</H3
+>xmlNewCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -781,7 +781,7 @@
 ><A
 NAME="XMLLOADACATALOG"
 ></A
->&#62;xmlLoadACatalog ()</H3
+>xmlLoadACatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -867,7 +867,7 @@
 ><A
 NAME="XMLLOADSGMLSUPERCATALOG"
 ></A
->&#62;xmlLoadSGMLSuperCatalog ()</H3
+>xmlLoadSGMLSuperCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -952,7 +952,7 @@
 ><A
 NAME="XMLCONVERTSGMLCATALOG"
 ></A
->&#62;xmlConvertSGMLCatalog ()</H3
+>xmlConvertSGMLCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1035,7 +1035,7 @@
 ><A
 NAME="XMLACATALOGADD"
 ></A
->&#62;xmlACatalogAdd ()</H3
+>xmlACatalogAdd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1182,7 +1182,7 @@
 ><A
 NAME="XMLACATALOGREMOVE"
 ></A
->&#62;xmlACatalogRemove ()</H3
+>xmlACatalogRemove ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1286,7 +1286,7 @@
 ><A
 NAME="XMLACATALOGRESOLVE"
 ></A
->&#62;xmlACatalogResolve ()</H3
+>xmlACatalogResolve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1398,7 +1398,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1415,7 +1415,7 @@
 ><A
 NAME="XMLACATALOGRESOLVESYSTEM"
 ></A
->&#62;xmlACatalogResolveSystem ()</H3
+>xmlACatalogResolveSystem ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1506,7 +1506,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+must be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1523,7 +1523,7 @@
 ><A
 NAME="XMLACATALOGRESOLVEPUBLIC"
 ></A
->&#62;xmlACatalogResolvePublic ()</H3
+>xmlACatalogResolvePublic ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1614,7 +1614,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+must be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1631,7 +1631,7 @@
 ><A
 NAME="XMLACATALOGRESOLVEURI"
 ></A
->&#62;xmlACatalogResolveURI ()</H3
+>xmlACatalogResolveURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1722,7 +1722,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1739,7 +1739,7 @@
 ><A
 NAME="XMLACATALOGDUMP"
 ></A
->&#62;xmlACatalogDump ()</H3
+>xmlACatalogDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1828,7 +1828,7 @@
 ><A
 NAME="XMLFREECATALOG"
 ></A
->&#62;xmlFreeCatalog ()</H3
+>xmlFreeCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1896,7 +1896,7 @@
 ><A
 NAME="XMLCATALOGISEMPTY"
 ></A
->&#62;xmlCatalogIsEmpty ()</H3
+>xmlCatalogIsEmpty ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1979,7 +1979,7 @@
 ><A
 NAME="XMLINITIALIZECATALOG"
 ></A
->&#62;xmlInitializeCatalog ()</H3
+>xmlInitializeCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2009,7 +2009,7 @@
 ><A
 NAME="XMLLOADCATALOG"
 ></A
->&#62;xmlLoadCatalog ()</H3
+>xmlLoadCatalog ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2092,7 +2092,7 @@
 ><A
 NAME="XMLLOADCATALOGS"
 ></A
->&#62;xmlLoadCatalogs ()</H3
+>xmlLoadCatalogs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2160,7 +2160,7 @@
 ><A
 NAME="XMLCATALOGCLEANUP"
 ></A
->&#62;xmlCatalogCleanup ()</H3
+>xmlCatalogCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2188,7 +2188,7 @@
 ><A
 NAME="XMLCATALOGDUMP"
 ></A
->&#62;xmlCatalogDump ()</H3
+>xmlCatalogDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2256,7 +2256,7 @@
 ><A
 NAME="XMLCATALOGRESOLVE"
 ></A
->&#62;xmlCatalogResolve ()</H3
+>xmlCatalogResolve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2347,7 +2347,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2364,7 +2364,7 @@
 ><A
 NAME="XMLCATALOGRESOLVESYSTEM"
 ></A
->&#62;xmlCatalogResolveSystem ()</H3
+>xmlCatalogResolveSystem ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2434,7 +2434,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+must be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2451,7 +2451,7 @@
 ><A
 NAME="XMLCATALOGRESOLVEPUBLIC"
 ></A
->&#62;xmlCatalogResolvePublic ()</H3
+>xmlCatalogResolvePublic ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2521,7 +2521,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the system ID if found or NULL otherwise, the value returned
-     must be freed by the caller.</TD
+must be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2538,7 +2538,7 @@
 ><A
 NAME="XMLCATALOGRESOLVEURI"
 ></A
->&#62;xmlCatalogResolveURI ()</H3
+>xmlCatalogResolveURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2608,7 +2608,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2625,7 +2625,7 @@
 ><A
 NAME="XMLCATALOGADD"
 ></A
->&#62;xmlCatalogAdd ()</H3
+>xmlCatalogAdd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2756,7 +2756,7 @@
 ><A
 NAME="XMLCATALOGREMOVE"
 ></A
->&#62;xmlCatalogRemove ()</H3
+>xmlCatalogRemove ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2839,7 +2839,7 @@
 ><A
 NAME="XMLPARSECATALOGFILE"
 ></A
->&#62;xmlParseCatalogFile ()</H3
+>xmlParseCatalogFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2926,7 +2926,7 @@
 ><A
 NAME="XMLCATALOGCONVERT"
 ></A
->&#62;xmlCatalogConvert ()</H3
+>xmlCatalogConvert ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2989,7 +2989,7 @@
 ><A
 NAME="XMLCATALOGFREELOCAL"
 ></A
->&#62;xmlCatalogFreeLocal ()</H3
+>xmlCatalogFreeLocal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3054,7 +3054,7 @@
 ><A
 NAME="XMLCATALOGADDLOCAL"
 ></A
->&#62;xmlCatalogAddLocal ()</H3
+>xmlCatalogAddLocal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3140,7 +3140,7 @@
 ><A
 NAME="XMLCATALOGLOCALRESOLVE"
 ></A
->&#62;xmlCatalogLocalResolve ()</H3
+>xmlCatalogLocalResolve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3250,7 +3250,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3267,7 +3267,7 @@
 ><A
 NAME="XMLCATALOGLOCALRESOLVEURI"
 ></A
->&#62;xmlCatalogLocalResolveURI ()</H3
+>xmlCatalogLocalResolveURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3356,7 +3356,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the URI of the resource or NULL if not found, it must be freed
-     by the caller.</TD
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3373,7 +3373,7 @@
 ><A
 NAME="XMLCATALOGSETDEBUG"
 ></A
->&#62;xmlCatalogSetDebug ()</H3
+>xmlCatalogSetDebug ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3454,7 +3454,7 @@
 ><A
 NAME="XMLCATALOGSETDEFAULTPREFER"
 ></A
->&#62;xmlCatalogSetDefaultPrefer ()</H3
+>xmlCatalogSetDefaultPrefer ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3542,7 +3542,7 @@
 ><A
 NAME="XMLCATALOGSETDEFAULTS"
 ></A
->&#62;xmlCatalogSetDefaults ()</H3
+>xmlCatalogSetDefaults ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3611,7 +3611,7 @@
 ><A
 NAME="XMLCATALOGGETDEFAULTS"
 ></A
->&#62;xmlCatalogGetDefaults ()</H3
+>xmlCatalogGetDefaults ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3678,7 +3678,7 @@
 ><A
 NAME="XMLCATALOGGETSYSTEM"
 ></A
->&#62;xmlCatalogGetSystem ()</H3
+>xmlCatalogGetSystem ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3768,7 +3768,7 @@
 ><A
 NAME="XMLCATALOGGETPUBLIC"
 ></A
->&#62;xmlCatalogGetPublic ()</H3
+>xmlCatalogGetPublic ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3919,7 +3919,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-threads.html"
+HREF="libxml-c14n.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -3947,7 +3947,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->threads</B
+>c14n</B
 ></FONT
 ></TD
 ></TR
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index 96d6b25..65b5a48 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN25314"
+NAME="AEN25480"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN25317"
+NAME="AEN25483"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25411"
+NAME="AEN25577"
 ></A
 ><H2
 >Description</H2
@@ -519,20 +519,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN25414"
+NAME="AEN25580"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25416"
+NAME="AEN25582"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPSTRING"
 ></A
->&#62;xmlDebugDumpString ()</H3
+>xmlDebugDumpString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -560,7 +560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25424"
+NAME="AEN25590"
 ></A
 ><P
 ></P
@@ -615,13 +615,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25437"
+NAME="AEN25603"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPATTR"
 ></A
->&#62;xmlDebugDumpAttr ()</H3
+>xmlDebugDumpAttr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -650,7 +650,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25445"
+NAME="AEN25611"
 ></A
 ><P
 ></P
@@ -722,13 +722,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25462"
+NAME="AEN25628"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPATTRLIST"
 ></A
->&#62;xmlDebugDumpAttrList ()</H3
+>xmlDebugDumpAttrList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -757,7 +757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25470"
+NAME="AEN25636"
 ></A
 ><P
 ></P
@@ -829,13 +829,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25487"
+NAME="AEN25653"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPONENODE"
 ></A
->&#62;xmlDebugDumpOneNode ()</H3
+>xmlDebugDumpOneNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -864,7 +864,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25495"
+NAME="AEN25661"
 ></A
 ><P
 ></P
@@ -936,13 +936,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25512"
+NAME="AEN25678"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPNODE"
 ></A
->&#62;xmlDebugDumpNode ()</H3
+>xmlDebugDumpNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -971,7 +971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25520"
+NAME="AEN25686"
 ></A
 ><P
 ></P
@@ -1043,13 +1043,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25537"
+NAME="AEN25703"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPNODELIST"
 ></A
->&#62;xmlDebugDumpNodeList ()</H3
+>xmlDebugDumpNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1078,7 +1078,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25545"
+NAME="AEN25711"
 ></A
 ><P
 ></P
@@ -1150,13 +1150,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25562"
+NAME="AEN25728"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPDOCUMENTHEAD"
 ></A
->&#62;xmlDebugDumpDocumentHead ()</H3
+>xmlDebugDumpDocumentHead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1184,7 +1184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25570"
+NAME="AEN25736"
 ></A
 ><P
 ></P
@@ -1239,13 +1239,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25583"
+NAME="AEN25749"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPDOCUMENT"
 ></A
->&#62;xmlDebugDumpDocument ()</H3
+>xmlDebugDumpDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1273,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25591"
+NAME="AEN25757"
 ></A
 ><P
 ></P
@@ -1328,13 +1328,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25604"
+NAME="AEN25770"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPDTD"
 ></A
->&#62;xmlDebugDumpDTD ()</H3
+>xmlDebugDumpDTD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1362,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25612"
+NAME="AEN25778"
 ></A
 ><P
 ></P
@@ -1417,13 +1417,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25625"
+NAME="AEN25791"
 ></A
 ><H3
 ><A
 NAME="XMLDEBUGDUMPENTITIES"
 ></A
->&#62;xmlDebugDumpEntities ()</H3
+>xmlDebugDumpEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1451,7 +1451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25633"
+NAME="AEN25799"
 ></A
 ><P
 ></P
@@ -1506,13 +1506,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25646"
+NAME="AEN25812"
 ></A
 ><H3
 ><A
 NAME="XMLLSONENODE"
 ></A
->&#62;xmlLsOneNode ()</H3
+>xmlLsOneNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1550,7 +1550,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25656"
+NAME="AEN25822"
 ></A
 ><P
 ></P
@@ -1605,13 +1605,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25669"
+NAME="AEN25835"
 ></A
 ><H3
 ><A
 NAME="XMLLSCOUNTNODE"
 ></A
->&#62;xmlLsCountNode ()</H3
+>xmlLsCountNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1640,7 +1640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25677"
+NAME="AEN25843"
 ></A
 ><P
 ></P
@@ -1698,13 +1698,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25691"
+NAME="AEN25857"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLREADLINEFUNC"
 ></A
->&#62;xmlShellReadlineFunc ()</H3
+>xmlShellReadlineFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1725,7 +1725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25697"
+NAME="AEN25863"
 ></A
 ><P
 ></P
@@ -1778,13 +1778,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25710"
+NAME="AEN25876"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCTXT"
 ></A
->&#62;struct xmlShellCtxt</H3
+>struct xmlShellCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1815,13 +1815,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25716"
+NAME="AEN25882"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCTXTPTR"
 ></A
->&#62;xmlShellCtxtPtr</H3
+>xmlShellCtxtPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1841,13 +1841,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25721"
+NAME="AEN25887"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCMD"
 ></A
->&#62;xmlShellCmd ()</H3
+>xmlShellCmd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1880,7 +1880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25730"
+NAME="AEN25896"
 ></A
 ><P
 ></P
@@ -1984,13 +1984,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25755"
+NAME="AEN25921"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLPRINTXPATHERROR"
 ></A
->&#62;xmlShellPrintXPathError ()</H3
+>xmlShellPrintXPathError ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2012,7 +2012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25761"
+NAME="AEN25927"
 ></A
 ><P
 ></P
@@ -2067,13 +2067,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25774"
+NAME="AEN25940"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLPRINTNODE"
 ></A
->&#62;xmlShellPrintNode ()</H3
+>xmlShellPrintNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2097,7 +2097,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25781"
+NAME="AEN25947"
 ></A
 ><P
 ></P
@@ -2135,13 +2135,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25790"
+NAME="AEN25956"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLPRINTXPATHRESULT"
 ></A
->&#62;xmlShellPrintXPathResult ()</H3
+>xmlShellPrintXPathResult ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2165,7 +2165,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25797"
+NAME="AEN25963"
 ></A
 ><P
 ></P
@@ -2203,13 +2203,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25806"
+NAME="AEN25972"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLLIST"
 ></A
->&#62;xmlShellList ()</H3
+>xmlShellList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2243,7 +2243,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25815"
+NAME="AEN25981"
 ></A
 ><P
 ></P
@@ -2347,13 +2347,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25840"
+NAME="AEN26006"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLBASE"
 ></A
->&#62;xmlShellBase ()</H3
+>xmlShellBase ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2387,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25849"
+NAME="AEN26015"
 ></A
 ><P
 ></P
@@ -2491,13 +2491,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25874"
+NAME="AEN26040"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLDIR"
 ></A
->&#62;xmlShellDir ()</H3
+>xmlShellDir ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2531,7 +2531,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25883"
+NAME="AEN26049"
 ></A
 ><P
 ></P
@@ -2635,13 +2635,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25908"
+NAME="AEN26074"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLCAT"
 ></A
->&#62;xmlShellCat ()</H3
+>xmlShellCat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2675,7 +2675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25917"
+NAME="AEN26083"
 ></A
 ><P
 ></P
@@ -2779,13 +2779,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25942"
+NAME="AEN26108"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLLOAD"
 ></A
->&#62;xmlShellLoad ()</H3
+>xmlShellLoad ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2819,7 +2819,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25951"
+NAME="AEN26117"
 ></A
 ><P
 ></P
@@ -2923,13 +2923,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25976"
+NAME="AEN26142"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLWRITE"
 ></A
->&#62;xmlShellWrite ()</H3
+>xmlShellWrite ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2969,7 +2969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25986"
+NAME="AEN26152"
 ></A
 ><P
 ></P
@@ -3073,13 +3073,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26011"
+NAME="AEN26177"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLSAVE"
 ></A
->&#62;xmlShellSave ()</H3
+>xmlShellSave ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3113,7 +3113,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26020"
+NAME="AEN26186"
 ></A
 ><P
 ></P
@@ -3217,13 +3217,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26045"
+NAME="AEN26211"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLVALIDATE"
 ></A
->&#62;xmlShellValidate ()</H3
+>xmlShellValidate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3258,7 +3258,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26054"
+NAME="AEN26220"
 ></A
 ><P
 ></P
@@ -3362,13 +3362,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26079"
+NAME="AEN26245"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLDU"
 ></A
->&#62;xmlShellDu ()</H3
+>xmlShellDu ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3413,7 +3413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26090"
+NAME="AEN26256"
 ></A
 ><P
 ></P
@@ -3517,13 +3517,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26115"
+NAME="AEN26281"
 ></A
 ><H3
 ><A
 NAME="XMLSHELLPWD"
 ></A
->&#62;xmlShellPwd ()</H3
+>xmlShellPwd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3559,7 +3559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26124"
+NAME="AEN26290"
 ></A
 ><P
 ></P
@@ -3663,13 +3663,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26149"
+NAME="AEN26315"
 ></A
 ><H3
 ><A
 NAME="XMLSHELL"
 ></A
->&#62;xmlShell ()</H3
+>xmlShell ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3704,7 +3704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26158"
+NAME="AEN26324"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index ea2d360..f77d32e 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20450"
+NAME="AEN20616"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20453"
+NAME="AEN20619"
 ></A
 ><H2
 >Synopsis</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20490"
+NAME="AEN20656"
 ></A
 ><H2
 >Description</H2
@@ -305,20 +305,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20493"
+NAME="AEN20659"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20495"
+NAME="AEN20661"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERCTXT"
 ></A
->&#62;docbParserCtxt</H3
+>docbParserCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -338,13 +338,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20500"
+NAME="AEN20666"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERCTXTPTR"
 ></A
->&#62;docbParserCtxtPtr</H3
+>docbParserCtxtPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -364,13 +364,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20505"
+NAME="AEN20671"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERNODEINFO"
 ></A
->&#62;docbParserNodeInfo</H3
+>docbParserNodeInfo</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -390,13 +390,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20510"
+NAME="AEN20676"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXHANDLER"
 ></A
->&#62;docbSAXHandler</H3
+>docbSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -416,13 +416,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20515"
+NAME="AEN20681"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXHANDLERPTR"
 ></A
->&#62;docbSAXHandlerPtr</H3
+>docbSAXHandlerPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -442,13 +442,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20520"
+NAME="AEN20686"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERINPUT"
 ></A
->&#62;docbParserInput</H3
+>docbParserInput</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -468,13 +468,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20525"
+NAME="AEN20691"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSERINPUTPTR"
 ></A
->&#62;docbParserInputPtr</H3
+>docbParserInputPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -494,13 +494,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20530"
+NAME="AEN20696"
 ></A
 ><H3
 ><A
 NAME="DOCBDOCPTR"
 ></A
->&#62;docbDocPtr</H3
+>docbDocPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -520,13 +520,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20535"
+NAME="AEN20701"
 ></A
 ><H3
 ><A
 NAME="DOCBNODEPTR"
 ></A
->&#62;docbNodePtr</H3
+>docbNodePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -546,13 +546,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20540"
+NAME="AEN20706"
 ></A
 ><H3
 ><A
 NAME="DOCBENCODEENTITIES"
 ></A
->&#62;docbEncodeEntities ()</H3
+>docbEncodeEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -578,7 +578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20546"
+NAME="AEN20712"
 ></A
 ><P
 ></P
@@ -705,7 +705,7 @@
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -722,13 +722,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20579"
+NAME="AEN20745"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXPARSEDOC"
 ></A
->&#62;docbSAXParseDoc ()</H3
+>docbSAXParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -763,7 +763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20588"
+NAME="AEN20754"
 ></A
 ><P
 ></P
@@ -867,13 +867,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20613"
+NAME="AEN20779"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSEDOC"
 ></A
->&#62;docbParseDoc ()</H3
+>docbParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -901,7 +901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20621"
+NAME="AEN20787"
 ></A
 ><P
 ></P
@@ -971,13 +971,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20638"
+NAME="AEN20804"
 ></A
 ><H3
 ><A
 NAME="DOCBSAXPARSEFILE"
 ></A
->&#62;docbSAXParseFile ()</H3
+>docbSAXParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1010,7 +1010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20646"
+NAME="AEN20812"
 ></A
 ><P
 ></P
@@ -1114,13 +1114,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20671"
+NAME="AEN20837"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSEFILE"
 ></A
->&#62;docbParseFile ()</H3
+>docbParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20678"
+NAME="AEN20844"
 ></A
 ><P
 ></P
@@ -1217,13 +1217,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20695"
+NAME="AEN20861"
 ></A
 ><H3
 ><A
 NAME="DOCBFREEPARSERCTXT"
 ></A
->&#62;docbFreeParserCtxt ()</H3
+>docbFreeParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1248,7 +1248,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20702"
+NAME="AEN20868"
 ></A
 ><P
 ></P
@@ -1286,13 +1286,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20711"
+NAME="AEN20877"
 ></A
 ><H3
 ><A
 NAME="DOCBCREATEPUSHPARSERCTXT"
 ></A
->&#62;docbCreatePushParserCtxt ()</H3
+>docbCreatePushParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1340,7 +1340,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20722"
+NAME="AEN20888"
 ></A
 ><P
 ></P
@@ -1478,13 +1478,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20755"
+NAME="AEN20921"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSECHUNK"
 ></A
->&#62;docbParseChunk ()</H3
+>docbParseChunk ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1511,7 +1511,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20762"
+NAME="AEN20928"
 ></A
 ><P
 ></P
@@ -1615,13 +1615,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20787"
+NAME="AEN20953"
 ></A
 ><H3
 ><A
 NAME="DOCBCREATEFILEPARSERCTXT"
 ></A
->&#62;docbCreateFileParserCtxt ()</H3
+>docbCreateFileParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1648,7 +1648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20794"
+NAME="AEN20960"
 ></A
 ><P
 ></P
@@ -1718,13 +1718,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20811"
+NAME="AEN20977"
 ></A
 ><H3
 ><A
 NAME="DOCBPARSEDOCUMENT"
 ></A
->&#62;docbParseDocument ()</H3
+>docbParseDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1749,7 +1749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20818"
+NAME="AEN20984"
 ></A
 ><P
 ></P
@@ -1792,7 +1792,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0, -1 in case of error. the parser context is augmented
-               as a result of the parsing.</TD
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index 98a5a15..b2c247f 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23695"
+NAME="AEN23861"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23698"
+NAME="AEN23864"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23758"
+NAME="AEN23924"
 ></A
 ><H2
 >Description</H2
@@ -392,20 +392,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23761"
+NAME="AEN23927"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23763"
+NAME="AEN23929"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODING"
 ></A
->&#62;enum xmlCharEncoding</H3
+>enum xmlCharEncoding</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -465,13 +465,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23770"
+NAME="AEN23936"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGINPUTFUNC"
 ></A
->&#62;xmlCharEncodingInputFunc ()</H3
+>xmlCharEncodingInputFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -496,7 +496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23776"
+NAME="AEN23942"
 ></A
 ><P
 ></P
@@ -600,14 +600,14 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte written, or -1 by lack of space, or -2
-    if the transcoding failed.
+if the transcoding failed.
 The value of <TT
 CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictiable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -624,13 +624,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23805"
+NAME="AEN23971"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGOUTPUTFUNC"
 ></A
->&#62;xmlCharEncodingOutputFunc ()</H3
+>xmlCharEncodingOutputFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -657,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23811"
+NAME="AEN23977"
 ></A
 ><P
 ></P
@@ -761,14 +761,14 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte written, or -1 by lack of space, or -2
-    if the transcoding failed.
+if the transcoding failed.
 The value of <TT
 CLASS="PARAMETER"
 ><I
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictiable.
+as the return value is positive, else unpredictiable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -785,13 +785,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23840"
+NAME="AEN24006"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGHANDLER"
 ></A
->&#62;struct xmlCharEncodingHandler</H3
+>struct xmlCharEncodingHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -819,13 +819,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23845"
+NAME="AEN24011"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCODINGHANDLERPTR"
 ></A
->&#62;xmlCharEncodingHandlerPtr</H3
+>xmlCharEncodingHandlerPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -845,13 +845,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23850"
+NAME="AEN24016"
 ></A
 ><H3
 ><A
 NAME="XMLINITCHARENCODINGHANDLERS"
 ></A
->&#62;xmlInitCharEncodingHandlers ()</H3
+>xmlInitCharEncodingHandlers ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -869,20 +869,20 @@
 >Initialize the char encoding support, it registers the default
 encoding supported.
 NOTE: while public, this function usually doesn't need to be called
-      in normal processing.</P
+in normal processing.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23856"
+NAME="AEN24022"
 ></A
 ><H3
 ><A
 NAME="XMLCLEANUPCHARENCODINGHANDLERS"
 ></A
->&#62;xmlCleanupCharEncodingHandlers ()</H3
+>xmlCleanupCharEncodingHandlers ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -905,13 +905,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23862"
+NAME="AEN24028"
 ></A
 ><H3
 ><A
 NAME="XMLREGISTERCHARENCODINGHANDLER"
 ></A
->&#62;xmlRegisterCharEncodingHandler ()</H3
+>xmlRegisterCharEncodingHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -935,7 +935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23869"
+NAME="AEN24035"
 ></A
 ><P
 ></P
@@ -973,13 +973,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23878"
+NAME="AEN24044"
 ></A
 ><H3
 ><A
 NAME="XMLGETCHARENCODINGHANDLER"
 ></A
->&#62;xmlGetCharEncodingHandler ()</H3
+>xmlGetCharEncodingHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1007,7 +1007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23886"
+NAME="AEN24052"
 ></A
 ><P
 ></P
@@ -1060,13 +1060,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23899"
+NAME="AEN24065"
 ></A
 ><H3
 ><A
 NAME="XMLFINDCHARENCODINGHANDLER"
 ></A
->&#62;xmlFindCharEncodingHandler ()</H3
+>xmlFindCharEncodingHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1091,7 +1091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23906"
+NAME="AEN24072"
 ></A
 ><P
 ></P
@@ -1144,13 +1144,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23919"
+NAME="AEN24085"
 ></A
 ><H3
 ><A
 NAME="XMLADDENCODINGALIAS"
 ></A
->&#62;xmlAddEncodingAlias ()</H3
+>xmlAddEncodingAlias ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1183,7 +1183,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23927"
+NAME="AEN24093"
 ></A
 ><P
 ></P
@@ -1253,13 +1253,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23944"
+NAME="AEN24110"
 ></A
 ><H3
 ><A
 NAME="XMLDELENCODINGALIAS"
 ></A
->&#62;xmlDelEncodingAlias ()</H3
+>xmlDelEncodingAlias ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1285,7 +1285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23951"
+NAME="AEN24117"
 ></A
 ><P
 ></P
@@ -1338,13 +1338,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23964"
+NAME="AEN24130"
 ></A
 ><H3
 ><A
 NAME="XMLGETENCODINGALIAS"
 ></A
->&#62;xmlGetEncodingAlias ()</H3
+>xmlGetEncodingAlias ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1365,7 +1365,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23970"
+NAME="AEN24136"
 ></A
 ><P
 ></P
@@ -1418,13 +1418,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23983"
+NAME="AEN24149"
 ></A
 ><H3
 ><A
 NAME="XMLCLEANUPENCODINGALIASES"
 ></A
->&#62;xmlCleanupEncodingAliases ()</H3
+>xmlCleanupEncodingAliases ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1446,13 +1446,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23989"
+NAME="AEN24155"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECHARENCODING"
 ></A
->&#62;xmlParseCharEncoding ()</H3
+>xmlParseCharEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1478,7 +1478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23996"
+NAME="AEN24162"
 ></A
 ><P
 ></P
@@ -1532,13 +1532,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24009"
+NAME="AEN24175"
 ></A
 ><H3
 ><A
 NAME="XMLGETCHARENCODINGNAME"
 ></A
->&#62;xmlGetCharEncodingName ()</H3
+>xmlGetCharEncodingName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1567,7 +1567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24017"
+NAME="AEN24183"
 ></A
 ><P
 ></P
@@ -1620,13 +1620,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24030"
+NAME="AEN24196"
 ></A
 ><H3
 ><A
 NAME="XMLDETECTCHARENCODING"
 ></A
->&#62;xmlDetectCharEncoding ()</H3
+>xmlDetectCharEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1652,7 +1652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24037"
+NAME="AEN24203"
 ></A
 ><P
 ></P
@@ -1680,7 +1680,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  a pointer to the first bytes of the XML entity, must be at least
-      4 bytes long.</TD
+4 bytes long.</TD
 ></TR
 ><TR
 ><TD
@@ -1723,13 +1723,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24054"
+NAME="AEN24220"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCOUTFUNC"
 ></A
->&#62;xmlCharEncOutFunc ()</H3
+>xmlCharEncOutFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1771,7 +1771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24064"
+NAME="AEN24230"
 ></A
 ><P
 ></P
@@ -1848,9 +1848,9 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte written if success, or 
-    -1 general error
-    -2 if the transcoding fails (for *in is not valid utf8 string or
-       the result of transformation can't fit into the encoding we want), or</TD
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1861,13 +1861,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24085"
+NAME="AEN24251"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCINFUNC"
 ></A
->&#62;xmlCharEncInFunc ()</H3
+>xmlCharEncInFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1899,7 +1899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24094"
+NAME="AEN24260"
 ></A
 ><P
 ></P
@@ -1976,9 +1976,9 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte written if success, or 
-    -1 general error
-    -2 if the transcoding fails (for *in is not valid utf8 string or
-       the result of transformation can't fit into the encoding we want), or</TD
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1989,13 +1989,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24115"
+NAME="AEN24281"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCFIRSTLINE"
 ></A
->&#62;xmlCharEncFirstLine ()</H3
+>xmlCharEncFirstLine ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2028,7 +2028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24124"
+NAME="AEN24290"
 ></A
 ><P
 ></P
@@ -2105,9 +2105,9 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte written if success, or 
-    -1 general error
-    -2 if the transcoding fails (for *in is not valid utf8 string or
-       the result of transformation can't fit into the encoding we want), or</TD
+-1 general error
+-2 if the transcoding fails (for *in is not valid utf8 string or
+the result of transformation can't fit into the encoding we want), or</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2118,13 +2118,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24145"
+NAME="AEN24311"
 ></A
 ><H3
 ><A
 NAME="XMLCHARENCCLOSEFUNC"
 ></A
->&#62;xmlCharEncCloseFunc ()</H3
+>xmlCharEncCloseFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2148,7 +2148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24152"
+NAME="AEN24318"
 ></A
 ><P
 ></P
@@ -2201,13 +2201,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24165"
+NAME="AEN24331"
 ></A
 ><H3
 ><A
 NAME="UTF8TOISOLAT1"
 ></A
->&#62;UTF8Toisolat1 ()</H3
+>UTF8Toisolat1 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2232,7 +2232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24171"
+NAME="AEN24337"
 ></A
 ><P
 ></P
@@ -2342,7 +2342,7 @@
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2359,13 +2359,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24200"
+NAME="AEN24366"
 ></A
 ><H3
 ><A
 NAME="ISOLAT1TOUTF8"
 ></A
->&#62;isolat1ToUTF8 ()</H3
+>isolat1ToUTF8 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2390,7 +2390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24206"
+NAME="AEN24372"
 ></A
 ><P
 ></P
@@ -2500,7 +2500,7 @@
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2517,13 +2517,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24235"
+NAME="AEN24401"
 ></A
 ><H3
 ><A
 NAME="XMLCHECKUTF8"
 ></A
->&#62;xmlCheckUTF8 ()</H3
+>xmlCheckUTF8 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2559,7 +2559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24243"
+NAME="AEN24409"
 ></A
 ><P
 ></P
@@ -2617,13 +2617,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24257"
+NAME="AEN24423"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRSIZE"
 ></A
->&#62;xmlUTF8Strsize ()</H3
+>xmlUTF8Strsize ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2648,7 +2648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24264"
+NAME="AEN24430"
 ></A
 ><P
 ></P
@@ -2719,13 +2719,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24281"
+NAME="AEN24447"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRNDUP"
 ></A
->&#62;xmlUTF8Strndup ()</H3
+>xmlUTF8Strndup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2753,7 +2753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24289"
+NAME="AEN24455"
 ></A
 ><P
 ></P
@@ -2828,13 +2828,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24307"
+NAME="AEN24473"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRPOS"
 ></A
->&#62;xmlUTF8Strpos ()</H3
+>xmlUTF8Strpos ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2863,7 +2863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24315"
+NAME="AEN24481"
 ></A
 ><P
 ></P
@@ -2933,13 +2933,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24332"
+NAME="AEN24498"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRLOC"
 ></A
->&#62;xmlUTF8Strloc ()</H3
+>xmlUTF8Strloc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2967,7 +2967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24340"
+NAME="AEN24506"
 ></A
 ><P
 ></P
@@ -3038,13 +3038,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24357"
+NAME="AEN24523"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRSUB"
 ></A
->&#62;xmlUTF8Strsub ()</H3
+>xmlUTF8Strsub ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3073,7 +3073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24365"
+NAME="AEN24531"
 ></A
 ><P
 ></P
@@ -3161,13 +3161,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24386"
+NAME="AEN24552"
 ></A
 ><H3
 ><A
 NAME="XMLUTF8STRLEN"
 ></A
->&#62;xmlUTF8Strlen ()</H3
+>xmlUTF8Strlen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3192,7 +3192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24393"
+NAME="AEN24559"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 693871b..70cb8e8 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -390,7 +390,7 @@
 ><A
 NAME="XMLENTITYTYPE"
 ></A
->&#62;enum xmlEntityType</H3
+>enum xmlEntityType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -423,7 +423,7 @@
 ><A
 NAME="XMLENTITY"
 ></A
->&#62;struct xmlEntity</H3
+>struct xmlEntity</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -469,7 +469,7 @@
 ><A
 NAME="XMLENTITIESTABLEPTR"
 ></A
->&#62;xmlEntitiesTablePtr</H3
+>xmlEntitiesTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -495,7 +495,7 @@
 ><A
 NAME="XMLINITIALIZEPREDEFINEDENTITIES"
 ></A
->&#62;xmlInitializePredefinedEntities ()</H3
+>xmlInitializePredefinedEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -523,7 +523,7 @@
 ><A
 NAME="XMLADDDOCENTITY"
 ></A
->&#62;xmlAddDocEntity ()</H3
+>xmlAddDocEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -711,7 +711,7 @@
 ><A
 NAME="XMLADDDTDENTITY"
 ></A
->&#62;xmlAddDtdEntity ()</H3
+>xmlAddDtdEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -899,7 +899,7 @@
 ><A
 NAME="XMLGETPREDEFINEDENTITY"
 ></A
->&#62;xmlGetPredefinedEntity ()</H3
+>xmlGetPredefinedEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -985,7 +985,7 @@
 ><A
 NAME="XMLGETDOCENTITY"
 ></A
->&#62;xmlGetDocEntity ()</H3
+>xmlGetDocEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1094,7 +1094,7 @@
 ><A
 NAME="XMLGETDTDENTITY"
 ></A
->&#62;xmlGetDtdEntity ()</H3
+>xmlGetDtdEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1203,7 +1203,7 @@
 ><A
 NAME="XMLGETPARAMETERENTITY"
 ></A
->&#62;xmlGetParameterEntity ()</H3
+>xmlGetParameterEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1311,7 +1311,7 @@
 ><A
 NAME="XMLENCODEENTITIES"
 ></A
->&#62;xmlEncodeEntities ()</H3
+>xmlEncodeEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1340,7 +1340,7 @@
 and non ASCII values with their entities and CharRef counterparts.</P
 ><P
 >TODO: remove xmlEncodeEntities, once we are not afraid of breaking binary
-      compatibility</P
+compatibility</P
 ><P
 >People must migrate their code to xmlEncodeEntitiesReentrant !
 This routine will issue a warning when encountered.</P
@@ -1425,7 +1425,7 @@
 ><A
 NAME="XMLENCODEENTITIESREENTRANT"
 ></A
->&#62;xmlEncodeEntitiesReentrant ()</H3
+>xmlEncodeEntitiesReentrant ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1535,7 +1535,7 @@
 ><A
 NAME="XMLENCODESPECIALCHARS"
 ></A
->&#62;xmlEncodeSpecialChars ()</H3
+>xmlEncodeSpecialChars ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1643,7 +1643,7 @@
 ><A
 NAME="XMLCREATEENTITIESTABLE"
 ></A
->&#62;xmlCreateEntitiesTable ()</H3
+>xmlCreateEntitiesTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1709,7 +1709,7 @@
 ><A
 NAME="XMLCOPYENTITIESTABLE"
 ></A
->&#62;xmlCopyEntitiesTable ()</H3
+>xmlCopyEntitiesTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1795,7 +1795,7 @@
 ><A
 NAME="XMLFREEENTITIESTABLE"
 ></A
->&#62;xmlFreeEntitiesTable ()</H3
+>xmlFreeEntitiesTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1863,7 +1863,7 @@
 ><A
 NAME="XMLDUMPENTITIESTABLE"
 ></A
->&#62;xmlDumpEntitiesTable ()</H3
+>xmlDumpEntitiesTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1952,7 +1952,7 @@
 ><A
 NAME="XMLDUMPENTITYDECL"
 ></A
->&#62;xmlDumpEntityDecl ()</H3
+>xmlDumpEntityDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2041,7 +2041,7 @@
 ><A
 NAME="XMLCLEANUPPREDEFINEDENTITIES"
 ></A
->&#62;xmlCleanupPredefinedEntities ()</H3
+>xmlCleanupPredefinedEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index d9a6b20..49da6c2 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20199"
+NAME="AEN20365"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20202"
+NAME="AEN20368"
 ></A
 ><H2
 >Synopsis</H2
@@ -264,7 +264,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20233"
+NAME="AEN20399"
 ></A
 ><H2
 >Description</H2
@@ -274,20 +274,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN20236"
+NAME="AEN20402"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20238"
+NAME="AEN20404"
 ></A
 ><H3
 ><A
 NAME="XMLGLOBALSTATE"
 ></A
->&#62;struct xmlGlobalState</H3
+>struct xmlGlobalState</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -340,13 +340,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20243"
+NAME="AEN20409"
 ></A
 ><H3
 ><A
 NAME="XMLGLOBALSTATEPTR"
 ></A
->&#62;xmlGlobalStatePtr</H3
+>xmlGlobalStatePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -366,13 +366,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20248"
+NAME="AEN20414"
 ></A
 ><H3
 ><A
 NAME="XMLINITIALIZEGLOBALSTATE"
 ></A
->&#62;xmlInitializeGlobalState ()</H3
+>xmlInitializeGlobalState ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -400,7 +400,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20256"
+NAME="AEN20422"
 ></A
 ><P
 ></P
@@ -438,13 +438,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20265"
+NAME="AEN20431"
 ></A
 ><H3
 ><A
 NAME="XMLMALLOC"
 ></A
->&#62;xmlMalloc()</H3
+>xmlMalloc()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -468,7 +468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20272"
+NAME="AEN20438"
 ></A
 ><P
 ></P
@@ -506,13 +506,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20281"
+NAME="AEN20447"
 ></A
 ><H3
 ><A
 NAME="XMLREALLOC"
 ></A
->&#62;xmlRealloc()</H3
+>xmlRealloc()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -536,7 +536,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20288"
+NAME="AEN20454"
 ></A
 ><P
 ></P
@@ -591,13 +591,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20301"
+NAME="AEN20467"
 ></A
 ><H3
 ><A
 NAME="XMLFREE"
 ></A
->&#62;xmlFree</H3
+>xmlFree</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -622,13 +622,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20308"
+NAME="AEN20474"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSTRDUP"
 ></A
->&#62;xmlMemStrdup()</H3
+>xmlMemStrdup()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -655,7 +655,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20316"
+NAME="AEN20482"
 ></A
 ><P
 ></P
@@ -693,13 +693,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20325"
+NAME="AEN20491"
 ></A
 ><H3
 ><A
 NAME="DOCBDEFAULTSAXHANDLER"
 ></A
->&#62;docbDefaultSAXHandler</H3
+>docbDefaultSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -721,13 +721,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20331"
+NAME="AEN20497"
 ></A
 ><H3
 ><A
 NAME="HTMLDEFAULTSAXHANDLER"
 ></A
->&#62;htmlDefaultSAXHandler</H3
+>htmlDefaultSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -749,13 +749,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20337"
+NAME="AEN20503"
 ></A
 ><H3
 ><A
 NAME="OLDXMLWDCOMPATIBILITY"
 ></A
->&#62;oldXMLWDcompatibility</H3
+>oldXMLWDcompatibility</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -777,13 +777,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20343"
+NAME="AEN20509"
 ></A
 ><H3
 ><A
 NAME="XMLBUFFERALLOCSCHEME"
 ></A
->&#62;xmlBufferAllocScheme</H3
+>xmlBufferAllocScheme</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -806,13 +806,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20349"
+NAME="AEN20515"
 ></A
 ><H3
 ><A
 NAME="XMLDEFAULTBUFFERSIZE"
 ></A
->&#62;xmlDefaultBufferSize</H3
+>xmlDefaultBufferSize</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -834,13 +834,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20355"
+NAME="AEN20521"
 ></A
 ><H3
 ><A
 NAME="XMLDEFAULTSAXHANDLER"
 ></A
->&#62;xmlDefaultSAXHandler</H3
+>xmlDefaultSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -862,13 +862,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20361"
+NAME="AEN20527"
 ></A
 ><H3
 ><A
 NAME="XMLDEFAULTSAXLOCATOR"
 ></A
->&#62;xmlDefaultSAXLocator</H3
+>xmlDefaultSAXLocator</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -891,13 +891,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20367"
+NAME="AEN20533"
 ></A
 ><H3
 ><A
 NAME="XMLDOVALIDITYCHECKINGDEFAULTVALUE"
 ></A
->&#62;xmlDoValidityCheckingDefaultValue</H3
+>xmlDoValidityCheckingDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -920,13 +920,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20373"
+NAME="AEN20539"
 ></A
 ><H3
 ><A
 NAME="XMLGENERICERROR"
 ></A
->&#62;xmlGenericError</H3
+>xmlGenericError</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -948,13 +948,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20379"
+NAME="AEN20545"
 ></A
 ><H3
 ><A
 NAME="XMLGENERICERRORCONTEXT"
 ></A
->&#62;xmlGenericErrorContext</H3
+>xmlGenericErrorContext</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -976,13 +976,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20385"
+NAME="AEN20551"
 ></A
 ><H3
 ><A
 NAME="XMLGETWARNINGSDEFAULTVALUE"
 ></A
->&#62;xmlGetWarningsDefaultValue</H3
+>xmlGetWarningsDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1005,13 +1005,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20391"
+NAME="AEN20557"
 ></A
 ><H3
 ><A
 NAME="XMLINDENTTREEOUTPUT"
 ></A
->&#62;xmlIndentTreeOutput</H3
+>xmlIndentTreeOutput</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1034,13 +1034,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20397"
+NAME="AEN20563"
 ></A
 ><H3
 ><A
 NAME="XMLKEEPBLANKSDEFAULTVALUE"
 ></A
->&#62;xmlKeepBlanksDefaultValue</H3
+>xmlKeepBlanksDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1066,13 +1066,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20403"
+NAME="AEN20569"
 ></A
 ><H3
 ><A
 NAME="XMLLINENUMBERSDEFAULTVALUE"
 ></A
->&#62;xmlLineNumbersDefaultValue</H3
+>xmlLineNumbersDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1097,13 +1097,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20409"
+NAME="AEN20575"
 ></A
 ><H3
 ><A
 NAME="XMLLOADEXTDTDDEFAULTVALUE"
 ></A
->&#62;xmlLoadExtDtdDefaultValue</H3
+>xmlLoadExtDtdDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1127,13 +1127,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20415"
+NAME="AEN20581"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERDEBUGENTITIES"
 ></A
->&#62;xmlParserDebugEntities</H3
+>xmlParserDebugEntities</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1157,13 +1157,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20421"
+NAME="AEN20587"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERVERSION"
 ></A
->&#62;xmlParserVersion</H3
+>xmlParserVersion</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1185,13 +1185,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20427"
+NAME="AEN20593"
 ></A
 ><H3
 ><A
 NAME="XMLPEDANTICPARSERDEFAULTVALUE"
 ></A
->&#62;xmlPedanticParserDefaultValue</H3
+>xmlPedanticParserDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1214,13 +1214,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20433"
+NAME="AEN20599"
 ></A
 ><H3
 ><A
 NAME="XMLSAVENOEMPTYTAGS"
 ></A
->&#62;xmlSaveNoEmptyTags</H3
+>xmlSaveNoEmptyTags</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1245,13 +1245,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20439"
+NAME="AEN20605"
 ></A
 ><H3
 ><A
 NAME="XMLSUBSTITUTEENTITIESDEFAULTVALUE"
 ></A
->&#62;xmlSubstituteEntitiesDefaultValue</H3
+>xmlSubstituteEntitiesDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-hash.html b/doc/html/libxml-hash.html
index 66b4afe..03b9b68 100644
--- a/doc/html/libxml-hash.html
+++ b/doc/html/libxml-hash.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN24411"
+NAME="AEN24577"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN24414"
+NAME="AEN24580"
 ></A
 ><H2
 >Synopsis</H2
@@ -524,7 +524,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24512"
+NAME="AEN24678"
 ></A
 ><H2
 >Description</H2
@@ -534,20 +534,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN24515"
+NAME="AEN24681"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24517"
+NAME="AEN24683"
 ></A
 ><H3
 ><A
 NAME="XMLHASHTABLE"
 ></A
->&#62;struct xmlHashTable</H3
+>struct xmlHashTable</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -567,13 +567,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24522"
+NAME="AEN24688"
 ></A
 ><H3
 ><A
 NAME="XMLHASHTABLEPTR"
 ></A
->&#62;xmlHashTablePtr</H3
+>xmlHashTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -593,13 +593,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24527"
+NAME="AEN24693"
 ></A
 ><H3
 ><A
 NAME="XMLHASHDEALLOCATOR"
 ></A
->&#62;xmlHashDeallocator ()</H3
+>xmlHashDeallocator ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -624,7 +624,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24534"
+NAME="AEN24700"
 ></A
 ><P
 ></P
@@ -679,13 +679,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24547"
+NAME="AEN24713"
 ></A
 ><H3
 ><A
 NAME="XMLHASHCOPIER"
 ></A
->&#62;xmlHashCopier ()</H3
+>xmlHashCopier ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -710,7 +710,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24554"
+NAME="AEN24720"
 ></A
 ><P
 ></P
@@ -765,13 +765,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24567"
+NAME="AEN24733"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCANNER"
 ></A
->&#62;xmlHashScanner ()</H3
+>xmlHashScanner ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -797,7 +797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24574"
+NAME="AEN24740"
 ></A
 ><P
 ></P
@@ -869,13 +869,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24591"
+NAME="AEN24757"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCANNERFULL"
 ></A
->&#62;xmlHashScannerFull ()</H3
+>xmlHashScannerFull ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -909,7 +909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24600"
+NAME="AEN24766"
 ></A
 ><P
 ></P
@@ -1015,13 +1015,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24625"
+NAME="AEN24791"
 ></A
 ><H3
 ><A
 NAME="XMLHASHCREATE"
 ></A
->&#62;xmlHashCreate ()</H3
+>xmlHashCreate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1045,7 +1045,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24632"
+NAME="AEN24798"
 ></A
 ><P
 ></P
@@ -1098,13 +1098,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24645"
+NAME="AEN24811"
 ></A
 ><H3
 ><A
 NAME="XMLHASHFREE"
 ></A
->&#62;xmlHashFree ()</H3
+>xmlHashFree ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1143,7 +1143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24655"
+NAME="AEN24821"
 ></A
 ><P
 ></P
@@ -1198,13 +1198,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24668"
+NAME="AEN24834"
 ></A
 ><H3
 ><A
 NAME="XMLHASHADDENTRY"
 ></A
->&#62;xmlHashAddEntry ()</H3
+>xmlHashAddEntry ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1249,7 +1249,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24679"
+NAME="AEN24845"
 ></A
 ><P
 ></P
@@ -1336,13 +1336,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24700"
+NAME="AEN24866"
 ></A
 ><H3
 ><A
 NAME="XMLHASHUPDATEENTRY"
 ></A
->&#62;xmlHashUpdateEntry ()</H3
+>xmlHashUpdateEntry ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1402,7 +1402,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24714"
+NAME="AEN24880"
 ></A
 ><P
 ></P
@@ -1506,13 +1506,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24739"
+NAME="AEN24905"
 ></A
 ><H3
 ><A
 NAME="XMLHASHADDENTRY2"
 ></A
->&#62;xmlHashAddEntry2 ()</H3
+>xmlHashAddEntry2 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1566,7 +1566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24752"
+NAME="AEN24918"
 ></A
 ><P
 ></P
@@ -1670,13 +1670,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24777"
+NAME="AEN24943"
 ></A
 ><H3
 ><A
 NAME="XMLHASHUPDATEENTRY2"
 ></A
->&#62;xmlHashUpdateEntry2 ()</H3
+>xmlHashUpdateEntry2 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1740,7 +1740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24792"
+NAME="AEN24958"
 ></A
 ><P
 ></P
@@ -1861,13 +1861,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24821"
+NAME="AEN24987"
 ></A
 ><H3
 ><A
 NAME="XMLHASHADDENTRY3"
 ></A
->&#62;xmlHashAddEntry3 ()</H3
+>xmlHashAddEntry3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1931,7 +1931,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24836"
+NAME="AEN25002"
 ></A
 ><P
 ></P
@@ -2052,13 +2052,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24865"
+NAME="AEN25031"
 ></A
 ><H3
 ><A
 NAME="XMLHASHUPDATEENTRY3"
 ></A
->&#62;xmlHashUpdateEntry3 ()</H3
+>xmlHashUpdateEntry3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2131,7 +2131,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24882"
+NAME="AEN25048"
 ></A
 ><P
 ></P
@@ -2269,13 +2269,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24915"
+NAME="AEN25081"
 ></A
 ><H3
 ><A
 NAME="XMLHASHREMOVEENTRY"
 ></A
->&#62;xmlHashRemoveEntry ()</H3
+>xmlHashRemoveEntry ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2324,7 +2324,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24927"
+NAME="AEN25093"
 ></A
 ><P
 ></P
@@ -2411,13 +2411,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24948"
+NAME="AEN25114"
 ></A
 ><H3
 ><A
 NAME="XMLHASHREMOVEENTRY2"
 ></A
->&#62;xmlHashRemoveEntry2 ()</H3
+>xmlHashRemoveEntry2 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2475,7 +2475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24962"
+NAME="AEN25128"
 ></A
 ><P
 ></P
@@ -2579,13 +2579,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24987"
+NAME="AEN25153"
 ></A
 ><H3
 ><A
 NAME="XMLHASHREMOVEENTRY3"
 ></A
->&#62;xmlHashRemoveEntry3 ()</H3
+>xmlHashRemoveEntry3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2652,7 +2652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25003"
+NAME="AEN25169"
 ></A
 ><P
 ></P
@@ -2773,13 +2773,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25032"
+NAME="AEN25198"
 ></A
 ><H3
 ><A
 NAME="XMLHASHLOOKUP"
 ></A
->&#62;xmlHashLookup ()</H3
+>xmlHashLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2812,7 +2812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25041"
+NAME="AEN25207"
 ></A
 ><P
 ></P
@@ -2867,13 +2867,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25054"
+NAME="AEN25220"
 ></A
 ><H3
 ><A
 NAME="XMLHASHLOOKUP2"
 ></A
->&#62;xmlHashLookup2 ()</H3
+>xmlHashLookup2 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2915,7 +2915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25065"
+NAME="AEN25231"
 ></A
 ><P
 ></P
@@ -2987,13 +2987,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25082"
+NAME="AEN25248"
 ></A
 ><H3
 ><A
 NAME="XMLHASHLOOKUP3"
 ></A
->&#62;xmlHashLookup3 ()</H3
+>xmlHashLookup3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3044,7 +3044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25095"
+NAME="AEN25261"
 ></A
 ><P
 ></P
@@ -3133,13 +3133,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25116"
+NAME="AEN25282"
 ></A
 ><H3
 ><A
 NAME="XMLHASHCOPY"
 ></A
->&#62;xmlHashCopy ()</H3
+>xmlHashCopy ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3180,7 +3180,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25127"
+NAME="AEN25293"
 ></A
 ><P
 ></P
@@ -3250,13 +3250,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25144"
+NAME="AEN25310"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSIZE"
 ></A
->&#62;xmlHashSize ()</H3
+>xmlHashSize ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3285,7 +3285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25152"
+NAME="AEN25318"
 ></A
 ><P
 ></P
@@ -3339,13 +3339,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25165"
+NAME="AEN25331"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCAN"
 ></A
->&#62;xmlHashScan ()</H3
+>xmlHashScan ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3384,7 +3384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25175"
+NAME="AEN25341"
 ></A
 ><P
 ></P
@@ -3456,13 +3456,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25192"
+NAME="AEN25358"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCAN3"
 ></A
->&#62;xmlHashScan3 ()</H3
+>xmlHashScan3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3530,7 +3530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25208"
+NAME="AEN25374"
 ></A
 ><P
 ></P
@@ -3653,13 +3653,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25237"
+NAME="AEN25403"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCANFULL"
 ></A
->&#62;xmlHashScanFull ()</H3
+>xmlHashScanFull ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3698,7 +3698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25247"
+NAME="AEN25413"
 ></A
 ><P
 ></P
@@ -3770,13 +3770,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN25264"
+NAME="AEN25430"
 ></A
 ><H3
 ><A
 NAME="XMLHASHSCANFULL3"
 ></A
->&#62;xmlHashScanFull3 ()</H3
+>xmlHashScanFull3 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3844,7 +3844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN25280"
+NAME="AEN25446"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 933637d..ab0e71e 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -418,7 +418,7 @@
 ><A
 NAME="HTMLPARSERCTXT"
 ></A
->&#62;htmlParserCtxt</H3
+>htmlParserCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -444,7 +444,7 @@
 ><A
 NAME="HTMLPARSERCTXTPTR"
 ></A
->&#62;htmlParserCtxtPtr</H3
+>htmlParserCtxtPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -470,7 +470,7 @@
 ><A
 NAME="HTMLPARSERNODEINFO"
 ></A
->&#62;htmlParserNodeInfo</H3
+>htmlParserNodeInfo</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -496,7 +496,7 @@
 ><A
 NAME="HTMLSAXHANDLER"
 ></A
->&#62;htmlSAXHandler</H3
+>htmlSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -522,7 +522,7 @@
 ><A
 NAME="HTMLSAXHANDLERPTR"
 ></A
->&#62;htmlSAXHandlerPtr</H3
+>htmlSAXHandlerPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -548,7 +548,7 @@
 ><A
 NAME="HTMLPARSERINPUT"
 ></A
->&#62;htmlParserInput</H3
+>htmlParserInput</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -574,7 +574,7 @@
 ><A
 NAME="HTMLPARSERINPUTPTR"
 ></A
->&#62;htmlParserInputPtr</H3
+>htmlParserInputPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -600,7 +600,7 @@
 ><A
 NAME="HTMLDOCPTR"
 ></A
->&#62;htmlDocPtr</H3
+>htmlDocPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -626,7 +626,7 @@
 ><A
 NAME="HTMLNODEPTR"
 ></A
->&#62;htmlNodePtr</H3
+>htmlNodePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -652,7 +652,7 @@
 ><A
 NAME="HTMLELEMDESC"
 ></A
->&#62;struct htmlElemDesc</H3
+>struct htmlElemDesc</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -688,7 +688,7 @@
 ><A
 NAME="HTMLELEMDESCPTR"
 ></A
->&#62;htmlElemDescPtr</H3
+>htmlElemDescPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -714,7 +714,7 @@
 ><A
 NAME="HTMLENTITYDESC"
 ></A
->&#62;struct htmlEntityDesc</H3
+>struct htmlEntityDesc</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -744,7 +744,7 @@
 ><A
 NAME="HTMLENTITYDESCPTR"
 ></A
->&#62;htmlEntityDescPtr</H3
+>htmlEntityDescPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -770,7 +770,7 @@
 ><A
 NAME="HTMLTAGLOOKUP"
 ></A
->&#62;htmlTagLookup ()</H3
+>htmlTagLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -856,7 +856,7 @@
 ><A
 NAME="HTMLENTITYLOOKUP"
 ></A
->&#62;htmlEntityLookup ()</H3
+>htmlEntityLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -944,7 +944,7 @@
 ><A
 NAME="HTMLENTITYVALUELOOKUP"
 ></A
->&#62;htmlEntityValueLookup ()</H3
+>htmlEntityValueLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1029,7 +1029,7 @@
 ><A
 NAME="HTMLISAUTOCLOSED"
 ></A
->&#62;htmlIsAutoClosed ()</H3
+>htmlIsAutoClosed ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1135,7 +1135,7 @@
 ><A
 NAME="HTMLAUTOCLOSETAG"
 ></A
->&#62;htmlAutoCloseTag ()</H3
+>htmlAutoCloseTag ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1263,7 +1263,7 @@
 ><A
 NAME="HTMLPARSEENTITYREF"
 ></A
->&#62;htmlParseEntityRef ()</H3
+>htmlParseEntityRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1356,7 +1356,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the associated htmlEntityDescPtr if found, or NULL otherwise,
-        if non-NULL *str will have to be freed by the caller.</TD
+if non-NULL *str will have to be freed by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1373,7 +1373,7 @@
 ><A
 NAME="HTMLPARSECHARREF"
 ></A
->&#62;htmlParseCharRef ()</H3
+>htmlParseCharRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1394,7 +1394,7 @@
 >parse Reference declarations</P
 ><P
 >[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-                 '&amp;<GTKDOCLINK
+'&amp;<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
@@ -1462,7 +1462,7 @@
 ><A
 NAME="HTMLPARSEELEMENT"
 ></A
->&#62;htmlParseElement ()</H3
+>htmlParseElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1534,7 +1534,7 @@
 ><A
 NAME="HTMLSAXPARSEDOC"
 ></A
->&#62;htmlSAXParseDoc ()</H3
+>htmlSAXParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1663,7 +1663,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the resulting document tree unless SAX is NULL or the document is
-    not well formed.</TD
+not well formed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1680,7 +1680,7 @@
 ><A
 NAME="HTMLPARSEDOC"
 ></A
->&#62;htmlParseDoc ()</H3
+>htmlParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1784,7 +1784,7 @@
 ><A
 NAME="HTMLSAXPARSEFILE"
 ></A
->&#62;htmlSAXParseFile ()</H3
+>htmlSAXParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1911,7 +1911,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the resulting document tree unless SAX is NULL or the document is
-    not well formed.</TD
+not well formed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1928,7 +1928,7 @@
 ><A
 NAME="HTMLPARSEFILE"
 ></A
->&#62;htmlParseFile ()</H3
+>htmlParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2030,7 +2030,7 @@
 ><A
 NAME="UTF8TOHTML"
 ></A
->&#62;UTF8ToHtml ()</H3
+>UTF8ToHtml ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2165,7 +2165,7 @@
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2188,7 +2188,7 @@
 ><A
 NAME="HTMLENCODEENTITIES"
 ></A
->&#62;htmlEncodeEntities ()</H3
+>htmlEncodeEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2341,7 +2341,7 @@
 >inlen</I
 ></TT
 > after return is the number of octets consumed
-    as the return value is positive, else unpredictable.
+as the return value is positive, else unpredictable.
 The value of <TT
 CLASS="PARAMETER"
 ><I
@@ -2364,7 +2364,7 @@
 ><A
 NAME="HTMLISSCRIPTATTRIBUTE"
 ></A
->&#62;htmlIsScriptAttribute ()</H3
+>htmlIsScriptAttribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2447,7 +2447,7 @@
 ><A
 NAME="HTMLHANDLEOMITTEDELEM"
 ></A
->&#62;htmlHandleOmittedElem ()</H3
+>htmlHandleOmittedElem ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2527,7 +2527,7 @@
 ><A
 NAME="HTMLFREEPARSERCTXT"
 ></A
->&#62;htmlFreeParserCtxt ()</H3
+>htmlFreeParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2596,7 +2596,7 @@
 ><A
 NAME="HTMLCREATEPUSHPARSERCTXT"
 ></A
->&#62;htmlCreatePushParserCtxt ()</H3
+>htmlCreatePushParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2788,7 +2788,7 @@
 ><A
 NAME="HTMLPARSECHUNK"
 ></A
->&#62;htmlParseChunk ()</H3
+>htmlParseChunk ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index 72bc9eb..73eb65b 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -384,7 +384,7 @@
 ><A
 NAME="HTML-TEXT-NODE-CAPS"
 ></A
->&#62;HTML_TEXT_NODE</H3
+>HTML_TEXT_NODE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -413,7 +413,7 @@
 ><A
 NAME="HTML-ENTITY-REF-NODE-CAPS"
 ></A
->&#62;HTML_ENTITY_REF_NODE</H3
+>HTML_ENTITY_REF_NODE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -442,7 +442,7 @@
 ><A
 NAME="HTML-COMMENT-NODE-CAPS"
 ></A
->&#62;HTML_COMMENT_NODE</H3
+>HTML_COMMENT_NODE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -471,7 +471,7 @@
 ><A
 NAME="HTML-PRESERVE-NODE-CAPS"
 ></A
->&#62;HTML_PRESERVE_NODE</H3
+>HTML_PRESERVE_NODE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -500,7 +500,7 @@
 ><A
 NAME="HTML-PI-NODE-CAPS"
 ></A
->&#62;HTML_PI_NODE</H3
+>HTML_PI_NODE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -529,7 +529,7 @@
 ><A
 NAME="HTMLNEWDOC"
 ></A
->&#62;htmlNewDoc ()</H3
+>htmlNewDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -636,7 +636,7 @@
 ><A
 NAME="HTMLNEWDOCNODTD"
 ></A
->&#62;htmlNewDocNoDtD ()</H3
+>htmlNewDocNoDtD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -754,7 +754,7 @@
 ><A
 NAME="HTMLGETMETAENCODING"
 ></A
->&#62;htmlGetMetaEncoding ()</H3
+>htmlGetMetaEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -840,7 +840,7 @@
 ><A
 NAME="HTMLSETMETAENCODING"
 ></A
->&#62;htmlSetMetaEncoding ()</H3
+>htmlSetMetaEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -946,7 +946,7 @@
 ><A
 NAME="HTMLDOCDUMPMEMORY"
 ></A
->&#62;htmlDocDumpMemory ()</H3
+>htmlDocDumpMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1054,7 +1054,7 @@
 ><A
 NAME="HTMLDOCDUMP"
 ></A
->&#62;htmlDocDump ()</H3
+>htmlDocDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1158,7 +1158,7 @@
 ><A
 NAME="HTMLSAVEFILE"
 ></A
->&#62;htmlSaveFile ()</H3
+>htmlSaveFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1265,7 +1265,7 @@
 ><A
 NAME="HTMLNODEDUMP"
 ></A
->&#62;htmlNodeDump ()</H3
+>htmlNodeDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1376,7 +1376,7 @@
 ><A
 NAME="HTMLNODEDUMPFILE"
 ></A
->&#62;htmlNodeDumpFile ()</H3
+>htmlNodeDumpFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1487,7 +1487,7 @@
 ><A
 NAME="HTMLNODEDUMPFILEFORMAT"
 ></A
->&#62;htmlNodeDumpFileFormat ()</H3
+>htmlNodeDumpFileFormat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1650,7 +1650,7 @@
 ><A
 NAME="HTMLSAVEFILEENC"
 ></A
->&#62;htmlSaveFileEnc ()</H3
+>htmlSaveFileEnc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1770,7 +1770,7 @@
 ><A
 NAME="HTMLSAVEFILEFORMAT"
 ></A
->&#62;htmlSaveFileFormat ()</H3
+>htmlSaveFileFormat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1907,7 +1907,7 @@
 ><A
 NAME="HTMLNODEDUMPFORMATOUTPUT"
 ></A
->&#62;htmlNodeDumpFormatOutput ()</H3
+>htmlNodeDumpFormatOutput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2053,7 +2053,7 @@
 ><A
 NAME="HTMLDOCCONTENTDUMPOUTPUT"
 ></A
->&#62;htmlDocContentDumpOutput ()</H3
+>htmlDocContentDumpOutput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2160,7 +2160,7 @@
 ><A
 NAME="HTMLDOCCONTENTDUMPFORMATOUTPUT"
 ></A
->&#62;htmlDocContentDumpFormatOutput ()</H3
+>htmlDocContentDumpFormatOutput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index aced511..1727caf 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -204,6 +204,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-c14n.html"
+>c14n</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-threads.html"
 >threads</A
 > &#8212; </DT
@@ -248,7 +253,8 @@
 >This section contains the API reference for libxml. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </P
-></DIV
+>_functions;
+    </DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><BR
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index 9716a55..84ba282 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -155,9 +155,9 @@
                                              const char *owner,
                                              const char *group,
                                              unsigned <GTKDOCLINK
-HREF="LONG-SIZE"
->long size</GTKDOCLINK
->,
+HREF="LONG"
+>long</GTKDOCLINK
+> size,
                                              int links,
                                              int year,
                                              const char *month,
@@ -306,7 +306,7 @@
 ><A
 NAME="FTPLISTCALLBACK"
 ></A
->&#62;ftpListCallback ()</H3
+>ftpListCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -322,9 +322,9 @@
                                              const char *owner,
                                              const char *group,
                                              unsigned <GTKDOCLINK
-HREF="LONG-SIZE"
->long size</GTKDOCLINK
->,
+HREF="LONG"
+>long</GTKDOCLINK
+> size,
                                              int links,
                                              int year,
                                              const char *month,
@@ -447,14 +447,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->Param6</I
+>size</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file size</TD
 ></TR
 ><TR
 ><TD
@@ -573,7 +573,7 @@
 ><A
 NAME="FTPDATACALLBACK"
 ></A
->&#62;ftpDataCallback ()</H3
+>ftpDataCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -674,7 +674,7 @@
 ><A
 NAME="XMLNANOFTPINIT"
 ></A
->&#62;xmlNanoFTPInit ()</H3
+>xmlNanoFTPInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -704,7 +704,7 @@
 ><A
 NAME="XMLNANOFTPCLEANUP"
 ></A
->&#62;xmlNanoFTPCleanup ()</H3
+>xmlNanoFTPCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -732,7 +732,7 @@
 ><A
 NAME="XMLNANOFTPNEWCTXT"
 ></A
->&#62;xmlNanoFTPNewCtxt ()</H3
+>xmlNanoFTPNewCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -797,7 +797,7 @@
 ><A
 NAME="XMLNANOFTPFREECTXT"
 ></A
->&#62;xmlNanoFTPFreeCtxt ()</H3
+>xmlNanoFTPFreeCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -862,7 +862,7 @@
 ><A
 NAME="XMLNANOFTPCONNECTTO"
 ></A
->&#62;xmlNanoFTPConnectTo ()</H3
+>xmlNanoFTPConnectTo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -945,7 +945,7 @@
 ><A
 NAME="XMLNANOFTPOPEN"
 ></A
->&#62;xmlNanoFTPOpen ()</H3
+>xmlNanoFTPOpen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1010,7 +1010,7 @@
 ><A
 NAME="XMLNANOFTPCONNECT"
 ></A
->&#62;xmlNanoFTPConnect ()</H3
+>xmlNanoFTPConnect ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1090,7 +1090,7 @@
 ><A
 NAME="XMLNANOFTPCLOSE"
 ></A
->&#62;xmlNanoFTPClose ()</H3
+>xmlNanoFTPClose ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1170,7 +1170,7 @@
 ><A
 NAME="XMLNANOFTPQUIT"
 ></A
->&#62;xmlNanoFTPQuit ()</H3
+>xmlNanoFTPQuit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1250,7 +1250,7 @@
 ><A
 NAME="XMLNANOFTPSCANPROXY"
 ></A
->&#62;xmlNanoFTPScanProxy ()</H3
+>xmlNanoFTPScanProxy ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1318,7 +1318,7 @@
 ><A
 NAME="XMLNANOFTPPROXY"
 ></A
->&#62;xmlNanoFTPProxy ()</H3
+>xmlNanoFTPProxy ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1462,7 +1462,7 @@
 ><A
 NAME="XMLNANOFTPUPDATEURL"
 ></A
->&#62;xmlNanoFTPUpdateURL ()</H3
+>xmlNanoFTPUpdateURL ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1564,7 +1564,7 @@
 ><A
 NAME="XMLNANOFTPGETRESPONSE"
 ></A
->&#62;xmlNanoFTPGetResponse ()</H3
+>xmlNanoFTPGetResponse ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1644,7 +1644,7 @@
 ><A
 NAME="XMLNANOFTPCHECKRESPONSE"
 ></A
->&#62;xmlNanoFTPCheckResponse ()</H3
+>xmlNanoFTPCheckResponse ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1724,7 +1724,7 @@
 ><A
 NAME="XMLNANOFTPCWD"
 ></A
->&#62;xmlNanoFTPCwd ()</H3
+>xmlNanoFTPCwd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1822,7 +1822,7 @@
 ><A
 NAME="XMLNANOFTPGETCONNECTION"
 ></A
->&#62;xmlNanoFTPGetConnection ()</H3
+>xmlNanoFTPGetConnection ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1903,7 +1903,7 @@
 ><A
 NAME="XMLNANOFTPCLOSECONNECTION"
 ></A
->&#62;xmlNanoFTPCloseConnection ()</H3
+>xmlNanoFTPCloseConnection ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1983,7 +1983,7 @@
 ><A
 NAME="XMLNANOFTPLIST"
 ></A
->&#62;xmlNanoFTPList ()</H3
+>xmlNanoFTPList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2121,7 +2121,7 @@
 ><A
 NAME="XMLNANOFTPGETSOCKET"
 ></A
->&#62;xmlNanoFTPGetSocket ()</H3
+>xmlNanoFTPGetSocket ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2219,7 +2219,7 @@
 ><A
 NAME="XMLNANOFTPGET"
 ></A
->&#62;xmlNanoFTPGet ()</H3
+>xmlNanoFTPGet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2357,7 +2357,7 @@
 ><A
 NAME="XMLNANOFTPREAD"
 ></A
->&#62;xmlNanoFTPRead ()</H3
+>xmlNanoFTPRead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2468,7 +2468,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte read. 0 is an indication of an end of connection.
-        -1 indicates a parameter error.</TD
+-1 indicates a parameter error.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index fee7208..a13dd4d 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -247,7 +247,7 @@
 ><A
 NAME="XMLNANOHTTPINIT"
 ></A
->&#62;xmlNanoHTTPInit ()</H3
+>xmlNanoHTTPInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -276,7 +276,7 @@
 ><A
 NAME="XMLNANOHTTPCLEANUP"
 ></A
->&#62;xmlNanoHTTPCleanup ()</H3
+>xmlNanoHTTPCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -304,7 +304,7 @@
 ><A
 NAME="XMLNANOHTTPSCANPROXY"
 ></A
->&#62;xmlNanoHTTPScanProxy ()</H3
+>xmlNanoHTTPScanProxy ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -372,7 +372,7 @@
 ><A
 NAME="XMLNANOHTTPFETCH"
 ></A
->&#62;xmlNanoHTTPFetch ()</H3
+>xmlNanoHTTPFetch ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -458,7 +458,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  if available the Content-Type information will be
-               returned at that location</TD
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -474,7 +474,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >-1 in case of failure, 0 incase of success. The contentType,
-    if provided must be freed by the caller</TD
+if provided must be freed by the caller</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -491,7 +491,7 @@
 ><A
 NAME="XMLNANOHTTPMETHOD"
 ></A
->&#62;xmlNanoHTTPMethod ()</H3
+>xmlNanoHTTPMethod ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -653,7 +653,7 @@
 ><A
 NAME="XMLNANOHTTPMETHODREDIR"
 ></A
->&#62;xmlNanoHTTPMethodRedir ()</H3
+>xmlNanoHTTPMethodRedir ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -833,7 +833,7 @@
 ><A
 NAME="XMLNANOHTTPOPEN"
 ></A
->&#62;xmlNanoHTTPOpen ()</H3
+>xmlNanoHTTPOpen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -901,7 +901,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  if available the Content-Type information will be
-               returned at that location</TD
+returned at that location</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -918,7 +918,7 @@
 ><A
 NAME="XMLNANOHTTPOPENREDIR"
 ></A
->&#62;xmlNanoHTTPOpenRedir ()</H3
+>xmlNanoHTTPOpenRedir ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -987,7 +987,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  if available the Content-Type information will be
-               returned at that location</TD
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -1021,7 +1021,7 @@
 ><A
 NAME="XMLNANOHTTPRETURNCODE"
 ></A
->&#62;xmlNanoHTTPReturnCode ()</H3
+>xmlNanoHTTPReturnCode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1101,7 +1101,7 @@
 ><A
 NAME="XMLNANOHTTPAUTHHEADER"
 ></A
->&#62;xmlNanoHTTPAuthHeader ()</H3
+>xmlNanoHTTPAuthHeader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1182,7 +1182,7 @@
 ><A
 NAME="XMLNANOHTTPREAD"
 ></A
->&#62;xmlNanoHTTPRead ()</H3
+>xmlNanoHTTPRead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1293,7 +1293,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of byte read. 0 is an indication of an end of connection.
-        -1 indicates a parameter error.</TD
+-1 indicates a parameter error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1310,7 +1310,7 @@
 ><A
 NAME="XMLNANOHTTPSAVE"
 ></A
->&#62;xmlNanoHTTPSave ()</H3
+>xmlNanoHTTPSave ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1409,7 +1409,7 @@
 ><A
 NAME="XMLNANOHTTPCLOSE"
 ></A
->&#62;xmlNanoHTTPClose ()</H3
+>xmlNanoHTTPClose ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 0c4a930..4e99b14 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -1254,7 +1254,7 @@
 ><A
 NAME="XML-DEFAULT-VERSION-CAPS"
 ></A
->&#62;XML_DEFAULT_VERSION</H3
+>XML_DEFAULT_VERSION</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1282,7 +1282,7 @@
 ><A
 NAME="XMLPARSERINPUTDEALLOCATE"
 ></A
->&#62;xmlParserInputDeallocate ()</H3
+>xmlParserInputDeallocate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1350,7 +1350,7 @@
 ><A
 NAME="XMLPARSERINPUT"
 ></A
->&#62;struct xmlParserInput</H3
+>struct xmlParserInput</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1400,7 +1400,7 @@
 ><A
 NAME="XMLPARSERNODEINFO"
 ></A
->&#62;struct xmlParserNodeInfo</H3
+>struct xmlParserNodeInfo</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1437,7 +1437,7 @@
 ><A
 NAME="XMLPARSERNODEINFOPTR"
 ></A
->&#62;xmlParserNodeInfoPtr</H3
+>xmlParserNodeInfoPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1463,7 +1463,7 @@
 ><A
 NAME="XMLPARSERNODEINFOSEQ"
 ></A
->&#62;struct xmlParserNodeInfoSeq</H3
+>struct xmlParserNodeInfoSeq</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1493,7 +1493,7 @@
 ><A
 NAME="XMLPARSERNODEINFOSEQPTR"
 ></A
->&#62;xmlParserNodeInfoSeqPtr</H3
+>xmlParserNodeInfoSeqPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1519,7 +1519,7 @@
 ><A
 NAME="XMLPARSERINPUTSTATE"
 ></A
->&#62;enum xmlParserInputState</H3
+>enum xmlParserInputState</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1567,7 +1567,7 @@
 ><A
 NAME="XML-DETECT-IDS-CAPS"
 ></A
->&#62;XML_DETECT_IDS</H3
+>XML_DETECT_IDS</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1596,7 +1596,7 @@
 ><A
 NAME="XML-COMPLETE-ATTRS-CAPS"
 ></A
->&#62;XML_COMPLETE_ATTRS</H3
+>XML_COMPLETE_ATTRS</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1626,7 +1626,7 @@
 ><A
 NAME="XMLPARSERCTXT"
 ></A
->&#62;struct xmlParserCtxt</H3
+>struct xmlParserCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1717,12 +1717,12 @@
 ><P
 >The parser context.
 NOTE This doesn't completely defines the parser state, the (current ?)
-     design of the parser uses recursive function calls since this allow
-     and easy mapping from the production rules of the specification
-     to the actual code. The drawback is that the actual function call
-     also reflect the parser state. However most of the parsing routines
-     takes as the only argument the parser context pointer, so migrating
-     to a state based parser for progressive parsing shouldn't be too hard.</P
+design of the parser uses recursive function calls since this allow
+and easy mapping from the production rules of the specification
+to the actual code. The drawback is that the actual function call
+also reflect the parser state. However most of the parsing routines
+takes as the only argument the parser context pointer, so migrating
+to a state based parser for progressive parsing shouldn't be too hard.</P
 ><P
 ></P
 ></DIV
@@ -1735,7 +1735,7 @@
 ><A
 NAME="XMLSAXLOCATOR"
 ></A
->&#62;struct xmlSAXLocator</H3
+>struct xmlSAXLocator</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1768,7 +1768,7 @@
 ><A
 NAME="RESOLVEENTITYSAXFUNC"
 ></A
->&#62;resolveEntitySAXFunc ()</H3
+>resolveEntitySAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1797,15 +1797,15 @@
 >Callback:
 The entity loader, to control the loading of external entities,
 the application can either:
-   - override this <A
+- override this <A
 HREF="libxml-sax.html#RESOLVEENTITY"
 >resolveEntity</A
 >() callback in the SAX block
-   - or better use the <A
+- or better use the <A
 HREF="libxml-parser.html#XMLSETEXTERNALENTITYLOADER"
 >xmlSetExternalEntityLoader</A
 >() function to
-     set up it's own entity resolution routine</P
+set up it's own entity resolution routine</P
 ><P
 ></P
 ><DIV
@@ -1904,7 +1904,7 @@
 ><A
 NAME="INTERNALSUBSETSAXFUNC"
 ></A
->&#62;internalSubsetSAXFunc ()</H3
+>internalSubsetSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2032,7 +2032,7 @@
 ><A
 NAME="EXTERNALSUBSETSAXFUNC"
 ></A
->&#62;externalSubsetSAXFunc ()</H3
+>externalSubsetSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2160,7 +2160,7 @@
 ><A
 NAME="GETENTITYSAXFUNC"
 ></A
->&#62;getEntitySAXFunc ()</H3
+>getEntitySAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2264,7 +2264,7 @@
 ><A
 NAME="GETPARAMETERENTITYSAXFUNC"
 ></A
->&#62;getParameterEntitySAXFunc ()</H3
+>getParameterEntitySAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2368,7 +2368,7 @@
 ><A
 NAME="ENTITYDECLSAXFUNC"
 ></A
->&#62;entityDeclSAXFunc ()</H3
+>entityDeclSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2535,7 +2535,7 @@
 ><A
 NAME="NOTATIONDECLSAXFUNC"
 ></A
->&#62;notationDeclSAXFunc ()</H3
+>notationDeclSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2663,7 +2663,7 @@
 ><A
 NAME="ATTRIBUTEDECLSAXFUNC"
 ></A
->&#62;attributeDeclSAXFunc ()</H3
+>attributeDeclSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2848,7 +2848,7 @@
 ><A
 NAME="ELEMENTDECLSAXFUNC"
 ></A
->&#62;elementDeclSAXFunc ()</H3
+>elementDeclSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2973,7 +2973,7 @@
 ><A
 NAME="UNPARSEDENTITYDECLSAXFUNC"
 ></A
->&#62;unparsedEntityDeclSAXFunc ()</H3
+>unparsedEntityDeclSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3122,7 +3122,7 @@
 ><A
 NAME="SETDOCUMENTLOCATORSAXFUNC"
 ></A
->&#62;setDocumentLocatorSAXFunc ()</H3
+>setDocumentLocatorSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3209,7 +3209,7 @@
 ><A
 NAME="STARTDOCUMENTSAXFUNC"
 ></A
->&#62;startDocumentSAXFunc ()</H3
+>startDocumentSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3274,7 +3274,7 @@
 ><A
 NAME="ENDDOCUMENTSAXFUNC"
 ></A
->&#62;endDocumentSAXFunc ()</H3
+>endDocumentSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3339,7 +3339,7 @@
 ><A
 NAME="STARTELEMENTSAXFUNC"
 ></A
->&#62;startElementSAXFunc ()</H3
+>startElementSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3446,7 +3446,7 @@
 ><A
 NAME="ENDELEMENTSAXFUNC"
 ></A
->&#62;endElementSAXFunc ()</H3
+>endElementSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3532,7 +3532,7 @@
 ><A
 NAME="ATTRIBUTESAXFUNC"
 ></A
->&#62;attributeSAXFunc ()</H3
+>attributeSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3642,7 +3642,7 @@
 ><A
 NAME="REFERENCESAXFUNC"
 ></A
->&#62;referenceSAXFunc ()</H3
+>referenceSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3728,7 +3728,7 @@
 ><A
 NAME="CHARACTERSSAXFUNC"
 ></A
->&#62;charactersSAXFunc ()</H3
+>charactersSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3832,7 +3832,7 @@
 ><A
 NAME="IGNORABLEWHITESPACESAXFUNC"
 ></A
->&#62;ignorableWhitespaceSAXFunc ()</H3
+>ignorableWhitespaceSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3937,7 +3937,7 @@
 ><A
 NAME="PROCESSINGINSTRUCTIONSAXFUNC"
 ></A
->&#62;processingInstructionSAXFunc ()</H3
+>processingInstructionSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4044,7 +4044,7 @@
 ><A
 NAME="COMMENTSAXFUNC"
 ></A
->&#62;commentSAXFunc ()</H3
+>commentSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4130,7 +4130,7 @@
 ><A
 NAME="CDATABLOCKSAXFUNC"
 ></A
->&#62;cdataBlockSAXFunc ()</H3
+>cdataBlockSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4234,7 +4234,7 @@
 ><A
 NAME="WARNINGSAXFUNC"
 ></A
->&#62;warningSAXFunc ()</H3
+>warningSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4335,7 +4335,7 @@
 ><A
 NAME="ERRORSAXFUNC"
 ></A
->&#62;errorSAXFunc ()</H3
+>errorSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4436,7 +4436,7 @@
 ><A
 NAME="FATALERRORSAXFUNC"
 ></A
->&#62;fatalErrorSAXFunc ()</H3
+>fatalErrorSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4537,7 +4537,7 @@
 ><A
 NAME="ISSTANDALONESAXFUNC"
 ></A
->&#62;isStandaloneSAXFunc ()</H3
+>isStandaloneSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4617,7 +4617,7 @@
 ><A
 NAME="HASINTERNALSUBSETSAXFUNC"
 ></A
->&#62;hasInternalSubsetSAXFunc ()</H3
+>hasInternalSubsetSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4697,7 +4697,7 @@
 ><A
 NAME="HASEXTERNALSUBSETSAXFUNC"
 ></A
->&#62;hasExternalSubsetSAXFunc ()</H3
+>hasExternalSubsetSAXFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4777,7 +4777,7 @@
 ><A
 NAME="XMLSAXHANDLER"
 ></A
->&#62;struct xmlSAXHandler</H3
+>struct xmlSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4835,7 +4835,7 @@
 ><A
 NAME="XMLEXTERNALENTITYLOADER"
 ></A
->&#62;xmlExternalEntityLoader ()</H3
+>xmlExternalEntityLoader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4958,7 +4958,7 @@
 ><A
 NAME="XMLSUBSTITUTEENTITIESDEFAULTVALUE"
 ></A
->&#62;xmlSubstituteEntitiesDefaultValue</H3
+>xmlSubstituteEntitiesDefaultValue</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4986,7 +4986,7 @@
 ><A
 NAME="XMLINITPARSER"
 ></A
->&#62;xmlInitParser ()</H3
+>xmlInitParser ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5016,7 +5016,7 @@
 ><A
 NAME="XMLCLEANUPPARSER"
 ></A
->&#62;xmlCleanupParser ()</H3
+>xmlCleanupParser ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5047,7 +5047,7 @@
 ><A
 NAME="XMLPARSERINPUTREAD"
 ></A
->&#62;xmlParserInputRead ()</H3
+>xmlParserInputRead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5150,7 +5150,7 @@
 ><A
 NAME="XMLPARSERINPUTGROW"
 ></A
->&#62;xmlParserInputGrow ()</H3
+>xmlParserInputGrow ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5253,7 +5253,7 @@
 ><A
 NAME="XMLSTRDUP"
 ></A
->&#62;xmlStrdup ()</H3
+>xmlStrdup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5341,7 +5341,7 @@
 ><A
 NAME="XMLSTRNDUP"
 ></A
->&#62;xmlStrndup ()</H3
+>xmlStrndup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5450,7 +5450,7 @@
 ><A
 NAME="XMLCHARSTRNDUP"
 ></A
->&#62;xmlCharStrndup ()</H3
+>xmlCharStrndup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5556,7 +5556,7 @@
 ><A
 NAME="XMLCHARSTRDUP"
 ></A
->&#62;xmlCharStrdup ()</H3
+>xmlCharStrdup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5639,7 +5639,7 @@
 ><A
 NAME="XMLSTRSUB"
 ></A
->&#62;xmlStrsub ()</H3
+>xmlStrsub ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5761,7 +5761,7 @@
 ><A
 NAME="XMLSTRCHR"
 ></A
->&#62;xmlStrchr ()</H3
+>xmlStrchr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5868,7 +5868,7 @@
 ><A
 NAME="XMLSTRSTR"
 ></A
->&#62;xmlStrstr ()</H3
+>xmlStrstr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5975,7 +5975,7 @@
 ><A
 NAME="XMLSTRCASESTR"
 ></A
->&#62;xmlStrcasestr ()</H3
+>xmlStrcasestr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6082,7 +6082,7 @@
 ><A
 NAME="XMLSTRCMP"
 ></A
->&#62;xmlStrcmp ()</H3
+>xmlStrcmp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6186,7 +6186,7 @@
 ><A
 NAME="XMLSTRNCMP"
 ></A
->&#62;xmlStrncmp ()</H3
+>xmlStrncmp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6308,7 +6308,7 @@
 ><A
 NAME="XMLSTRCASECMP"
 ></A
->&#62;xmlStrcasecmp ()</H3
+>xmlStrcasecmp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6412,7 +6412,7 @@
 ><A
 NAME="XMLSTRNCASECMP"
 ></A
->&#62;xmlStrncasecmp ()</H3
+>xmlStrncasecmp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6534,7 +6534,7 @@
 ><A
 NAME="XMLSTREQUAL"
 ></A
->&#62;xmlStrEqual ()</H3
+>xmlStrEqual ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6642,7 +6642,7 @@
 ><A
 NAME="XMLSTRLEN"
 ></A
->&#62;xmlStrlen ()</H3
+>xmlStrlen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6725,7 +6725,7 @@
 ><A
 NAME="XMLSTRCAT"
 ></A
->&#62;xmlStrcat ()</H3
+>xmlStrcat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6834,7 +6834,7 @@
 ><A
 NAME="XMLSTRNCAT"
 ></A
->&#62;xmlStrncat ()</H3
+>xmlStrncat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6981,7 +6981,7 @@
 ><A
 NAME="XMLPARSEDOC"
 ></A
->&#62;xmlParseDoc ()</H3
+>xmlParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7067,7 +7067,7 @@
 ><A
 NAME="XMLPARSEMEMORY"
 ></A
->&#62;xmlParseMemory ()</H3
+>xmlParseMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7168,7 +7168,7 @@
 ><A
 NAME="XMLPARSEFILE"
 ></A
->&#62;xmlParseFile ()</H3
+>xmlParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7253,7 +7253,7 @@
 ><A
 NAME="XMLSUBSTITUTEENTITIESDEFAULT"
 ></A
->&#62;xmlSubstituteEntitiesDefault ()</H3
+>xmlSubstituteEntitiesDefault ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7341,7 +7341,7 @@
 ><A
 NAME="XMLKEEPBLANKSDEFAULT"
 ></A
->&#62;xmlKeepBlanksDefault ()</H3
+>xmlKeepBlanksDefault ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7448,7 +7448,7 @@
 ><A
 NAME="XMLSTOPPARSER"
 ></A
->&#62;xmlStopParser ()</H3
+>xmlStopParser ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7516,7 +7516,7 @@
 ><A
 NAME="XMLPEDANTICPARSERDEFAULT"
 ></A
->&#62;xmlPedanticParserDefault ()</H3
+>xmlPedanticParserDefault ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7596,7 +7596,7 @@
 ><A
 NAME="XMLLINENUMBERSDEFAULT"
 ></A
->&#62;xmlLineNumbersDefault ()</H3
+>xmlLineNumbersDefault ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7677,7 +7677,7 @@
 ><A
 NAME="XMLRECOVERDOC"
 ></A
->&#62;xmlRecoverDoc ()</H3
+>xmlRecoverDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7764,7 +7764,7 @@
 ><A
 NAME="XMLRECOVERMEMORY"
 ></A
->&#62;xmlRecoverMemory ()</H3
+>xmlRecoverMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7866,7 +7866,7 @@
 ><A
 NAME="XMLRECOVERFILE"
 ></A
->&#62;xmlRecoverFile ()</H3
+>xmlRecoverFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7951,7 +7951,7 @@
 ><A
 NAME="XMLPARSEDOCUMENT"
 ></A
->&#62;xmlParseDocument ()</H3
+>xmlParseDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8023,7 +8023,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0, -1 in case of error. the parser context is augmented
-               as a result of the parsing.</TD
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8040,7 +8040,7 @@
 ><A
 NAME="XMLPARSEEXTPARSEDENT"
 ></A
->&#62;xmlParseExtParsedEnt ()</H3
+>xmlParseExtParsedEnt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8111,7 +8111,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0, -1 in case of error. the parser context is augmented
-               as a result of the parsing.</TD
+as a result of the parsing.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8128,7 +8128,7 @@
 ><A
 NAME="XMLSAXPARSEDOC"
 ></A
->&#62;xmlSAXParseDoc ()</H3
+>xmlSAXParseDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8224,7 +8224,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  work in recovery mode, i.e. tries to read no Well Formed
-            documents</TD
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8256,7 +8256,7 @@
 ><A
 NAME="XMLSAXUSERPARSEFILE"
 ></A
->&#62;xmlSAXUserParseFile ()</H3
+>xmlSAXUserParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8376,7 +8376,7 @@
 ><A
 NAME="XMLSAXUSERPARSEMEMORY"
 ></A
->&#62;xmlSAXUserParseMemory ()</H3
+>xmlSAXUserParseMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8514,7 +8514,7 @@
 ><A
 NAME="XMLSAXPARSEMEMORY"
 ></A
->&#62;xmlSAXParseMemory ()</H3
+>xmlSAXParseMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8625,7 +8625,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  work in recovery mode, i.e. tries to read not Well Formed
-            documents</TD
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8657,7 +8657,7 @@
 ><A
 NAME="XMLSAXPARSEFILE"
 ></A
->&#62;xmlSAXParseFile ()</H3
+>xmlSAXParseFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8751,7 +8751,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  work in recovery mode, i.e. tries to read no Well Formed
-            documents</TD
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8783,7 +8783,7 @@
 ><A
 NAME="XMLSAXPARSEFILEWITHDATA"
 ></A
->&#62;xmlSAXParseFileWithData ()</H3
+>xmlSAXParseFileWithData ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8881,7 +8881,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  work in recovery mode, i.e. tries to read no Well Formed
-            documents</TD
+documents</TD
 ></TR
 ><TR
 ><TD
@@ -8930,7 +8930,7 @@
 ><A
 NAME="XMLSAXPARSEENTITY"
 ></A
->&#62;xmlSAXParseEntity ()</H3
+>xmlSAXParseEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9040,7 +9040,7 @@
 ><A
 NAME="XMLPARSEENTITY"
 ></A
->&#62;xmlParseEntity ()</H3
+>xmlParseEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9127,7 +9127,7 @@
 ><A
 NAME="XMLPARSEDTD"
 ></A
->&#62;xmlParseDTD ()</H3
+>xmlParseDTD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9234,7 +9234,7 @@
 ><A
 NAME="XMLSAXPARSEDTD"
 ></A
->&#62;xmlSAXParseDTD ()</H3
+>xmlSAXParseDTD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9362,7 +9362,7 @@
 ><A
 NAME="XMLIOPARSEDTD"
 ></A
->&#62;xmlIOParseDTD ()</H3
+>xmlIOParseDTD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9496,7 +9496,7 @@
 ><A
 NAME="XMLPARSEBALANCEDCHUNKMEMORY"
 ></A
->&#62;xmlParseBalancedChunkMemory ()</H3
+>xmlParseBalancedChunkMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9667,7 +9667,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0 if the chunk is well balanced, -1 in case of args problem and
-   the parser error code otherwise</TD
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9684,7 +9684,7 @@
 ><A
 NAME="XMLPARSEEXTERNALENTITY"
 ></A
->&#62;xmlParseExternalEntity ()</H3
+>xmlParseExternalEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9875,7 +9875,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0 if the entity is well formed, -1 in case of args problem and
-   the parser error code otherwise</TD
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9892,7 +9892,7 @@
 ><A
 NAME="XMLPARSECTXTEXTERNALENTITY"
 ></A
->&#62;xmlParseCtxtExternalEntity ()</H3
+>xmlParseCtxtExternalEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10026,7 +10026,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0 if the entity is well formed, -1 in case of args problem and
-   the parser error code otherwise</TD
+the parser error code otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10043,7 +10043,7 @@
 ><A
 NAME="XMLINITPARSERCTXT"
 ></A
->&#62;xmlInitParserCtxt ()</H3
+>xmlInitParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10111,7 +10111,7 @@
 ><A
 NAME="XMLCLEARPARSERCTXT"
 ></A
->&#62;xmlClearParserCtxt ()</H3
+>xmlClearParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10179,7 +10179,7 @@
 ><A
 NAME="XMLFREEPARSERCTXT"
 ></A
->&#62;xmlFreeParserCtxt ()</H3
+>xmlFreeParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10248,7 +10248,7 @@
 ><A
 NAME="XMLSETUPPARSERFORBUFFER"
 ></A
->&#62;xmlSetupParserForBuffer ()</H3
+>xmlSetupParserForBuffer ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10357,7 +10357,7 @@
 ><A
 NAME="XMLCREATEDOCPARSERCTXT"
 ></A
->&#62;xmlCreateDocParserCtxt ()</H3
+>xmlCreateDocParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10443,7 +10443,7 @@
 ><A
 NAME="XMLGETFEATURESLIST"
 ></A
->&#62;xmlGetFeaturesList ()</H3
+>xmlGetFeaturesList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10535,8 +10535,8 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >-1 in case or error, or the total number of features,
-           len is updated with the number of strings copied,
-           strings must not be deallocated</TD
+len is updated with the number of strings copied,
+strings must not be deallocated</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10553,7 +10553,7 @@
 ><A
 NAME="XMLGETFEATURE"
 ></A
->&#62;xmlGetFeature ()</H3
+>xmlGetFeature ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10672,7 +10672,7 @@
 ><A
 NAME="XMLSETFEATURE"
 ></A
->&#62;xmlSetFeature ()</H3
+>xmlSetFeature ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10791,7 +10791,7 @@
 ><A
 NAME="XMLCREATEPUSHPARSERCTXT"
 ></A
->&#62;xmlCreatePushParserCtxt ()</H3
+>xmlCreatePushParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10962,7 +10962,7 @@
 ><A
 NAME="XMLPARSECHUNK"
 ></A
->&#62;xmlParseChunk ()</H3
+>xmlParseChunk ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11099,7 +11099,7 @@
 ><A
 NAME="XMLCREATEIOPARSERCTXT"
 ></A
->&#62;xmlCreateIOParserCtxt ()</H3
+>xmlCreateIOParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11285,7 +11285,7 @@
 ><A
 NAME="XMLNEWIOINPUTSTREAM"
 ></A
->&#62;xmlNewIOInputStream ()</H3
+>xmlNewIOInputStream ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11419,7 +11419,7 @@
 ><A
 NAME="XMLPARSERFINDNODEINFO"
 ></A
->&#62;xmlParserFindNodeInfo ()</H3
+>xmlParserFindNodeInfo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11527,7 +11527,7 @@
 ><A
 NAME="XMLINITNODEINFOSEQ"
 ></A
->&#62;xmlInitNodeInfoSeq ()</H3
+>xmlInitNodeInfoSeq ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11595,7 +11595,7 @@
 ><A
 NAME="XMLCLEARNODEINFOSEQ"
 ></A
->&#62;xmlClearNodeInfoSeq ()</H3
+>xmlClearNodeInfoSeq ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11614,7 +11614,7 @@
 ></TABLE
 ><P
 >-- Clear (release memory and reinitialize) node
-  info sequence</P
+info sequence</P
 ><P
 ></P
 ><DIV
@@ -11664,7 +11664,7 @@
 ><A
 NAME="XMLPARSERFINDNODEINFOINDEX"
 ></A
->&#62;xmlParserFindNodeInfoIndex ()</H3
+>xmlParserFindNodeInfoIndex ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11690,7 +11690,7 @@
 ></TABLE
 ><P
 >xmlParserFindNodeInfoIndex : Find the index that the info record for
-  the given node is or should be at in a sorted sequence</P
+the given node is or should be at in a sorted sequence</P
 ><P
 ></P
 ><DIV
@@ -11772,7 +11772,7 @@
 ><A
 NAME="XMLPARSERADDNODEINFO"
 ></A
->&#62;xmlParserAddNodeInfo ()</H3
+>xmlParserAddNodeInfo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11861,7 +11861,7 @@
 ><A
 NAME="XMLSETEXTERNALENTITYLOADER"
 ></A
->&#62;xmlSetExternalEntityLoader ()</H3
+>xmlSetExternalEntityLoader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11929,7 +11929,7 @@
 ><A
 NAME="XMLGETEXTERNALENTITYLOADER"
 ></A
->&#62;xmlGetExternalEntityLoader ()</H3
+>xmlGetExternalEntityLoader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11996,7 +11996,7 @@
 ><A
 NAME="XMLLOADEXTERNALENTITY"
 ></A
->&#62;xmlLoadExternalEntity ()</H3
+>xmlLoadExternalEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 3177e20..b5d8ef9 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN20836"
+NAME="AEN21002"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN20839"
+NAME="AEN21005"
 ></A
 ><H2
 >Synopsis</H2
@@ -1145,7 +1145,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21117"
+NAME="AEN21283"
 ></A
 ><H2
 >Description</H2
@@ -1155,20 +1155,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21120"
+NAME="AEN21286"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21122"
+NAME="AEN21288"
 ></A
 ><H3
 ><A
 NAME="XML-MAX-NAMELEN-CAPS"
 ></A
->&#62;XML_MAX_NAMELEN</H3
+>XML_MAX_NAMELEN</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1191,13 +1191,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21128"
+NAME="AEN21294"
 ></A
 ><H3
 ><A
 NAME="INPUT-CHUNK-CAPS"
 ></A
->&#62;INPUT_CHUNK</H3
+>INPUT_CHUNK</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1220,13 +1220,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21134"
+NAME="AEN21300"
 ></A
 ><H3
 ><A
 NAME="IS-CHAR-CAPS"
 ></A
->&#62;IS_CHAR()</H3
+>IS_CHAR()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1265,7 +1265,7 @@
 HREF="XFFFD"
 >xFFFD</GTKDOCLINK
 >]
-                 | [<GTKDOCLINK
+| [<GTKDOCLINK
 HREF="X10000-"
 >x10000-</GTKDOCLINK
 ><GTKDOCLINK
@@ -1278,7 +1278,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21150"
+NAME="AEN21316"
 ></A
 ><P
 ></P
@@ -1316,13 +1316,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21159"
+NAME="AEN21325"
 ></A
 ><H3
 ><A
 NAME="IS-BLANK-CAPS"
 ></A
->&#62;IS_BLANK()</H3
+>IS_BLANK()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1357,7 +1357,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21170"
+NAME="AEN21336"
 ></A
 ><P
 ></P
@@ -1395,13 +1395,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21179"
+NAME="AEN21345"
 ></A
 ><H3
 ><A
 NAME="IS-BASECHAR-CAPS"
 ></A
->&#62;IS_BASECHAR()</H3
+>IS_BASECHAR()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1424,7 +1424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21186"
+NAME="AEN21352"
 ></A
 ><P
 ></P
@@ -1462,13 +1462,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21195"
+NAME="AEN21361"
 ></A
 ><H3
 ><A
 NAME="IS-DIGIT-CAPS"
 ></A
->&#62;IS_DIGIT()</H3
+>IS_DIGIT()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1491,7 +1491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21202"
+NAME="AEN21368"
 ></A
 ><P
 ></P
@@ -1529,13 +1529,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21211"
+NAME="AEN21377"
 ></A
 ><H3
 ><A
 NAME="IS-COMBINING-CAPS"
 ></A
->&#62;IS_COMBINING()</H3
+>IS_COMBINING()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1558,7 +1558,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21218"
+NAME="AEN21384"
 ></A
 ><P
 ></P
@@ -1596,13 +1596,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21227"
+NAME="AEN21393"
 ></A
 ><H3
 ><A
 NAME="IS-EXTENDER-CAPS"
 ></A
->&#62;IS_EXTENDER()</H3
+>IS_EXTENDER()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1635,7 +1635,7 @@
 HREF="X0640"
 >x0640</GTKDOCLINK
 > |
-                  <GTKDOCLINK
+<GTKDOCLINK
 HREF="X0E46"
 >x0E46</GTKDOCLINK
 > | <GTKDOCLINK
@@ -1651,7 +1651,7 @@
 HREF="X3035"
 >x3035</GTKDOCLINK
 >] |
-                  [<GTKDOCLINK
+[<GTKDOCLINK
 HREF="X309D-"
 >x309D-</GTKDOCLINK
 ><GTKDOCLINK
@@ -1669,7 +1669,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21248"
+NAME="AEN21414"
 ></A
 ><P
 ></P
@@ -1707,13 +1707,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21257"
+NAME="AEN21423"
 ></A
 ><H3
 ><A
 NAME="IS-IDEOGRAPHIC-CAPS"
 ></A
->&#62;IS_IDEOGRAPHIC()</H3
+>IS_IDEOGRAPHIC()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1751,7 +1751,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21269"
+NAME="AEN21435"
 ></A
 ><P
 ></P
@@ -1789,13 +1789,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21278"
+NAME="AEN21444"
 ></A
 ><H3
 ><A
 NAME="IS-LETTER-CAPS"
 ></A
->&#62;IS_LETTER()</H3
+>IS_LETTER()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1818,7 +1818,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21285"
+NAME="AEN21451"
 ></A
 ><P
 ></P
@@ -1856,13 +1856,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21294"
+NAME="AEN21460"
 ></A
 ><H3
 ><A
 NAME="IS-PUBIDCHAR-CAPS"
 ></A
->&#62;IS_PUBIDCHAR()</H3
+>IS_PUBIDCHAR()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1894,7 +1894,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21304"
+NAME="AEN21470"
 ></A
 ><P
 ></P
@@ -1932,13 +1932,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21313"
+NAME="AEN21479"
 ></A
 ><H3
 ><A
 NAME="SKIP-EOL-CAPS"
 ></A
->&#62;SKIP_EOL()</H3
+>SKIP_EOL()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1959,7 +1959,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21319"
+NAME="AEN21485"
 ></A
 ><P
 ></P
@@ -1997,13 +1997,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21328"
+NAME="AEN21494"
 ></A
 ><H3
 ><A
 NAME="MOVETO-ENDTAG-CAPS"
 ></A
->&#62;MOVETO_ENDTAG()</H3
+>MOVETO_ENDTAG()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2024,7 +2024,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21334"
+NAME="AEN21500"
 ></A
 ><P
 ></P
@@ -2062,13 +2062,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21343"
+NAME="AEN21509"
 ></A
 ><H3
 ><A
 NAME="MOVETO-STARTTAG-CAPS"
 ></A
->&#62;MOVETO_STARTTAG()</H3
+>MOVETO_STARTTAG()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2089,7 +2089,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21349"
+NAME="AEN21515"
 ></A
 ><P
 ></P
@@ -2127,13 +2127,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21358"
+NAME="AEN21524"
 ></A
 ><H3
 ><A
 NAME="XMLISBASECHAR"
 ></A
->&#62;xmlIsBaseChar ()</H3
+>xmlIsBaseChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2169,7 +2169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21368"
+NAME="AEN21534"
 ></A
 ><P
 ></P
@@ -2222,13 +2222,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21381"
+NAME="AEN21547"
 ></A
 ><H3
 ><A
 NAME="XMLISBLANK"
 ></A
->&#62;xmlIsBlank ()</H3
+>xmlIsBlank ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2266,7 +2266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21392"
+NAME="AEN21558"
 ></A
 ><P
 ></P
@@ -2319,13 +2319,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21405"
+NAME="AEN21571"
 ></A
 ><H3
 ><A
 NAME="XMLISPUBIDCHAR"
 ></A
->&#62;xmlIsPubidChar ()</H3
+>xmlIsPubidChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2356,7 +2356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21414"
+NAME="AEN21580"
 ></A
 ><P
 ></P
@@ -2409,13 +2409,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21427"
+NAME="AEN21593"
 ></A
 ><H3
 ><A
 NAME="XMLISLETTER"
 ></A
->&#62;xmlIsLetter ()</H3
+>xmlIsLetter ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2437,7 +2437,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21433"
+NAME="AEN21599"
 ></A
 ><P
 ></P
@@ -2490,13 +2490,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21446"
+NAME="AEN21612"
 ></A
 ><H3
 ><A
 NAME="XMLISDIGIT"
 ></A
->&#62;xmlIsDigit ()</H3
+>xmlIsDigit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2518,7 +2518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21452"
+NAME="AEN21618"
 ></A
 ><P
 ></P
@@ -2571,13 +2571,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21465"
+NAME="AEN21631"
 ></A
 ><H3
 ><A
 NAME="XMLISIDEOGRAPHIC"
 ></A
->&#62;xmlIsIdeographic ()</H3
+>xmlIsIdeographic ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2614,7 +2614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21476"
+NAME="AEN21642"
 ></A
 ><P
 ></P
@@ -2667,13 +2667,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21489"
+NAME="AEN21655"
 ></A
 ><H3
 ><A
 NAME="XMLISEXTENDER"
 ></A
->&#62;xmlIsExtender ()</H3
+>xmlIsExtender ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2705,7 +2705,7 @@
 HREF="X0640"
 >x0640</GTKDOCLINK
 > |
-                  <GTKDOCLINK
+<GTKDOCLINK
 HREF="X0E46"
 >x0E46</GTKDOCLINK
 > | <GTKDOCLINK
@@ -2721,7 +2721,7 @@
 HREF="X3035"
 >x3035</GTKDOCLINK
 >] |
-                  [<GTKDOCLINK
+[<GTKDOCLINK
 HREF="X309D-"
 >x309D-</GTKDOCLINK
 ><GTKDOCLINK
@@ -2739,7 +2739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21509"
+NAME="AEN21675"
 ></A
 ><P
 ></P
@@ -2792,13 +2792,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21522"
+NAME="AEN21688"
 ></A
 ><H3
 ><A
 NAME="XMLISCOMBINING"
 ></A
->&#62;xmlIsCombining ()</H3
+>xmlIsCombining ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2820,7 +2820,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21528"
+NAME="AEN21694"
 ></A
 ><P
 ></P
@@ -2873,13 +2873,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21541"
+NAME="AEN21707"
 ></A
 ><H3
 ><A
 NAME="XMLISCHAR"
 ></A
->&#62;xmlIsChar ()</H3
+>xmlIsChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2917,7 +2917,7 @@
 HREF="XFFFD"
 >xFFFD</GTKDOCLINK
 >]
-                 | [<GTKDOCLINK
+| [<GTKDOCLINK
 HREF="X10000-"
 >x10000-</GTKDOCLINK
 ><GTKDOCLINK
@@ -2934,7 +2934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21557"
+NAME="AEN21723"
 ></A
 ><P
 ></P
@@ -2987,13 +2987,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21570"
+NAME="AEN21736"
 ></A
 ><H3
 ><A
 NAME="XMLCREATEFILEPARSERCTXT"
 ></A
->&#62;xmlCreateFileParserCtxt ()</H3
+>xmlCreateFileParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3019,7 +3019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21577"
+NAME="AEN21743"
 ></A
 ><P
 ></P
@@ -3072,13 +3072,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21590"
+NAME="AEN21756"
 ></A
 ><H3
 ><A
 NAME="XMLCREATEMEMORYPARSERCTXT"
 ></A
->&#62;xmlCreateMemoryParserCtxt ()</H3
+>xmlCreateMemoryParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3103,7 +3103,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21597"
+NAME="AEN21763"
 ></A
 ><P
 ></P
@@ -3173,13 +3173,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21614"
+NAME="AEN21780"
 ></A
 ><H3
 ><A
 NAME="XMLNEWPARSERCTXT"
 ></A
->&#62;xmlNewParserCtxt ()</H3
+>xmlNewParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3203,7 +3203,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21621"
+NAME="AEN21787"
 ></A
 ><P
 ></P
@@ -3239,13 +3239,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21630"
+NAME="AEN21796"
 ></A
 ><H3
 ><A
 NAME="XMLCREATEENTITYPARSERCTXT"
 ></A
->&#62;xmlCreateEntityParserCtxt ()</H3
+>xmlCreateEntityParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3282,7 +3282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21640"
+NAME="AEN21806"
 ></A
 ><P
 ></P
@@ -3369,13 +3369,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21661"
+NAME="AEN21827"
 ></A
 ><H3
 ><A
 NAME="XMLSWITCHENCODING"
 ></A
->&#62;xmlSwitchEncoding ()</H3
+>xmlSwitchEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3404,7 +3404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21669"
+NAME="AEN21835"
 ></A
 ><P
 ></P
@@ -3474,13 +3474,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21686"
+NAME="AEN21852"
 ></A
 ><H3
 ><A
 NAME="XMLSWITCHTOENCODING"
 ></A
->&#62;xmlSwitchToEncoding ()</H3
+>xmlSwitchToEncoding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3509,7 +3509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21694"
+NAME="AEN21860"
 ></A
 ><P
 ></P
@@ -3579,13 +3579,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21711"
+NAME="AEN21877"
 ></A
 ><H3
 ><A
 NAME="XMLHANDLEENTITY"
 ></A
->&#62;xmlHandleEntity ()</H3
+>xmlHandleEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3616,7 +3616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21720"
+NAME="AEN21886"
 ></A
 ><P
 ></P
@@ -3671,13 +3671,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21733"
+NAME="AEN21899"
 ></A
 ><H3
 ><A
 NAME="XMLNEWSTRINGINPUTSTREAM"
 ></A
->&#62;xmlNewStringInputStream ()</H3
+>xmlNewStringInputStream ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3708,7 +3708,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21742"
+NAME="AEN21908"
 ></A
 ><P
 ></P
@@ -3778,13 +3778,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21759"
+NAME="AEN21925"
 ></A
 ><H3
 ><A
 NAME="XMLNEWENTITYINPUTSTREAM"
 ></A
->&#62;xmlNewEntityInputStream ()</H3
+>xmlNewEntityInputStream ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3815,7 +3815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21768"
+NAME="AEN21934"
 ></A
 ><P
 ></P
@@ -3885,13 +3885,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21785"
+NAME="AEN21951"
 ></A
 ><H3
 ><A
 NAME="XMLPUSHINPUT"
 ></A
->&#62;xmlPushInput ()</H3
+>xmlPushInput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3914,13 +3914,13 @@
 ></TABLE
 ><P
 >xmlPushInput: switch to a new input stream which is stacked on top
-              of the previous one(s).</P
+of the previous one(s).</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21793"
+NAME="AEN21959"
 ></A
 ><P
 ></P
@@ -3975,13 +3975,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21806"
+NAME="AEN21972"
 ></A
 ><H3
 ><A
 NAME="XMLPOPINPUT"
 ></A
->&#62;xmlPopInput ()</H3
+>xmlPopInput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4003,13 +4003,13 @@
 ></TABLE
 ><P
 >xmlPopInput: the current input pointed by ctxt-&gt;input came to an end
-         pop it and return the next char.</P
+pop it and return the next char.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21814"
+NAME="AEN21980"
 ></A
 ><P
 ></P
@@ -4062,13 +4062,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21827"
+NAME="AEN21993"
 ></A
 ><H3
 ><A
 NAME="XMLFREEINPUTSTREAM"
 ></A
->&#62;xmlFreeInputStream ()</H3
+>xmlFreeInputStream ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4092,7 +4092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21834"
+NAME="AEN22000"
 ></A
 ><P
 ></P
@@ -4130,13 +4130,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21843"
+NAME="AEN22009"
 ></A
 ><H3
 ><A
 NAME="XMLNEWINPUTFROMFILE"
 ></A
->&#62;xmlNewInputFromFile ()</H3
+>xmlNewInputFromFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4164,7 +4164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21851"
+NAME="AEN22017"
 ></A
 ><P
 ></P
@@ -4234,13 +4234,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21868"
+NAME="AEN22034"
 ></A
 ><H3
 ><A
 NAME="XMLNEWINPUTSTREAM"
 ></A
->&#62;xmlNewInputStream ()</H3
+>xmlNewInputStream ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4267,7 +4267,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21876"
+NAME="AEN22042"
 ></A
 ><P
 ></P
@@ -4320,13 +4320,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21889"
+NAME="AEN22055"
 ></A
 ><H3
 ><A
 NAME="XMLSPLITQNAME"
 ></A
->&#62;xmlSplitQName ()</H3
+>xmlSplitQName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4367,7 +4367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21902"
+NAME="AEN22068"
 ></A
 ><P
 ></P
@@ -4444,7 +4444,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the local part, and prefix is updated
-  to get the Prefix if any.</TD
+to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4455,13 +4455,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21923"
+NAME="AEN22089"
 ></A
 ><H3
 ><A
 NAME="XMLNAMESPACEPARSENCNAME"
 ></A
->&#62;xmlNamespaceParseNCName ()</H3
+>xmlNamespaceParseNCName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4485,18 +4485,18 @@
 >parse an XML namespace name.</P
 ><P
 >TODO: this seems not in use anymore, the namespace handling is done on
-      top of the SAX interfaces, i.e. not on raw input.</P
+top of the SAX interfaces, i.e. not on raw input.</P
 ><P
 >[NS 3] NCName ::= (Letter | '_') (NCNameChar)*</P
 ><P
 >[NS 4] NCNameChar ::= Letter | Digit | '.' | '-' | '_' |
-                      CombiningChar | Extender</P
+CombiningChar | Extender</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21934"
+NAME="AEN22100"
 ></A
 ><P
 ></P
@@ -4549,13 +4549,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21947"
+NAME="AEN22113"
 ></A
 ><H3
 ><A
 NAME="XMLNAMESPACEPARSEQNAME"
 ></A
->&#62;xmlNamespaceParseQName ()</H3
+>xmlNamespaceParseQName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4581,7 +4581,7 @@
 ></TABLE
 ><P
 >TODO: this seems not in use anymore, the namespace handling is done on
-      top of the SAX interfaces, i.e. not on raw input.</P
+top of the SAX interfaces, i.e. not on raw input.</P
 ><P
 >parse an XML qualified name</P
 ><P
@@ -4595,7 +4595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21960"
+NAME="AEN22126"
 ></A
 ><P
 ></P
@@ -4655,7 +4655,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the local part, and prefix is updated
-  to get the Prefix if any.</TD
+to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4666,13 +4666,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21977"
+NAME="AEN22143"
 ></A
 ><H3
 ><A
 NAME="XMLNAMESPACEPARSENSDEF"
 ></A
->&#62;xmlNamespaceParseNSDef ()</H3
+>xmlNamespaceParseNSDef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4696,7 +4696,7 @@
 >parse a namespace prefix declaration</P
 ><P
 >TODO: this seems not in use anymore, the namespace handling is done on
-      top of the SAX interfaces, i.e. not on raw input.</P
+top of the SAX interfaces, i.e. not on raw input.</P
 ><P
 >[NS 1] NSDef ::= PrefixDef Eq SystemLiteral</P
 ><P
@@ -4706,7 +4706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21988"
+NAME="AEN22154"
 ></A
 ><P
 ></P
@@ -4759,13 +4759,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22001"
+NAME="AEN22167"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEQUOTEDSTRING"
 ></A
->&#62;xmlParseQuotedString ()</H3
+>xmlParseQuotedString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4794,7 +4794,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22010"
+NAME="AEN22176"
 ></A
 ><P
 ></P
@@ -4847,13 +4847,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22023"
+NAME="AEN22189"
 ></A
 ><H3
 ><A
 NAME="XMLPARSENAMESPACE"
 ></A
->&#62;xmlParseNamespace ()</H3
+>xmlParseNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4885,7 +4885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22033"
+NAME="AEN22199"
 ></A
 ><P
 ></P
@@ -4923,13 +4923,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22042"
+NAME="AEN22208"
 ></A
 ><H3
 ><A
 NAME="XMLSCANNAME"
 ></A
->&#62;xmlScanName ()</H3
+>xmlScanName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4954,10 +4954,10 @@
 Needed for rollback cases. Used only when parsing entities references.</P
 ><P
 >TODO: seems deprecated now, only used in the default part of
-      xmlParserHandleReference</P
+xmlParserHandleReference</P
 ><P
 >[4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
-                 CombiningChar | Extender</P
+CombiningChar | Extender</P
 ><P
 >[5] Name ::= (Letter | '_' | ':') (NameChar)*</P
 ><P
@@ -4967,7 +4967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22054"
+NAME="AEN22220"
 ></A
 ><P
 ></P
@@ -5020,13 +5020,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22067"
+NAME="AEN22233"
 ></A
 ><H3
 ><A
 NAME="XMLPARSENAME"
 ></A
->&#62;xmlParseName ()</H3
+>xmlParseName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5050,7 +5050,7 @@
 >parse an XML name.</P
 ><P
 >[4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
-                 CombiningChar | Extender</P
+CombiningChar | Extender</P
 ><P
 >[5] Name ::= (Letter | '_' | ':') (NameChar)*</P
 ><P
@@ -5060,7 +5060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22078"
+NAME="AEN22244"
 ></A
 ><P
 ></P
@@ -5113,13 +5113,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22091"
+NAME="AEN22257"
 ></A
 ><H3
 ><A
 NAME="XMLPARSENMTOKEN"
 ></A
->&#62;xmlParseNmtoken ()</H3
+>xmlParseNmtoken ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5150,7 +5150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22101"
+NAME="AEN22267"
 ></A
 ><P
 ></P
@@ -5203,13 +5203,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22114"
+NAME="AEN22280"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENTITYVALUE"
 ></A
->&#62;xmlParseEntityValue ()</H3
+>xmlParseEntityValue ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5237,13 +5237,13 @@
 >parse a value for ENTITY declarations</P
 ><P
 >[9] EntityValue ::= '"' ([^%&amp;"] | PEReference | Reference)* '"' |
-               "'" ([^%&amp;'] | PEReference | Reference)* "'"</P
+"'" ([^%&amp;'] | PEReference | Reference)* "'"</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22124"
+NAME="AEN22290"
 ></A
 ><P
 ></P
@@ -5313,13 +5313,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22141"
+NAME="AEN22307"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEATTVALUE"
 ></A
->&#62;xmlParseAttValue ()</H3
+>xmlParseAttValue ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5345,15 +5345,15 @@
 will be handled later in xmlStringGetNodeList</P
 ><P
 >[10] AttValue ::= '"' ([^&lt;&amp;"] | Reference)* '"' |
-                  "'" ([^&lt;&amp;'] | Reference)* "'"</P
+"'" ([^&lt;&amp;'] | Reference)* "'"</P
 ><P
 >3.3.3 Attribute-Value Normalization:
 Before the value of an attribute is passed to the application or
 checked for validity, the XML processor must normalize it as follows: 
 - a character reference is processed by appending the referenced
-  character to the attribute value
+character to the attribute value
 - an entity reference is processed by recursively processing the
-  replacement text of the entity 
+replacement text of the entity 
 - a whitespace character (<GTKDOCLINK
 HREF="X20"
 >x20</GTKDOCLINK
@@ -5367,11 +5367,11 @@
 HREF="X9"
 >x9</GTKDOCLINK
 >) is processed by
-  appending <GTKDOCLINK
+appending <GTKDOCLINK
 HREF="X20"
 >x20</GTKDOCLINK
 > to the normalized value, except that only a single
-  <GTKDOCLINK
+<GTKDOCLINK
 HREF="X20"
 >x20</GTKDOCLINK
 > is appended for a "<GTKDOCLINK
@@ -5381,7 +5381,7 @@
 HREF="XA"
 >xA</GTKDOCLINK
 >" sequence that is part of an external
-  parsed entity or the literal entity value of an internal parsed entity 
+parsed entity or the literal entity value of an internal parsed entity 
 - other characters are processed by appending them to the normalized value 
 If the declared value is not CDATA, then the XML processor must further
 process the normalized attribute value by discarding any leading and
@@ -5403,7 +5403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22162"
+NAME="AEN22328"
 ></A
 ><P
 ></P
@@ -5456,13 +5456,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22175"
+NAME="AEN22341"
 ></A
 ><H3
 ><A
 NAME="XMLPARSESYSTEMLITERAL"
 ></A
->&#62;xmlParseSystemLiteral ()</H3
+>xmlParseSystemLiteral ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5491,7 +5491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22184"
+NAME="AEN22350"
 ></A
 ><P
 ></P
@@ -5544,13 +5544,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22197"
+NAME="AEN22363"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEPUBIDLITERAL"
 ></A
->&#62;xmlParsePubidLiteral ()</H3
+>xmlParsePubidLiteral ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5579,7 +5579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22206"
+NAME="AEN22372"
 ></A
 ><P
 ></P
@@ -5632,13 +5632,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22219"
+NAME="AEN22385"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECHARDATA"
 ></A
->&#62;xmlParseCharData ()</H3
+>xmlParseCharData ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5671,7 +5671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22228"
+NAME="AEN22394"
 ></A
 ><P
 ></P
@@ -5726,13 +5726,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22241"
+NAME="AEN22407"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEEXTERNALID"
 ></A
->&#62;xmlParseExternalID ()</H3
+>xmlParseExternalID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5761,10 +5761,10 @@
 >Parse an External ID or a Public ID</P
 ><P
 >NOTE: Productions [75] and [83] interact badly since [75] can generate
-      'PUBLIC' S PubidLiteral S SystemLiteral</P
+'PUBLIC' S PubidLiteral S SystemLiteral</P
 ><P
 >[75] ExternalID ::= 'SYSTEM' S SystemLiteral
-                  | 'PUBLIC' S PubidLiteral S SystemLiteral</P
+| 'PUBLIC' S PubidLiteral S SystemLiteral</P
 ><P
 >[83] PublicID ::= 'PUBLIC' S PubidLiteral</P
 ><P
@@ -5772,7 +5772,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22253"
+NAME="AEN22419"
 ></A
 ><P
 ></P
@@ -5834,7 +5834,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 > indicate whether we should restrict parsing to only
-         production [75], see NOTE below</TD
+production [75], see NOTE below</TD
 ></TR
 ><TR
 ><TD
@@ -5850,8 +5850,8 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the function returns SystemLiteral and in the second
-               case publicID receives PubidLiteral, is strict is off
-               it is possible to return NULL and have publicID set.</TD
+case publicID receives PubidLiteral, is strict is off
+it is possible to return NULL and have publicID set.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5862,13 +5862,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22274"
+NAME="AEN22440"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECOMMENT"
 ></A
->&#62;xmlParseComment ()</H3
+>xmlParseComment ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5887,8 +5887,8 @@
 ></TABLE
 ><P
 >Skip an XML (SGML) comment &lt;!-- .... --&gt;
- The spec says that "For compatibility, the string "--" (double-hyphen)
- must not occur within comments. "</P
+The spec says that "For compatibility, the string "--" (double-hyphen)
+must not occur within comments. "</P
 ><P
 >[15] Comment ::= '&lt;!--' ((Char - '-') | ('-' (Char - '-')))* '--&gt;'</P
 ><P
@@ -5896,7 +5896,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22282"
+NAME="AEN22448"
 ></A
 ><P
 ></P
@@ -5934,13 +5934,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22291"
+NAME="AEN22457"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEPITARGET"
 ></A
->&#62;xmlParsePITarget ()</H3
+>xmlParsePITarget ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5969,7 +5969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22300"
+NAME="AEN22466"
 ></A
 ><P
 ></P
@@ -6022,13 +6022,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22313"
+NAME="AEN22479"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEPI"
 ></A
->&#62;xmlParsePI ()</H3
+>xmlParsePI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6056,7 +6056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22322"
+NAME="AEN22488"
 ></A
 ><P
 ></P
@@ -6094,13 +6094,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22331"
+NAME="AEN22497"
 ></A
 ><H3
 ><A
 NAME="XMLPARSENOTATIONDECL"
 ></A
->&#62;xmlParseNotationDecl ()</H3
+>xmlParseNotationDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6123,8 +6123,8 @@
 >[82] NotationDecl ::= '&lt;!NOTATION' S Name S (ExternalID |  PublicID) S? '&gt;'</P
 ><P
 >Hence there is actually 3 choices:
-    'PUBLIC' S PubidLiteral
-    'PUBLIC' S PubidLiteral S SystemLiteral
+'PUBLIC' S PubidLiteral
+'PUBLIC' S PubidLiteral S SystemLiteral
 and 'SYSTEM' S SystemLiteral</P
 ><P
 >See the NOTE on <A
@@ -6136,7 +6136,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22342"
+NAME="AEN22508"
 ></A
 ><P
 ></P
@@ -6174,13 +6174,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22351"
+NAME="AEN22517"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENTITYDECL"
 ></A
->&#62;xmlParseEntityDecl ()</H3
+>xmlParseEntityDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6219,7 +6219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22365"
+NAME="AEN22531"
 ></A
 ><P
 ></P
@@ -6257,13 +6257,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22374"
+NAME="AEN22540"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEDEFAULTDECL"
 ></A
->&#62;xmlParseDefaultDecl ()</H3
+>xmlParseDefaultDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6330,7 +6330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22394"
+NAME="AEN22560"
 ></A
 ><P
 ></P
@@ -6390,7 +6390,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 > XML_ATTRIBUTE_NONE, XML_ATTRIBUTE_REQUIRED, XML_ATTRIBUTE_IMPLIED
-         or XML_ATTRIBUTE_FIXED. </TD
+or XML_ATTRIBUTE_FIXED. </TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6401,13 +6401,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22411"
+NAME="AEN22577"
 ></A
 ><H3
 ><A
 NAME="XMLPARSENOTATIONTYPE"
 ></A
->&#62;xmlParseNotationType ()</H3
+>xmlParseNotationType ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6442,7 +6442,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22422"
+NAME="AEN22588"
 ></A
 ><P
 ></P
@@ -6495,13 +6495,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22435"
+NAME="AEN22601"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENUMERATIONTYPE"
 ></A
->&#62;xmlParseEnumerationType ()</H3
+>xmlParseEnumerationType ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6534,7 +6534,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22445"
+NAME="AEN22611"
 ></A
 ><P
 ></P
@@ -6587,13 +6587,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22458"
+NAME="AEN22624"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENUMERATEDTYPE"
 ></A
->&#62;xmlParseEnumeratedType ()</H3
+>xmlParseEnumeratedType ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6625,7 +6625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22468"
+NAME="AEN22634"
 ></A
 ><P
 ></P
@@ -6695,13 +6695,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22485"
+NAME="AEN22651"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEATTRIBUTETYPE"
 ></A
->&#62;xmlParseAttributeType ()</H3
+>xmlParseAttributeType ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6730,7 +6730,7 @@
 >[55] StringType ::= 'CDATA'</P
 ><P
 >[56] TokenizedType ::= 'ID' | 'IDREF' | 'IDREFS' | 'ENTITY' |
-                       'ENTITIES' | 'NMTOKEN' | 'NMTOKENS'</P
+'ENTITIES' | 'NMTOKEN' | 'NMTOKENS'</P
 ><P
 >Validity constraints for attribute values syntax are checked in
 <A
@@ -6774,7 +6774,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22506"
+NAME="AEN22672"
 ></A
 ><P
 ></P
@@ -6844,13 +6844,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22523"
+NAME="AEN22689"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEATTRIBUTELISTDECL"
 ></A
->&#62;xmlParseAttributeListDecl ()</H3
+>xmlParseAttributeListDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6878,7 +6878,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22532"
+NAME="AEN22698"
 ></A
 ><P
 ></P
@@ -6916,13 +6916,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22541"
+NAME="AEN22707"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENTMIXEDCONTENTDECL"
 ></A
->&#62;xmlParseElementMixedContentDecl ()</H3
+>xmlParseElementMixedContentDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6955,7 +6955,7 @@
 HREF="PCDATA-CAPS"
 >PCDATA</GTKDOCLINK
 >' (S? '|' S? Name)* S? ')*' |
-               '(' S? '<GTKDOCLINK
+'(' S? '<GTKDOCLINK
 HREF="PCDATA-CAPS"
 >PCDATA</GTKDOCLINK
 >' S? ')'</P
@@ -6970,7 +6970,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22555"
+NAME="AEN22721"
 ></A
 ><P
 ></P
@@ -7040,13 +7040,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22572"
+NAME="AEN22738"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENTCHILDRENCONTENTD"
 ></A
->&#62;xmlParseElementChildrenContentD ()</H3
+>xmlParseElementChildrenContentD ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7077,7 +7077,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22581"
+NAME="AEN22747"
 ></A
 ><P
 ></P
@@ -7120,7 +7120,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the tree of xmlElementContentPtr describing the element 
-         hierarchy.</TD
+hierarchy.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7131,13 +7131,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22594"
+NAME="AEN22760"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENTCHILDRENCONTENTDECL"
 ></A
->&#62;xmlParseElementChildrenContentDecl ()</H3
+>xmlParseElementChildrenContentDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7189,7 +7189,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22608"
+NAME="AEN22774"
 ></A
 ><P
 ></P
@@ -7249,7 +7249,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the tree of xmlElementContentPtr describing the element 
-         hierarchy.</TD
+hierarchy.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7260,13 +7260,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22625"
+NAME="AEN22791"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENTCONTENTDECL"
 ></A
->&#62;xmlParseElementContentDecl ()</H3
+>xmlParseElementContentDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7301,7 +7301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22635"
+NAME="AEN22801"
 ></A
 ><P
 ></P
@@ -7388,13 +7388,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22656"
+NAME="AEN22822"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENTDECL"
 ></A
->&#62;xmlParseElementDecl ()</H3
+>xmlParseElementDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7423,7 +7423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22665"
+NAME="AEN22831"
 ></A
 ><P
 ></P
@@ -7476,13 +7476,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22678"
+NAME="AEN22844"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEMARKUPDECL"
 ></A
->&#62;xmlParseMarkupDecl ()</H3
+>xmlParseMarkupDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7503,7 +7503,7 @@
 >parse Markup declarations</P
 ><P
 >[29] markupdecl ::= elementdecl | AttlistDecl | EntityDecl |
-                    NotationDecl | PI | Comment</P
+NotationDecl | PI | Comment</P
 ><P
 >[ VC: Proper Declaration/PE Nesting ]
 Parameter-entity replacement text must be properly nested with
@@ -7522,7 +7522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22688"
+NAME="AEN22854"
 ></A
 ><P
 ></P
@@ -7560,13 +7560,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22697"
+NAME="AEN22863"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECHARREF"
 ></A
->&#62;xmlParseCharRef ()</H3
+>xmlParseCharRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7587,7 +7587,7 @@
 >parse Reference declarations</P
 ><P
 >[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-                 '&amp;<GTKDOCLINK
+'&amp;<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
@@ -7600,7 +7600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22707"
+NAME="AEN22873"
 ></A
 ><P
 ></P
@@ -7653,13 +7653,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22720"
+NAME="AEN22886"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENTITYREF"
 ></A
->&#62;xmlParseEntityRef ()</H3
+>xmlParseEntityRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7706,7 +7706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22731"
+NAME="AEN22897"
 ></A
 ><P
 ></P
@@ -7759,13 +7759,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22744"
+NAME="AEN22910"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEREFERENCE"
 ></A
->&#62;xmlParseReference ()</H3
+>xmlParseReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7800,7 +7800,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22754"
+NAME="AEN22920"
 ></A
 ><P
 ></P
@@ -7838,13 +7838,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22763"
+NAME="AEN22929"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEPEREFERENCE"
 ></A
->&#62;xmlParsePEReference ()</H3
+>xmlParsePEReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7891,7 +7891,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22775"
+NAME="AEN22941"
 ></A
 ><P
 ></P
@@ -7929,13 +7929,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22784"
+NAME="AEN22950"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEDOCTYPEDECL"
 ></A
->&#62;xmlParseDocTypeDecl ()</H3
+>xmlParseDocTypeDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7956,7 +7956,7 @@
 >parse a DOCTYPE declaration</P
 ><P
 >[28] doctypedecl ::= '&lt;!DOCTYPE' S Name (S ExternalID)? S? 
-                     ('[' (markupdecl | PEReference | S)* ']' S?)? '&gt;'</P
+('[' (markupdecl | PEReference | S)* ']' S?)? '&gt;'</P
 ><P
 >[ VC: Root Element Type ]
 The Name in the document type declaration must match the element
@@ -7966,7 +7966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22793"
+NAME="AEN22959"
 ></A
 ><P
 ></P
@@ -8004,13 +8004,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22802"
+NAME="AEN22968"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEATTRIBUTE"
 ></A
->&#62;xmlParseAttribute ()</H3
+>xmlParseAttribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8064,7 +8064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22819"
+NAME="AEN22985"
 ></A
 ><P
 ></P
@@ -8134,13 +8134,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22836"
+NAME="AEN23002"
 ></A
 ><H3
 ><A
 NAME="XMLPARSESTARTTAG"
 ></A
->&#62;xmlParseStartTag ()</H3
+>xmlParseStartTag ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8186,7 +8186,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22851"
+NAME="AEN23017"
 ></A
 ><P
 ></P
@@ -8239,13 +8239,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22864"
+NAME="AEN23030"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENDTAG"
 ></A
->&#62;xmlParseEndTag ()</H3
+>xmlParseEndTag ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8275,7 +8275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22874"
+NAME="AEN23040"
 ></A
 ><P
 ></P
@@ -8313,13 +8313,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22883"
+NAME="AEN23049"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECDSECT"
 ></A
->&#62;xmlParseCDSect ()</H3
+>xmlParseCDSect ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8351,7 +8351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22894"
+NAME="AEN23060"
 ></A
 ><P
 ></P
@@ -8389,13 +8389,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22903"
+NAME="AEN23069"
 ></A
 ><H3
 ><A
 NAME="XMLPARSECONTENT"
 ></A
->&#62;xmlParseContent ()</H3
+>xmlParseContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8421,7 +8421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22911"
+NAME="AEN23077"
 ></A
 ><P
 ></P
@@ -8459,13 +8459,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22920"
+NAME="AEN23086"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEELEMENT"
 ></A
->&#62;xmlParseElement ()</H3
+>xmlParseElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8494,21 +8494,21 @@
 >[ VC: Element Valid ]
 An element is valid if there is a declaration matching elementdecl
 where the Name matches the element type and one of the following holds:
- - The declaration matches EMPTY and the element has no content.
- - The declaration matches children and the sequence of child elements
-   belongs to the language generated by the regular expression in the
-   content model, with optional white space (characters matching the
-   nonterminal S) between each pair of child elements. 
- - The declaration matches Mixed and the content consists of character
-   data and child elements whose types match names in the content model. 
- - The declaration matches ANY, and the types of any child elements have
-   been declared.</P
+- The declaration matches EMPTY and the element has no content.
+- The declaration matches children and the sequence of child elements
+belongs to the language generated by the regular expression in the
+content model, with optional white space (characters matching the
+nonterminal S) between each pair of child elements. 
+- The declaration matches Mixed and the content consists of character
+data and child elements whose types match names in the content model. 
+- The declaration matches ANY, and the types of any child elements have
+been declared.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22930"
+NAME="AEN23096"
 ></A
 ><P
 ></P
@@ -8546,13 +8546,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22939"
+NAME="AEN23105"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEVERSIONNUM"
 ></A
->&#62;xmlParseVersionNum ()</H3
+>xmlParseVersionNum ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8581,7 +8581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22948"
+NAME="AEN23114"
 ></A
 ><P
 ></P
@@ -8634,13 +8634,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22961"
+NAME="AEN23127"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEVERSIONINFO"
 ></A
->&#62;xmlParseVersionInfo ()</H3
+>xmlParseVersionInfo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8671,7 +8671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22971"
+NAME="AEN23137"
 ></A
 ><P
 ></P
@@ -8724,13 +8724,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22984"
+NAME="AEN23150"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENCNAME"
 ></A
->&#62;xmlParseEncName ()</H3
+>xmlParseEncName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8759,7 +8759,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22993"
+NAME="AEN23159"
 ></A
 ><P
 ></P
@@ -8812,13 +8812,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23006"
+NAME="AEN23172"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEENCODINGDECL"
 ></A
->&#62;xmlParseEncodingDecl ()</H3
+>xmlParseEncodingDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8849,7 +8849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23016"
+NAME="AEN23182"
 ></A
 ><P
 ></P
@@ -8902,13 +8902,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23029"
+NAME="AEN23195"
 ></A
 ><H3
 ><A
 NAME="XMLPARSESDDECL"
 ></A
->&#62;xmlParseSDDecl ()</H3
+>xmlParseSDDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8929,27 +8929,27 @@
 >parse the XML standalone declaration</P
 ><P
 >[32] SDDecl ::= S 'standalone' Eq
-                (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) </P
+(("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no')'"')) </P
 ><P
 >[ VC: Standalone Document Declaration ]
 TODO The standalone document declaration must have the value "no"
 if any external markup declarations contain declarations of:
- - attributes with default values, if elements to which these
-   attributes apply appear in the document without specifications
-   of values for these attributes, or
- - entities (other than amp, lt, gt, apos, quot), if references
-   to those entities appear in the document, or
- - attributes with values subject to normalization, where the
-   attribute appears in the document with a value which will change
-   as a result of normalization, or
- - element types with element content, if white space occurs directly
-   within any instance of those types.</P
+- attributes with default values, if elements to which these
+attributes apply appear in the document without specifications
+of values for these attributes, or
+- entities (other than amp, lt, gt, apos, quot), if references
+to those entities appear in the document, or
+- attributes with values subject to normalization, where the
+attribute appears in the document with a value which will change
+as a result of normalization, or
+- element types with element content, if white space occurs directly
+within any instance of those types.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23038"
+NAME="AEN23204"
 ></A
 ><P
 ></P
@@ -9002,13 +9002,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23051"
+NAME="AEN23217"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEXMLDECL"
 ></A
->&#62;xmlParseXMLDecl ()</H3
+>xmlParseXMLDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9034,7 +9034,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23059"
+NAME="AEN23225"
 ></A
 ><P
 ></P
@@ -9072,13 +9072,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23068"
+NAME="AEN23234"
 ></A
 ><H3
 ><A
 NAME="XMLPARSETEXTDECL"
 ></A
->&#62;xmlParseTextDecl ()</H3
+>xmlParseTextDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9106,7 +9106,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23077"
+NAME="AEN23243"
 ></A
 ><P
 ></P
@@ -9144,13 +9144,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23086"
+NAME="AEN23252"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEMISC"
 ></A
->&#62;xmlParseMisc ()</H3
+>xmlParseMisc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9176,7 +9176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23094"
+NAME="AEN23260"
 ></A
 ><P
 ></P
@@ -9214,13 +9214,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23103"
+NAME="AEN23269"
 ></A
 ><H3
 ><A
 NAME="XMLPARSEEXTERNALSUBSET"
 ></A
->&#62;xmlParseExternalSubset ()</H3
+>xmlParseExternalSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9256,7 +9256,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23114"
+NAME="AEN23280"
 ></A
 ><P
 ></P
@@ -9328,13 +9328,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23131"
+NAME="AEN23297"
 ></A
 ><H3
 ><A
 NAME="XML-SUBSTITUTE-NONE-CAPS"
 ></A
->&#62;XML_SUBSTITUTE_NONE</H3
+>XML_SUBSTITUTE_NONE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9356,13 +9356,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23137"
+NAME="AEN23303"
 ></A
 ><H3
 ><A
 NAME="XML-SUBSTITUTE-REF-CAPS"
 ></A
->&#62;XML_SUBSTITUTE_REF</H3
+>XML_SUBSTITUTE_REF</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9384,13 +9384,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23143"
+NAME="AEN23309"
 ></A
 ><H3
 ><A
 NAME="XML-SUBSTITUTE-PEREF-CAPS"
 ></A
->&#62;XML_SUBSTITUTE_PEREF</H3
+>XML_SUBSTITUTE_PEREF</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9412,13 +9412,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23149"
+NAME="AEN23315"
 ></A
 ><H3
 ><A
 NAME="XML-SUBSTITUTE-BOTH-CAPS"
 ></A
->&#62;XML_SUBSTITUTE_BOTH</H3
+>XML_SUBSTITUTE_BOTH</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9440,13 +9440,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23155"
+NAME="AEN23321"
 ></A
 ><H3
 ><A
 NAME="XMLDECODEENTITIES"
 ></A
->&#62;xmlDecodeEntities ()</H3
+>xmlDecodeEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9494,7 +9494,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23169"
+NAME="AEN23335"
 ></A
 ><P
 ></P
@@ -9622,7 +9622,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >A newly allocated string with the substitution done. The caller
-     must deallocate it !</TD
+must deallocate it !</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9633,13 +9633,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23202"
+NAME="AEN23368"
 ></A
 ><H3
 ><A
 NAME="XMLSTRINGDECODEENTITIES"
 ></A
->&#62;xmlStringDecodeEntities ()</H3
+>xmlStringDecodeEntities ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9687,7 +9687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23216"
+NAME="AEN23382"
 ></A
 ><P
 ></P
@@ -9815,7 +9815,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >A newly allocated string with the substitution done. The caller
-     must deallocate it !</TD
+must deallocate it !</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9826,13 +9826,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23249"
+NAME="AEN23415"
 ></A
 ><H3
 ><A
 NAME="NODEPUSH"
 ></A
->&#62;nodePush ()</H3
+>nodePush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9860,7 +9860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23257"
+NAME="AEN23423"
 ></A
 ><P
 ></P
@@ -9930,13 +9930,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23274"
+NAME="AEN23440"
 ></A
 ><H3
 ><A
 NAME="NODEPOP"
 ></A
->&#62;nodePop ()</H3
+>nodePop ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9963,7 +9963,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23282"
+NAME="AEN23448"
 ></A
 ><P
 ></P
@@ -10016,13 +10016,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23295"
+NAME="AEN23461"
 ></A
 ><H3
 ><A
 NAME="INPUTPUSH"
 ></A
->&#62;inputPush ()</H3
+>inputPush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10050,7 +10050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23303"
+NAME="AEN23469"
 ></A
 ><P
 ></P
@@ -10120,13 +10120,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23320"
+NAME="AEN23486"
 ></A
 ><H3
 ><A
 NAME="INPUTPOP"
 ></A
->&#62;inputPop ()</H3
+>inputPop ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10153,7 +10153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23328"
+NAME="AEN23494"
 ></A
 ><P
 ></P
@@ -10206,13 +10206,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23341"
+NAME="AEN23507"
 ></A
 ><H3
 ><A
 NAME="NAMEPOP"
 ></A
->&#62;namePop ()</H3
+>namePop ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10239,7 +10239,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23349"
+NAME="AEN23515"
 ></A
 ><P
 ></P
@@ -10292,13 +10292,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23362"
+NAME="AEN23528"
 ></A
 ><H3
 ><A
 NAME="NAMEPUSH"
 ></A
->&#62;namePush ()</H3
+>namePush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10326,7 +10326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23370"
+NAME="AEN23536"
 ></A
 ><P
 ></P
@@ -10396,13 +10396,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23387"
+NAME="AEN23553"
 ></A
 ><H3
 ><A
 NAME="XMLSKIPBLANKCHARS"
 ></A
->&#62;xmlSkipBlankChars ()</H3
+>xmlSkipBlankChars ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10427,7 +10427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23394"
+NAME="AEN23560"
 ></A
 ><P
 ></P
@@ -10480,13 +10480,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23407"
+NAME="AEN23573"
 ></A
 ><H3
 ><A
 NAME="XMLSTRINGCURRENTCHAR"
 ></A
->&#62;xmlStringCurrentChar ()</H3
+>xmlStringCurrentChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10516,7 +10516,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23415"
+NAME="AEN23581"
 ></A
 ><P
 ></P
@@ -10603,13 +10603,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23436"
+NAME="AEN23602"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERHANDLEPEREFERENCE"
 ></A
->&#62;xmlParserHandlePEReference ()</H3
+>xmlParserHandlePEReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10650,19 +10650,19 @@
 ><P
 >A PEReference may have been detected in the current input stream
 the handling is done accordingly to 
-     http://www.w3.org/TR/REC-xml<GTKDOCLINK
+http://www.w3.org/TR/REC-xml<GTKDOCLINK
 HREF="ENTPROC"
 >entproc</GTKDOCLINK
 >
 i.e. 
-  - Included in literal in entity values
-  - Included as Parameter Entity reference within DTDs</P
+- Included in literal in entity values
+- Included as Parameter Entity reference within DTDs</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23449"
+NAME="AEN23615"
 ></A
 ><P
 ></P
@@ -10700,13 +10700,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23458"
+NAME="AEN23624"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERHANDLEREFERENCE"
 ></A
->&#62;xmlParserHandleReference ()</H3
+>xmlParserHandleReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10725,7 +10725,7 @@
 ></TABLE
 ><P
 >TODO: Remove, now deprecated ... the test is done directly in the
-      content parsing
+content parsing
 routines.</P
 ><P
 >[67] Reference ::= EntityRef | CharRef</P
@@ -10741,14 +10741,14 @@
 An entity reference must not contain the name of an unparsed entity</P
 ><P
 >[66] CharRef ::= '&amp;#' [0-9]+ ';' |
-                 '&amp;<GTKDOCLINK
+'&amp;<GTKDOCLINK
 HREF="X"
 >x</GTKDOCLINK
 >' [0-9a-fA-F]+ ';'</P
 ><P
 >A PEReference may have been detected in the current input stream
 the handling is done accordingly to 
-     http://www.w3.org/TR/REC-xml<GTKDOCLINK
+http://www.w3.org/TR/REC-xml<GTKDOCLINK
 HREF="ENTPROC"
 >entproc</GTKDOCLINK
 ></P
@@ -10757,7 +10757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23473"
+NAME="AEN23639"
 ></A
 ><P
 ></P
@@ -10795,13 +10795,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23482"
+NAME="AEN23648"
 ></A
 ><H3
 ><A
 NAME="XMLCHECKLANGUAGEID"
 ></A
->&#62;xmlCheckLanguageID ()</H3
+>xmlCheckLanguageID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10822,7 +10822,7 @@
 >Checks that the value conforms to the LanguageID production:</P
 ><P
 >NOTE: this is somewhat deprecated, those productions were removed from
-      the XML Second edition.</P
+the XML Second edition.</P
 ><P
 >[33] LanguageID ::= Langcode ('-' Subcode)*
 [34] Langcode ::= ISO639Code |  IanaCode |  UserCode
@@ -10835,7 +10835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23491"
+NAME="AEN23657"
 ></A
 ><P
 ></P
@@ -10888,13 +10888,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23504"
+NAME="AEN23670"
 ></A
 ><H3
 ><A
 NAME="XMLCURRENTCHAR"
 ></A
->&#62;xmlCurrentChar ()</H3
+>xmlCurrentChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10942,7 +10942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23516"
+NAME="AEN23682"
 ></A
 ><P
 ></P
@@ -11012,13 +11012,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23533"
+NAME="AEN23699"
 ></A
 ><H3
 ><A
 NAME="XMLCOPYCHARMULTIBYTE"
 ></A
->&#62;xmlCopyCharMultiByte ()</H3
+>xmlCopyCharMultiByte ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11043,7 +11043,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23540"
+NAME="AEN23706"
 ></A
 ><P
 ></P
@@ -11113,13 +11113,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23557"
+NAME="AEN23723"
 ></A
 ><H3
 ><A
 NAME="XMLCOPYCHAR"
 ></A
->&#62;xmlCopyChar ()</H3
+>xmlCopyChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11145,7 +11145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23564"
+NAME="AEN23730"
 ></A
 ><P
 ></P
@@ -11232,13 +11232,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23585"
+NAME="AEN23751"
 ></A
 ><H3
 ><A
 NAME="XMLNEXTCHAR"
 ></A
->&#62;xmlNextChar ()</H3
+>xmlNextChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11262,7 +11262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23592"
+NAME="AEN23758"
 ></A
 ><P
 ></P
@@ -11300,13 +11300,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23601"
+NAME="AEN23767"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTSHRINK"
 ></A
->&#62;xmlParserInputShrink ()</H3
+>xmlParserInputShrink ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11330,7 +11330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23608"
+NAME="AEN23774"
 ></A
 ><P
 ></P
@@ -11368,13 +11368,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23617"
+NAME="AEN23783"
 ></A
 ><H3
 ><A
 NAME="HTMLINITAUTOCLOSE"
 ></A
->&#62;htmlInitAutoClose ()</H3
+>htmlInitAutoClose ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11401,13 +11401,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23624"
+NAME="AEN23790"
 ></A
 ><H3
 ><A
 NAME="HTMLCREATEFILEPARSERCTXT"
 ></A
->&#62;htmlCreateFileParserCtxt ()</H3
+>htmlCreateFileParserCtxt ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11434,7 +11434,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23631"
+NAME="AEN23797"
 ></A
 ><P
 ></P
@@ -11504,13 +11504,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23648"
+NAME="AEN23814"
 ></A
 ><H3
 ><A
 NAME="XMLENTITYREFERENCEFUNC"
 ></A
->&#62;xmlEntityReferenceFunc ()</H3
+>xmlEntityReferenceFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11543,7 +11543,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23657"
+NAME="AEN23823"
 ></A
 ><P
 ></P
@@ -11615,13 +11615,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23674"
+NAME="AEN23840"
 ></A
 ><H3
 ><A
 NAME="XMLSETENTITYREFERENCEFUNC"
 ></A
->&#62;xmlSetEntityReferenceFunc ()</H3
+>xmlSetEntityReferenceFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11645,7 +11645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23681"
+NAME="AEN23847"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index de40be8..ababc15 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -555,7 +555,7 @@
 ><A
 NAME="GETPUBLICID"
 ></A
->&#62;getPublicId ()</H3
+>getPublicId ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -638,7 +638,7 @@
 ><A
 NAME="GETSYSTEMID"
 ></A
->&#62;getSystemId ()</H3
+>getSystemId ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -722,7 +722,7 @@
 ><A
 NAME="SETDOCUMENTLOCATOR"
 ></A
->&#62;setDocumentLocator ()</H3
+>setDocumentLocator ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -809,7 +809,7 @@
 ><A
 NAME="GETLINENUMBER"
 ></A
->&#62;getLineNumber ()</H3
+>getLineNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -889,7 +889,7 @@
 ><A
 NAME="GETCOLUMNNUMBER"
 ></A
->&#62;getColumnNumber ()</H3
+>getColumnNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -969,7 +969,7 @@
 ><A
 NAME="ISSTANDALONE"
 ></A
->&#62;isStandalone ()</H3
+>isStandalone ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1049,7 +1049,7 @@
 ><A
 NAME="HASINTERNALSUBSET"
 ></A
->&#62;hasInternalSubset ()</H3
+>hasInternalSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1129,7 +1129,7 @@
 ><A
 NAME="HASEXTERNALSUBSET"
 ></A
->&#62;hasExternalSubset ()</H3
+>hasExternalSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1209,7 +1209,7 @@
 ><A
 NAME="INTERNALSUBSET"
 ></A
->&#62;internalSubset ()</H3
+>internalSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1337,7 +1337,7 @@
 ><A
 NAME="EXTERNALSUBSET"
 ></A
->&#62;externalSubset ()</H3
+>externalSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1465,7 +1465,7 @@
 ><A
 NAME="GETENTITY"
 ></A
->&#62;getEntity ()</H3
+>getEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1569,7 +1569,7 @@
 ><A
 NAME="GETPARAMETERENTITY"
 ></A
->&#62;getParameterEntity ()</H3
+>getParameterEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1673,7 +1673,7 @@
 ><A
 NAME="RESOLVEENTITY"
 ></A
->&#62;resolveEntity ()</H3
+>resolveEntity ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1701,15 +1701,15 @@
 ><P
 >The entity loader, to control the loading of external entities,
 the application can either:
-   - override this <A
+- override this <A
 HREF="libxml-sax.html#RESOLVEENTITY"
 >resolveEntity</A
 >() callback in the SAX block
-   - or better use the <A
+- or better use the <A
 HREF="libxml-parser.html#XMLSETEXTERNALENTITYLOADER"
 >xmlSetExternalEntityLoader</A
 >() function to
-     set up it's own entity resolution routine</P
+set up it's own entity resolution routine</P
 ><P
 ></P
 ><DIV
@@ -1808,7 +1808,7 @@
 ><A
 NAME="ENTITYDECL"
 ></A
->&#62;entityDecl ()</H3
+>entityDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1975,7 +1975,7 @@
 ><A
 NAME="ATTRIBUTEDECL"
 ></A
->&#62;attributeDecl ()</H3
+>attributeDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2160,7 +2160,7 @@
 ><A
 NAME="ELEMENTDECL"
 ></A
->&#62;elementDecl ()</H3
+>elementDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2285,7 +2285,7 @@
 ><A
 NAME="NOTATIONDECL"
 ></A
->&#62;notationDecl ()</H3
+>notationDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2413,7 +2413,7 @@
 ><A
 NAME="UNPARSEDENTITYDECL"
 ></A
->&#62;unparsedEntityDecl ()</H3
+>unparsedEntityDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2562,7 +2562,7 @@
 ><A
 NAME="STARTDOCUMENT"
 ></A
->&#62;startDocument ()</H3
+>startDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2627,7 +2627,7 @@
 ><A
 NAME="ENDDOCUMENT"
 ></A
->&#62;endDocument ()</H3
+>endDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2692,7 +2692,7 @@
 ><A
 NAME="ATTRIBUTE"
 ></A
->&#62;attribute ()</H3
+>attribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2802,7 +2802,7 @@
 ><A
 NAME="STARTELEMENT"
 ></A
->&#62;startElement ()</H3
+>startElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2909,7 +2909,7 @@
 ><A
 NAME="ENDELEMENT"
 ></A
->&#62;endElement ()</H3
+>endElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2995,7 +2995,7 @@
 ><A
 NAME="REFERENCE"
 ></A
->&#62;reference ()</H3
+>reference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3081,7 +3081,7 @@
 ><A
 NAME="CHARACTERS"
 ></A
->&#62;characters ()</H3
+>characters ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3185,7 +3185,7 @@
 ><A
 NAME="IGNORABLEWHITESPACE"
 ></A
->&#62;ignorableWhitespace ()</H3
+>ignorableWhitespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3290,7 +3290,7 @@
 ><A
 NAME="PROCESSINGINSTRUCTION"
 ></A
->&#62;processingInstruction ()</H3
+>processingInstruction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3397,7 +3397,7 @@
 ><A
 NAME="GLOBALNAMESPACE"
 ></A
->&#62;globalNamespace ()</H3
+>globalNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3504,7 +3504,7 @@
 ><A
 NAME="SETNAMESPACE"
 ></A
->&#62;setNamespace ()</H3
+>setNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3590,7 +3590,7 @@
 ><A
 NAME="GETNAMESPACE"
 ></A
->&#62;getNamespace ()</H3
+>getNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3673,7 +3673,7 @@
 ><A
 NAME="CHECKNAMESPACE"
 ></A
->&#62;checkNamespace ()</H3
+>checkNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3775,7 +3775,7 @@
 ><A
 NAME="NAMESPACEDECL"
 ></A
->&#62;namespaceDecl ()</H3
+>namespaceDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3882,7 +3882,7 @@
 ><A
 NAME="COMMENT"
 ></A
->&#62;comment ()</H3
+>comment ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3968,7 +3968,7 @@
 ><A
 NAME="CDATABLOCK"
 ></A
->&#62;cdataBlock ()</H3
+>cdataBlock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4072,7 +4072,7 @@
 ><A
 NAME="INITXMLDEFAULTSAXHANDLER"
 ></A
->&#62;initxmlDefaultSAXHandler ()</H3
+>initxmlDefaultSAXHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4158,7 +4158,7 @@
 ><A
 NAME="INITHTMLDEFAULTSAXHANDLER"
 ></A
->&#62;inithtmlDefaultSAXHandler ()</H3
+>inithtmlDefaultSAXHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4226,7 +4226,7 @@
 ><A
 NAME="INITDOCBDEFAULTSAXHANDLER"
 ></A
->&#62;initdocbDefaultSAXHandler ()</H3
+>initdocbDefaultSAXHandler ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4294,7 +4294,7 @@
 ><A
 NAME="XMLDEFAULTSAXHANDLERINIT"
 ></A
->&#62;xmlDefaultSAXHandlerInit ()</H3
+>xmlDefaultSAXHandlerInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4322,7 +4322,7 @@
 ><A
 NAME="HTMLDEFAULTSAXHANDLERINIT"
 ></A
->&#62;htmlDefaultSAXHandlerInit ()</H3
+>htmlDefaultSAXHandlerInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4350,7 +4350,7 @@
 ><A
 NAME="DOCBDEFAULTSAXHANDLERINIT"
 ></A
->&#62;docbDefaultSAXHandlerInit ()</H3
+>docbDefaultSAXHandlerInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-threads.html b/doc/html/libxml-threads.html
index df4afd4..0c1c692 100644
--- a/doc/html/libxml-threads.html
+++ b/doc/html/libxml-threads.html
@@ -13,8 +13,8 @@
 TITLE="Libxml Library Reference"
 HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
-TITLE="catalog"
-HREF="libxml-catalog.html"><LINK
+TITLE="c14n"
+HREF="libxml-c14n.html"><LINK
 REL="NEXT"
 TITLE="globals"
 HREF="libxml-globals.html"></HEAD
@@ -49,7 +49,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-catalog.html"
+HREF="libxml-c14n.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19926"
+NAME="AEN20092"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19929"
+NAME="AEN20095"
 ></A
 ><H2
 >Synopsis</H2
@@ -256,7 +256,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19960"
+NAME="AEN20126"
 ></A
 ><H2
 >Description</H2
@@ -266,20 +266,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19963"
+NAME="AEN20129"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19965"
+NAME="AEN20131"
 ></A
 ><H3
 ><A
 NAME="XMLMUTEX"
 ></A
->&#62;struct xmlMutex</H3
+>struct xmlMutex</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -299,13 +299,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19970"
+NAME="AEN20136"
 ></A
 ><H3
 ><A
 NAME="XMLMUTEXPTR"
 ></A
->&#62;xmlMutexPtr</H3
+>xmlMutexPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -331,13 +331,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19977"
+NAME="AEN20143"
 ></A
 ><H3
 ><A
 NAME="XMLRMUTEX"
 ></A
->&#62;struct xmlRMutex</H3
+>struct xmlRMutex</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -357,13 +357,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19982"
+NAME="AEN20148"
 ></A
 ><H3
 ><A
 NAME="XMLRMUTEXPTR"
 ></A
->&#62;xmlRMutexPtr</H3
+>xmlRMutexPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -383,13 +383,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19987"
+NAME="AEN20153"
 ></A
 ><H3
 ><A
 NAME="XMLNEWMUTEX"
 ></A
->&#62;xmlNewMutex ()</H3
+>xmlNewMutex ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -411,7 +411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19993"
+NAME="AEN20159"
 ></A
 ><P
 ></P
@@ -447,13 +447,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20002"
+NAME="AEN20168"
 ></A
 ><H3
 ><A
 NAME="XMLMUTEXLOCK"
 ></A
->&#62;xmlMutexLock ()</H3
+>xmlMutexLock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -480,7 +480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20010"
+NAME="AEN20176"
 ></A
 ><P
 ></P
@@ -518,13 +518,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20019"
+NAME="AEN20185"
 ></A
 ><H3
 ><A
 NAME="XMLMUTEXUNLOCK"
 ></A
->&#62;xmlMutexUnlock ()</H3
+>xmlMutexUnlock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -551,7 +551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20027"
+NAME="AEN20193"
 ></A
 ><P
 ></P
@@ -589,13 +589,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20036"
+NAME="AEN20202"
 ></A
 ><H3
 ><A
 NAME="XMLFREEMUTEX"
 ></A
->&#62;xmlFreeMutex ()</H3
+>xmlFreeMutex ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -623,7 +623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20044"
+NAME="AEN20210"
 ></A
 ><P
 ></P
@@ -661,13 +661,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20053"
+NAME="AEN20219"
 ></A
 ><H3
 ><A
 NAME="XMLNEWRMUTEX"
 ></A
->&#62;xmlNewRMutex ()</H3
+>xmlNewRMutex ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -689,7 +689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20059"
+NAME="AEN20225"
 ></A
 ><P
 ></P
@@ -725,13 +725,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20068"
+NAME="AEN20234"
 ></A
 ><H3
 ><A
 NAME="XMLRMUTEXLOCK"
 ></A
->&#62;xmlRMutexLock ()</H3
+>xmlRMutexLock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -758,7 +758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20076"
+NAME="AEN20242"
 ></A
 ><P
 ></P
@@ -796,13 +796,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20085"
+NAME="AEN20251"
 ></A
 ><H3
 ><A
 NAME="XMLRMUTEXUNLOCK"
 ></A
->&#62;xmlRMutexUnlock ()</H3
+>xmlRMutexUnlock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -829,7 +829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20093"
+NAME="AEN20259"
 ></A
 ><P
 ></P
@@ -867,13 +867,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20102"
+NAME="AEN20268"
 ></A
 ><H3
 ><A
 NAME="XMLFREERMUTEX"
 ></A
->&#62;xmlFreeRMutex ()</H3
+>xmlFreeRMutex ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -895,7 +895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20108"
+NAME="AEN20274"
 ></A
 ><P
 ></P
@@ -933,13 +933,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20117"
+NAME="AEN20283"
 ></A
 ><H3
 ><A
 NAME="XMLINITTHREADS"
 ></A
->&#62;xmlInitThreads ()</H3
+>xmlInitThreads ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -965,13 +965,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20124"
+NAME="AEN20290"
 ></A
 ><H3
 ><A
 NAME="XMLLOCKLIBRARY"
 ></A
->&#62;xmlLockLibrary ()</H3
+>xmlLockLibrary ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -997,13 +997,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20131"
+NAME="AEN20297"
 ></A
 ><H3
 ><A
 NAME="XMLUNLOCKLIBRARY"
 ></A
->&#62;xmlUnlockLibrary ()</H3
+>xmlUnlockLibrary ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1029,13 +1029,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20138"
+NAME="AEN20304"
 ></A
 ><H3
 ><A
 NAME="XMLGETTHREADID"
 ></A
->&#62;xmlGetThreadId ()</H3
+>xmlGetThreadId ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1059,7 +1059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20145"
+NAME="AEN20311"
 ></A
 ><P
 ></P
@@ -1095,13 +1095,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20154"
+NAME="AEN20320"
 ></A
 ><H3
 ><A
 NAME="XMLISMAINTHREAD"
 ></A
->&#62;xmlIsMainThread ()</H3
+>xmlIsMainThread ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1125,7 +1125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20161"
+NAME="AEN20327"
 ></A
 ><P
 ></P
@@ -1161,13 +1161,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20170"
+NAME="AEN20336"
 ></A
 ><H3
 ><A
 NAME="XMLCLEANUPTHREADS"
 ></A
->&#62;xmlCleanupThreads ()</H3
+>xmlCleanupThreads ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1193,13 +1193,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20177"
+NAME="AEN20343"
 ></A
 ><H3
 ><A
 NAME="XMLGETGLOBALSTATE"
 ></A
->&#62;xmlGetGlobalState ()</H3
+>xmlGetGlobalState ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1226,7 +1226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20185"
+NAME="AEN20351"
 ></A
 ><P
 ></P
@@ -1275,7 +1275,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-catalog.html"
+HREF="libxml-c14n.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -1347,7 +1347,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->catalog</B
+>c14n</B
 ></FONT
 ></TD
 ><TD
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 9352b9a..e8906e8 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -1959,7 +1959,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFER"
 ></A
->&#62;struct xmlParserInputBuffer</H3
+>struct xmlParserInputBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1994,7 +1994,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERPTR"
 ></A
->&#62;xmlParserInputBufferPtr</H3
+>xmlParserInputBufferPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2020,7 +2020,7 @@
 ><A
 NAME="XMLOUTPUTBUFFER"
 ></A
->&#62;struct xmlOutputBuffer</H3
+>struct xmlOutputBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2056,7 +2056,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERPTR"
 ></A
->&#62;xmlOutputBufferPtr</H3
+>xmlOutputBufferPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2082,7 +2082,7 @@
 ><A
 NAME="XMLPARSERINPUT"
 ></A
->&#62;struct xmlParserInput</H3
+>struct xmlParserInput</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2132,7 +2132,7 @@
 ><A
 NAME="XMLPARSERINPUTPTR"
 ></A
->&#62;xmlParserInputPtr</H3
+>xmlParserInputPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2158,7 +2158,7 @@
 ><A
 NAME="XMLPARSERCTXT"
 ></A
->&#62;struct xmlParserCtxt</H3
+>struct xmlParserCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2249,12 +2249,12 @@
 ><P
 >The parser context.
 NOTE This doesn't completely defines the parser state, the (current ?)
-     design of the parser uses recursive function calls since this allow
-     and easy mapping from the production rules of the specification
-     to the actual code. The drawback is that the actual function call
-     also reflect the parser state. However most of the parsing routines
-     takes as the only argument the parser context pointer, so migrating
-     to a state based parser for progressive parsing shouldn't be too hard.</P
+design of the parser uses recursive function calls since this allow
+and easy mapping from the production rules of the specification
+to the actual code. The drawback is that the actual function call
+also reflect the parser state. However most of the parsing routines
+takes as the only argument the parser context pointer, so migrating
+to a state based parser for progressive parsing shouldn't be too hard.</P
 ><P
 ></P
 ></DIV
@@ -2267,7 +2267,7 @@
 ><A
 NAME="XMLPARSERCTXTPTR"
 ></A
->&#62;xmlParserCtxtPtr</H3
+>xmlParserCtxtPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2293,7 +2293,7 @@
 ><A
 NAME="XMLSAXLOCATOR"
 ></A
->&#62;struct xmlSAXLocator</H3
+>struct xmlSAXLocator</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2326,7 +2326,7 @@
 ><A
 NAME="XMLSAXLOCATORPTR"
 ></A
->&#62;xmlSAXLocatorPtr</H3
+>xmlSAXLocatorPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2352,7 +2352,7 @@
 ><A
 NAME="XMLSAXHANDLER"
 ></A
->&#62;struct xmlSAXHandler</H3
+>struct xmlSAXHandler</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2410,7 +2410,7 @@
 ><A
 NAME="XMLSAXHANDLERPTR"
 ></A
->&#62;xmlSAXHandlerPtr</H3
+>xmlSAXHandlerPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2436,7 +2436,7 @@
 ><A
 NAME="XMLENTITY"
 ></A
->&#62;struct xmlEntity</H3
+>struct xmlEntity</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2482,7 +2482,7 @@
 ><A
 NAME="XMLENTITYPTR"
 ></A
->&#62;xmlEntityPtr</H3
+>xmlEntityPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2508,7 +2508,7 @@
 ><A
 NAME="BASE-BUFFER-SIZE-CAPS"
 ></A
->&#62;BASE_BUFFER_SIZE</H3
+>BASE_BUFFER_SIZE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2536,7 +2536,7 @@
 ><A
 NAME="XML-XML-NAMESPACE-CAPS"
 ></A
->&#62;XML_XML_NAMESPACE</H3
+>XML_XML_NAMESPACE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2565,7 +2565,7 @@
 ><A
 NAME="XMLELEMENTTYPE"
 ></A
->&#62;enum xmlElementType</H3
+>enum xmlElementType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2615,7 +2615,7 @@
 ><A
 NAME="XMLCHAR"
 ></A
->&#62;xmlChar</H3
+>xmlChar</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2645,7 +2645,7 @@
 ><A
 NAME="BAD-CAST-CAPS"
 ></A
->&#62;BAD_CAST</H3
+>BAD_CAST</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2673,7 +2673,7 @@
 ><A
 NAME="XMLNOTATION"
 ></A
->&#62;struct xmlNotation</H3
+>struct xmlNotation</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2705,7 +2705,7 @@
 ><A
 NAME="XMLNOTATIONPTR"
 ></A
->&#62;xmlNotationPtr</H3
+>xmlNotationPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2731,7 +2731,7 @@
 ><A
 NAME="XMLATTRIBUTETYPE"
 ></A
->&#62;enum xmlAttributeType</H3
+>enum xmlAttributeType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2770,7 +2770,7 @@
 ><A
 NAME="XMLATTRIBUTEDEFAULT"
 ></A
->&#62;enum xmlAttributeDefault</H3
+>enum xmlAttributeDefault</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2803,7 +2803,7 @@
 ><A
 NAME="XMLENUMERATION"
 ></A
->&#62;struct xmlEnumeration</H3
+>struct xmlEnumeration</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2834,7 +2834,7 @@
 ><A
 NAME="XMLENUMERATIONPTR"
 ></A
->&#62;xmlEnumerationPtr</H3
+>xmlEnumerationPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2860,7 +2860,7 @@
 ><A
 NAME="XMLATTRIBUTE"
 ></A
->&#62;struct xmlAttribute</H3
+>struct xmlAttribute</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2906,7 +2906,7 @@
 ><A
 NAME="XMLATTRIBUTEPTR"
 ></A
->&#62;xmlAttributePtr</H3
+>xmlAttributePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2932,7 +2932,7 @@
 ><A
 NAME="XMLELEMENTCONTENTTYPE"
 ></A
->&#62;enum xmlElementContentType</H3
+>enum xmlElementContentType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2965,7 +2965,7 @@
 ><A
 NAME="XMLELEMENTCONTENTOCCUR"
 ></A
->&#62;enum xmlElementContentOccur</H3
+>enum xmlElementContentOccur</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2998,7 +2998,7 @@
 ><A
 NAME="XMLELEMENTCONTENT"
 ></A
->&#62;struct xmlElementContent</H3
+>struct xmlElementContent</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3035,7 +3035,7 @@
 ><A
 NAME="XMLELEMENTCONTENTPTR"
 ></A
->&#62;xmlElementContentPtr</H3
+>xmlElementContentPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3061,7 +3061,7 @@
 ><A
 NAME="XMLELEMENTTYPEVAL"
 ></A
->&#62;enum xmlElementTypeVal</H3
+>enum xmlElementTypeVal</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3095,7 +3095,7 @@
 ><A
 NAME="XMLELEMENT"
 ></A
->&#62;struct xmlElement</H3
+>struct xmlElement</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3138,7 +3138,7 @@
 ><A
 NAME="XMLELEMENTPTR"
 ></A
->&#62;xmlElementPtr</H3
+>xmlElementPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3164,7 +3164,7 @@
 ><A
 NAME="XML-LOCAL-NAMESPACE-CAPS"
 ></A
->&#62;XML_LOCAL_NAMESPACE</H3
+>XML_LOCAL_NAMESPACE</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3192,7 +3192,7 @@
 ><A
 NAME="XMLNSTYPE"
 ></A
->&#62;xmlNsType</H3
+>xmlNsType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3218,7 +3218,7 @@
 ><A
 NAME="XMLNS"
 ></A
->&#62;struct xmlNs</H3
+>struct xmlNs</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3255,7 +3255,7 @@
 ><A
 NAME="XMLNSPTR"
 ></A
->&#62;xmlNsPtr</H3
+>xmlNsPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3281,7 +3281,7 @@
 ><A
 NAME="XMLDTD"
 ></A
->&#62;struct xmlDtd</H3
+>struct xmlDtd</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3329,7 +3329,7 @@
 ><A
 NAME="XMLDTDPTR"
 ></A
->&#62;xmlDtdPtr</H3
+>xmlDtdPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3355,7 +3355,7 @@
 ><A
 NAME="XMLATTR"
 ></A
->&#62;struct xmlAttr</H3
+>struct xmlAttr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3395,7 +3395,7 @@
 ><A
 NAME="XMLATTRPTR"
 ></A
->&#62;xmlAttrPtr</H3
+>xmlAttrPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3421,7 +3421,7 @@
 ><A
 NAME="XMLID"
 ></A
->&#62;struct xmlID</H3
+>struct xmlID</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3453,7 +3453,7 @@
 ><A
 NAME="XMLIDPTR"
 ></A
->&#62;xmlIDPtr</H3
+>xmlIDPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3479,7 +3479,7 @@
 ><A
 NAME="XMLREF"
 ></A
->&#62;struct xmlRef</H3
+>struct xmlRef</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3511,7 +3511,7 @@
 ><A
 NAME="XMLREFPTR"
 ></A
->&#62;xmlRefPtr</H3
+>xmlRefPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3537,7 +3537,7 @@
 ><A
 NAME="XMLBUFFERALLOCATIONSCHEME"
 ></A
->&#62;enum xmlBufferAllocationScheme</H3
+>enum xmlBufferAllocationScheme</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3569,7 +3569,7 @@
 ><A
 NAME="XMLBUFFER"
 ></A
->&#62;struct xmlBuffer</H3
+>struct xmlBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3602,7 +3602,7 @@
 ><A
 NAME="XMLBUFFERPTR"
 ></A
->&#62;xmlBufferPtr</H3
+>xmlBufferPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3628,7 +3628,7 @@
 ><A
 NAME="XMLNODE"
 ></A
->&#62;struct xmlNode</H3
+>struct xmlNode</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3676,7 +3676,7 @@
 ><A
 NAME="XMLNODEPTR"
 ></A
->&#62;xmlNodePtr</H3
+>xmlNodePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3702,7 +3702,7 @@
 ><A
 NAME="XML-GET-CONTENT-CAPS"
 ></A
->&#62;XML_GET_CONTENT()</H3
+>XML_GET_CONTENT()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3767,7 +3767,7 @@
 ><A
 NAME="XML-GET-LINE-CAPS"
 ></A
->&#62;XML_GET_LINE()</H3
+>XML_GET_LINE()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3834,7 +3834,7 @@
 ><A
 NAME="XMLDOC"
 ></A
->&#62;struct xmlDoc</H3
+>struct xmlDoc</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3886,7 +3886,7 @@
 ><A
 NAME="XMLDOCPTR"
 ></A
->&#62;xmlDocPtr</H3
+>xmlDocPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3912,7 +3912,7 @@
 ><A
 NAME="XMLCHILDRENNODE"
 ></A
->&#62;xmlChildrenNode</H3
+>xmlChildrenNode</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3940,7 +3940,7 @@
 ><A
 NAME="XMLROOTNODE"
 ></A
->&#62;xmlRootNode</H3
+>xmlRootNode</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3968,7 +3968,7 @@
 ><A
 NAME="XMLSETBUFFERALLOCATIONSCHEME"
 ></A
->&#62;xmlSetBufferAllocationScheme ()</H3
+>xmlSetBufferAllocationScheme ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3989,7 +3989,7 @@
 >Set the buffer allocation method.  Types are
 XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down
 XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, 
-                            improves performance</P
+improves performance</P
 ><P
 ></P
 ><DIV
@@ -4039,7 +4039,7 @@
 ><A
 NAME="XMLGETBUFFERALLOCATIONSCHEME"
 ></A
->&#62;xmlGetBufferAllocationScheme ()</H3
+>xmlGetBufferAllocationScheme ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4061,7 +4061,7 @@
 >Types are
 XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down
 XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, 
-                            improves performance</P
+improves performance</P
 ><P
 ></P
 ><DIV
@@ -4109,7 +4109,7 @@
 ><A
 NAME="XMLBUFFERCREATE"
 ></A
->&#62;xmlBufferCreate ()</H3
+>xmlBufferCreate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4175,7 +4175,7 @@
 ><A
 NAME="XMLBUFFERCREATESIZE"
 ></A
->&#62;xmlBufferCreateSize ()</H3
+>xmlBufferCreateSize ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4261,7 +4261,7 @@
 ><A
 NAME="XMLBUFFERRESIZE"
 ></A
->&#62;xmlBufferResize ()</H3
+>xmlBufferResize ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4367,7 +4367,7 @@
 ><A
 NAME="XMLBUFFERFREE"
 ></A
->&#62;xmlBufferFree ()</H3
+>xmlBufferFree ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4436,7 +4436,7 @@
 ><A
 NAME="XMLBUFFERDUMP"
 ></A
->&#62;xmlBufferDump ()</H3
+>xmlBufferDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4543,7 +4543,7 @@
 ><A
 NAME="XMLBUFFERADD"
 ></A
->&#62;xmlBufferAdd ()</H3
+>xmlBufferAdd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4657,7 +4657,7 @@
 ><A
 NAME="XMLBUFFERADDHEAD"
 ></A
->&#62;xmlBufferAddHead ()</H3
+>xmlBufferAddHead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4776,7 +4776,7 @@
 ><A
 NAME="XMLBUFFERCAT"
 ></A
->&#62;xmlBufferCat ()</H3
+>xmlBufferCat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4868,7 +4868,7 @@
 ><A
 NAME="XMLBUFFERCCAT"
 ></A
->&#62;xmlBufferCCat ()</H3
+>xmlBufferCCat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4954,7 +4954,7 @@
 ><A
 NAME="XMLBUFFERSHRINK"
 ></A
->&#62;xmlBufferShrink ()</H3
+>xmlBufferShrink ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5058,7 +5058,7 @@
 ><A
 NAME="XMLBUFFERGROW"
 ></A
->&#62;xmlBufferGrow ()</H3
+>xmlBufferGrow ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5159,7 +5159,7 @@
 ><A
 NAME="XMLBUFFEREMPTY"
 ></A
->&#62;xmlBufferEmpty ()</H3
+>xmlBufferEmpty ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5227,7 +5227,7 @@
 ><A
 NAME="XMLBUFFERCONTENT"
 ></A
->&#62;xmlBufferContent ()</H3
+>xmlBufferContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5313,7 +5313,7 @@
 ><A
 NAME="XMLBUFFERSETALLOCATIONSCHEME"
 ></A
->&#62;xmlBufferSetAllocationScheme ()</H3
+>xmlBufferSetAllocationScheme ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5402,7 +5402,7 @@
 ><A
 NAME="XMLBUFFERLENGTH"
 ></A
->&#62;xmlBufferLength ()</H3
+>xmlBufferLength ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5485,7 +5485,7 @@
 ><A
 NAME="XMLCREATEINTSUBSET"
 ></A
->&#62;xmlCreateIntSubset ()</H3
+>xmlCreateIntSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5634,7 +5634,7 @@
 ><A
 NAME="XMLNEWDTD"
 ></A
->&#62;xmlNewDtd ()</H3
+>xmlNewDtd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5787,7 +5787,7 @@
 ><A
 NAME="XMLGETINTSUBSET"
 ></A
->&#62;xmlGetIntSubset ()</H3
+>xmlGetIntSubset ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5873,7 +5873,7 @@
 ><A
 NAME="XMLFREEDTD"
 ></A
->&#62;xmlFreeDtd ()</H3
+>xmlFreeDtd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5941,7 +5941,7 @@
 ><A
 NAME="XMLNEWGLOBALNS"
 ></A
->&#62;xmlNewGlobalNs ()</H3
+>xmlNewGlobalNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5971,7 +5971,7 @@
 ></TABLE
 ><P
 >Creation of a Namespace, the old way using PI and without scoping
-  DEPRECATED !!!
+DEPRECATED !!!
 It now create a namespace on the root element of the document if found.</P
 ><P
 ></P
@@ -6071,7 +6071,7 @@
 ><A
 NAME="XMLNEWNS"
 ></A
->&#62;xmlNewNs ()</H3
+>xmlNewNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6203,7 +6203,7 @@
 ><A
 NAME="XMLFREENS"
 ></A
->&#62;xmlFreeNs ()</H3
+>xmlFreeNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6271,7 +6271,7 @@
 ><A
 NAME="XMLFREENSLIST"
 ></A
->&#62;xmlFreeNsList ()</H3
+>xmlFreeNsList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6339,7 +6339,7 @@
 ><A
 NAME="XMLNEWDOC"
 ></A
->&#62;xmlNewDoc ()</H3
+>xmlNewDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6425,7 +6425,7 @@
 ><A
 NAME="XMLFREEDOC"
 ></A
->&#62;xmlFreeDoc ()</H3
+>xmlFreeDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6493,7 +6493,7 @@
 ><A
 NAME="XMLNEWDOCPROP"
 ></A
->&#62;xmlNewDocProp ()</H3
+>xmlNewDocProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6621,7 +6621,7 @@
 ><A
 NAME="XMLNEWPROP"
 ></A
->&#62;xmlNewProp ()</H3
+>xmlNewProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6749,7 +6749,7 @@
 ><A
 NAME="XMLNEWNSPROP"
 ></A
->&#62;xmlNewNsProp ()</H3
+>xmlNewNsProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6898,7 +6898,7 @@
 ><A
 NAME="XMLFREEPROPLIST"
 ></A
->&#62;xmlFreePropList ()</H3
+>xmlFreePropList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6966,7 +6966,7 @@
 ><A
 NAME="XMLFREEPROP"
 ></A
->&#62;xmlFreeProp ()</H3
+>xmlFreeProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7034,7 +7034,7 @@
 ><A
 NAME="XMLCOPYPROP"
 ></A
->&#62;xmlCopyProp ()</H3
+>xmlCopyProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7144,7 +7144,7 @@
 ><A
 NAME="XMLCOPYPROPLIST"
 ></A
->&#62;xmlCopyPropList ()</H3
+>xmlCopyPropList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7254,7 +7254,7 @@
 ><A
 NAME="XMLCOPYDTD"
 ></A
->&#62;xmlCopyDtd ()</H3
+>xmlCopyDtd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7343,7 +7343,7 @@
 ><A
 NAME="XMLCOPYDOC"
 ></A
->&#62;xmlCopyDoc ()</H3
+>xmlCopyDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7451,7 +7451,7 @@
 ><A
 NAME="XMLNEWDOCNODE"
 ></A
->&#62;xmlNewDocNode ()</H3
+>xmlNewDocNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7502,15 +7502,15 @@
 >content</I
 ></TT
 > is supposed to be a piece of XML CDATA, so it allow entities
-      references, but XML special chars need to be escaped first by using
-      <A
+references, but XML special chars need to be escaped first by using
+<A
 HREF="libxml-entities.html#XMLENCODEENTITIESREENTRANT"
 >xmlEncodeEntitiesReentrant</A
 >(). Use <A
 HREF="libxml-tree.html#XMLNEWDOCRAWNODE"
 >xmlNewDocRawNode</A
 >() if you don't
-      need entities support.</P
+need entities support.</P
 ><P
 ></P
 ><DIV
@@ -7626,7 +7626,7 @@
 ><A
 NAME="XMLNEWDOCRAWNODE"
 ></A
->&#62;xmlNewDocRawNode ()</H3
+>xmlNewDocRawNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7786,7 +7786,7 @@
 ><A
 NAME="XMLNEWNODE"
 ></A
->&#62;xmlNewNode ()</H3
+>xmlNewNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7898,7 +7898,7 @@
 ><A
 NAME="XMLNEWCHILD"
 ></A
->&#62;xmlNewChild ()</H3
+>xmlNewChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7955,15 +7955,15 @@
 >content</I
 ></TT
 > is supposed to be a piece of XML CDATA, so it allow entities
-      references, but XML special chars need to be escaped first by using
-      <A
+references, but XML special chars need to be escaped first by using
+<A
 HREF="libxml-entities.html#XMLENCODEENTITIESREENTRANT"
 >xmlEncodeEntitiesReentrant</A
 >(). Use <A
 HREF="libxml-tree.html#XMLNEWTEXTCHILD"
 >xmlNewTextChild</A
 >() if entities
-      support is not needed.</P
+support is not needed.</P
 ><P
 ></P
 ><DIV
@@ -8079,7 +8079,7 @@
 ><A
 NAME="XMLNEWTEXTCHILD"
 ></A
->&#62;xmlNewTextChild ()</H3
+>xmlNewTextChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8245,7 +8245,7 @@
 ><A
 NAME="XMLNEWDOCTEXT"
 ></A
->&#62;xmlNewDocText ()</H3
+>xmlNewDocText ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8352,7 +8352,7 @@
 ><A
 NAME="XMLNEWTEXT"
 ></A
->&#62;xmlNewText ()</H3
+>xmlNewText ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8438,7 +8438,7 @@
 ><A
 NAME="XMLNEWPI"
 ></A
->&#62;xmlNewPI ()</H3
+>xmlNewPI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8545,7 +8545,7 @@
 ><A
 NAME="XMLNEWDOCTEXTLEN"
 ></A
->&#62;xmlNewDocTextLen ()</H3
+>xmlNewDocTextLen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8671,7 +8671,7 @@
 ><A
 NAME="XMLNEWTEXTLEN"
 ></A
->&#62;xmlNewTextLen ()</H3
+>xmlNewTextLen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8775,7 +8775,7 @@
 ><A
 NAME="XMLNEWDOCCOMMENT"
 ></A
->&#62;xmlNewDocComment ()</H3
+>xmlNewDocComment ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8882,7 +8882,7 @@
 ><A
 NAME="XMLNEWCOMMENT"
 ></A
->&#62;xmlNewComment ()</H3
+>xmlNewComment ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8968,7 +8968,7 @@
 ><A
 NAME="XMLNEWCDATABLOCK"
 ></A
->&#62;xmlNewCDataBlock ()</H3
+>xmlNewCDataBlock ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9093,7 +9093,7 @@
 ><A
 NAME="XMLNEWCHARREF"
 ></A
->&#62;xmlNewCharRef ()</H3
+>xmlNewCharRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9200,7 +9200,7 @@
 ><A
 NAME="XMLNEWREFERENCE"
 ></A
->&#62;xmlNewReference ()</H3
+>xmlNewReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9307,7 +9307,7 @@
 ><A
 NAME="XMLCOPYNODE"
 ></A
->&#62;xmlCopyNode ()</H3
+>xmlCopyNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9414,7 +9414,7 @@
 ><A
 NAME="XMLDOCCOPYNODE"
 ></A
->&#62;xmlDocCopyNode ()</H3
+>xmlDocCopyNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9542,7 +9542,7 @@
 ><A
 NAME="XMLCOPYNODELIST"
 ></A
->&#62;xmlCopyNodeList ()</H3
+>xmlCopyNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9631,7 +9631,7 @@
 ><A
 NAME="XMLNEWDOCFRAGMENT"
 ></A
->&#62;xmlNewDocFragment ()</H3
+>xmlNewDocFragment ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9717,7 +9717,7 @@
 ><A
 NAME="XMLGETLINENO"
 ></A
->&#62;xmlGetLineNo ()</H3
+>xmlGetLineNo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9804,7 +9804,7 @@
 ><A
 NAME="XMLGETNODEPATH"
 ></A
->&#62;xmlGetNodePath ()</H3
+>xmlGetNodePath ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9874,7 +9874,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the new path or NULL in case of error. The caller must free
-    the returned string</TD
+the returned string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9891,7 +9891,7 @@
 ><A
 NAME="XMLDOCGETROOTELEMENT"
 ></A
->&#62;xmlDocGetRootElement ()</H3
+>xmlDocGetRootElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9981,7 +9981,7 @@
 ><A
 NAME="XMLGETLASTCHILD"
 ></A
->&#62;xmlGetLastChild ()</H3
+>xmlGetLastChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10067,7 +10067,7 @@
 ><A
 NAME="XMLNODEISTEXT"
 ></A
->&#62;xmlNodeIsText ()</H3
+>xmlNodeIsText ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10150,7 +10150,7 @@
 ><A
 NAME="XMLISBLANKNODE"
 ></A
->&#62;xmlIsBlankNode ()</H3
+>xmlIsBlankNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10234,7 +10234,7 @@
 ><A
 NAME="XMLDOCSETROOTELEMENT"
 ></A
->&#62;xmlDocSetRootElement ()</H3
+>xmlDocSetRootElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10342,7 +10342,7 @@
 ><A
 NAME="XMLNODESETNAME"
 ></A
->&#62;xmlNodeSetName ()</H3
+>xmlNodeSetName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10431,7 +10431,7 @@
 ><A
 NAME="XMLADDCHILD"
 ></A
->&#62;xmlAddChild ()</H3
+>xmlAddChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10553,7 +10553,7 @@
 ><A
 NAME="XMLADDCHILDLIST"
 ></A
->&#62;xmlAddChildList ()</H3
+>xmlAddChildList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10666,7 +10666,7 @@
 ><A
 NAME="XMLREPLACENODE"
 ></A
->&#62;xmlReplaceNode ()</H3
+>xmlReplaceNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10785,7 +10785,7 @@
 ><A
 NAME="XMLADDSIBLING"
 ></A
->&#62;xmlAddSibling ()</H3
+>xmlAddSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10910,7 +10910,7 @@
 ><A
 NAME="XMLADDPREVSIBLING"
 ></A
->&#62;xmlAddPrevSibling ()</H3
+>xmlAddPrevSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11037,7 +11037,7 @@
 ><A
 NAME="XMLADDNEXTSIBLING"
 ></A
->&#62;xmlAddNextSibling ()</H3
+>xmlAddNextSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11164,7 +11164,7 @@
 ><A
 NAME="XMLUNLINKNODE"
 ></A
->&#62;xmlUnlinkNode ()</H3
+>xmlUnlinkNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11232,7 +11232,7 @@
 ><A
 NAME="XMLTEXTMERGE"
 ></A
->&#62;xmlTextMerge ()</H3
+>xmlTextMerge ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11339,7 +11339,7 @@
 ><A
 NAME="XMLTEXTCONCAT"
 ></A
->&#62;xmlTextConcat ()</H3
+>xmlTextConcat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11451,7 +11451,7 @@
 ><A
 NAME="XMLFREENODELIST"
 ></A
->&#62;xmlFreeNodeList ()</H3
+>xmlFreeNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11520,7 +11520,7 @@
 ><A
 NAME="XMLFREENODE"
 ></A
->&#62;xmlFreeNode ()</H3
+>xmlFreeNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11592,7 +11592,7 @@
 ><A
 NAME="XMLSETTREEDOC"
 ></A
->&#62;xmlSetTreeDoc ()</H3
+>xmlSetTreeDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11681,7 +11681,7 @@
 ><A
 NAME="XMLSETLISTDOC"
 ></A
->&#62;xmlSetListDoc ()</H3
+>xmlSetListDoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11770,7 +11770,7 @@
 ><A
 NAME="XMLSEARCHNS"
 ></A
->&#62;xmlSearchNs ()</H3
+>xmlSearchNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11909,7 +11909,7 @@
 ><A
 NAME="XMLSEARCHNSBYHREF"
 ></A
->&#62;xmlSearchNsByHref ()</H3
+>xmlSearchNsByHref ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12038,7 +12038,7 @@
 ><A
 NAME="XMLGETNSLIST"
 ></A
->&#62;xmlGetNsList ()</H3
+>xmlGetNsList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12132,8 +12132,8 @@
 HREF="libxml-tree.html#XMLNSPTR"
 >xmlNsPtr</A
 > found
-        that need to be freed by the caller or NULL if no
-        namespace if defined</TD
+that need to be freed by the caller or NULL if no
+namespace if defined</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12150,7 +12150,7 @@
 ><A
 NAME="XMLSETNS"
 ></A
->&#62;xmlSetNs ()</H3
+>xmlSetNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12239,7 +12239,7 @@
 ><A
 NAME="XMLCOPYNAMESPACE"
 ></A
->&#62;xmlCopyNamespace ()</H3
+>xmlCopyNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12328,7 +12328,7 @@
 ><A
 NAME="XMLCOPYNAMESPACELIST"
 ></A
->&#62;xmlCopyNamespaceList ()</H3
+>xmlCopyNamespaceList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12417,7 +12417,7 @@
 ><A
 NAME="XMLSETPROP"
 ></A
->&#62;xmlSetProp ()</H3
+>xmlSetProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12545,7 +12545,7 @@
 ><A
 NAME="XMLGETPROP"
 ></A
->&#62;xmlGetProp ()</H3
+>xmlGetProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12642,7 +12642,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the attribute value or NULL if not found.
-    It's up to the caller to free the memory.</TD
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12659,7 +12659,7 @@
 ><A
 NAME="XMLHASPROP"
 ></A
->&#62;xmlHasProp ()</H3
+>xmlHasProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12755,7 +12755,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the attribute or the attribute declaration or NULL if 
-        neither was found.</TD
+neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12772,7 +12772,7 @@
 ><A
 NAME="XMLHASNSPROP"
 ></A
->&#62;xmlHasNsProp ()</H3
+>xmlHasNsProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12891,7 +12891,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the attribute or the attribute declaration or NULL
-    if neither was found.</TD
+if neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12908,7 +12908,7 @@
 ><A
 NAME="XMLSETNSPROP"
 ></A
->&#62;xmlSetNsProp ()</H3
+>xmlSetNsProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13058,7 +13058,7 @@
 ><A
 NAME="XMLGETNSPROP"
 ></A
->&#62;xmlGetNsProp ()</H3
+>xmlGetNsProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13177,7 +13177,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the attribute value or NULL if not found.
-    It's up to the caller to free the memory.</TD
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13194,7 +13194,7 @@
 ><A
 NAME="XMLSTRINGGETNODELIST"
 ></A
->&#62;xmlStringGetNodeList ()</H3
+>xmlStringGetNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13302,7 +13302,7 @@
 ><A
 NAME="XMLSTRINGLENGETNODELIST"
 ></A
->&#62;xmlStringLenGetNodeList ()</H3
+>xmlStringLenGetNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13428,7 +13428,7 @@
 ><A
 NAME="XMLNODELISTGETSTRING"
 ></A
->&#62;xmlNodeListGetString ()</H3
+>xmlNodeListGetString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13554,7 +13554,7 @@
 ><A
 NAME="XMLNODELISTGETRAWSTRING"
 ></A
->&#62;xmlNodeListGetRawString ()</H3
+>xmlNodeListGetRawString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13684,7 +13684,7 @@
 ><A
 NAME="XMLNODESETCONTENT"
 ></A
->&#62;xmlNodeSetContent ()</H3
+>xmlNodeSetContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13773,7 +13773,7 @@
 ><A
 NAME="XMLNODESETCONTENTLEN"
 ></A
->&#62;xmlNodeSetContentLen ()</H3
+>xmlNodeSetContentLen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13885,7 +13885,7 @@
 ><A
 NAME="XMLNODEADDCONTENT"
 ></A
->&#62;xmlNodeAddContent ()</H3
+>xmlNodeAddContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13974,7 +13974,7 @@
 ><A
 NAME="XMLNODEADDCONTENTLEN"
 ></A
->&#62;xmlNodeAddContentLen ()</H3
+>xmlNodeAddContentLen ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14086,7 +14086,7 @@
 ><A
 NAME="XMLNODEGETCONTENT"
 ></A
->&#62;xmlNodeGetContent ()</H3
+>xmlNodeGetContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14162,7 +14162,7 @@
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > * or NULL if no content is available.
-    It's up to the caller to free the memory.</TD
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14179,7 +14179,7 @@
 ><A
 NAME="XMLNODEGETLANG"
 ></A
->&#62;xmlNodeGetLang ()</H3
+>xmlNodeGetLang ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14250,7 +14250,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a pointer to the lang value, or NULL if not found
-    It's up to the caller to free the memory.</TD
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14267,7 +14267,7 @@
 ><A
 NAME="XMLNODESETLANG"
 ></A
->&#62;xmlNodeSetLang ()</H3
+>xmlNodeSetLang ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14357,7 +14357,7 @@
 ><A
 NAME="XMLNODEGETSPACEPRESERVE"
 ></A
->&#62;xmlNodeGetSpacePreserve ()</H3
+>xmlNodeGetSpacePreserve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14442,7 +14442,7 @@
 ><A
 NAME="XMLNODESETSPACEPRESERVE"
 ></A
->&#62;xmlNodeSetSpacePreserve ()</H3
+>xmlNodeSetSpacePreserve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14529,7 +14529,7 @@
 ><A
 NAME="XMLNODEGETBASE"
 ></A
->&#62;xmlNodeGetBase ()</H3
+>xmlNodeGetBase ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14630,7 +14630,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a pointer to the base URL, or NULL if not found
-    It's up to the caller to free the memory.</TD
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14647,7 +14647,7 @@
 ><A
 NAME="XMLNODESETBASE"
 ></A
->&#62;xmlNodeSetBase ()</H3
+>xmlNodeSetBase ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14737,7 +14737,7 @@
 ><A
 NAME="XMLREMOVEPROP"
 ></A
->&#62;xmlRemoveProp ()</H3
+>xmlRemoveProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14821,7 +14821,7 @@
 ><A
 NAME="XMLUNSETPROP"
 ></A
->&#62;xmlUnsetProp ()</H3
+>xmlUnsetProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14925,7 +14925,7 @@
 ><A
 NAME="XMLUNSETNSPROP"
 ></A
->&#62;xmlUnsetNsProp ()</H3
+>xmlUnsetNsProp ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15050,7 +15050,7 @@
 ><A
 NAME="XMLBUFFERWRITEXMLCHAR"
 ></A
->&#62;xmlBufferWriteXmlCHAR ()</H3
+>xmlBufferWriteXmlCHAR ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15141,7 +15141,7 @@
 ><A
 NAME="XMLBUFFERWRITECHAR"
 ></A
->&#62;xmlBufferWriteCHAR ()</H3
+>xmlBufferWriteCHAR ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15231,7 +15231,7 @@
 ><A
 NAME="XMLBUFFERWRITECHAR"
 ></A
->&#62;xmlBufferWriteChar ()</H3
+>xmlBufferWriteChar ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15318,7 +15318,7 @@
 ><A
 NAME="XMLBUFFERWRITEQUOTEDSTRING"
 ></A
->&#62;xmlBufferWriteQuotedString ()</H3
+>xmlBufferWriteQuotedString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15412,7 +15412,7 @@
 ><A
 NAME="XMLRECONCILIATENS"
 ></A
->&#62;xmlReconciliateNs ()</H3
+>xmlReconciliateNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15527,7 +15527,7 @@
 ><A
 NAME="XMLDOCDUMPFORMATMEMORY"
 ></A
->&#62;xmlDocDumpFormatMemory ()</H3
+>xmlDocDumpFormatMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15656,7 +15656,7 @@
 ><A
 NAME="XMLDOCDUMPMEMORY"
 ></A
->&#62;xmlDocDumpMemory ()</H3
+>xmlDocDumpMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15767,7 +15767,7 @@
 ><A
 NAME="XMLDOCDUMPMEMORYENC"
 ></A
->&#62;xmlDocDumpMemoryEnc ()</H3
+>xmlDocDumpMemoryEnc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15894,7 +15894,7 @@
 ><A
 NAME="XMLDOCDUMPFORMATMEMORYENC"
 ></A
->&#62;xmlDocDumpFormatMemoryEnc ()</H3
+>xmlDocDumpFormatMemoryEnc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16039,7 +16039,7 @@
 ><A
 NAME="XMLDOCDUMP"
 ></A
->&#62;xmlDocDump ()</H3
+>xmlDocDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16143,7 +16143,7 @@
 ><A
 NAME="XMLELEMDUMP"
 ></A
->&#62;xmlElemDump ()</H3
+>xmlElemDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16253,7 +16253,7 @@
 ><A
 NAME="XMLSAVEFILE"
 ></A
->&#62;xmlSaveFile ()</H3
+>xmlSaveFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16361,7 +16361,7 @@
 ><A
 NAME="XMLSAVEFORMATFILE"
 ></A
->&#62;xmlSaveFormatFile ()</H3
+>xmlSaveFormatFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16492,7 +16492,7 @@
 ><A
 NAME="XMLNODEDUMP"
 ></A
->&#62;xmlNodeDump ()</H3
+>xmlNodeDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16638,7 +16638,7 @@
 ><A
 NAME="XMLSAVEFILETO"
 ></A
->&#62;xmlSaveFileTo ()</H3
+>xmlSaveFileTo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16760,7 +16760,7 @@
 ><A
 NAME="XMLSAVEFORMATFILETO"
 ></A
->&#62;xmlSaveFormatFileTo ()</H3
+>xmlSaveFormatFileTo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -16900,7 +16900,7 @@
 ><A
 NAME="XMLNODEDUMPOUTPUT"
 ></A
->&#62;xmlNodeDumpOutput ()</H3
+>xmlNodeDumpOutput ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17064,7 +17064,7 @@
 ><A
 NAME="XMLSAVEFORMATFILEENC"
 ></A
->&#62;xmlSaveFormatFileEnc ()</H3
+>xmlSaveFormatFileEnc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17201,7 +17201,7 @@
 ><A
 NAME="XMLSAVEFILEENC"
 ></A
->&#62;xmlSaveFileEnc ()</H3
+>xmlSaveFileEnc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17320,7 +17320,7 @@
 ><A
 NAME="XMLGETDOCCOMPRESSMODE"
 ></A
->&#62;xmlGetDocCompressMode ()</H3
+>xmlGetDocCompressMode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17403,7 +17403,7 @@
 ><A
 NAME="XMLSETDOCCOMPRESSMODE"
 ></A
->&#62;xmlSetDocCompressMode ()</H3
+>xmlSetDocCompressMode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17490,7 +17490,7 @@
 ><A
 NAME="XMLGETCOMPRESSMODE"
 ></A
->&#62;xmlGetCompressMode ()</H3
+>xmlGetCompressMode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -17553,7 +17553,7 @@
 ><A
 NAME="XMLSETCOMPRESSMODE"
 ></A
->&#62;xmlSetCompressMode ()</H3
+>xmlSetCompressMode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index 54ef11e..8eeebc4 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -282,7 +282,7 @@
 ><A
 NAME="XMLURI"
 ></A
->&#62;struct xmlURI</H3
+>struct xmlURI</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -322,7 +322,7 @@
 ><A
 NAME="XMLURIPTR"
 ></A
->&#62;xmlURIPtr</H3
+>xmlURIPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -348,7 +348,7 @@
 ><A
 NAME="XMLCREATEURI"
 ></A
->&#62;xmlCreateURI ()</H3
+>xmlCreateURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -414,7 +414,7 @@
 ><A
 NAME="XMLBUILDURI"
 ></A
->&#62;xmlBuildURI ()</H3
+>xmlBuildURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -510,7 +510,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a new URI string (to be freed by the caller) or NULL in case
-        of error.</TD
+of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -527,7 +527,7 @@
 ><A
 NAME="XMLPARSEURI"
 ></A
->&#62;xmlParseURI ()</H3
+>xmlParseURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -612,7 +612,7 @@
 ><A
 NAME="XMLPARSEURIREFERENCE"
 ></A
->&#62;xmlParseURIReference ()</H3
+>xmlParseURIReference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -721,7 +721,7 @@
 ><A
 NAME="XMLSAVEURI"
 ></A
->&#62;xmlSaveUri ()</H3
+>xmlSaveUri ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -807,7 +807,7 @@
 ><A
 NAME="XMLPRINTURI"
 ></A
->&#62;xmlPrintURI ()</H3
+>xmlPrintURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -901,7 +901,7 @@
 ><A
 NAME="XMLURIESCAPESTR"
 ></A
->&#62;xmlURIEscapeStr ()</H3
+>xmlURIEscapeStr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1009,7 +1009,7 @@
 ><A
 NAME="XMLURIUNESCAPESTRING"
 ></A
->&#62;xmlURIUnescapeString ()</H3
+>xmlURIUnescapeString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1129,7 +1129,7 @@
 ><A
 NAME="XMLNORMALIZEURIPATH"
 ></A
->&#62;xmlNormalizeURIPath ()</H3
+>xmlNormalizeURIPath ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1212,7 +1212,7 @@
 ><A
 NAME="XMLURIESCAPE"
 ></A
->&#62;xmlURIEscape ()</H3
+>xmlURIEscape ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1288,7 +1288,7 @@
 25 May 2001
 Uses xmlParseURI and xmlURIEscapeStr to try to escape correctly
 according to RFC2396.
-  - Carl Douglas</TD
+- Carl Douglas</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1305,7 +1305,7 @@
 ><A
 NAME="XMLFREEURI"
 ></A
->&#62;xmlFreeURI ()</H3
+>xmlFreeURI ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 25daa22..202a94d 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -1022,7 +1022,7 @@
 ><A
 NAME="XMLVALIDSTATE"
 ></A
->&#62;struct xmlValidState</H3
+>struct xmlValidState</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1048,7 +1048,7 @@
 ><A
 NAME="XMLVALIDSTATEPTR"
 ></A
->&#62;xmlValidStatePtr</H3
+>xmlValidStatePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1074,7 +1074,7 @@
 ><A
 NAME="XMLVALIDITYERRORFUNC"
 ></A
->&#62;xmlValidityErrorFunc ()</H3
+>xmlValidityErrorFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1176,7 +1176,7 @@
 ><A
 NAME="XMLVALIDITYWARNINGFUNC"
 ></A
->&#62;xmlValidityWarningFunc ()</H3
+>xmlValidityWarningFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1278,7 +1278,7 @@
 ><A
 NAME="XMLVALIDCTXT"
 ></A
->&#62;struct xmlValidCtxt</H3
+>struct xmlValidCtxt</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1326,7 +1326,7 @@
 ><A
 NAME="XMLVALIDCTXTPTR"
 ></A
->&#62;xmlValidCtxtPtr</H3
+>xmlValidCtxtPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1352,7 +1352,7 @@
 ><A
 NAME="XMLNOTATIONTABLEPTR"
 ></A
->&#62;xmlNotationTablePtr</H3
+>xmlNotationTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1378,7 +1378,7 @@
 ><A
 NAME="XMLELEMENTTABLEPTR"
 ></A
->&#62;xmlElementTablePtr</H3
+>xmlElementTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1404,7 +1404,7 @@
 ><A
 NAME="XMLATTRIBUTETABLEPTR"
 ></A
->&#62;xmlAttributeTablePtr</H3
+>xmlAttributeTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1430,7 +1430,7 @@
 ><A
 NAME="XMLIDTABLEPTR"
 ></A
->&#62;xmlIDTablePtr</H3
+>xmlIDTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1456,7 +1456,7 @@
 ><A
 NAME="XMLREFTABLEPTR"
 ></A
->&#62;xmlRefTablePtr</H3
+>xmlRefTablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1482,7 +1482,7 @@
 ><A
 NAME="XMLSPLITQNAME2"
 ></A
->&#62;xmlSplitQName2 ()</H3
+>xmlSplitQName2 ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1579,7 +1579,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >NULL if not a QName, otherwise the local part, and prefix
-  is updated to get the Prefix if any.</TD
+is updated to get the Prefix if any.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1596,7 +1596,7 @@
 ><A
 NAME="XMLADDNOTATIONDECL"
 ></A
->&#62;xmlAddNotationDecl ()</H3
+>xmlAddNotationDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1766,7 +1766,7 @@
 ><A
 NAME="XMLCOPYNOTATIONTABLE"
 ></A
->&#62;xmlCopyNotationTable ()</H3
+>xmlCopyNotationTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1852,7 +1852,7 @@
 ><A
 NAME="XMLFREENOTATIONTABLE"
 ></A
->&#62;xmlFreeNotationTable ()</H3
+>xmlFreeNotationTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1920,7 +1920,7 @@
 ><A
 NAME="XMLDUMPNOTATIONDECL"
 ></A
->&#62;xmlDumpNotationDecl ()</H3
+>xmlDumpNotationDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2009,7 +2009,7 @@
 ><A
 NAME="XMLDUMPNOTATIONTABLE"
 ></A
->&#62;xmlDumpNotationTable ()</H3
+>xmlDumpNotationTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2098,7 +2098,7 @@
 ><A
 NAME="XMLNEWELEMENTCONTENT"
 ></A
->&#62;xmlNewElementContent ()</H3
+>xmlNewElementContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2205,7 +2205,7 @@
 ><A
 NAME="XMLCOPYELEMENTCONTENT"
 ></A
->&#62;xmlCopyElementContent ()</H3
+>xmlCopyElementContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2291,7 +2291,7 @@
 ><A
 NAME="XMLFREEELEMENTCONTENT"
 ></A
->&#62;xmlFreeElementContent ()</H3
+>xmlFreeElementContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2359,7 +2359,7 @@
 ><A
 NAME="XMLSNPRINTFELEMENTCONTENT"
 ></A
->&#62;xmlSnprintfElementContent ()</H3
+>xmlSnprintfElementContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2482,7 +2482,7 @@
 ><A
 NAME="XMLSPRINTFELEMENTCONTENT"
 ></A
->&#62;xmlSprintfElementContent ()</H3
+>xmlSprintfElementContent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2586,7 +2586,7 @@
 ><A
 NAME="XMLADDELEMENTDECL"
 ></A
->&#62;xmlAddElementDecl ()</H3
+>xmlAddElementDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2756,7 +2756,7 @@
 ><A
 NAME="XMLCOPYELEMENTTABLE"
 ></A
->&#62;xmlCopyElementTable ()</H3
+>xmlCopyElementTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2842,7 +2842,7 @@
 ><A
 NAME="XMLFREEELEMENTTABLE"
 ></A
->&#62;xmlFreeElementTable ()</H3
+>xmlFreeElementTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2910,7 +2910,7 @@
 ><A
 NAME="XMLDUMPELEMENTTABLE"
 ></A
->&#62;xmlDumpElementTable ()</H3
+>xmlDumpElementTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2999,7 +2999,7 @@
 ><A
 NAME="XMLDUMPELEMENTDECL"
 ></A
->&#62;xmlDumpElementDecl ()</H3
+>xmlDumpElementDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3089,7 +3089,7 @@
 ><A
 NAME="XMLCREATEENUMERATION"
 ></A
->&#62;xmlCreateEnumeration ()</H3
+>xmlCreateEnumeration ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3159,7 +3159,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlEnumerationPtr just created or NULL in case
-               of error.</TD
+of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3176,7 +3176,7 @@
 ><A
 NAME="XMLFREEENUMERATION"
 ></A
->&#62;xmlFreeEnumeration ()</H3
+>xmlFreeEnumeration ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3244,7 +3244,7 @@
 ><A
 NAME="XMLCOPYENUMERATION"
 ></A
->&#62;xmlCopyEnumeration ()</H3
+>xmlCopyEnumeration ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3314,7 +3314,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlEnumerationPtr just created or NULL in case
-               of error.</TD
+of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3331,7 +3331,7 @@
 ><A
 NAME="XMLADDATTRIBUTEDECL"
 ></A
->&#62;xmlAddAttributeDecl ()</H3
+>xmlAddAttributeDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3591,7 +3591,7 @@
 ><A
 NAME="XMLCOPYATTRIBUTETABLE"
 ></A
->&#62;xmlCopyAttributeTable ()</H3
+>xmlCopyAttributeTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3677,7 +3677,7 @@
 ><A
 NAME="XMLFREEATTRIBUTETABLE"
 ></A
->&#62;xmlFreeAttributeTable ()</H3
+>xmlFreeAttributeTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3745,7 +3745,7 @@
 ><A
 NAME="XMLDUMPATTRIBUTETABLE"
 ></A
->&#62;xmlDumpAttributeTable ()</H3
+>xmlDumpAttributeTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3834,7 +3834,7 @@
 ><A
 NAME="XMLDUMPATTRIBUTEDECL"
 ></A
->&#62;xmlDumpAttributeDecl ()</H3
+>xmlDumpAttributeDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3924,7 +3924,7 @@
 ><A
 NAME="XMLADDID"
 ></A
->&#62;xmlAddID ()</H3
+>xmlAddID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4073,7 +4073,7 @@
 ><A
 NAME="XMLFREEIDTABLE"
 ></A
->&#62;xmlFreeIDTable ()</H3
+>xmlFreeIDTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4141,7 +4141,7 @@
 ><A
 NAME="XMLGETID"
 ></A
->&#62;xmlGetID ()</H3
+>xmlGetID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4248,7 +4248,7 @@
 ><A
 NAME="XMLISID"
 ></A
->&#62;xmlIsID ()</H3
+>xmlIsID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4375,7 +4375,7 @@
 ><A
 NAME="XMLREMOVEID"
 ></A
->&#62;xmlRemoveID ()</H3
+>xmlRemoveID ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4479,7 +4479,7 @@
 ><A
 NAME="XMLADDREF"
 ></A
->&#62;xmlAddRef ()</H3
+>xmlAddRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4628,7 +4628,7 @@
 ><A
 NAME="XMLFREEREFTABLE"
 ></A
->&#62;xmlFreeRefTable ()</H3
+>xmlFreeRefTable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4696,7 +4696,7 @@
 ><A
 NAME="XMLISREF"
 ></A
->&#62;xmlIsRef ()</H3
+>xmlIsRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4823,7 +4823,7 @@
 ><A
 NAME="XMLREMOVEREF"
 ></A
->&#62;xmlRemoveRef ()</H3
+>xmlRemoveRef ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4927,7 +4927,7 @@
 ><A
 NAME="XMLGETREFS"
 ></A
->&#62;xmlGetRefs ()</H3
+>xmlGetRefs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5034,7 +5034,7 @@
 ><A
 NAME="XMLVALIDATEROOT"
 ></A
->&#62;xmlValidateRoot ()</H3
+>xmlValidateRoot ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5059,7 +5059,7 @@
 >Try to validate a the root element
 basically it does the following check as described by the
 XML-1.0 recommendation:
- - [ VC: Root Element Type ]
+- [ VC: Root Element Type ]
 it doesn't try to recurse or apply other check to the element</P
 ><P
 ></P
@@ -5142,7 +5142,7 @@
 ><A
 NAME="XMLVALIDATEELEMENTDECL"
 ></A
->&#62;xmlValidateElementDecl ()</H3
+>xmlValidateElementDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5171,9 +5171,9 @@
 >Try to validate a single element definition
 basically it does the following checks as described by the
 XML-1.0 recommendation:
- - [ VC: One ID per Element Type ]
- - [ VC: No Duplicate Types ]
- - [ VC: Unique Element Type Declaration ]</P
+- [ VC: One ID per Element Type ]
+- [ VC: No Duplicate Types ]
+- [ VC: Unique Element Type Declaration ]</P
 ><P
 ></P
 ><DIV
@@ -5272,7 +5272,7 @@
 ><A
 NAME="XMLVALIDNORMALIZEATTRIBUTEVALUE"
 ></A
->&#62;xmlValidNormalizeAttributeValue ()</H3
+>xmlValidNormalizeAttributeValue ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5420,7 +5420,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a new normalized string if normalization is needed, NULL otherwise
-     the caller must free the returned value.</TD
+the caller must free the returned value.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5437,7 +5437,7 @@
 ><A
 NAME="XMLVALIDCTXTNORMALIZEATTRIBUTEVALUE"
 ></A
->&#62;xmlValidCtxtNormalizeAttributeValue ()</H3
+>xmlValidCtxtNormalizeAttributeValue ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5493,7 +5493,7 @@
 >) character.</P
 ><P
 >Also  check VC: Standalone Document Declaration in P32, and update
- ctxt-&gt;valid accordingly</P
+ctxt-&gt;valid accordingly</P
 ><P
 ></P
 ><DIV
@@ -5610,7 +5610,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a new normalized string if normalization is needed, NULL otherwise
-     the caller must free the returned value.</TD
+the caller must free the returned value.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5627,7 +5627,7 @@
 ><A
 NAME="XMLVALIDATEATTRIBUTEDECL"
 ></A
->&#62;xmlValidateAttributeDecl ()</H3
+>xmlValidateAttributeDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5656,9 +5656,9 @@
 >Try to validate a single attribute definition
 basically it does the following checks as described by the
 XML-1.0 recommendation:
- - [ VC: Attribute Default Legal ]
- - [ VC: Enumeration ]
- - [ VC: ID Attribute Default ]</P
+- [ VC: Attribute Default Legal ]
+- [ VC: Enumeration ]
+- [ VC: ID Attribute Default ]</P
 ><P
 >The ID/IDREF uniqueness and matching are done separately</P
 ><P
@@ -5759,7 +5759,7 @@
 ><A
 NAME="XMLVALIDATEATTRIBUTEVALUE"
 ></A
->&#62;xmlValidateAttributeValue ()</H3
+>xmlValidateAttributeValue ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5878,7 +5878,7 @@
 ><A
 NAME="XMLVALIDATENOTATIONDECL"
 ></A
->&#62;xmlValidateNotationDecl ()</H3
+>xmlValidateNotationDecl ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5907,7 +5907,7 @@
 >Try to validate a single notation definition
 basically it does the following checks as described by the
 XML-1.0 recommendation:
- - it seems that no validity constraint exists on notation declarations
+- it seems that no validity constraint exists on notation declarations
 But this function get called anyway ...</P
 ><P
 ></P
@@ -6007,7 +6007,7 @@
 ><A
 NAME="XMLVALIDATEDTD"
 ></A
->&#62;xmlValidateDtd ()</H3
+>xmlValidateDtd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6134,7 +6134,7 @@
 ><A
 NAME="XMLVALIDATEDTDFINAL"
 ></A
->&#62;xmlValidateDtdFinal ()</H3
+>xmlValidateDtdFinal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6161,9 +6161,9 @@
 ><P
 >basically it does the following checks described by the XML Rec
 - check that ENTITY and ENTITIES type attributes default or 
-  possible values matches one of the defined entities.
+possible values matches one of the defined entities.
 - check that NOTATION type attributes default or 
-  possible values matches one of the defined notations.</P
+possible values matches one of the defined notations.</P
 ><P
 ></P
 ><DIV
@@ -6245,7 +6245,7 @@
 ><A
 NAME="XMLVALIDATEDOCUMENT"
 ></A
->&#62;xmlValidateDocument ()</H3
+>xmlValidateDocument ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6353,7 +6353,7 @@
 ><A
 NAME="XMLVALIDATEELEMENT"
 ></A
->&#62;xmlValidateElement ()</H3
+>xmlValidateElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6478,7 +6478,7 @@
 ><A
 NAME="XMLVALIDATEONEELEMENT"
 ></A
->&#62;xmlValidateOneElement ()</H3
+>xmlValidateOneElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6507,8 +6507,8 @@
 >Try to validate a single element and it's attributes,
 basically it does the following checks as described by the
 XML-1.0 recommendation:
- - [ VC: Element Valid ]
- - [ VC: Required Attribute ]
+- [ VC: Element Valid ]
+- [ VC: Required Attribute ]
 Then call <A
 HREF="libxml-valid.html#XMLVALIDATEONEATTRIBUTE"
 >xmlValidateOneAttribute</A
@@ -6613,7 +6613,7 @@
 ><A
 NAME="XMLVALIDATEONEATTRIBUTE"
 ></A
->&#62;xmlValidateOneAttribute ()</H3
+>xmlValidateOneAttribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6650,14 +6650,14 @@
 >Try to validate a single attribute for an element
 basically it does the following checks as described by the
 XML-1.0 recommendation:
- - [ VC: Attribute Value Type ]
- - [ VC: Fixed Attribute Default ]
- - [ VC: Entity Name ]
- - [ VC: Name Token ]
- - [ VC: ID ]
- - [ VC: IDREF ]
- - [ VC: Entity Name ]
- - [ VC: Notation Attributes ]</P
+- [ VC: Attribute Value Type ]
+- [ VC: Fixed Attribute Default ]
+- [ VC: Entity Name ]
+- [ VC: Name Token ]
+- [ VC: ID ]
+- [ VC: IDREF ]
+- [ VC: Entity Name ]
+- [ VC: Notation Attributes ]</P
 ><P
 >The ID/IDREF uniqueness and matching are done separately</P
 ><P
@@ -6792,7 +6792,7 @@
 ><A
 NAME="XMLVALIDATEDOCUMENTFINAL"
 ></A
->&#62;xmlValidateDocumentFinal ()</H3
+>xmlValidateDocumentFinal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6899,7 +6899,7 @@
 ><A
 NAME="XMLVALIDATENOTATIONUSE"
 ></A
->&#62;xmlValidateNotationUse ()</H3
+>xmlValidateNotationUse ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7025,7 +7025,7 @@
 ><A
 NAME="XMLISMIXEDELEMENT"
 ></A
->&#62;xmlIsMixedElement ()</H3
+>xmlIsMixedElement ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7130,7 +7130,7 @@
 ><A
 NAME="XMLGETDTDATTRDESC"
 ></A
->&#62;xmlGetDtdAttrDesc ()</H3
+>xmlGetDtdAttrDesc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7259,7 +7259,7 @@
 ><A
 NAME="XMLGETDTDQATTRDESC"
 ></A
->&#62;xmlGetDtdQAttrDesc ()</H3
+>xmlGetDtdQAttrDesc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7409,7 +7409,7 @@
 ><A
 NAME="XMLGETDTDNOTATIONDESC"
 ></A
->&#62;xmlGetDtdNotationDesc ()</H3
+>xmlGetDtdNotationDesc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7516,7 +7516,7 @@
 ><A
 NAME="XMLGETDTDQELEMENTDESC"
 ></A
->&#62;xmlGetDtdQElementDesc ()</H3
+>xmlGetDtdQElementDesc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7644,7 +7644,7 @@
 ><A
 NAME="XMLGETDTDELEMENTDESC"
 ></A
->&#62;xmlGetDtdElementDesc ()</H3
+>xmlGetDtdElementDesc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7751,7 +7751,7 @@
 ><A
 NAME="XMLVALIDGETVALIDELEMENTS"
 ></A
->&#62;xmlValidGetValidElements ()</H3
+>xmlValidGetValidElements ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7792,11 +7792,11 @@
 >next</I
 ></TT
 > in the following ways:
- to insert before 'node': xmlValidGetValidElements(node-&gt;prev, node, ...
- to insert next 'node': xmlValidGetValidElements(node, node-&gt;next, ...
- to replace 'node': xmlValidGetValidElements(node-&gt;prev, node-&gt;next, ...
- to prepend a child to 'node': xmlValidGetValidElements(NULL, node-&gt;childs,
- to append a child to 'node': xmlValidGetValidElements(node-&gt;last, NULL, ...</P
+to insert before 'node': xmlValidGetValidElements(node-&gt;prev, node, ...
+to insert next 'node': xmlValidGetValidElements(node, node-&gt;next, ...
+to replace 'node': xmlValidGetValidElements(node-&gt;prev, node-&gt;next, ...
+to prepend a child to 'node': xmlValidGetValidElements(NULL, node-&gt;childs,
+to append a child to 'node': xmlValidGetValidElements(node-&gt;last, NULL, ...</P
 ><P
 >pointers to the element names are inserted at the beginning of the array
 and do not need to be freed.</P
@@ -7899,13 +7899,13 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of element in the list, or -1 in case of error. If
-   the function returns the value <TT
+the function returns the value <TT
 CLASS="PARAMETER"
 ><I
 >max</I
 ></TT
 > the caller is invited to grow the
-   receiving array and retry.</TD
+receiving array and retry.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7922,7 +7922,7 @@
 ><A
 NAME="XMLVALIDGETPOTENTIALCHILDREN"
 ></A
->&#62;xmlValidGetPotentialChildren ()</H3
+>xmlValidGetPotentialChildren ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index dd78f67..6ba74e3 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -183,7 +183,7 @@
 ><A
 NAME="XMLXINCLUDEPROCESS"
 ></A
->&#62;xmlXIncludeProcess ()</H3
+>xmlXIncludeProcess ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -255,7 +255,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >0 if no substitution were done, -1 if some processing failed
-   or the number of substitutions done.</TD
+or the number of substitutions done.</TD
 ></TR
 ></TBODY
 ></TABLE
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index e966aef..2c33686 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -239,7 +239,7 @@
 ><A
 NAME="XMLPARSERERRORS"
 ></A
->&#62;enum xmlParserErrors</H3
+>enum xmlParserErrors</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -394,7 +394,7 @@
 ><A
 NAME="XMLGENERICERRORFUNC"
 ></A
->&#62;xmlGenericErrorFunc ()</H3
+>xmlGenericErrorFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -496,7 +496,7 @@
 ><A
 NAME="XMLSETGENERICERRORFUNC"
 ></A
->&#62;xmlSetGenericErrorFunc ()</H3
+>xmlSetGenericErrorFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -613,7 +613,7 @@
 ><A
 NAME="INITGENERICERRORDEFAULTFUNC"
 ></A
->&#62;initGenericErrorDefaultFunc ()</H3
+>initGenericErrorDefaultFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -681,7 +681,7 @@
 ><A
 NAME="XMLPARSERERROR"
 ></A
->&#62;xmlParserError ()</H3
+>xmlParserError ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -783,7 +783,7 @@
 ><A
 NAME="XMLPARSERWARNING"
 ></A
->&#62;xmlParserWarning ()</H3
+>xmlParserWarning ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -885,7 +885,7 @@
 ><A
 NAME="XMLPARSERVALIDITYERROR"
 ></A
->&#62;xmlParserValidityError ()</H3
+>xmlParserValidityError ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -987,7 +987,7 @@
 ><A
 NAME="XMLPARSERVALIDITYWARNING"
 ></A
->&#62;xmlParserValidityWarning ()</H3
+>xmlParserValidityWarning ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1089,7 +1089,7 @@
 ><A
 NAME="XMLPARSERPRINTFILEINFO"
 ></A
->&#62;xmlParserPrintFileInfo ()</H3
+>xmlParserPrintFileInfo ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1157,7 +1157,7 @@
 ><A
 NAME="XMLPARSERPRINTFILECONTEXT"
 ></A
->&#62;xmlParserPrintFileContext ()</H3
+>xmlParserPrintFileContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index 05a669d..1f3e563 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -528,7 +528,7 @@
 ><A
 NAME="XMLINPUTMATCHCALLBACK"
 ></A
->&#62;xmlInputMatchCallback ()</H3
+>xmlInputMatchCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -609,7 +609,7 @@
 ><A
 NAME="XMLINPUTOPENCALLBACK"
 ></A
->&#62;xmlInputOpenCallback ()</H3
+>xmlInputOpenCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -674,7 +674,7 @@
 ><A
 NAME="XMLINPUTREADCALLBACK"
 ></A
->&#62;xmlInputReadCallback ()</H3
+>xmlInputReadCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -790,7 +790,7 @@
 ><A
 NAME="XMLINPUTCLOSECALLBACK"
 ></A
->&#62;xmlInputCloseCallback ()</H3
+>xmlInputCloseCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -870,7 +870,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFER"
 ></A
->&#62;struct xmlParserInputBuffer</H3
+>struct xmlParserInputBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -905,7 +905,7 @@
 ><A
 NAME="XMLOUTPUTMATCHCALLBACK"
 ></A
->&#62;xmlOutputMatchCallback ()</H3
+>xmlOutputMatchCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -986,7 +986,7 @@
 ><A
 NAME="XMLOUTPUTOPENCALLBACK"
 ></A
->&#62;xmlOutputOpenCallback ()</H3
+>xmlOutputOpenCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1051,7 +1051,7 @@
 ><A
 NAME="XMLOUTPUTWRITECALLBACK"
 ></A
->&#62;xmlOutputWriteCallback ()</H3
+>xmlOutputWriteCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1167,7 +1167,7 @@
 ><A
 NAME="XMLOUTPUTCLOSECALLBACK"
 ></A
->&#62;xmlOutputCloseCallback ()</H3
+>xmlOutputCloseCallback ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1247,7 +1247,7 @@
 ><A
 NAME="XMLOUTPUTBUFFER"
 ></A
->&#62;struct xmlOutputBuffer</H3
+>struct xmlOutputBuffer</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1283,7 +1283,7 @@
 ><A
 NAME="XMLCLEANUPINPUTCALLBACKS"
 ></A
->&#62;xmlCleanupInputCallbacks ()</H3
+>xmlCleanupInputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1312,7 +1312,7 @@
 ><A
 NAME="XMLCLEANUPOUTPUTCALLBACKS"
 ></A
->&#62;xmlCleanupOutputCallbacks ()</H3
+>xmlCleanupOutputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1341,7 +1341,7 @@
 ><A
 NAME="XMLREGISTERDEFAULTINPUTCALLBACKS"
 ></A
->&#62;xmlRegisterDefaultInputCallbacks ()</H3
+>xmlRegisterDefaultInputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1370,7 +1370,7 @@
 ><A
 NAME="XMLALLOCPARSERINPUTBUFFER"
 ></A
->&#62;xmlAllocParserInputBuffer ()</H3
+>xmlAllocParserInputBuffer ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1457,7 +1457,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEFNAME"
 ></A
->&#62;xmlParserInputBufferCreateFname ()</H3
+>xmlParserInputBufferCreateFname ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1565,7 +1565,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEFILENAME"
 ></A
->&#62;xmlParserInputBufferCreateFilename ()</H3
+>xmlParserInputBufferCreateFilename ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1674,7 +1674,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEFILE"
 ></A
->&#62;xmlParserInputBufferCreateFile ()</H3
+>xmlParserInputBufferCreateFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1783,7 +1783,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEFD"
 ></A
->&#62;xmlParserInputBufferCreateFd ()</H3
+>xmlParserInputBufferCreateFd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1889,7 +1889,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEMEM"
 ></A
->&#62;xmlParserInputBufferCreateMem ()</H3
+>xmlParserInputBufferCreateMem ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2013,7 +2013,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERCREATEIO"
 ></A
->&#62;xmlParserInputBufferCreateIO ()</H3
+>xmlParserInputBufferCreateIO ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2161,7 +2161,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERREAD"
 ></A
->&#62;xmlParserInputBufferRead ()</H3
+>xmlParserInputBufferRead ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2248,7 +2248,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of chars read and stored in the buffer, or -1
-        in case of error.</TD
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2265,7 +2265,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERGROW"
 ></A
->&#62;xmlParserInputBufferGrow ()</H3
+>xmlParserInputBufferGrow ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2289,7 +2289,7 @@
 This routine is used when operating the parser in normal (pull) mode</P
 ><P
 >TODO: one should be able to remove one extra copy by copying directly
-      onto in-&gt;buffer or in-&gt;raw</P
+onto in-&gt;buffer or in-&gt;raw</P
 ><P
 ></P
 ><DIV
@@ -2355,7 +2355,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of chars read and stored in the buffer, or -1
-        in case of error.</TD
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2372,7 +2372,7 @@
 ><A
 NAME="XMLPARSERINPUTBUFFERPUSH"
 ></A
->&#62;xmlParserInputBufferPush ()</H3
+>xmlParserInputBufferPush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2477,7 +2477,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of chars read and stored in the buffer, or -1
-        in case of error.</TD
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2494,7 +2494,7 @@
 ><A
 NAME="XMLFREEPARSERINPUTBUFFER"
 ></A
->&#62;xmlFreeParserInputBuffer ()</H3
+>xmlFreeParserInputBuffer ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2562,7 +2562,7 @@
 ><A
 NAME="XMLPARSERGETDIRECTORY"
 ></A
->&#62;xmlParserGetDirectory ()</H3
+>xmlParserGetDirectory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2642,7 +2642,7 @@
 ><A
 NAME="XMLREGISTERINPUTCALLBACKS"
 ></A
->&#62;xmlRegisterInputCallbacks ()</H3
+>xmlRegisterInputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2788,7 +2788,7 @@
 ><A
 NAME="XMLREGISTERDEFAULTOUTPUTCALLBACKS"
 ></A
->&#62;xmlRegisterDefaultOutputCallbacks ()</H3
+>xmlRegisterDefaultOutputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2817,7 +2817,7 @@
 ><A
 NAME="XMLALLOCOUTPUTBUFFER"
 ></A
->&#62;xmlAllocOutputBuffer ()</H3
+>xmlAllocOutputBuffer ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2903,7 +2903,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERCREATEFILENAME"
 ></A
->&#62;xmlOutputBufferCreateFilename ()</H3
+>xmlOutputBufferCreateFilename ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2932,7 +2932,7 @@
 Automatic support for ZLIB/Compress compressed document is provided
 by default if found at compile-time.
 TODO: currently if compression is set, the library only support
-      writing to a local file.</P
+writing to a local file.</P
 ><P
 ></P
 ><DIV
@@ -3031,7 +3031,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERCREATEFILE"
 ></A
->&#62;xmlOutputBufferCreateFile ()</H3
+>xmlOutputBufferCreateFile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3140,7 +3140,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERCREATEFD"
 ></A
->&#62;xmlOutputBufferCreateFd ()</H3
+>xmlOutputBufferCreateFd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3245,7 +3245,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERCREATEIO"
 ></A
->&#62;xmlOutputBufferCreateIO ()</H3
+>xmlOutputBufferCreateIO ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3392,7 +3392,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERWRITE"
 ></A
->&#62;xmlOutputBufferWrite ()</H3
+>xmlOutputBufferWrite ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3498,7 +3498,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of chars immediately written, or -1
-        in case of error.</TD
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3515,7 +3515,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERWRITESTRING"
 ></A
->&#62;xmlOutputBufferWriteString ()</H3
+>xmlOutputBufferWriteString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3603,7 +3603,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the number of chars immediately written, or -1
-        in case of error.</TD
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3620,7 +3620,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERFLUSH"
 ></A
->&#62;xmlOutputBufferFlush ()</H3
+>xmlOutputBufferFlush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3703,7 +3703,7 @@
 ><A
 NAME="XMLOUTPUTBUFFERCLOSE"
 ></A
->&#62;xmlOutputBufferClose ()</H3
+>xmlOutputBufferClose ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3787,7 +3787,7 @@
 ><A
 NAME="XMLREGISTEROUTPUTCALLBACKS"
 ></A
->&#62;xmlRegisterOutputCallbacks ()</H3
+>xmlRegisterOutputCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3933,7 +3933,7 @@
 ><A
 NAME="XMLIOHTTPOPENW"
 ></A
->&#62;xmlIOHTTPOpenW ()</H3
+>xmlIOHTTPOpenW ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4017,7 +4017,7 @@
 ><A
 NAME="XMLREGISTERHTTPPOSTCALLBACKS"
 ></A
->&#62;xmlRegisterHTTPPostCallbacks ()</H3
+>xmlRegisterHTTPPostCallbacks ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4047,7 +4047,7 @@
 ><A
 NAME="XMLNONETEXTERNALENTITYLOADER"
 ></A
->&#62;xmlNoNetExternalEntityLoader ()</H3
+>xmlNoNetExternalEntityLoader ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index c185461..340c0b6 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN26184"
+NAME="AEN26350"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN26187"
+NAME="AEN26353"
 ></A
 ><H2
 >Synopsis</H2
@@ -270,7 +270,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26222"
+NAME="AEN26388"
 ></A
 ><H2
 >Description</H2
@@ -280,20 +280,20 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26225"
+NAME="AEN26391"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26227"
+NAME="AEN26393"
 ></A
 ><H3
 ><A
 NAME="DEBUG-MEMORY-CAPS"
 ></A
->&#62;DEBUG_MEMORY</H3
+>DEBUG_MEMORY</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -318,13 +318,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26233"
+NAME="AEN26399"
 ></A
 ><H3
 ><A
 NAME="XMLFREEFUNC"
 ></A
->&#62;xmlFreeFunc ()</H3
+>xmlFreeFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -348,7 +348,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26240"
+NAME="AEN26406"
 ></A
 ><P
 ></P
@@ -386,13 +386,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26249"
+NAME="AEN26415"
 ></A
 ><H3
 ><A
 NAME="XMLMALLOCFUNC"
 ></A
->&#62;xmlMallocFunc ()</H3
+>xmlMallocFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -419,7 +419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26257"
+NAME="AEN26423"
 ></A
 ><P
 ></P
@@ -457,13 +457,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26266"
+NAME="AEN26432"
 ></A
 ><H3
 ><A
 NAME="XMLREALLOCFUNC"
 ></A
->&#62;xmlReallocFunc ()</H3
+>xmlReallocFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -491,7 +491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26274"
+NAME="AEN26440"
 ></A
 ><P
 ></P
@@ -546,13 +546,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26287"
+NAME="AEN26453"
 ></A
 ><H3
 ><A
 NAME="XMLSTRDUPFUNC"
 ></A
->&#62;xmlStrdupFunc ()</H3
+>xmlStrdupFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -576,7 +576,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26294"
+NAME="AEN26460"
 ></A
 ><P
 ></P
@@ -629,13 +629,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26307"
+NAME="AEN26473"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSETUP"
 ></A
->&#62;xmlMemSetup ()</H3
+>xmlMemSetup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -675,7 +675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26318"
+NAME="AEN26484"
 ></A
 ><P
 ></P
@@ -791,13 +791,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26347"
+NAME="AEN26513"
 ></A
 ><H3
 ><A
 NAME="XMLMEMGET"
 ></A
->&#62;xmlMemGet ()</H3
+>xmlMemGet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -833,7 +833,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26357"
+NAME="AEN26523"
 ></A
 ><P
 ></P
@@ -949,13 +949,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26386"
+NAME="AEN26552"
 ></A
 ><H3
 ><A
 NAME="XMLINITMEMORY"
 ></A
->&#62;xmlInitMemory ()</H3
+>xmlInitMemory ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -976,7 +976,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26392"
+NAME="AEN26558"
 ></A
 ><P
 ></P
@@ -1012,13 +1012,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26401"
+NAME="AEN26567"
 ></A
 ><H3
 ><A
 NAME="XMLMEMUSED"
 ></A
->&#62;xmlMemUsed ()</H3
+>xmlMemUsed ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1039,7 +1039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26407"
+NAME="AEN26573"
 ></A
 ><P
 ></P
@@ -1075,13 +1075,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26416"
+NAME="AEN26582"
 ></A
 ><H3
 ><A
 NAME="XMLMEMDISPLAY"
 ></A
->&#62;xmlMemDisplay ()</H3
+>xmlMemDisplay ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1105,7 +1105,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26423"
+NAME="AEN26589"
 ></A
 ><P
 ></P
@@ -1133,7 +1133,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  a FILE descriptor used as the output file, if NULL, the result is
-      written to the file .memorylist</TD
+written to the file .memorylist</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1144,13 +1144,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26432"
+NAME="AEN26598"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSHOW"
 ></A
->&#62;xmlMemShow ()</H3
+>xmlMemShow ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1181,7 +1181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26440"
+NAME="AEN26606"
 ></A
 ><P
 ></P
@@ -1236,13 +1236,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26453"
+NAME="AEN26619"
 ></A
 ><H3
 ><A
 NAME="XMLMEMORYDUMP"
 ></A
->&#62;xmlMemoryDump ()</H3
+>xmlMemoryDump ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1264,13 +1264,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26459"
+NAME="AEN26625"
 ></A
 ><H3
 ><A
 NAME="XMLMALLOC"
 ></A
->&#62;xmlMalloc()</H3
+>xmlMalloc()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1294,7 +1294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26466"
+NAME="AEN26632"
 ></A
 ><P
 ></P
@@ -1332,13 +1332,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26475"
+NAME="AEN26641"
 ></A
 ><H3
 ><A
 NAME="XMLREALLOC"
 ></A
->&#62;xmlRealloc()</H3
+>xmlRealloc()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1362,7 +1362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26482"
+NAME="AEN26648"
 ></A
 ><P
 ></P
@@ -1417,13 +1417,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26495"
+NAME="AEN26661"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSTRDUP"
 ></A
->&#62;xmlMemStrdup()</H3
+>xmlMemStrdup()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1450,7 +1450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26503"
+NAME="AEN26669"
 ></A
 ><P
 ></P
@@ -1488,13 +1488,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26512"
+NAME="AEN26678"
 ></A
 ><H3
 ><A
 NAME="XMLMALLOCLOC"
 ></A
->&#62;xmlMallocLoc ()</H3
+>xmlMallocLoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1523,7 +1523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26520"
+NAME="AEN26686"
 ></A
 ><P
 ></P
@@ -1595,13 +1595,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26537"
+NAME="AEN26703"
 ></A
 ><H3
 ><A
 NAME="XMLREALLOCLOC"
 ></A
->&#62;xmlReallocLoc ()</H3
+>xmlReallocLoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1631,7 +1631,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26545"
+NAME="AEN26711"
 ></A
 ><P
 ></P
@@ -1720,13 +1720,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN26566"
+NAME="AEN26732"
 ></A
 ><H3
 ><A
 NAME="XMLMEMSTRDUPLOC"
 ></A
->&#62;xmlMemStrdupLoc ()</H3
+>xmlMemStrdupLoc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1752,7 +1752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN26573"
+NAME="AEN26739"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 88040a7..b5ecace 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -615,7 +615,7 @@
 ><A
 NAME="XMLXPATHCONTEXT"
 ></A
->&#62;struct xmlXPathContext</H3
+>struct xmlXPathContext</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -685,11 +685,11 @@
 ><P
 >Expression evaluation occurs with respect to a context.
 he context consists of:
-   - a node (the context node) 
-   - a node list (the context node list) 
-   - a set of variable bindings 
-   - a function library 
-   - the set of namespace declarations in scope for the expression 
+- a node (the context node) 
+- a node list (the context node list) 
+- a set of variable bindings 
+- a function library 
+- the set of namespace declarations in scope for the expression 
 Following the switch to hash tables, this need to be trimmed up at
 the next binary incompatible release.</P
 ><P
@@ -704,7 +704,7 @@
 ><A
 NAME="XMLXPATHCONTEXTPTR"
 ></A
->&#62;xmlXPathContextPtr</H3
+>xmlXPathContextPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -730,7 +730,7 @@
 ><A
 NAME="XMLXPATHPARSERCONTEXT"
 ></A
->&#62;struct xmlXPathParserContext</H3
+>struct xmlXPathParserContext</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -774,7 +774,7 @@
 ><A
 NAME="XMLXPATHPARSERCONTEXTPTR"
 ></A
->&#62;xmlXPathParserContextPtr</H3
+>xmlXPathParserContextPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -800,7 +800,7 @@
 ><A
 NAME="XMLXPATHERROR"
 ></A
->&#62;enum xmlXPathError</H3
+>enum xmlXPathError</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -849,7 +849,7 @@
 ><A
 NAME="XMLNODESET"
 ></A
->&#62;struct xmlNodeSet</H3
+>struct xmlNodeSet</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -863,6 +863,7 @@
     int nodeNr;			/* number of nodes in the set */
     int nodeMax;		/* size of the array as allocated */
     xmlNodePtr *nodeTab;	/* array of nodes in no particular order */
+    /* @@ with_ns to check wether namespace nodes should be looked at @@ */
 };</PRE
 ></TD
 ></TR
@@ -879,7 +880,7 @@
 ><A
 NAME="XMLNODESETPTR"
 ></A
->&#62;xmlNodeSetPtr</H3
+>xmlNodeSetPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -905,7 +906,7 @@
 ><A
 NAME="XMLXPATHOBJECTTYPE"
 ></A
->&#62;enum xmlXPathObjectType</H3
+>enum xmlXPathObjectType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -942,7 +943,7 @@
 ><A
 NAME="XMLXPATHOBJECT"
 ></A
->&#62;struct xmlXPathObject</H3
+>struct xmlXPathObject</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -978,7 +979,7 @@
 ><A
 NAME="XMLXPATHOBJECTPTR"
 ></A
->&#62;xmlXPathObjectPtr</H3
+>xmlXPathObjectPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1004,7 +1005,7 @@
 ><A
 NAME="XMLXPATHCONVERTFUNC"
 ></A
->&#62;xmlXPathConvertFunc ()</H3
+>xmlXPathConvertFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1106,7 +1107,7 @@
 ><A
 NAME="XMLXPATHTYPE"
 ></A
->&#62;struct xmlXPathType</H3
+>struct xmlXPathType</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1135,7 +1136,7 @@
 ><A
 NAME="XMLXPATHTYPEPTR"
 ></A
->&#62;xmlXPathTypePtr</H3
+>xmlXPathTypePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1161,7 +1162,7 @@
 ><A
 NAME="XMLXPATHVARIABLE"
 ></A
->&#62;struct xmlXPathVariable</H3
+>struct xmlXPathVariable</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1190,7 +1191,7 @@
 ><A
 NAME="XMLXPATHVARIABLEPTR"
 ></A
->&#62;xmlXPathVariablePtr</H3
+>xmlXPathVariablePtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1216,7 +1217,7 @@
 ><A
 NAME="XMLXPATHEVALFUNC"
 ></A
->&#62;xmlXPathEvalFunc ()</H3
+>xmlXPathEvalFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1302,7 +1303,7 @@
 ><A
 NAME="XMLXPATHFUNCT"
 ></A
->&#62;struct xmlXPathFunct</H3
+>struct xmlXPathFunct</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1331,7 +1332,7 @@
 ><A
 NAME="XMLXPATHFUNCPTR"
 ></A
->&#62;xmlXPathFuncPtr</H3
+>xmlXPathFuncPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1357,7 +1358,7 @@
 ><A
 NAME="XMLXPATHAXISFUNC"
 ></A
->&#62;xmlXPathAxisFunc ()</H3
+>xmlXPathAxisFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1466,7 +1467,7 @@
 ><A
 NAME="XMLXPATHAXIS"
 ></A
->&#62;struct xmlXPathAxis</H3
+>struct xmlXPathAxis</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1495,7 +1496,7 @@
 ><A
 NAME="XMLXPATHAXISPTR"
 ></A
->&#62;xmlXPathAxisPtr</H3
+>xmlXPathAxisPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1521,7 +1522,7 @@
 ><A
 NAME="XMLXPATHCOMPEXPR"
 ></A
->&#62;struct xmlXPathCompExpr</H3
+>struct xmlXPathCompExpr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1537,8 +1538,8 @@
 ></TABLE
 ><P
 >[14]   Expr ::=   OrExpr 
- [21]   OrExpr ::=   AndExpr 
-                | OrExpr 'or' AndExpr </P
+[21]   OrExpr ::=   AndExpr 
+| OrExpr 'or' AndExpr </P
 ><P
 >Parse and compile an expression</P
 ><P
@@ -1553,7 +1554,7 @@
 ><A
 NAME="XMLXPATHCOMPEXPRPTR"
 ></A
->&#62;xmlXPathCompExprPtr</H3
+>xmlXPathCompExprPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1579,7 +1580,7 @@
 ><A
 NAME="XMLXPATHFUNCTION"
 ></A
->&#62;xmlXPathFunction ()</H3
+>xmlXPathFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1667,7 +1668,7 @@
 ><A
 NAME="XMLXPATHISNAN"
 ></A
->&#62;xmlXPathIsNaN ()</H3
+>xmlXPathIsNaN ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1755,7 +1756,7 @@
 ><A
 NAME="XMLXPATHISINF"
 ></A
->&#62;xmlXPathIsInf ()</H3
+>xmlXPathIsInf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1843,7 +1844,7 @@
 ><A
 NAME="XMLXPATHNODESETGETLENGTH"
 ></A
->&#62;xmlXPathNodeSetGetLength()</H3
+>xmlXPathNodeSetGetLength()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1908,7 +1909,7 @@
 ><A
 NAME="XMLXPATHNODESETITEM"
 ></A
->&#62;xmlXPathNodeSetItem()</H3
+>xmlXPathNodeSetItem()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1993,7 +1994,7 @@
 ><A
 NAME="XMLXPATHNODESETISEMPTY"
 ></A
->&#62;xmlXPathNodeSetIsEmpty()</H3
+>xmlXPathNodeSetIsEmpty()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2063,7 +2064,7 @@
 ><A
 NAME="XMLXPATHFREEOBJECT"
 ></A
->&#62;xmlXPathFreeObject ()</H3
+>xmlXPathFreeObject ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2131,7 +2132,7 @@
 ><A
 NAME="XMLXPATHNODESETCREATE"
 ></A
->&#62;xmlXPathNodeSetCreate ()</H3
+>xmlXPathNodeSetCreate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2222,7 +2223,7 @@
 ><A
 NAME="XMLXPATHFREENODESETLIST"
 ></A
->&#62;xmlXPathFreeNodeSetList ()</H3
+>xmlXPathFreeNodeSetList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2299,7 +2300,7 @@
 ><A
 NAME="XMLXPATHFREENODESET"
 ></A
->&#62;xmlXPathFreeNodeSet ()</H3
+>xmlXPathFreeNodeSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2367,7 +2368,7 @@
 ><A
 NAME="XMLXPATHOBJECTCOPY"
 ></A
->&#62;xmlXPathObjectCopy ()</H3
+>xmlXPathObjectCopy ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2453,7 +2454,7 @@
 ><A
 NAME="XMLXPATHCMPNODES"
 ></A
->&#62;xmlXPathCmpNodes ()</H3
+>xmlXPathCmpNodes ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2541,7 +2542,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >-2 in case of error 1 if first point &lt; second point, 0 if
-        that's the same node, -1 otherwise</TD
+that's the same node, -1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2558,7 +2559,7 @@
 ><A
 NAME="XMLXPATHCASTNUMBERTOBOOLEAN"
 ></A
->&#62;xmlXPathCastNumberToBoolean ()</H3
+>xmlXPathCastNumberToBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2641,7 +2642,7 @@
 ><A
 NAME="XMLXPATHCASTSTRINGTOBOOLEAN"
 ></A
->&#62;xmlXPathCastStringToBoolean ()</H3
+>xmlXPathCastStringToBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2724,7 +2725,7 @@
 ><A
 NAME="XMLXPATHCASTNODESETTOBOOLEAN"
 ></A
->&#62;xmlXPathCastNodeSetToBoolean ()</H3
+>xmlXPathCastNodeSetToBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2807,7 +2808,7 @@
 ><A
 NAME="XMLXPATHCASTTOBOOLEAN"
 ></A
->&#62;xmlXPathCastToBoolean ()</H3
+>xmlXPathCastToBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2890,7 +2891,7 @@
 ><A
 NAME="XMLXPATHCASTBOOLEANTONUMBER"
 ></A
->&#62;xmlXPathCastBooleanToNumber ()</H3
+>xmlXPathCastBooleanToNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2973,7 +2974,7 @@
 ><A
 NAME="XMLXPATHCASTSTRINGTONUMBER"
 ></A
->&#62;xmlXPathCastStringToNumber ()</H3
+>xmlXPathCastStringToNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3059,7 +3060,7 @@
 ><A
 NAME="XMLXPATHCASTNODETONUMBER"
 ></A
->&#62;xmlXPathCastNodeToNumber ()</H3
+>xmlXPathCastNodeToNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3145,7 +3146,7 @@
 ><A
 NAME="XMLXPATHCASTNODESETTONUMBER"
 ></A
->&#62;xmlXPathCastNodeSetToNumber ()</H3
+>xmlXPathCastNodeSetToNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3231,7 +3232,7 @@
 ><A
 NAME="XMLXPATHCASTTONUMBER"
 ></A
->&#62;xmlXPathCastToNumber ()</H3
+>xmlXPathCastToNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3317,7 +3318,7 @@
 ><A
 NAME="XMLXPATHCASTBOOLEANTOSTRING"
 ></A
->&#62;xmlXPathCastBooleanToString ()</H3
+>xmlXPathCastBooleanToString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3400,7 +3401,7 @@
 ><A
 NAME="XMLXPATHCASTNUMBERTOSTRING"
 ></A
->&#62;xmlXPathCastNumberToString ()</H3
+>xmlXPathCastNumberToString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3486,7 +3487,7 @@
 ><A
 NAME="XMLXPATHCASTNODETOSTRING"
 ></A
->&#62;xmlXPathCastNodeToString ()</H3
+>xmlXPathCastNodeToString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3572,7 +3573,7 @@
 ><A
 NAME="XMLXPATHCASTNODESETTOSTRING"
 ></A
->&#62;xmlXPathCastNodeSetToString ()</H3
+>xmlXPathCastNodeSetToString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3658,7 +3659,7 @@
 ><A
 NAME="XMLXPATHCASTTOSTRING"
 ></A
->&#62;xmlXPathCastToString ()</H3
+>xmlXPathCastToString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3731,13 +3732,13 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the string value of the object, NULL in case of error.
-        A new string is allocated only if needed (<TT
+A new string is allocated only if needed (<TT
 CLASS="PARAMETER"
 ><I
 >val</I
 ></TT
 > isn't a
-        string object).</TD
+string object).</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3754,7 +3755,7 @@
 ><A
 NAME="XMLXPATHCONVERTBOOLEAN"
 ></A
->&#62;xmlXPathConvertBoolean ()</H3
+>xmlXPathConvertBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3827,7 +3828,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the new object, the old one is freed (or the operation
-        is done directly on <TT
+is done directly on <TT
 CLASS="PARAMETER"
 ><I
 >val</I
@@ -3849,7 +3850,7 @@
 ><A
 NAME="XMLXPATHCONVERTNUMBER"
 ></A
->&#62;xmlXPathConvertNumber ()</H3
+>xmlXPathConvertNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3922,7 +3923,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the new object, the old one is freed (or the operation
-        is done directly on <TT
+is done directly on <TT
 CLASS="PARAMETER"
 ><I
 >val</I
@@ -3944,7 +3945,7 @@
 ><A
 NAME="XMLXPATHCONVERTSTRING"
 ></A
->&#62;xmlXPathConvertString ()</H3
+>xmlXPathConvertString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4017,7 +4018,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the new object, the old one is freed (or the operation
-        is done directly on <TT
+is done directly on <TT
 CLASS="PARAMETER"
 ><I
 >val</I
@@ -4039,7 +4040,7 @@
 ><A
 NAME="XMLXPATHINIT"
 ></A
->&#62;xmlXPathInit ()</H3
+>xmlXPathInit ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4067,7 +4068,7 @@
 ><A
 NAME="XMLXPATHNEWCONTEXT"
 ></A
->&#62;xmlXPathNewContext ()</H3
+>xmlXPathNewContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4136,7 +4137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the xmlXPathContext just allocated.</TD
+>the xmlXPathContext just allocated. The caller will need to free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4153,7 +4154,7 @@
 ><A
 NAME="XMLXPATHFREECONTEXT"
 ></A
->&#62;xmlXPathFreeContext ()</H3
+>xmlXPathFreeContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4221,7 +4222,7 @@
 ><A
 NAME="XMLXPATHEVAL"
 ></A
->&#62;xmlXPathEval ()</H3
+>xmlXPathEval ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4312,7 +4313,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlXPathObjectPtr resulting from the evaluation or NULL.
-        the caller has to free the object.</TD
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4329,7 +4330,7 @@
 ><A
 NAME="XMLXPATHEVALEXPRESSION"
 ></A
->&#62;xmlXPathEvalExpression ()</H3
+>xmlXPathEvalExpression ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4420,7 +4421,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlXPathObjectPtr resulting from the evaluation or NULL.
-        the caller has to free the object.</TD
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4437,7 +4438,7 @@
 ><A
 NAME="XMLXPATHEVALPREDICATE"
 ></A
->&#62;xmlXPathEvalPredicate ()</H3
+>xmlXPathEvalPredicate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4548,7 +4549,7 @@
 ><A
 NAME="XMLXPATHCOMPILE"
 ></A
->&#62;xmlXPathCompile ()</H3
+>xmlXPathCompile ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4618,7 +4619,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlXPathObjectPtr resulting from the evaluation or NULL.
-        the caller has to free the object.</TD
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4635,7 +4636,7 @@
 ><A
 NAME="XMLXPATHCOMPILEDEVAL"
 ></A
->&#62;xmlXPathCompiledEval ()</H3
+>xmlXPathCompiledEval ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4726,7 +4727,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlXPathObjectPtr resulting from the evaluation or NULL.
-        the caller has to free the object.</TD
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4743,7 +4744,7 @@
 ><A
 NAME="XMLXPATHFREECOMPEXPR"
 ></A
->&#62;xmlXPathFreeCompExpr ()</H3
+>xmlXPathFreeCompExpr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 922ce86..0a926d9 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -1510,7 +1510,7 @@
 ><A
 NAME="XMLXPATHSETERROR"
 ></A
->&#62;xmlXPathSetError()</H3
+>xmlXPathSetError()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1592,7 +1592,7 @@
 ><A
 NAME="XMLXPATHSETARITYERROR"
 ></A
->&#62;xmlXPathSetArityError()</H3
+>xmlXPathSetArityError()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1657,7 +1657,7 @@
 ><A
 NAME="XMLXPATHSETTYPEERROR"
 ></A
->&#62;xmlXPathSetTypeError()</H3
+>xmlXPathSetTypeError()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1722,7 +1722,7 @@
 ><A
 NAME="XMLXPATHGETERROR"
 ></A
->&#62;xmlXPathGetError()</H3
+>xmlXPathGetError()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1787,7 +1787,7 @@
 ><A
 NAME="XMLXPATHCHECKERROR"
 ></A
->&#62;xmlXPathCheckError()</H3
+>xmlXPathCheckError()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1852,7 +1852,7 @@
 ><A
 NAME="XMLXPATHGETDOCUMENT"
 ></A
->&#62;xmlXPathGetDocument()</H3
+>xmlXPathGetDocument()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1917,7 +1917,7 @@
 ><A
 NAME="XMLXPATHGETCONTEXTNODE"
 ></A
->&#62;xmlXPathGetContextNode()</H3
+>xmlXPathGetContextNode()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1982,7 +1982,7 @@
 ><A
 NAME="XMLXPATHPOPBOOLEAN"
 ></A
->&#62;xmlXPathPopBoolean ()</H3
+>xmlXPathPopBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2069,7 +2069,7 @@
 ><A
 NAME="XMLXPATHPOPNUMBER"
 ></A
->&#62;xmlXPathPopNumber ()</H3
+>xmlXPathPopNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2159,7 +2159,7 @@
 ><A
 NAME="XMLXPATHPOPSTRING"
 ></A
->&#62;xmlXPathPopString ()</H3
+>xmlXPathPopString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2249,7 +2249,7 @@
 ><A
 NAME="XMLXPATHPOPNODESET"
 ></A
->&#62;xmlXPathPopNodeSet ()</H3
+>xmlXPathPopNodeSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2339,7 +2339,7 @@
 ><A
 NAME="XMLXPATHPOPEXTERNAL"
 ></A
->&#62;xmlXPathPopExternal ()</H3
+>xmlXPathPopExternal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2411,7 +2411,7 @@
 ><A
 NAME="XMLXPATHRETURNBOOLEAN"
 ></A
->&#62;xmlXPathReturnBoolean()</H3
+>xmlXPathReturnBoolean()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2498,7 +2498,7 @@
 ><A
 NAME="XMLXPATHRETURNTRUE"
 ></A
->&#62;xmlXPathReturnTrue()</H3
+>xmlXPathReturnTrue()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2563,7 +2563,7 @@
 ><A
 NAME="XMLXPATHRETURNFALSE"
 ></A
->&#62;xmlXPathReturnFalse()</H3
+>xmlXPathReturnFalse()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2628,7 +2628,7 @@
 ><A
 NAME="XMLXPATHRETURNNUMBER"
 ></A
->&#62;xmlXPathReturnNumber()</H3
+>xmlXPathReturnNumber()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2715,7 +2715,7 @@
 ><A
 NAME="XMLXPATHRETURNSTRING"
 ></A
->&#62;xmlXPathReturnString()</H3
+>xmlXPathReturnString()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2802,7 +2802,7 @@
 ><A
 NAME="XMLXPATHRETURNEMPTYSTRING"
 ></A
->&#62;xmlXPathReturnEmptyString()</H3
+>xmlXPathReturnEmptyString()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2867,7 +2867,7 @@
 ><A
 NAME="XMLXPATHRETURNNODESET"
 ></A
->&#62;xmlXPathReturnNodeSet()</H3
+>xmlXPathReturnNodeSet()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2954,7 +2954,7 @@
 ><A
 NAME="XMLXPATHRETURNEMPTYNODESET"
 ></A
->&#62;xmlXPathReturnEmptyNodeSet()</H3
+>xmlXPathReturnEmptyNodeSet()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3019,7 +3019,7 @@
 ><A
 NAME="XMLXPATHRETURNEXTERNAL"
 ></A
->&#62;xmlXPathReturnExternal()</H3
+>xmlXPathReturnExternal()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3101,7 +3101,7 @@
 ><A
 NAME="XMLXPATHSTACKISNODESET"
 ></A
->&#62;xmlXPathStackIsNodeSet()</H3
+>xmlXPathStackIsNodeSet()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3167,7 +3167,7 @@
 ><A
 NAME="XMLXPATHSTACKISEXTERNAL"
 ></A
->&#62;xmlXPathStackIsExternal()</H3
+>xmlXPathStackIsExternal()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3233,7 +3233,7 @@
 ><A
 NAME="XMLXPATHEMPTYNODESET"
 ></A
->&#62;xmlXPathEmptyNodeSet()</H3
+>xmlXPathEmptyNodeSet()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3298,7 +3298,7 @@
 ><A
 NAME="CHECK-ERROR-CAPS"
 ></A
->&#62;CHECK_ERROR</H3
+>CHECK_ERROR</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3326,7 +3326,7 @@
 ><A
 NAME="CHECK-ERROR0-CAPS"
 ></A
->&#62;CHECK_ERROR0</H3
+>CHECK_ERROR0</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3354,7 +3354,7 @@
 ><A
 NAME="XP-ERROR-CAPS"
 ></A
->&#62;XP_ERROR()</H3
+>XP_ERROR()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3419,7 +3419,7 @@
 ><A
 NAME="XP-ERROR0-CAPS"
 ></A
->&#62;XP_ERROR0()</H3
+>XP_ERROR0()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3484,7 +3484,7 @@
 ><A
 NAME="CHECK-TYPE-CAPS"
 ></A
->&#62;CHECK_TYPE()</H3
+>CHECK_TYPE()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3550,7 +3550,7 @@
 ><A
 NAME="CHECK-TYPE0-CAPS"
 ></A
->&#62;CHECK_TYPE0()</H3
+>CHECK_TYPE0()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3616,7 +3616,7 @@
 ><A
 NAME="CHECK-ARITY-CAPS"
 ></A
->&#62;CHECK_ARITY()</H3
+>CHECK_ARITY()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3681,7 +3681,7 @@
 ><A
 NAME="CAST-TO-STRING-CAPS"
 ></A
->&#62;CAST_TO_STRING</H3
+>CAST_TO_STRING</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3709,7 +3709,7 @@
 ><A
 NAME="CAST-TO-NUMBER-CAPS"
 ></A
->&#62;CAST_TO_NUMBER</H3
+>CAST_TO_NUMBER</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3737,7 +3737,7 @@
 ><A
 NAME="CAST-TO-BOOLEAN-CAPS"
 ></A
->&#62;CAST_TO_BOOLEAN</H3
+>CAST_TO_BOOLEAN</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3765,7 +3765,7 @@
 ><A
 NAME="XMLXPATHVARIABLELOOKUPFUNC"
 ></A
->&#62;xmlXPathVariableLookupFunc ()</H3
+>xmlXPathVariableLookupFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3892,7 +3892,7 @@
 ><A
 NAME="XMLXPATHREGISTERVARIABLELOOKUP"
 ></A
->&#62;xmlXPathRegisterVariableLookup ()</H3
+>xmlXPathRegisterVariableLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -3999,7 +3999,7 @@
 ><A
 NAME="XMLXPATHFUNCLOOKUPFUNC"
 ></A
->&#62;xmlXPathFuncLookupFunc ()</H3
+>xmlXPathFuncLookupFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4125,7 +4125,7 @@
 ><A
 NAME="XMLXPATHREGISTERFUNCLOOKUP"
 ></A
->&#62;xmlXPathRegisterFuncLookup ()</H3
+>xmlXPathRegisterFuncLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4232,7 +4232,7 @@
 ><A
 NAME="XMLXPATHERROR"
 ></A
->&#62;xmlXPatherror ()</H3
+>xmlXPatherror ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4354,7 +4354,7 @@
 ><A
 NAME="XMLXPATHDEBUGDUMPOBJECT"
 ></A
->&#62;xmlXPathDebugDumpObject ()</H3
+>xmlXPathDebugDumpObject ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4461,7 +4461,7 @@
 ><A
 NAME="XMLXPATHDEBUGDUMPCOMPEXPR"
 ></A
->&#62;xmlXPathDebugDumpCompExpr ()</H3
+>xmlXPathDebugDumpCompExpr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4568,7 +4568,7 @@
 ><A
 NAME="XMLXPATHNODESETCONTAINS"
 ></A
->&#62;xmlXPathNodeSetContains ()</H3
+>xmlXPathNodeSetContains ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4692,7 +4692,7 @@
 ><A
 NAME="XMLXPATHDIFFERENCE"
 ></A
->&#62;xmlXPathDifference ()</H3
+>xmlXPathDifference ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4721,7 +4721,7 @@
 HREF="DIFFERENCE"
 >difference</GTKDOCLINK
 >() function:
-   node-set set:difference (node-set, node-set)</P
+node-set set:difference (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -4787,7 +4787,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the difference between the two node sets, or nodes1 if
-        nodes2 is empty</TD
+nodes2 is empty</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4804,7 +4804,7 @@
 ><A
 NAME="XMLXPATHINTERSECTION"
 ></A
->&#62;xmlXPathIntersection ()</H3
+>xmlXPathIntersection ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4833,7 +4833,7 @@
 HREF="INTERSECTION"
 >intersection</GTKDOCLINK
 >() function:
-   node-set set:intersection (node-set, node-set)</P
+node-set set:intersection (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -4899,7 +4899,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >a node set comprising the nodes that are within both the
-        node sets passed as arguments</TD
+node sets passed as arguments</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4916,7 +4916,7 @@
 ><A
 NAME="XMLXPATHDISTINCTSORTED"
 ></A
->&#62;xmlXPathDistinctSorted ()</H3
+>xmlXPathDistinctSorted ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -4941,7 +4941,7 @@
 HREF="DISTINCT"
 >distinct</GTKDOCLINK
 >() function:
-   node-set set:distinct (node-set)</P
+node-set set:distinct (node-set)</P
 ><P
 ></P
 ><DIV
@@ -5000,7 +5000,7 @@
 >nodes</I
 ></TT
 > if
-        it is empty</TD
+it is empty</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5017,7 +5017,7 @@
 ><A
 NAME="XMLXPATHDISTINCT"
 ></A
->&#62;xmlXPathDistinct ()</H3
+>xmlXPathDistinct ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5042,7 +5042,7 @@
 HREF="DISTINCT"
 >distinct</GTKDOCLINK
 >() function:
-   node-set set:distinct (node-set)
+node-set set:distinct (node-set)
 <TT
 CLASS="PARAMETER"
 ><I
@@ -5111,7 +5111,7 @@
 >nodes</I
 ></TT
 > if
-        it is empty</TD
+it is empty</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5128,7 +5128,7 @@
 ><A
 NAME="XMLXPATHHASSAMENODES"
 ></A
->&#62;xmlXPathHasSameNodes ()</H3
+>xmlXPathHasSameNodes ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5151,7 +5151,7 @@
 ></TABLE
 ><P
 >Implements the EXSLT - Sets has-same-nodes function:
-   boolean set:has-same-node(node-set, node-set)</P
+boolean set:has-same-node(node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -5227,7 +5227,7 @@
 >nodes2</I
 ></TT
 >, false (0)
-        otherwise</TD
+otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5244,7 +5244,7 @@
 ><A
 NAME="XMLXPATHNODELEADINGSORTED"
 ></A
->&#62;xmlXPathNodeLeadingSorted ()</H3
+>xmlXPathNodeLeadingSorted ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5273,7 +5273,7 @@
 HREF="LEADING"
 >leading</GTKDOCLINK
 >() function:
-   node-set set:leading (node-set, node-set)</P
+node-set set:leading (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -5349,7 +5349,7 @@
 >node</I
 ></TT
 > in document order,
-        <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >nodes</I
@@ -5365,7 +5365,7 @@
 >nodes</I
 ></TT
 >
-        doesn't contain <TT
+doesn't contain <TT
 CLASS="PARAMETER"
 ><I
 >node</I
@@ -5387,7 +5387,7 @@
 ><A
 NAME="XMLXPATHLEADINGSORTED"
 ></A
->&#62;xmlXPathLeadingSorted ()</H3
+>xmlXPathLeadingSorted ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5416,7 +5416,7 @@
 HREF="LEADING"
 >leading</GTKDOCLINK
 >() function:
-   node-set set:leading (node-set, node-set)</P
+node-set set:leading (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -5492,7 +5492,7 @@
 >nodes2</I
 ></TT
 >
-        in document order, <TT
+in document order, <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -5503,7 +5503,7 @@
 >nodes2</I
 ></TT
 > is NULL or empty or
-        an empty node-set if <TT
+an empty node-set if <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -5530,7 +5530,7 @@
 ><A
 NAME="XMLXPATHNODELEADING"
 ></A
->&#62;xmlXPathNodeLeading ()</H3
+>xmlXPathNodeLeading ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5559,7 +5559,7 @@
 HREF="LEADING"
 >leading</GTKDOCLINK
 >() function:
-   node-set set:leading (node-set, node-set)
+node-set set:leading (node-set, node-set)
 <TT
 CLASS="PARAMETER"
 ><I
@@ -5645,7 +5645,7 @@
 >node</I
 ></TT
 > in document order,
-        <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >nodes</I
@@ -5661,7 +5661,7 @@
 >nodes</I
 ></TT
 >
-        doesn't contain <TT
+doesn't contain <TT
 CLASS="PARAMETER"
 ><I
 >node</I
@@ -5683,7 +5683,7 @@
 ><A
 NAME="XMLXPATHLEADING"
 ></A
->&#62;xmlXPathLeading ()</H3
+>xmlXPathLeading ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5712,7 +5712,7 @@
 HREF="LEADING"
 >leading</GTKDOCLINK
 >() function:
-   node-set set:leading (node-set, node-set)
+node-set set:leading (node-set, node-set)
 <TT
 CLASS="PARAMETER"
 ><I
@@ -5803,7 +5803,7 @@
 >nodes2</I
 ></TT
 >
-        in document order, <TT
+in document order, <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -5814,7 +5814,7 @@
 >nodes2</I
 ></TT
 > is NULL or empty or
-        an empty node-set if <TT
+an empty node-set if <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -5841,7 +5841,7 @@
 ><A
 NAME="XMLXPATHNODETRAILINGSORTED"
 ></A
->&#62;xmlXPathNodeTrailingSorted ()</H3
+>xmlXPathNodeTrailingSorted ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -5870,7 +5870,7 @@
 HREF="TRAILING"
 >trailing</GTKDOCLINK
 >() function:
-   node-set set:trailing (node-set, node-set)</P
+node-set set:trailing (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -5946,7 +5946,7 @@
 >node</I
 ></TT
 > in document order,
-        <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >nodes</I
@@ -5962,7 +5962,7 @@
 >nodes</I
 ></TT
 >
-        doesn't contain <TT
+doesn't contain <TT
 CLASS="PARAMETER"
 ><I
 >node</I
@@ -5984,7 +5984,7 @@
 ><A
 NAME="XMLXPATHTRAILINGSORTED"
 ></A
->&#62;xmlXPathTrailingSorted ()</H3
+>xmlXPathTrailingSorted ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6013,7 +6013,7 @@
 HREF="TRAILING"
 >trailing</GTKDOCLINK
 >() function:
-   node-set set:trailing (node-set, node-set)</P
+node-set set:trailing (node-set, node-set)</P
 ><P
 ></P
 ><DIV
@@ -6089,7 +6089,7 @@
 >nodes2</I
 ></TT
 >
-        in document order, <TT
+in document order, <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -6100,7 +6100,7 @@
 >nodes2</I
 ></TT
 > is NULL or empty or
-        an empty node-set if <TT
+an empty node-set if <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -6127,7 +6127,7 @@
 ><A
 NAME="XMLXPATHNODETRAILING"
 ></A
->&#62;xmlXPathNodeTrailing ()</H3
+>xmlXPathNodeTrailing ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6156,7 +6156,7 @@
 HREF="TRAILING"
 >trailing</GTKDOCLINK
 >() function:
-   node-set set:trailing (node-set, node-set)
+node-set set:trailing (node-set, node-set)
 <TT
 CLASS="PARAMETER"
 ><I
@@ -6242,7 +6242,7 @@
 >node</I
 ></TT
 > in document order,
-        <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >nodes</I
@@ -6258,7 +6258,7 @@
 >nodes</I
 ></TT
 >
-        doesn't contain <TT
+doesn't contain <TT
 CLASS="PARAMETER"
 ><I
 >node</I
@@ -6280,7 +6280,7 @@
 ><A
 NAME="XMLXPATHTRAILING"
 ></A
->&#62;xmlXPathTrailing ()</H3
+>xmlXPathTrailing ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6309,7 +6309,7 @@
 HREF="TRAILING"
 >trailing</GTKDOCLINK
 >() function:
-   node-set set:trailing (node-set, node-set)
+node-set set:trailing (node-set, node-set)
 <TT
 CLASS="PARAMETER"
 ><I
@@ -6400,7 +6400,7 @@
 >nodes2</I
 ></TT
 >
-        in document order, <TT
+in document order, <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -6411,7 +6411,7 @@
 >nodes2</I
 ></TT
 > is NULL or empty or
-        an empty node-set if <TT
+an empty node-set if <TT
 CLASS="PARAMETER"
 ><I
 >nodes1</I
@@ -6438,7 +6438,7 @@
 ><A
 NAME="XMLXPATHREGISTERNS"
 ></A
->&#62;xmlXPathRegisterNs ()</H3
+>xmlXPathRegisterNs ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6569,7 +6569,7 @@
 ><A
 NAME="XMLXPATHNSLOOKUP"
 ></A
->&#62;xmlXPathNsLookup ()</H3
+>xmlXPathNsLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6677,7 +6677,7 @@
 ><A
 NAME="XMLXPATHREGISTEREDNSCLEANUP"
 ></A
->&#62;xmlXPathRegisteredNsCleanup ()</H3
+>xmlXPathRegisteredNsCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6745,7 +6745,7 @@
 ><A
 NAME="XMLXPATHREGISTERFUNC"
 ></A
->&#62;xmlXPathRegisterFunc ()</H3
+>xmlXPathRegisterFunc ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -6875,7 +6875,7 @@
 ><A
 NAME="XMLXPATHREGISTERFUNCNS"
 ></A
->&#62;xmlXPathRegisterFuncNS ()</H3
+>xmlXPathRegisterFuncNS ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7026,7 +7026,7 @@
 ><A
 NAME="XMLXPATHREGISTERVARIABLE"
 ></A
->&#62;xmlXPathRegisterVariable ()</H3
+>xmlXPathRegisterVariable ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7157,7 +7157,7 @@
 ><A
 NAME="XMLXPATHREGISTERVARIABLENS"
 ></A
->&#62;xmlXPathRegisterVariableNS ()</H3
+>xmlXPathRegisterVariableNS ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7309,7 +7309,7 @@
 ><A
 NAME="XMLXPATHFUNCTIONLOOKUP"
 ></A
->&#62;xmlXPathFunctionLookup ()</H3
+>xmlXPathFunctionLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7417,7 +7417,7 @@
 ><A
 NAME="XMLXPATHFUNCTIONLOOKUPNS"
 ></A
->&#62;xmlXPathFunctionLookupNS ()</H3
+>xmlXPathFunctionLookupNS ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7546,7 +7546,7 @@
 ><A
 NAME="XMLXPATHREGISTEREDFUNCSCLEANUP"
 ></A
->&#62;xmlXPathRegisteredFuncsCleanup ()</H3
+>xmlXPathRegisteredFuncsCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7614,7 +7614,7 @@
 ><A
 NAME="XMLXPATHVARIABLELOOKUP"
 ></A
->&#62;xmlXPathVariableLookup ()</H3
+>xmlXPathVariableLookup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7722,7 +7722,7 @@
 ><A
 NAME="XMLXPATHVARIABLELOOKUPNS"
 ></A
->&#62;xmlXPathVariableLookupNS ()</H3
+>xmlXPathVariableLookupNS ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7851,7 +7851,7 @@
 ><A
 NAME="XMLXPATHREGISTEREDVARIABLESCLEANUP"
 ></A
->&#62;xmlXPathRegisteredVariablesCleanup ()</H3
+>xmlXPathRegisteredVariablesCleanup ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -7920,7 +7920,7 @@
 ><A
 NAME="XMLXPATHNEWPARSERCONTEXT"
 ></A
->&#62;xmlXPathNewParserContext ()</H3
+>xmlXPathNewParserContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8028,7 +8028,7 @@
 ><A
 NAME="XMLXPATHFREEPARSERCONTEXT"
 ></A
->&#62;xmlXPathFreeParserContext ()</H3
+>xmlXPathFreeParserContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8096,7 +8096,7 @@
 ><A
 NAME="VALUEPOP"
 ></A
->&#62;valuePop ()</H3
+>valuePop ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8182,7 +8182,7 @@
 ><A
 NAME="VALUEPUSH"
 ></A
->&#62;valuePush ()</H3
+>valuePush ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8286,7 +8286,7 @@
 ><A
 NAME="XMLXPATHNEWSTRING"
 ></A
->&#62;xmlXPathNewString ()</H3
+>xmlXPathNewString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8377,7 +8377,7 @@
 ><A
 NAME="XMLXPATHNEWCSTRING"
 ></A
->&#62;xmlXPathNewCString ()</H3
+>xmlXPathNewCString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8465,7 +8465,7 @@
 ><A
 NAME="XMLXPATHWRAPSTRING"
 ></A
->&#62;xmlXPathWrapString ()</H3
+>xmlXPathWrapString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8556,7 +8556,7 @@
 ><A
 NAME="XMLXPATHWRAPCSTRING"
 ></A
->&#62;xmlXPathWrapCString ()</H3
+>xmlXPathWrapCString ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8639,7 +8639,7 @@
 ><A
 NAME="XMLXPATHNEWFLOAT"
 ></A
->&#62;xmlXPathNewFloat ()</H3
+>xmlXPathNewFloat ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8730,7 +8730,7 @@
 ><A
 NAME="XMLXPATHNEWBOOLEAN"
 ></A
->&#62;xmlXPathNewBoolean ()</H3
+>xmlXPathNewBoolean ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8818,7 +8818,7 @@
 ><A
 NAME="XMLXPATHNEWNODESET"
 ></A
->&#62;xmlXPathNewNodeSet ()</H3
+>xmlXPathNewNodeSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -8910,7 +8910,7 @@
 ><A
 NAME="XMLXPATHNEWVALUETREE"
 ></A
->&#62;xmlXPathNewValueTree ()</H3
+>xmlXPathNewValueTree ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9002,7 +9002,7 @@
 ><A
 NAME="XMLXPATHNODESETADD"
 ></A
->&#62;xmlXPathNodeSetAdd ()</H3
+>xmlXPathNodeSetAdd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9091,7 +9091,7 @@
 ><A
 NAME="XMLXPATHNODESETADDUNIQUE"
 ></A
->&#62;xmlXPathNodeSetAddUnique ()</H3
+>xmlXPathNodeSetAddUnique ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9181,7 +9181,7 @@
 ><A
 NAME="XMLXPATHNODESETSORT"
 ></A
->&#62;xmlXPathNodeSetSort ()</H3
+>xmlXPathNodeSetSort ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9249,7 +9249,7 @@
 ><A
 NAME="XMLXPATHROOT"
 ></A
->&#62;xmlXPathRoot ()</H3
+>xmlXPathRoot ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9317,7 +9317,7 @@
 ><A
 NAME="XMLXPATHEVALEXPR"
 ></A
->&#62;xmlXPathEvalExpr ()</H3
+>xmlXPathEvalExpr ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9386,7 +9386,7 @@
 ><A
 NAME="XMLXPATHPARSENAME"
 ></A
->&#62;xmlXPathParseName ()</H3
+>xmlXPathParseName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9410,7 +9410,7 @@
 >parse an XML name</P
 ><P
 >[4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |
-                 CombiningChar | Extender</P
+CombiningChar | Extender</P
 ><P
 >[5] Name ::= (Letter | '_' | ':') (NameChar)*</P
 ><P
@@ -9477,7 +9477,7 @@
 ><A
 NAME="XMLXPATHPARSENCNAME"
 ></A
->&#62;xmlXPathParseNCName ()</H3
+>xmlXPathParseNCName ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9503,7 +9503,7 @@
 >[NS 3] NCName ::= (Letter | '_') (NCNameChar)*</P
 ><P
 >[NS 4] NCNameChar ::= Letter | Digit | '.' | '-' | '_' |
-                      CombiningChar | Extender</P
+CombiningChar | Extender</P
 ><P
 ></P
 ><DIV
@@ -9568,7 +9568,7 @@
 ><A
 NAME="XMLXPATHSTRINGEVALNUMBER"
 ></A
->&#62;xmlXPathStringEvalNumber ()</H3
+>xmlXPathStringEvalNumber ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9591,9 +9591,9 @@
 ><P
 >[30a]  Float  ::= Number ('e' Digits?)?</P
 ><P
-> [30]   Number ::=   Digits ('.' Digits?)?
-                   | '.' Digits 
- [31]   Digits ::=   [0-9]+</P
+>[30]   Number ::=   Digits ('.' Digits?)?
+| '.' Digits 
+[31]   Digits ::=   [0-9]+</P
 ><P
 >Compile a Number in the string
 In complement of the Number expression, this function also handles
@@ -9662,7 +9662,7 @@
 ><A
 NAME="XMLXPATHEVALUATEPREDICATERESULT"
 ></A
->&#62;xmlXPathEvaluatePredicateResult ()</H3
+>xmlXPathEvaluatePredicateResult ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9773,7 +9773,7 @@
 ><A
 NAME="XMLXPATHREGISTERALLFUNCTIONS"
 ></A
->&#62;xmlXPathRegisterAllFunctions ()</H3
+>xmlXPathRegisterAllFunctions ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9841,7 +9841,7 @@
 ><A
 NAME="XMLXPATHNODESETMERGE"
 ></A
->&#62;xmlXPathNodeSetMerge ()</H3
+>xmlXPathNodeSetMerge ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -9974,7 +9974,7 @@
 ><A
 NAME="XMLXPATHNODESETDEL"
 ></A
->&#62;xmlXPathNodeSetDel ()</H3
+>xmlXPathNodeSetDel ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10063,7 +10063,7 @@
 ><A
 NAME="XMLXPATHNODESETREMOVE"
 ></A
->&#62;xmlXPathNodeSetRemove ()</H3
+>xmlXPathNodeSetRemove ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10149,7 +10149,7 @@
 ><A
 NAME="XMLXPATHNEWNODESETLIST"
 ></A
->&#62;xmlXPathNewNodeSetList ()</H3
+>xmlXPathNewNodeSetList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10241,7 +10241,7 @@
 ><A
 NAME="XMLXPATHWRAPNODESET"
 ></A
->&#62;xmlXPathWrapNodeSet ()</H3
+>xmlXPathWrapNodeSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10332,7 +10332,7 @@
 ><A
 NAME="XMLXPATHWRAPEXTERNAL"
 ></A
->&#62;xmlXPathWrapExternal ()</H3
+>xmlXPathWrapExternal ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10420,7 +10420,7 @@
 ><A
 NAME="XMLXPATHEQUALVALUES"
 ></A
->&#62;xmlXPathEqualValues ()</H3
+>xmlXPathEqualValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10513,7 +10513,7 @@
 ><A
 NAME="XMLXPATHCOMPAREVALUES"
 ></A
->&#62;xmlXPathCompareValues ()</H3
+>xmlXPathCompareValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10534,7 +10534,7 @@
 ></TABLE
 ><P
 >Implement the compare operation on XPath objects: 
-    <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >arg1</I
@@ -10545,7 +10545,7 @@
 >arg2</I
 ></TT
 >    (1, 1, ...
-    <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >arg1</I
@@ -10556,7 +10556,7 @@
 >arg2</I
 ></TT
 >   (1, 0, ...
-    <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >arg1</I
@@ -10567,7 +10567,7 @@
 >arg2</I
 ></TT
 >    (0, 1, ...
-    <TT
+<TT
 CLASS="PARAMETER"
 ><I
 >arg1</I
@@ -10686,7 +10686,7 @@
 ><A
 NAME="XMLXPATHVALUEFLIPSIGN"
 ></A
->&#62;xmlXPathValueFlipSign ()</H3
+>xmlXPathValueFlipSign ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10756,7 +10756,7 @@
 ><A
 NAME="XMLXPATHADDVALUES"
 ></A
->&#62;xmlXPathAddValues ()</H3
+>xmlXPathAddValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10826,7 +10826,7 @@
 ><A
 NAME="XMLXPATHSUBVALUES"
 ></A
->&#62;xmlXPathSubValues ()</H3
+>xmlXPathSubValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10896,7 +10896,7 @@
 ><A
 NAME="XMLXPATHMULTVALUES"
 ></A
->&#62;xmlXPathMultValues ()</H3
+>xmlXPathMultValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -10966,7 +10966,7 @@
 ><A
 NAME="XMLXPATHDIVVALUES"
 ></A
->&#62;xmlXPathDivValues ()</H3
+>xmlXPathDivValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11046,7 +11046,7 @@
 ><A
 NAME="XMLXPATHMODVALUES"
 ></A
->&#62;xmlXPathModValues ()</H3
+>xmlXPathModValues ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11126,7 +11126,7 @@
 ><A
 NAME="XMLXPATHISNODETYPE"
 ></A
->&#62;xmlXPathIsNodeType ()</H3
+>xmlXPathIsNodeType ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11146,10 +11146,10 @@
 ><P
 >Is the name given a NodeType one.</P
 ><P
-> [38]   NodeType ::=   'comment'
-                   | 'text'
-                   | 'processing-instruction'
-                   | 'node'</P
+>[38]   NodeType ::=   'comment'
+| 'text'
+| 'processing-instruction'
+| 'node'</P
 ><P
 ></P
 ><DIV
@@ -11214,7 +11214,7 @@
 ><A
 NAME="XMLXPATHNEXTSELF"
 ></A
->&#62;xmlXPathNextSelf ()</H3
+>xmlXPathNextSelf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11322,7 +11322,7 @@
 ><A
 NAME="XMLXPATHNEXTCHILD"
 ></A
->&#62;xmlXPathNextChild ()</H3
+>xmlXPathNextChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11430,7 +11430,7 @@
 ><A
 NAME="XMLXPATHNEXTDESCENDANT"
 ></A
->&#62;xmlXPathNextDescendant ()</H3
+>xmlXPathNextDescendant ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11539,7 +11539,7 @@
 ><A
 NAME="XMLXPATHNEXTDESCENDANTORSELF"
 ></A
->&#62;xmlXPathNextDescendantOrSelf ()</H3
+>xmlXPathNextDescendantOrSelf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11650,7 +11650,7 @@
 ><A
 NAME="XMLXPATHNEXTPARENT"
 ></A
->&#62;xmlXPathNextParent ()</H3
+>xmlXPathNextParent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11758,7 +11758,7 @@
 ><A
 NAME="XMLXPATHNEXTANCESTORORSELF"
 ></A
->&#62;xmlXPathNextAncestorOrSelf ()</H3
+>xmlXPathNextAncestorOrSelf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11869,7 +11869,7 @@
 ><A
 NAME="XMLXPATHNEXTFOLLOWINGSIBLING"
 ></A
->&#62;xmlXPathNextFollowingSibling ()</H3
+>xmlXPathNextFollowingSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -11978,7 +11978,7 @@
 ><A
 NAME="XMLXPATHNEXTFOLLOWING"
 ></A
->&#62;xmlXPathNextFollowing ()</H3
+>xmlXPathNextFollowing ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12089,7 +12089,7 @@
 ><A
 NAME="XMLXPATHNEXTNAMESPACE"
 ></A
->&#62;xmlXPathNextNamespace ()</H3
+>xmlXPathNextNamespace ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12201,7 +12201,7 @@
 ><A
 NAME="XMLXPATHNEXTATTRIBUTE"
 ></A
->&#62;xmlXPathNextAttribute ()</H3
+>xmlXPathNextAttribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12309,7 +12309,7 @@
 ><A
 NAME="XMLXPATHNEXTPRECEDING"
 ></A
->&#62;xmlXPathNextPreceding ()</H3
+>xmlXPathNextPreceding ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12420,7 +12420,7 @@
 ><A
 NAME="XMLXPATHNEXTANCESTOR"
 ></A
->&#62;xmlXPathNextAncestor ()</H3
+>xmlXPathNextAncestor ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12532,7 +12532,7 @@
 ><A
 NAME="XMLXPATHNEXTPRECEDINGSIBLING"
 ></A
->&#62;xmlXPathNextPrecedingSibling ()</H3
+>xmlXPathNextPrecedingSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12642,7 +12642,7 @@
 ><A
 NAME="XMLXPATHLASTFUNCTION"
 ></A
->&#62;xmlXPathLastFunction ()</H3
+>xmlXPathLastFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12665,7 +12665,7 @@
 HREF="LAST"
 >last</GTKDOCLINK
 >() XPath function
-   number <GTKDOCLINK
+number <GTKDOCLINK
 HREF="LAST"
 >last</GTKDOCLINK
 >()
@@ -12736,7 +12736,7 @@
 ><A
 NAME="XMLXPATHPOSITIONFUNCTION"
 ></A
->&#62;xmlXPathPositionFunction ()</H3
+>xmlXPathPositionFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12759,7 +12759,7 @@
 HREF="POSITION"
 >position</GTKDOCLINK
 >() XPath function
-   number <GTKDOCLINK
+number <GTKDOCLINK
 HREF="POSITION"
 >position</GTKDOCLINK
 >()
@@ -12835,7 +12835,7 @@
 ><A
 NAME="XMLXPATHCOUNTFUNCTION"
 ></A
->&#62;xmlXPathCountFunction ()</H3
+>xmlXPathCountFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12858,7 +12858,7 @@
 HREF="COUNT"
 >count</GTKDOCLINK
 >() XPath function
-   number count(node-set)</P
+number count(node-set)</P
 ><P
 ></P
 ><DIV
@@ -12925,7 +12925,7 @@
 ><A
 NAME="XMLXPATHIDFUNCTION"
 ></A
->&#62;xmlXPathIdFunction ()</H3
+>xmlXPathIdFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12948,7 +12948,7 @@
 HREF="ID"
 >id</GTKDOCLINK
 >() XPath function
-   node-set id(object)
+node-set id(object)
 The id function selects elements by their unique ID
 (see [5.2.1 Unique IDs]). When the argument to id is of type node-set,
 then the result is the union of the result of applying id to the
@@ -13025,7 +13025,7 @@
 ><A
 NAME="XMLXPATHLOCALNAMEFUNCTION"
 ></A
->&#62;xmlXPathLocalNameFunction ()</H3
+>xmlXPathLocalNameFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13048,7 +13048,7 @@
 HREF="NAME"
 >name</GTKDOCLINK
 >() XPath function
-   string local-name(node-set?)
+string local-name(node-set?)
 The local-name function returns a string containing the local part
 of the name of the node in the argument node-set that is first in
 document order. If the node-set is empty or the first node has no
@@ -13120,7 +13120,7 @@
 ><A
 NAME="XMLXPATHNAMESPACEURIFUNCTION"
 ></A
->&#62;xmlXPathNamespaceURIFunction ()</H3
+>xmlXPathNamespaceURIFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13143,7 +13143,7 @@
 HREF="URI"
 >uri</GTKDOCLINK
 >() XPath function
-   string namespace-uri(node-set?)
+string namespace-uri(node-set?)
 The namespace-uri function returns a string containing the
 namespace URI of the expanded name of the node in the argument
 node-set that is first in document order. If the node-set is empty,
@@ -13216,7 +13216,7 @@
 ><A
 NAME="XMLXPATHSTRINGFUNCTION"
 ></A
->&#62;xmlXPathStringFunction ()</H3
+>xmlXPathStringFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13239,32 +13239,32 @@
 HREF="STRING"
 >string</GTKDOCLINK
 >() XPath function
-   string string(object?)
+string string(object?)
 he string function converts an object to a string as follows:
-   - A node-set is converted to a string by returning the value of
-     the node in the node-set that is first in document order.
-     If the node-set is empty, an empty string is returned.
-   - A number is converted to a string as follows
-     + NaN is converted to the string NaN 
-     + positive zero is converted to the string 0 
-     + negative zero is converted to the string 0 
-     + positive infinity is converted to the string Infinity 
-     + negative infinity is converted to the string -Infinity 
-     + if the number is an integer, the number is represented in
-       decimal form as a Number with no decimal point and no leading
-       zeros, preceded by a minus sign (-) if the number is negative
-     + otherwise, the number is represented in decimal form as a
-       Number including a decimal point with at least one digit
-       before the decimal point and at least one digit after the
-       decimal point, preceded by a minus sign (-) if the number
-       is negative; there must be no leading zeros before the decimal
-       point apart possibly from the one required digit immediately
-       before the decimal point; beyond the one required digit
-       after the decimal point there must be as many, but only as
-       many, more digits as are needed to uniquely distinguish the
-       number from all other IEEE 754 numeric values.
-   - The boolean false value is converted to the string false.
-     The boolean true value is converted to the string true.</P
+- A node-set is converted to a string by returning the value of
+the node in the node-set that is first in document order.
+If the node-set is empty, an empty string is returned.
+- A number is converted to a string as follows
++ NaN is converted to the string NaN 
++ positive zero is converted to the string 0 
++ negative zero is converted to the string 0 
++ positive infinity is converted to the string Infinity 
++ negative infinity is converted to the string -Infinity 
++ if the number is an integer, the number is represented in
+decimal form as a Number with no decimal point and no leading
+zeros, preceded by a minus sign (-) if the number is negative
++ otherwise, the number is represented in decimal form as a
+Number including a decimal point with at least one digit
+before the decimal point and at least one digit after the
+decimal point, preceded by a minus sign (-) if the number
+is negative; there must be no leading zeros before the decimal
+point apart possibly from the one required digit immediately
+before the decimal point; beyond the one required digit
+after the decimal point there must be as many, but only as
+many, more digits as are needed to uniquely distinguish the
+number from all other IEEE 754 numeric values.
+- The boolean false value is converted to the string false.
+The boolean true value is converted to the string true.</P
 ><P
 >If the argument is omitted, it defaults to a node-set with the
 context node as its only member.</P
@@ -13334,7 +13334,7 @@
 ><A
 NAME="XMLXPATHSTRINGLENGTHFUNCTION"
 ></A
->&#62;xmlXPathStringLengthFunction ()</H3
+>xmlXPathStringLengthFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13357,7 +13357,7 @@
 HREF="LENGTH"
 >length</GTKDOCLINK
 >() XPath function
-   number string-length(string?)
+number string-length(string?)
 The string-length returns the number of characters in the string
 (see [3.6 Strings]). If the argument is omitted, it defaults to
 the context node converted to a string, in other words the value
@@ -13428,7 +13428,7 @@
 ><A
 NAME="XMLXPATHCONCATFUNCTION"
 ></A
->&#62;xmlXPathConcatFunction ()</H3
+>xmlXPathConcatFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13451,7 +13451,7 @@
 HREF="CONCAT"
 >concat</GTKDOCLINK
 >() XPath function
-   string concat(string, string, string*)
+string concat(string, string, string*)
 The concat function returns the concatenation of its arguments.</P
 ><P
 ></P
@@ -13519,7 +13519,7 @@
 ><A
 NAME="XMLXPATHCONTAINSFUNCTION"
 ></A
->&#62;xmlXPathContainsFunction ()</H3
+>xmlXPathContainsFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13542,7 +13542,7 @@
 HREF="CONTAINS"
 >contains</GTKDOCLINK
 >() XPath function
-   boolean contains(string, string)
+boolean contains(string, string)
 The contains function returns true if the first argument string
 contains the second argument string, and otherwise returns false.</P
 ><P
@@ -13611,7 +13611,7 @@
 ><A
 NAME="XMLXPATHSTARTSWITHFUNCTION"
 ></A
->&#62;xmlXPathStartsWithFunction ()</H3
+>xmlXPathStartsWithFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13634,7 +13634,7 @@
 HREF="WITH"
 >with</GTKDOCLINK
 >() XPath function
-   boolean starts-with(string, string)
+boolean starts-with(string, string)
 The starts-with function returns true if the first argument string
 starts with the second argument string, and otherwise returns false.</P
 ><P
@@ -13703,7 +13703,7 @@
 ><A
 NAME="XMLXPATHSUBSTRINGFUNCTION"
 ></A
->&#62;xmlXPathSubstringFunction ()</H3
+>xmlXPathSubstringFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13726,7 +13726,7 @@
 HREF="SUBSTRING"
 >substring</GTKDOCLINK
 >() XPath function
-   string substring(string, number, number?)
+string substring(string, number, number?)
 The substring function returns the substring of the first argument
 starting at the position specified in the second argument with
 length specified in the third argument. For example,
@@ -13741,12 +13741,12 @@
 or equal to the second argument and, if the third argument is specified,
 less than the sum of the second and third arguments; the comparisons
 and addition used for the above follow the standard IEEE 754 rules. Thus:
- - substring("12345", 1.5, 2.6) returns "234" 
- - substring("12345", 0, 3) returns "12" 
- - substring("12345", 0 div 0, 3) returns "" 
- - substring("12345", 1, 0 div 0) returns "" 
- - substring("12345", -42, 1 div 0) returns "12345" 
- - substring("12345", -1 div 0, 1 div 0) returns ""</P
+- substring("12345", 1.5, 2.6) returns "234" 
+- substring("12345", 0, 3) returns "12" 
+- substring("12345", 0 div 0, 3) returns "" 
+- substring("12345", 1, 0 div 0) returns "" 
+- substring("12345", -42, 1 div 0) returns "12345" 
+- substring("12345", -1 div 0, 1 div 0) returns ""</P
 ><P
 ></P
 ><DIV
@@ -13813,7 +13813,7 @@
 ><A
 NAME="XMLXPATHSUBSTRINGBEFOREFUNCTION"
 ></A
->&#62;xmlXPathSubstringBeforeFunction ()</H3
+>xmlXPathSubstringBeforeFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13836,7 +13836,7 @@
 HREF="BEFORE"
 >before</GTKDOCLINK
 >() XPath function
-   string substring-before(string, string)
+string substring-before(string, string)
 The substring-before function returns the substring of the first
 argument string that precedes the first occurrence of the second
 argument string in the first argument string, or the empty string
@@ -13908,7 +13908,7 @@
 ><A
 NAME="XMLXPATHSUBSTRINGAFTERFUNCTION"
 ></A
->&#62;xmlXPathSubstringAfterFunction ()</H3
+>xmlXPathSubstringAfterFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13931,7 +13931,7 @@
 HREF="AFTER"
 >after</GTKDOCLINK
 >() XPath function
-   string substring-after(string, string)
+string substring-after(string, string)
 The substring-after function returns the substring of the first
 argument string that follows the first occurrence of the second
 argument string in the first argument string, or the empty stringi
@@ -14004,7 +14004,7 @@
 ><A
 NAME="XMLXPATHNORMALIZEFUNCTION"
 ></A
->&#62;xmlXPathNormalizeFunction ()</H3
+>xmlXPathNormalizeFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14027,7 +14027,7 @@
 HREF="SPACE"
 >space</GTKDOCLINK
 >() XPath function
-   string normalize-space(string?)
+string normalize-space(string?)
 The normalize-space function returns the argument string with white
 space normalized by stripping leading and trailing whitespace
 and replacing sequences of whitespace characters by a single
@@ -14100,7 +14100,7 @@
 ><A
 NAME="XMLXPATHTRANSLATEFUNCTION"
 ></A
->&#62;xmlXPathTranslateFunction ()</H3
+>xmlXPathTranslateFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14123,7 +14123,7 @@
 HREF="TRANSLATE"
 >translate</GTKDOCLINK
 >() XPath function
-   string translate(string, string, string)
+string translate(string, string, string)
 The translate function returns the first argument string with
 occurrences of characters in the second argument string replaced
 by the character at the corresponding position in the third argument
@@ -14199,7 +14199,7 @@
 ><A
 NAME="XMLXPATHNOTFUNCTION"
 ></A
->&#62;xmlXPathNotFunction ()</H3
+>xmlXPathNotFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14222,7 +14222,7 @@
 HREF="NOT"
 >not</GTKDOCLINK
 >() XPath function
-   boolean not(boolean)
+boolean not(boolean)
 The not function returns true if its argument is false,
 and false otherwise.</P
 ><P
@@ -14291,7 +14291,7 @@
 ><A
 NAME="XMLXPATHTRUEFUNCTION"
 ></A
->&#62;xmlXPathTrueFunction ()</H3
+>xmlXPathTrueFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14314,7 +14314,7 @@
 HREF="TRUE"
 >true</GTKDOCLINK
 >() XPath function
-   boolean <GTKDOCLINK
+boolean <GTKDOCLINK
 HREF="TRUE"
 >true</GTKDOCLINK
 >()</P
@@ -14384,7 +14384,7 @@
 ><A
 NAME="XMLXPATHFALSEFUNCTION"
 ></A
->&#62;xmlXPathFalseFunction ()</H3
+>xmlXPathFalseFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14407,7 +14407,7 @@
 HREF="FALSE"
 >false</GTKDOCLINK
 >() XPath function
-   boolean <GTKDOCLINK
+boolean <GTKDOCLINK
 HREF="FALSE"
 >false</GTKDOCLINK
 >()</P
@@ -14477,7 +14477,7 @@
 ><A
 NAME="XMLXPATHLANGFUNCTION"
 ></A
->&#62;xmlXPathLangFunction ()</H3
+>xmlXPathLangFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14500,7 +14500,7 @@
 HREF="LANG"
 >lang</GTKDOCLINK
 >() XPath function
-   boolean lang(string)
+boolean lang(string)
 The lang function returns true or false depending on whether the
 language of the context node as specified by xml:lang attributes
 is the same as or is a sublanguage of the language specified by
@@ -14575,7 +14575,7 @@
 ><A
 NAME="XMLXPATHNUMBERFUNCTION"
 ></A
->&#62;xmlXPathNumberFunction ()</H3
+>xmlXPathNumberFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14598,7 +14598,7 @@
 HREF="NUMBER"
 >number</GTKDOCLINK
 >() XPath function
-   number number(object?)</P
+number number(object?)</P
 ><P
 ></P
 ><DIV
@@ -14665,7 +14665,7 @@
 ><A
 NAME="XMLXPATHSUMFUNCTION"
 ></A
->&#62;xmlXPathSumFunction ()</H3
+>xmlXPathSumFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14688,7 +14688,7 @@
 HREF="SUM"
 >sum</GTKDOCLINK
 >() XPath function
-   number sum(node-set)
+number sum(node-set)
 The sum function returns the sum of the values of the nodes in
 the argument node-set.</P
 ><P
@@ -14757,7 +14757,7 @@
 ><A
 NAME="XMLXPATHFLOORFUNCTION"
 ></A
->&#62;xmlXPathFloorFunction ()</H3
+>xmlXPathFloorFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14780,7 +14780,7 @@
 HREF="FLOOR"
 >floor</GTKDOCLINK
 >() XPath function
-   number floor(number)
+number floor(number)
 The floor function returns the largest (closest to positive infinity)
 number that is not greater than the argument and that is an integer.</P
 ><P
@@ -14849,7 +14849,7 @@
 ><A
 NAME="XMLXPATHCEILINGFUNCTION"
 ></A
->&#62;xmlXPathCeilingFunction ()</H3
+>xmlXPathCeilingFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14872,7 +14872,7 @@
 HREF="CEILING"
 >ceiling</GTKDOCLINK
 >() XPath function
-   number ceiling(number)
+number ceiling(number)
 The ceiling function returns the smallest (closest to negative infinity)
 number that is not less than the argument and that is an integer.</P
 ><P
@@ -14941,7 +14941,7 @@
 ><A
 NAME="XMLXPATHROUNDFUNCTION"
 ></A
->&#62;xmlXPathRoundFunction ()</H3
+>xmlXPathRoundFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -14964,7 +14964,7 @@
 HREF="ROUND"
 >round</GTKDOCLINK
 >() XPath function
-   number round(number)
+number round(number)
 The round function returns the number that is closest to the
 argument and that is an integer. If there are two such numbers,
 then the one that is even is returned.</P
@@ -15034,7 +15034,7 @@
 ><A
 NAME="XMLXPATHBOOLEANFUNCTION"
 ></A
->&#62;xmlXPathBooleanFunction ()</H3
+>xmlXPathBooleanFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -15057,12 +15057,12 @@
 HREF="BOOLEAN"
 >boolean</GTKDOCLINK
 >() XPath function
-   boolean boolean(object)
+boolean boolean(object)
 he boolean function converts its argument to a boolean as follows:
-   - a number is true if and only if it is neither positive or
-     negative zero nor NaN
-   - a node-set is true if and only if it is non-empty
-   - a string is true if and only if its length is non-zero</P
+- a number is true if and only if it is neither positive or
+negative zero nor NaN
+- a node-set is true if and only if it is non-empty
+- a string is true if and only if its length is non-zero</P
 ><P
 ></P
 ><DIV
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index f024945..82843e4 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -434,7 +434,7 @@
 ><A
 NAME="XMLLOCATIONSET"
 ></A
->&#62;struct xmlLocationSet</H3
+>struct xmlLocationSet</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -464,7 +464,7 @@
 ><A
 NAME="XMLLOCATIONSETPTR"
 ></A
->&#62;xmlLocationSetPtr</H3
+>xmlLocationSetPtr</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -490,7 +490,7 @@
 ><A
 NAME="XMLXPTRLOCATIONSETCREATE"
 ></A
->&#62;xmlXPtrLocationSetCreate ()</H3
+>xmlXPtrLocationSetCreate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -581,7 +581,7 @@
 ><A
 NAME="XMLXPTRFREELOCATIONSET"
 ></A
->&#62;xmlXPtrFreeLocationSet ()</H3
+>xmlXPtrFreeLocationSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -649,7 +649,7 @@
 ><A
 NAME="XMLXPTRLOCATIONSETMERGE"
 ></A
->&#62;xmlXPtrLocationSetMerge ()</H3
+>xmlXPtrLocationSetMerge ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -766,7 +766,7 @@
 ><A
 NAME="XMLXPTRNEWRANGE"
 ></A
->&#62;xmlXPtrNewRange ()</H3
+>xmlXPtrNewRange ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -909,7 +909,7 @@
 ><A
 NAME="XMLXPTRNEWRANGEPOINTS"
 ></A
->&#62;xmlXPtrNewRangePoints ()</H3
+>xmlXPtrNewRangePoints ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1016,7 +1016,7 @@
 ><A
 NAME="XMLXPTRNEWRANGENODEPOINT"
 ></A
->&#62;xmlXPtrNewRangeNodePoint ()</H3
+>xmlXPtrNewRangeNodePoint ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1123,7 +1123,7 @@
 ><A
 NAME="XMLXPTRNEWRANGEPOINTNODE"
 ></A
->&#62;xmlXPtrNewRangePointNode ()</H3
+>xmlXPtrNewRangePointNode ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1230,7 +1230,7 @@
 ><A
 NAME="XMLXPTRNEWRANGENODES"
 ></A
->&#62;xmlXPtrNewRangeNodes ()</H3
+>xmlXPtrNewRangeNodes ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1337,7 +1337,7 @@
 ><A
 NAME="XMLXPTRNEWLOCATIONSETNODES"
 ></A
->&#62;xmlXPtrNewLocationSetNodes ()</H3
+>xmlXPtrNewLocationSetNodes ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1456,7 +1456,7 @@
 ><A
 NAME="XMLXPTRNEWLOCATIONSETNODESET"
 ></A
->&#62;xmlXPtrNewLocationSetNodeSet ()</H3
+>xmlXPtrNewLocationSetNodeSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1549,7 +1549,7 @@
 ><A
 NAME="XMLXPTRNEWRANGENODEOBJECT"
 ></A
->&#62;xmlXPtrNewRangeNodeObject ()</H3
+>xmlXPtrNewRangeNodeObject ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1656,7 +1656,7 @@
 ><A
 NAME="XMLXPTRNEWCOLLAPSEDRANGE"
 ></A
->&#62;xmlXPtrNewCollapsedRange ()</H3
+>xmlXPtrNewCollapsedRange ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1742,7 +1742,7 @@
 ><A
 NAME="XMLXPTRLOCATIONSETADD"
 ></A
->&#62;xmlXPtrLocationSetAdd ()</H3
+>xmlXPtrLocationSetAdd ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1837,7 +1837,7 @@
 ><A
 NAME="XMLXPTRWRAPLOCATIONSET"
 ></A
->&#62;xmlXPtrWrapLocationSet ()</H3
+>xmlXPtrWrapLocationSet ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -1928,7 +1928,7 @@
 ><A
 NAME="XMLXPTRLOCATIONSETDEL"
 ></A
->&#62;xmlXPtrLocationSetDel ()</H3
+>xmlXPtrLocationSetDel ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2017,7 +2017,7 @@
 ><A
 NAME="XMLXPTRLOCATIONSETREMOVE"
 ></A
->&#62;xmlXPtrLocationSetRemove ()</H3
+>xmlXPtrLocationSetRemove ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2103,7 +2103,7 @@
 ><A
 NAME="XMLXPTRNEWCONTEXT"
 ></A
->&#62;xmlXPtrNewContext ()</H3
+>xmlXPtrNewContext ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2200,7 +2200,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >  the element from which a user or program initiated traversal of
-          the link, or NULL.</TD
+the link, or NULL.</TD
 ></TR
 ><TR
 ><TD
@@ -2232,7 +2232,7 @@
 ><A
 NAME="XMLXPTREVAL"
 ></A
->&#62;xmlXPtrEval ()</H3
+>xmlXPtrEval ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2323,7 +2323,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >the xmlXPathObjectPtr resulting from the evaluation or NULL.
-        the caller has to free the object.</TD
+the caller has to free the object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2340,7 +2340,7 @@
 ><A
 NAME="XMLXPTRRANGETOFUNCTION"
 ></A
->&#62;xmlXPtrRangeToFunction ()</H3
+>xmlXPtrRangeToFunction ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2429,7 +2429,7 @@
 ><A
 NAME="XMLXPTRBUILDNODELIST"
 ></A
->&#62;xmlXPtrBuildNodeList ()</H3
+>xmlXPtrBuildNodeList ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2500,7 +2500,7 @@
 ALIGN="LEFT"
 VALIGN="TOP"
 >an xmlNodePtr list or NULL.
-        the caller has to free the node tree.</TD
+the caller has to free the node tree.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2517,7 +2517,7 @@
 ><A
 NAME="XMLXPTREVALRANGEPREDICATE"
 ></A
->&#62;xmlXPtrEvalRangePredicate ()</H3
+>xmlXPtrEvalRangePredicate ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -2536,7 +2536,7 @@
 ></TABLE
 ><P
 >[8]   Predicate ::=   '[' PredicateExpr ']'
- [9]   PredicateExpr ::=   Expr </P
+[9]   PredicateExpr ::=   Expr </P
 ><P
 >Evaluate a predicate as in <A
 HREF="libxml-xpath.html#XMLXPATHEVALPREDICATE"
diff --git a/doc/index.html b/doc/index.html
index 14ac3f1..5547e7e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -99,8 +99,8 @@
 <li>XML Base: <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
 </li>
 <li>
-<a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a>
-     : Uniform Resource Identifiers <a href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a>
+<a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a> :
+    Uniform Resource Identifiers <a href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a>
 </li>
 <li>XML Path Language (XPath) 1.0: <a href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a>
 </li>
@@ -127,11 +127,11 @@
     it doesn't implement the API itself, gdome2 does this in top of
   libxml2</li>
 <li>
-<a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a>
-     : libxml implements a basic FTP client code</li>
+<a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a> :
+    libxml implements a basic FTP client code</li>
 <li>
-<a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a>
-     : HTTP/1.0, again a basic HTTP client code</li>
+<a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a> :
+    HTTP/1.0, again a basic HTTP client code</li>
 <li>SAX: a minimal SAX implementation compatible with early expat
   versions</li>
 <li>DocBook SGML v4: libxml2 includes a hackish parser to transition to
@@ -143,12 +143,11 @@
 <p>Separate documents:</p>
 <ul>
 <li>
-<a href="http://xmlsoft.org/XSLT/">the libxslt page</a>
-     providing an implementation of XSLT 1.0 and extensions on top of
-  libxml2</li>
+<a href="http://xmlsoft.org/XSLT/">the libxslt page</a> providing an
+    implementation of XSLT 1.0 and extensions on top of libxml2</li>
 <li>
 <a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 page</a>
-     : a standard DOM2 implementation based on libxml2</li>
+    : a standard DOM2 implementation based on libxml2</li>
 </ul>
 <p><a href="bugs.html">Daniel Veillard</a></p>
 </td></tr></table></td></tr></table></td></tr></table></td>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 617d43a..fbfd3ce 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -690,6 +690,11 @@
      <exports symbol='htmlDocContentDumpOutput'/>
      <exports symbol='htmlDocContentDumpFormatOutput'/>
     </file>
+    <file name='c14n'>
+     <exports symbol='xmlC14NDocSaveTo'/>
+     <exports symbol='xmlC14NDocDumpMemory'/>
+     <exports symbol='xmlC14NDocSave'/>
+    </file>
     <file name='xpathInternals'>
      <exports symbol='xmlXPathSetError'/>
      <exports symbol='xmlXPathSetArityError'/>
@@ -1094,6 +1099,7 @@
      <exports symbol='LIBXML_FTP_ENABLED'/>
      <exports symbol='LIBXML_HTTP_ENABLED'/>
      <exports symbol='LIBXML_HTML_ENABLED'/>
+     <exports symbol='LIBXML_C14N_ENABLED'/>
      <exports symbol='LIBXML_CATALOG_ENABLED'/>
      <exports symbol='LIBXML_DOCB_ENABLED'/>
      <exports symbol='LIBXML_XPATH_ENABLED'/>
@@ -1336,6 +1342,9 @@
       <info>Macro to check the following production in the XML spec </info>
       <arg name='c' info='an UNICODE value (int) '/>
     </macro>
+    <macro name='LIBXML_C14N_ENABLED' file='xmlversion'>
+      <info>Whether the Canonicalization support is configured in</info>
+    </macro>
     <macro name='LIBXML_CATALOG_ENABLED' file='xmlversion'>
       <info>Whether the Catalog support is configured in</info>
     </macro>
@@ -1972,7 +1981,7 @@
       <arg name='attrib' type='const char *' info='the attribute string '/>
       <arg name='owner' type='const char *' info='the owner string '/>
       <arg name='group' type='const char *' info='the group string '/>
-      <arg name='size' type='unsigned long'/>
+      <arg name='size' type='unsigned long' info='the file size '/>
       <arg name='links' type='int' info='the link count '/>
       <arg name='year' type='int' info='the year '/>
       <arg name='month' type='const char *' info='the month '/>
@@ -2836,6 +2845,37 @@
       <arg name='URI' type='const xmlChar *' info='the URI instance found in the document '/>
       <arg name='base' type='const xmlChar *' info='the base value '/>
     </function>
+    <function name='xmlC14NDocDumpMemory' file='c14n'>
+      <info>Dumps the canonized image of given XML document into memory. For details see &quot;Canonical XML&quot; (http://www.w3.org/TR/xml-c14n) or &quot;Exclusive XML Canonicalization&quot; (http://www.w3.org/TR/xml-exc-c14n)</info>
+      <return type='int' info='the number of bytes written on success or a negative value on fail '/>
+      <arg name='doc' type='xmlDocPtr' info='		the XML document for canonization '/>
+      <arg name='nodes' type='xmlNodeSetPtr' info='		the nodes set to be included in the canonized image or NULL if all document nodes should be included '/>
+      <arg name='exclusive' type='int' info='inclusive_ns_prefixe the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) '/>
+      <arg name='inclusive_ns_prefixes' type='xmlChar **'/>
+      <arg name='with_comments' type='int' info='	include comments in the result (!=0) or not (==0) '/>
+      <arg name='doc_txt_ptr' type='xmlChar **' info='	the memory pointer for allocated canonical XML text; the caller of this functions is responsible for calling xmlFree() to free allocated memory '/>
+    </function>
+    <function name='xmlC14NDocSave' file='c14n'>
+      <info>Dumps the canonized image of given XML document into the file. For details see &quot;Canonical XML&quot; (http://www.w3.org/TR/xml-c14n) or &quot;Exclusive XML Canonicalization&quot; (http://www.w3.org/TR/xml-exc-c14n)</info>
+      <return type='int' info='the number of bytes written success or a negative value on fail '/>
+      <arg name='doc' type='xmlDocPtr' info='		the XML document for canonization '/>
+      <arg name='nodes' type='xmlNodeSetPtr' info='		the nodes set to be included in the canonized image or NULL if all document nodes should be included '/>
+      <arg name='exclusive' type='int' info='inclusive_ns_prefixe the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) '/>
+      <arg name='inclusive_ns_prefixes' type='xmlChar **'/>
+      <arg name='with_comments' type='int' info='	include comments in the result (!=0) or not (==0) '/>
+      <arg name='filename' type='const char*' info='		the filename to store canonical XML image '/>
+      <arg name='compression' type='int' info='	the compression level (zlib requred): -1 - libxml default, 0 - uncompressed, &gt;0 - compression level '/>
+    </function>
+    <function name='xmlC14NDocSaveTo' file='c14n'>
+      <info>Dumps the canonized image of given XML document into the provided buffer. For details see &quot;Canonical XML&quot; (http://www.w3.org/TR/xml-c14n) or &quot;Exclusive XML Canonicalization&quot; (http://www.w3.org/TR/xml-exc-c14n)</info>
+      <return type='int' info='non-negative value on success or a negative value on fail '/>
+      <arg name='doc' type='xmlDocPtr' info='		the XML document for canonization '/>
+      <arg name='nodes' type='xmlNodeSetPtr' info='		the nodes set to be included in the canonized image or NULL if all document nodes should be included '/>
+      <arg name='exclusive' type='int' info='inclusive_ns_prefixe the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise) '/>
+      <arg name='inclusive_ns_prefixes' type='xmlChar **'/>
+      <arg name='with_comments' type='int' info='	include comments in the result (!=0) or not (==0) '/>
+      <arg name='buf' type='xmlOutputBufferPtr' info='		the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output '/>
+    </function>
     <struct name='xmlCatalog' file='catalog'/>
     <function name='xmlCatalogAdd' file='catalog'>
       <info>Add an entry in the catalog, it may overwrite existing but different entries. If called before any other catalog routine, allows to override the default shared catalog put in place by xmlInitializeCatalog();</info>
@@ -3623,7 +3663,7 @@
       <arg name='' type='...'/>
     </functype>
     <function name='xmlGetBufferAllocationScheme' file='tree'>
-      <info>Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed,  improves performance</info>
+      <info>Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance</info>
       <return type='xmlBufferAllocationScheme' info='the current allocation scheme '/>
     </function>
     <function name='xmlGetCharEncodingHandler' file='encoding'>
@@ -4100,7 +4140,7 @@
       <arg name='c' type='int' info='an unicode character (int) '/>
     </function>
     <function name='xmlIsExtender' file='parserInternals'>
-      <info>Check whether the character is allowed by the production [89] Extender ::= x00B7 | x02D0 | x02D1 | x0387 | x0640 |  x0E46 | x0EC6 | x3005 | [x3031-x3035] |  [x309D-x309E] | [x30FC-x30FE]</info>
+      <info>Check whether the character is allowed by the production [89] Extender ::= x00B7 | x02D0 | x02D1 | x0387 | x0640 | x0E46 | x0EC6 | x3005 | [x3031-x3035] | [x309D-x309E] | [x30FC-x30FE]</info>
       <return type='int' info='0 if not, non-zero otherwise '/>
       <arg name='c' type='int' info='an unicode character (int) '/>
     </function>
@@ -5195,12 +5235,12 @@
     </function>
     <function name='xmlParseElementChildrenContentD' file='parserInternals'>
       <info>VMS version of xmlParseElementChildrenContentDecl()</info>
-      <return type='xmlElementContentPtr' info='the tree of xmlElementContentPtr describing the element  hierarchy. '/>
+      <return type='xmlElementContentPtr' info='the tree of xmlElementContentPtr describing the element hierarchy. '/>
       <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context '/>
     </function>
     <function name='xmlParseElementChildrenContentDecl' file='parserInternals'>
       <info>parse the declaration for a Mixed Element content The leading &apos;(&apos; and spaces have been skipped in xmlParseElementContentDecl </info>
-      <return type='xmlElementContentPtr' info='the tree of xmlElementContentPtr describing the element  hierarchy. '/>
+      <return type='xmlElementContentPtr' info='the tree of xmlElementContentPtr describing the element hierarchy. '/>
       <arg name='ctxt' type='xmlParserCtxtPtr' info='an XML parser context '/>
       <arg name='inputchk' type='xmlParserInputPtr'/>
     </function>
@@ -5862,7 +5902,7 @@
       <arg name='href' type='const xmlChar *' info='the namespace value '/>
     </function>
     <function name='xmlSetBufferAllocationScheme' file='tree'>
-      <info>Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed,  improves performance</info>
+      <info>Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance</info>
       <return type='void'/>
       <arg name='scheme' type='xmlBufferAllocationScheme' info='allocation method to use '/>
     </function>
@@ -6896,7 +6936,7 @@
     </function>
     <function name='xmlXPathNewContext' file='xpath'>
       <info>Create a new xmlXPathContext</info>
-      <return type='xmlXPathContextPtr' info='the xmlXPathContext just allocated. '/>
+      <return type='xmlXPathContextPtr' info='the xmlXPathContext just allocated. The caller will need to free it. '/>
       <arg name='doc' type='xmlDocPtr' info='the XML document '/>
     </function>
     <function name='xmlXPathNewFloat' file='xpathInternals'>
@@ -7503,7 +7543,7 @@
       <return type='xmlXPathContextPtr' info='the xmlXPathContext just allocated. '/>
       <arg name='doc' type='xmlDocPtr' info='the XML document '/>
       <arg name='here' type='xmlNodePtr' info='the node that directly contains the XPointer being evaluated or NULL '/>
-      <arg name='origin' type='xmlNodePtr' info='the element from which a user or program initiated traversal of  the link, or NULL. '/>
+      <arg name='origin' type='xmlNodePtr' info='the element from which a user or program initiated traversal of the link, or NULL. '/>
     </function>
     <function name='xmlXPtrNewLocationSetNodeSet' file='xpointer'>
       <info>Create a new xmlXPathObjectPtr of type LocationSet and initialize it with all the nodes from set</info>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 4a073ad..e41708e 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -29,6 +29,7 @@
     <reference name='IS_IDEOGRAPHIC' href='html/libxml-parserinternals.html#IS-IDEOGRAPHIC-CAPS'/>
     <reference name='IS_LETTER' href='html/libxml-parserinternals.html#IS-LETTER-CAPS'/>
     <reference name='IS_PUBIDCHAR' href='html/libxml-parserinternals.html#IS-PUBIDCHAR-CAPS'/>
+    <reference name='LIBXML_C14N_ENABLED' href='html/libxml-xmlversion.html#LIBXML-C14N-ENABLED-CAPS'/>
     <reference name='LIBXML_CATALOG_ENABLED' href='html/libxml-xmlversion.html#LIBXML-CATALOG-ENABLED-CAPS'/>
     <reference name='LIBXML_DEBUG_ENABLED' href='html/libxml-xmlversion.html#LIBXML-DEBUG-ENABLED-CAPS'/>
     <reference name='LIBXML_DLL_IMPORT' href='html/libxml-xmlversion.html#LIBXML-DLL-IMPORT-CAPS'/>
@@ -302,6 +303,9 @@
     <reference name='xmlBufferWriteQuotedString' href='html/libxml-tree.html#XMLBUFFERWRITEQUOTEDSTRING'/>
     <reference name='xmlBufferWriteXmlCHAR' href='html/libxml-tree.html#XMLBUFFERWRITEXMLCHAR'/>
     <reference name='xmlBuildURI' href='html/libxml-uri.html#XMLBUILDURI'/>
+    <reference name='xmlC14NDocDumpMemory' href='html/libxml-c14n.html#XMLC14NDOCDUMPMEMORY'/>
+    <reference name='xmlC14NDocSave' href='html/libxml-c14n.html#XMLC14NDOCSAVE'/>
+    <reference name='xmlC14NDocSaveTo' href='html/libxml-c14n.html#XMLC14NDOCSAVETO'/>
     <reference name='xmlCatalog' href='html/libxml-catalog.html#XMLCATALOG'/>
     <reference name='xmlCatalogAdd' href='html/libxml-catalog.html#XMLCATALOGADD'/>
     <reference name='xmlCatalogAddLocal' href='html/libxml-catalog.html#XMLCATALOGADDLOCAL'/>
@@ -1248,6 +1252,7 @@
     <ref name='IS_PUBIDCHAR'/>
     </letter>
     <letter name='L'>
+    <ref name='LIBXML_C14N_ENABLED'/>
     <ref name='LIBXML_CATALOG_ENABLED'/>
     <ref name='LIBXML_DEBUG_ENABLED'/>
     <ref name='LIBXML_DLL_IMPORT'/>
@@ -1569,6 +1574,9 @@
     <ref name='xmlBufferWriteQuotedString'/>
     <ref name='xmlBufferWriteXmlCHAR'/>
     <ref name='xmlBuildURI'/>
+    <ref name='xmlC14NDocDumpMemory'/>
+    <ref name='xmlC14NDocSave'/>
+    <ref name='xmlC14NDocSaveTo'/>
     <ref name='xmlCatalog'/>
     <ref name='xmlCatalogAdd'/>
     <ref name='xmlCatalogAddLocal'/>
@@ -3017,6 +3025,9 @@
     <type name='const char **'>
       <ref name='xmlGetFeaturesList'/>
     </type>
+    <type name='const char*'>
+      <ref name='xmlC14NDocSave'/>
+    </type>
     <type name='const unsigned char *'>
       <ref name='docbEncodeEntities'/>
       <ref name='UTF8ToHtml'/>
@@ -3791,6 +3802,10 @@
       <ref name='xmlDocDumpMemoryEnc'/>
       <ref name='xmlDocDumpFormatMemoryEnc'/>
       <ref name='xmlSplitQName2'/>
+      <ref name='xmlC14NDocSaveTo'/>
+      <ref name='xmlC14NDocDumpMemory'/>
+      <ref name='xmlC14NDocDumpMemory'/>
+      <ref name='xmlC14NDocSave'/>
     </type>
     <type name='xmlCharEncoding'>
       <ref name='docbCreatePushParserCtxt'/>
@@ -3922,6 +3937,9 @@
       <ref name='xmlXIncludeProcess'/>
       <ref name='xmlXPathNewContext'/>
       <ref name='xmlXPtrNewContext'/>
+      <ref name='xmlC14NDocSaveTo'/>
+      <ref name='xmlC14NDocDumpMemory'/>
+      <ref name='xmlC14NDocSave'/>
     </type>
     <type name='xmlDtdPtr'>
       <ref name='xmlDebugDumpDTD'/>
@@ -4324,6 +4342,9 @@
       <ref name='xmlXPathNewNodeSetList'/>
       <ref name='xmlXPathWrapNodeSet'/>
       <ref name='xmlXPtrNewLocationSetNodeSet'/>
+      <ref name='xmlC14NDocSaveTo'/>
+      <ref name='xmlC14NDocDumpMemory'/>
+      <ref name='xmlC14NDocSave'/>
     </type>
     <type name='xmlNotationPtr'>
       <ref name='xmlDumpNotationDecl'/>
@@ -4360,6 +4381,7 @@
       <ref name='xmlOutputBufferWriteString'/>
       <ref name='xmlOutputBufferFlush'/>
       <ref name='xmlOutputBufferClose'/>
+      <ref name='xmlC14NDocSaveTo'/>
     </type>
     <type name='xmlOutputCloseCallback'>
       <ref name='xmlOutputBufferCreateIO'/>
@@ -4836,6 +4858,11 @@
       <ref name='htmlDefaultSAXHandlerInit'/>
       <ref name='docbDefaultSAXHandlerInit'/>
     </file>
+    <file name='c14n'>
+      <ref name='xmlC14NDocSaveTo'/>
+      <ref name='xmlC14NDocDumpMemory'/>
+      <ref name='xmlC14NDocSave'/>
+    </file>
     <file name='catalog'>
       <ref name='XML_CATALOGS_NAMESPACE'/>
       <ref name='XML_CATALOG_PI'/>
@@ -5709,6 +5736,7 @@
       <ref name='LIBXML_FTP_ENABLED'/>
       <ref name='LIBXML_HTTP_ENABLED'/>
       <ref name='LIBXML_HTML_ENABLED'/>
+      <ref name='LIBXML_C14N_ENABLED'/>
       <ref name='LIBXML_CATALOG_ENABLED'/>
       <ref name='LIBXML_DOCB_ENABLED'/>
       <ref name='LIBXML_XPATH_ENABLED'/>
@@ -6140,6 +6168,9 @@
         </word>
       </letter>
       <letter name='C'>
+        <word name='C14N'>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='CATALOG'>
           <ref name='xmlLoadACatalog'/>
           <ref name='xmlLoadCatalog'/>
@@ -6192,6 +6223,17 @@
           <ref name='xmlCleanupParser'/>
           <ref name='xmlRegisterHTTPPostCallbacks'/>
         </word>
+        <word name='Canonical'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
+        <word name='Canonicalization'>
+          <ref name='LIBXML_C14N_ENABLED'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='Carl'>
           <ref name='xmlURIEscape'/>
         </word>
@@ -6608,6 +6650,9 @@
         </word>
         <word name='Dumps'>
           <ref name='xmlBufferDump'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlDebugDumpAttr'/>
           <ref name='xmlDebugDumpAttrList'/>
           <ref name='xmlDebugDumpDTD'/>
@@ -6735,6 +6780,11 @@
           <ref name='setDocumentLocator'/>
           <ref name='setDocumentLocatorSAXFunc'/>
         </word>
+        <word name='Exclusive'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='Existing'>
           <ref name='xmlAddEncodingAlias'/>
           <ref name='xmlHashRemoveEntry'/>
@@ -6867,6 +6917,9 @@
         <word name='For'>
           <ref name='LIBXML_DLL_IMPORT'/>
           <ref name='xmlBufferWriteXmlCHAR'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlParseComment'/>
           <ref name='xmlXPathSubstringAfterFunction'/>
           <ref name='xmlXPathSubstringBeforeFunction'/>
@@ -7238,6 +7291,9 @@
         <word name='META'>
           <ref name='htmlSetMetaEncoding'/>
         </word>
+        <word name='MUST'>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='Macro'>
           <ref name='ATTRIBUTE_UNUSED'/>
           <ref name='BAD_CAST'/>
@@ -8186,6 +8242,7 @@
         </word>
         <word name='Whether'>
           <ref name='DEBUG_MEMORY_LOCATION'/>
+          <ref name='LIBXML_C14N_ENABLED'/>
           <ref name='LIBXML_CATALOG_ENABLED'/>
           <ref name='LIBXML_DEBUG_ENABLED'/>
           <ref name='LIBXML_DOCB_ENABLED'/>
@@ -8889,6 +8946,7 @@
           <ref name='xmlSubstituteEntitiesDefault'/>
         </word>
         <word name='because'>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlXPathTranslateFunction'/>
         </word>
         <word name='becomes'>
@@ -9218,6 +9276,7 @@
         </word>
         <word name='calling'>
           <ref name='XML_GET_LINE'/>
+          <ref name='xmlC14NDocDumpMemory'/>
           <ref name='xmlGetLineNo'/>
           <ref name='xmlXPathAddValues'/>
           <ref name='xmlXPathDivValues'/>
@@ -9260,8 +9319,26 @@
           <ref name='xmlSetupParserForBuffer'/>
         </word>
         <word name='canonical'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlGetCharEncodingName'/>
         </word>
+        <word name='canonicalization'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
+        <word name='canonization'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
+        <word name='canonized'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='capable'>
           <ref name='xmlCheckUTF8'/>
         </word>
@@ -9569,6 +9646,9 @@
           <ref name='xmlParseComment'/>
         </word>
         <word name='comments'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlDocGetRootElement'/>
           <ref name='xmlDocSetRootElement'/>
           <ref name='xmlParseComment'/>
@@ -9683,6 +9763,7 @@
           <ref name='xmlSAXUserParseFile'/>
         </word>
         <word name='compression'>
+          <ref name='xmlC14NDocSave'/>
           <ref name='xmlGetCompressMode'/>
           <ref name='xmlGetDocCompressMode'/>
           <ref name='xmlIOHTTPOpenW'/>
@@ -9710,6 +9791,7 @@
         <word name='configured'>
           <ref name='DEBUG_MEMORY'/>
           <ref name='DEBUG_MEMORY_LOCATION'/>
+          <ref name='LIBXML_C14N_ENABLED'/>
           <ref name='LIBXML_CATALOG_ENABLED'/>
           <ref name='LIBXML_DEBUG_ENABLED'/>
           <ref name='LIBXML_DOCB_ENABLED'/>
@@ -10289,6 +10371,11 @@
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
         </word>
+        <word name='details'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='detect'>
           <ref name='xmlInputMatchCallback'/>
           <ref name='xmlKeepBlanksDefault'/>
@@ -10653,6 +10740,9 @@
           <ref name='xmlCharEncOutFunc'/>
           <ref name='xmlCharEncodingOutputFunc'/>
         </word>
+        <word name='encoder==NULL'>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='encodings'>
           <ref name='xmlCharEncoding'/>
         </word>
@@ -10665,6 +10755,9 @@
           <ref name='xmlParseReference'/>
         </word>
         <word name='ended'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCleanupThreads'/>
         </word>
         <word name='ending'>
@@ -10858,6 +10951,11 @@
           <ref name='xmlXPathNextFollowing'/>
           <ref name='xmlXPathNextPreceding'/>
         </word>
+        <word name='exclusive'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='exist'>
           <ref name='xmlXPtrLocationSetAdd'/>
         </word>
@@ -10921,6 +11019,9 @@
     <chunk name='chunk11'>
       <letter name='f'>
         <word name='fail'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlShellPrintXPathError'/>
         </word>
         <word name='failed'>
@@ -11222,6 +11323,7 @@
           <ref name='xmlXPathNodeSetItem'/>
         </word>
         <word name='functions'>
+          <ref name='xmlC14NDocDumpMemory'/>
           <ref name='xmlMemGet'/>
           <ref name='xmlMemSetup'/>
           <ref name='xmlShellCmd'/>
@@ -11415,6 +11517,7 @@
         <word name='have'>
           <ref name='INPUT_CHUNK'/>
           <ref name='htmlParseEntityRef'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlIsID'/>
           <ref name='xmlIsRef'/>
           <ref name='xmlKeepBlanksDefaultValue'/>
@@ -11522,6 +11625,9 @@
         </word>
         <word name='http:'>
           <ref name='getSystemId'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlGetCharEncodingName'/>
           <ref name='xmlNanoHTTPScanProxy'/>
           <ref name='xmlXPathIsInf'/>
@@ -11545,9 +11651,19 @@
         <word name='ignorableWhitespace'>
           <ref name='xmlKeepBlanksDefault'/>
         </word>
+        <word name='ignored'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='ignoring'>
           <ref name='xmlURIEscapeStr'/>
         </word>
+        <word name='image'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='imbrication'>
           <ref name='xmlNodeDump'/>
           <ref name='xmlNodeDumpOutput'/>
@@ -11622,10 +11738,16 @@
           <ref name='xmlNanoHTTPSave'/>
         </word>
         <word name='include'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCheckVersion'/>
           <ref name='xmlListMerge'/>
         </word>
         <word name='included'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlFreeDoc'/>
         </word>
         <word name='includes'>
@@ -11641,6 +11763,16 @@
           <ref name='startElementSAXFunc'/>
           <ref name='xmlXPathStringFunction'/>
         </word>
+        <word name='inclusive'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
+        <word name='inclusive_ns_prefixe'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='incompatible'>
           <ref name='xmlXPathContext'/>
         </word>
@@ -11951,6 +12083,9 @@
           <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCharEncFirstLine'/>
           <ref name='xmlCharEncInFunc'/>
           <ref name='xmlCharEncOutFunc'/>
@@ -12164,6 +12299,7 @@
           <ref name='xmlXPathSubstringFunction'/>
         </word>
         <word name='level'>
+          <ref name='xmlC14NDocSave'/>
           <ref name='xmlCatalogSetDebug'/>
           <ref name='xmlDebugDumpAttr'/>
           <ref name='xmlDebugDumpAttrList'/>
@@ -12202,6 +12338,7 @@
           <ref name='DEBUG_MEMORY'/>
           <ref name='LIBXML_DLL_IMPORT'/>
           <ref name='LIBXML_TEST_VERSION'/>
+          <ref name='xmlC14NDocSave'/>
           <ref name='xmlFree'/>
           <ref name='xmlMemSetup'/>
           <ref name='xmlRegisterHTTPPostCallbacks'/>
@@ -12712,6 +12849,9 @@
           <ref name='xmlXPathNamespaceURIFunction'/>
         </word>
         <word name='namespaces'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCopyDoc'/>
           <ref name='xmlFreeNsList'/>
           <ref name='xmlReconciliateNs'/>
@@ -12743,6 +12883,7 @@
           <ref name='xmlNewChild'/>
           <ref name='xmlNewDocNode'/>
           <ref name='xmlXPathContext'/>
+          <ref name='xmlXPathNewContext'/>
         </word>
         <word name='needed'>
           <ref name='xmlGetBufferAllocationScheme'/>
@@ -12771,6 +12912,9 @@
           <ref name='xmlStrstr'/>
         </word>
         <word name='negative'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlShellCmd'/>
           <ref name='xmlXPathBooleanFunction'/>
           <ref name='xmlXPathCeilingFunction'/>
@@ -12851,6 +12995,9 @@
         <word name='non-empty'>
           <ref name='xmlXPathBooleanFunction'/>
         </word>
+        <word name='non-negative'>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='non-normative'>
           <ref name='xmlDetectCharEncoding'/>
         </word>
@@ -13090,6 +13237,9 @@
           <ref name='XML_GET_LINE'/>
           <ref name='ftpListCallback'/>
           <ref name='xmlBufferWriteXmlCHAR'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCharEncFirstLine'/>
           <ref name='xmlIsBlankNode'/>
           <ref name='xmlKeepBlanksDefault'/>
@@ -13190,6 +13340,9 @@
           <ref name='xmlListDataCompare'/>
         </word>
         <word name='org'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlGetCharEncodingName'/>
         </word>
         <word name='oriented'>
@@ -13606,6 +13759,11 @@
           <ref name='xmlXPathNsLookup'/>
           <ref name='xmlXPathRegisterNs'/>
         </word>
+        <word name='prefixes'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='prepend'>
           <ref name='xmlValidGetValidElements'/>
         </word>
@@ -13845,6 +14003,7 @@
           <ref name='htmlParseFile'/>
           <ref name='htmlSAXParseDoc'/>
           <ref name='htmlSAXParseFile'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCreateEntityParserCtxt'/>
           <ref name='xmlCreateFileParserCtxt'/>
           <ref name='xmlHashFree'/>
@@ -14359,8 +14518,12 @@
           <ref name='xmlXPathStringFunction'/>
         </word>
         <word name='requires'>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlGetLineNo'/>
         </word>
+        <word name='requred'>
+          <ref name='xmlC14NDocSave'/>
+        </word>
         <word name='reserved'>
           <ref name='xmlURIEscapeStr'/>
         </word>
@@ -14436,6 +14599,9 @@
           <ref name='xmlNanoFTPCheckResponse'/>
           <ref name='xmlNanoFTPGetResponse'/>
         </word>
+        <word name='responsible'>
+          <ref name='xmlC14NDocDumpMemory'/>
+        </word>
         <word name='restrict'>
           <ref name='xmlParseExternalID'/>
         </word>
@@ -14735,6 +14901,9 @@
           <ref name='xmlNodeGetBase'/>
         </word>
         <word name='see'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlIsBaseChar'/>
           <ref name='xmlIsCombining'/>
           <ref name='xmlIsDigit'/>
@@ -15186,6 +15355,8 @@
           <ref name='htmlEncodeEntities'/>
           <ref name='htmlParseEntityRef'/>
           <ref name='isolat1ToUTF8'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCharEncodingInputFunc'/>
           <ref name='xmlCharEncodingOutputFunc'/>
           <ref name='xmlGetFeature'/>
@@ -15410,6 +15581,9 @@
         <word name='success'>
           <ref name='htmlSetMetaEncoding'/>
           <ref name='xmlAddEncodingAlias'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlCharEncCloseFunc'/>
           <ref name='xmlCharEncFirstLine'/>
           <ref name='xmlCharEncInFunc'/>
@@ -15632,6 +15806,9 @@
           <ref name='xmlAddChild'/>
           <ref name='xmlAddNextSibling'/>
           <ref name='xmlAddPrevSibling'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlEnumeration'/>
           <ref name='xmlGenericErrorFunc'/>
           <ref name='xmlNanoFTPCheckResponse'/>
@@ -15949,6 +16126,7 @@
           <ref name='xmlXPathValueFlipSign'/>
         </word>
         <word name='uncompressed'>
+          <ref name='xmlC14NDocSave'/>
           <ref name='xmlGetCompressMode'/>
           <ref name='xmlGetDocCompressMode'/>
           <ref name='xmlSetCompressMode'/>
@@ -16552,6 +16730,8 @@
           <ref name='htmlSaveFileEnc'/>
           <ref name='htmlSaveFileFormat'/>
           <ref name='xmlBufferDump'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
           <ref name='xmlCharEncFirstLine'/>
           <ref name='xmlCharEncInFunc'/>
           <ref name='xmlCharEncOutFunc'/>
@@ -16573,9 +16753,14 @@
         </word>
         <word name='www'>
           <ref name='getSystemId'/>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlGetCharEncodingName'/>
         </word>
       </letter>
+    </chunk>
+    <chunk name='chunk22'>
       <letter name='x'>
         <word name='x00B7'>
           <ref name='xmlIsExtender'/>
@@ -16638,6 +16823,16 @@
         <word name='xml'>
           <ref name='xmlSetEntityReferenceFunc'/>
         </word>
+        <word name='xml-c14n'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
+        <word name='xml-exc-c14n'>
+          <ref name='xmlC14NDocDumpMemory'/>
+          <ref name='xmlC14NDocSave'/>
+          <ref name='xmlC14NDocSaveTo'/>
+        </word>
         <word name='xml:'>
           <ref name='XML_XML_NAMESPACE'/>
         </word>
@@ -16758,6 +16953,9 @@
         <word name='xmlExternalEntityLoader'>
           <ref name='xmlGetExternalEntityLoader'/>
         </word>
+        <word name='xmlFree'>
+          <ref name='xmlC14NDocDumpMemory'/>
+        </word>
         <word name='xmlFreeMutex'>
           <ref name='xmlFreeMutex'/>
         </word>
@@ -17063,7 +17261,7 @@
         </word>
       </letter>
     </chunk>
-    <chunk name='chunk22'>
+    <chunk name='chunk23'>
       <letter name='y'>
         <word name='year'>
           <ref name='ftpListCallback'/>
@@ -17099,6 +17297,9 @@
         <word name='zeros'>
           <ref name='xmlXPathStringFunction'/>
         </word>
+        <word name='zlib'>
+          <ref name='xmlC14NDocSave'/>
+        </word>
       </letter>
     </chunk>
     <chunks>
@@ -17123,7 +17324,8 @@
       <chunk name='chunk18' start='s' end='s'/>
       <chunk name='chunk19' start='t' end='t'/>
       <chunk name='chunk20' start='u' end='v'/>
-      <chunk name='chunk21' start='w' end='x'/>
+      <chunk name='chunk21' start='w' end='w'/>
+      <chunk name='chunk22' start='x' end='x'/>
     </chunks>
   </index>
 </apirefs>
diff --git a/doc/news.html b/doc/news.html
index a26a62c..6127b81 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -87,13 +87,15 @@
 for a really accurate description</h3>
 <p>Items floating around but not actively worked on, get in touch with me if
 you want to test those</p>
+<ul><li>Finishing up <a href="http://www.w3.org/TR/xptr">XPointer</a> and <a href="http://www.w3.org/TR/xinclude">XInclude</a>
+</li></ul>
+<h3>2.4.17: Mar 8 2002</h3>
 <ul>
-<li>Implementing <a href="http://xmlsoft.org/XSLT">XSLT</a>, this is done
-    as a separate C library on top of libxml called libxslt</li>
-<li>Finishing up <a href="http://www.w3.org/TR/xptr">XPointer</a> and <a href="http://www.w3.org/TR/xinclude">XInclude</a>
-</li>
-<li>(seeems working but delayed from release) parsing/import of Docbook
-    SGML docs</li>
+<li>a lot of bug fixes, including &quot;namespace nodes have no parents in
+  XPath&quot;</li>
+<li>fixed/improved the Python wrappers, added more examples and more
+    regression tests, XPath extension functions can now return node-sets</li>
+<li>added the XML Canonalization support from Aleksey Sanin</li>
 </ul>
 <h3>2.4.16: Feb 20 2002</h3>
 <ul>
diff --git a/doc/python.html b/doc/python.html
index 00b885d..f440b2d 100644
--- a/doc/python.html
+++ b/doc/python.html
@@ -90,8 +90,8 @@
 or libxslt wrappers or bindings:</p>
 <ul>
 <li>
-<a href="mailto:ari@lusis.org">Ari Johnson</a>
-     provides a  C++ wrapper for libxml:<br>
+<a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
+    for libxml:<br>
     Website: <a href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
     Download: <a href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a>
 </li>
@@ -99,46 +99,41 @@
     based on the gdome2 </a>bindings maintained by Tobias Peters.</li>
 <li>
 <a href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
-    Sergeant</a>
-     developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl
-    wrapper for libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML application server</a>
+    Sergeant</a> developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
+    libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML
+    application server</a>
 </li>
 <li>
-<a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a>
-     provides and earlier version of the libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a>
+<a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides and
+    earlier version of the libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for Python</a>
 </li>
 <li>Petr Kozelka provides <a href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue
     libxml2</a> with Kylix, Delphi and other Pascal compilers</li>
 <li>Wai-Sun &quot;Squidster&quot; Chia provides <a href="http://www.rubycolor.org/arc/redist/">bindings for Ruby</a>  and
     libxml2 bindings are also available in Ruby through the <a href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a> module
     maintained by Tobias Peters.</li>
-<li>Steve Ball and contributors maintains
-    <a href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for
+<li>Steve Ball and contributors maintains <a href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for
     Tcl</a>
 </li>
-<li>There is support for libxml2 in the DOM module of PHP.
-</li>
+<li>There is support for libxml2 in the DOM module of PHP.</li>
 </ul>
 <p>The distribution includes a set of Python bindings, which are garanteed to
 be maintained as part of the library in the future, though the Python
 interface have not yet reached the maturity of the C API.</p>
-<p>To install the Python bindings there are 2 options:
-</p>
+<p>To install the Python bindings there are 2 options:</p>
 <ul>
-<li> If you use an RPM based distribution, simply install the
-<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-python RPM</a> (and if needed the
-<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-python RPM</a>).
-</li>
-<li> Otherwise use the <a href="ftp://xmlsoft.org/python/">libxml2-python
-module distribution</a> corresponding to your installed version of libxml2
-and libxslt. Note that to install it you will need both libxml2 and libxslt
-installed and run &quot;python setup.py build install&quot; in the module tree.
-</li>
+<li>If you use an RPM based distribution, simply install the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-python
+    RPM</a> (and if needed the <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-python
+    RPM</a>).</li>
+<li>Otherwise use the <a href="ftp://xmlsoft.org/python/">libxml2-python
+    module distribution</a> corresponding to your installed version of
+    libxml2 and libxslt. Note that to install it you will need both libxml2
+    and libxslt installed and run &quot;python setup.py build install&quot; in the
+    module tree.</li>
 </ul>
-<p>The distribution
-includes a set of examples and regression tests for the python bindings in
-the <code>python/tests</code> directory. Here are some excepts from those
-tests:</p>
+<p>The distribution includes a set of examples and regression tests for the
+python bindings in the <code>python/tests</code> directory. Here are some
+excepts from those tests:</p>
 <h3>tst.py:</h3>
 <p>This is a basic test of the file interface and DOM navigation:</p>
 <pre>import libxml2
@@ -162,22 +157,19 @@
 binding level share the same subset of accesors:</p>
 <ul>
 <li>
-<code>name</code>
-    : returns the node name</li>
+<code>name</code> : returns the node name</li>
 <li>
-<code>type</code>
-    : returns a string indicating the node typ<code>e</code>
+<code>type</code> : returns a string indicating the node
+    typ<code>e</code>
 </li>
 <li>
-<code>content</code>
-    : returns the content of the node, it is based on xmlNodeGetContent() and
-    hence is recursive.</li>
+<code>content</code> : returns the content of the node, it is based on
+    xmlNodeGetContent() and hence is recursive.</li>
 <li>
-<code>parent</code>
-    , <code>children</code>, <code>last</code>, <code>next</code>,
-    <code>prev</code>, <code>doc</code>, <code>properties</code>: pointing to
-    the associated element in the tree, those may return None in case no such
-    link exists.</li>
+<code>parent</code> , <code>children</code>, <code>last</code>,
+    <code>next</code>, <code>prev</code>, <code>doc</code>,
+    <code>properties</code>: pointing to the associated element in the tree,
+    those may return None in case no such link exists.</li>
 </ul>
 <p>Also note the need to explicitely deallocate documents with freeDoc() .
 Reference counting for libxml2 trees would need quite a lot of work to
@@ -352,8 +344,7 @@
 <h3>Memory debugging:</h3>
 <p>last but not least, all tests starts with the following prologue:</p>
 <pre>#memory debug specific
-libxml2.debugMemory(1)
-</pre>
+libxml2.debugMemory(1)</pre>
 <p>and ends with the following epilogue:</p>
 <pre>#memory debug specific
 libxml2.cleanupParser()
diff --git a/doc/xml.html b/doc/xml.html
index f3062be..7fd713d 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -3,7 +3,7 @@
 <html>
 <head>
   <title>The XML C library for Gnome</title>
-  <meta name="GENERATOR" content="amaya V5.0">
+  <meta name="GENERATOR" content="amaya 5.1">
   <meta http-equiv="Content-Type" content="text/html">
 </head>
 
@@ -32,8 +32,8 @@
     href="http://www.w3.org/TR/REC-xml-names/">http://www.w3.org/TR/REC-xml-names/</a></li>
   <li>XML Base: <a
     href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a></li>
-  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a>
-     : Uniform Resource Identifiers <a
+  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc2396.txt">RFC 2396</a> :
+    Uniform Resource Identifiers <a
     href="http://www.ietf.org/rfc/rfc2396.txt">http://www.ietf.org/rfc/rfc2396.txt</a></li>
   <li>XML Path Language (XPath) 1.0: <a
     href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</a></li>
@@ -64,10 +64,10 @@
     href="http://www.w3.org/TR/DOM-Level-2-Core/">http://www.w3.org/TR/DOM-Level-2-Core/</a>
     it doesn't implement the API itself, gdome2 does this in top of
   libxml2</li>
-  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a>
-     : libxml implements a basic FTP client code</li>
-  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a>
-     : HTTP/1.0, again a basic HTTP client code</li>
+  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc959.txt">RFC 959</a> :
+    libxml implements a basic FTP client code</li>
+  <li><a href="http://www.cis.ohio-state.edu/rfc/rfc1945.txt">RFC 1945</a> :
+    HTTP/1.0, again a basic HTTP client code</li>
   <li>SAX: a minimal SAX implementation compatible with early expat
   versions</li>
   <li>DocBook SGML v4: libxml2 includes a hackish parser to transition to
@@ -80,11 +80,10 @@
 
 <p>Separate documents:</p>
 <ul>
-  <li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a>
-     providing an implementation of XSLT 1.0 and extensions on top of
-  libxml2</li>
+  <li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a> providing an
+    implementation of XSLT 1.0 and extensions on top of libxml2</li>
   <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 page</a>
-     : a standard DOM2 implementation based on libxml2</li>
+    : a standard DOM2 implementation based on libxml2</li>
 </ul>
 
 <h2><a name="Introducti">Introduction</a></h2>
@@ -158,8 +157,7 @@
   <li>Unless you are forced to because your application links with a Gnome
     library requiring it,  <strong><span style="background-color: #FF0000">Do
     Not Use libxml1</span></strong>, use libxml2</li>
-  <li><em>Where can I get libxml</em>
-     ?
+  <li><em>Where can I get libxml</em> ?
     <p>The original distribution comes from <a
     href="ftp://rpmfind.net/pub/libxml/">rpmfind.net</a> or <a
     href="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/">gnome.org</a></p>
@@ -228,8 +226,8 @@
     <p>However if found at configuration time libxml will detect and use the
     following libs:</p>
     <ul>
-      <li><a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a>
-         : a highly portable and available widely compression library</li>
+      <li><a href="http://www.info-zip.org/pub/infozip/zlib/">libz</a> : a
+        highly portable and available widely compression library</li>
       <li>iconv: a powerful character encoding conversion library. It's
         included by default on recent glibc libraries, so it doesn't need to
         be installed specifically on linux. It seems it's now <a
@@ -351,9 +349,8 @@
       </li>
       <li><a
         href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&amp;dir=gnome-xml">Browse
-        the libxml source</a>
-         , I try to write code as clean and documented as possible, so
-        looking at it may be helpful</li>
+        the libxml source</a> , I try to write code as clean and documented
+        as possible, so looking at it may be helpful</li>
     </ul>
   </li>
   <li>What about C++ ?
@@ -401,8 +398,7 @@
     internationalization support</a></li>
   <li>This page provides a global overview and <a href="example.html">some
     examples</a> on how to use libxml.</li>
-  <li><a href="mailto:james@daa.com.au">James Henstridge</a>
-     wrote <a
+  <li><a href="mailto:james@daa.com.au">James Henstridge</a> wrote <a
     href="http://www.daa.com.au/~james/gnome/xml-sax/xml-sax.html">some nice
     documentation</a> explaining how to use the libxml SAX interface.</li>
   <li>George Lebl wrote <a
@@ -546,12 +542,17 @@
 <p>Items floating around but not actively worked on, get in touch with me if
 you want to test those</p>
 <ul>
-  <li>Implementing <a href="http://xmlsoft.org/XSLT">XSLT</a>, this is done
-    as a separate C library on top of libxml called libxslt</li>
   <li>Finishing up <a href="http://www.w3.org/TR/xptr">XPointer</a> and <a
     href="http://www.w3.org/TR/xinclude">XInclude</a></li>
-  <li>(seeems working but delayed from release) parsing/import of Docbook
-    SGML docs</li>
+</ul>
+
+<h3>2.4.17: Mar 8 2002</h3>
+<ul>
+  <li>a lot of bug fixes, including "namespace nodes have no parents in
+  XPath"</li>
+  <li>fixed/improved the Python wrappers, added more examples and more
+    regression tests, XPath extension functions can now return node-sets</li>
+  <li>added the XML Canonalization support from Aleksey Sanin</li>
 </ul>
 
 <h3>2.4.16: Feb 20 2002</h3>
@@ -1314,8 +1315,8 @@
 order to get updates to this list or to discuss the specific topic of libxml2
 or libxslt wrappers or bindings:</p>
 <ul>
-  <li><a href="mailto:ari@lusis.org">Ari Johnson</a>
-     provides a  C++ wrapper for libxml:<br>
+  <li><a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
+    for libxml:<br>
     Website: <a
     href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
     Download: <a
@@ -1324,12 +1325,12 @@
     based on the gdome2 </a>bindings maintained by Tobias Peters.</li>
   <li><a
     href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
-    Sergeant</a>
-     developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl
-    wrapper for libxml2/libxslt as part of the <a
-    href="http://axkit.com/">AxKit XML application server</a></li>
-  <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a>
-     provides and earlier version of the libxml/libxslt <a
+    Sergeant</a> developped <a
+    href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
+    libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML
+    application server</a></li>
+  <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides and
+    earlier version of the libxml/libxslt <a
     href="http://www.rexx.com/~dkuhlman">wrappers for Python</a></li>
   <li>Petr Kozelka provides <a
     href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue
@@ -1339,31 +1340,33 @@
     libxml2 bindings are also available in Ruby through the <a
     href="http://libgdome-ruby.berlios.de/">libgdome-ruby</a> module
     maintained by Tobias Peters.</li>
-  <li>Steve Ball and contributors maintains
-    <a href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for
-    Tcl</a>
-  <li>There is support for libxml2 in the DOM module of PHP.
+  <li>Steve Ball and contributors maintains <a
+    href="http://tclxml.sourceforge.net/">libxml2 and libxslt bindings for
+    Tcl</a></li>
+  <li>There is support for libxml2 in the DOM module of PHP.</li>
 </ul>
 
 <p>The distribution includes a set of Python bindings, which are garanteed to
 be maintained as part of the library in the future, though the Python
 interface have not yet reached the maturity of the C API.</p>
-<p>To install the Python bindings there are 2 options:
+
+<p>To install the Python bindings there are 2 options:</p>
 <ul>
-<li> If you use an RPM based distribution, simply install the
-<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python"
->libxml2-python RPM</a> (and if needed the
-<a href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python"
->libxslt-python RPM</a>).
-<li> Otherwise use the <a href="ftp://xmlsoft.org/python/">libxml2-python
-module distribution</a> corresponding to your installed version of libxml2
-and libxslt. Note that to install it you will need both libxml2 and libxslt
-installed and run "python setup.py build install" in the module tree.
+  <li>If you use an RPM based distribution, simply install the <a
+    href="http://rpmfind.net/linux/rpm2html/search.php?query=libxml2-python">libxml2-python
+    RPM</a> (and if needed the <a
+    href="http://rpmfind.net/linux/rpm2html/search.php?query=libxslt-python">libxslt-python
+    RPM</a>).</li>
+  <li>Otherwise use the <a href="ftp://xmlsoft.org/python/">libxml2-python
+    module distribution</a> corresponding to your installed version of
+    libxml2 and libxslt. Note that to install it you will need both libxml2
+    and libxslt installed and run "python setup.py build install" in the
+    module tree.</li>
 </ul>
-<p>The distribution
-includes a set of examples and regression tests for the python bindings in
-the <code>python/tests</code> directory. Here are some excepts from those
-tests:</p>
+
+<p>The distribution includes a set of examples and regression tests for the
+python bindings in the <code>python/tests</code> directory. Here are some
+excepts from those tests:</p>
 
 <h3>tst.py:</h3>
 
@@ -1389,18 +1392,15 @@
 prefix is removed and the casing convention are kept). All node seen at the
 binding level share the same subset of accesors:</p>
 <ul>
-  <li><code>name</code>
-    : returns the node name</li>
-  <li><code>type</code>
-    : returns a string indicating the node typ<code>e</code></li>
-  <li><code>content</code>
-    : returns the content of the node, it is based on xmlNodeGetContent() and
-    hence is recursive.</li>
-  <li><code>parent</code>
-    , <code>children</code>, <code>last</code>, <code>next</code>,
-    <code>prev</code>, <code>doc</code>, <code>properties</code>: pointing to
-    the associated element in the tree, those may return None in case no such
-    link exists.</li>
+  <li><code>name</code> : returns the node name</li>
+  <li><code>type</code> : returns a string indicating the node
+    typ<code>e</code></li>
+  <li><code>content</code> : returns the content of the node, it is based on
+    xmlNodeGetContent() and hence is recursive.</li>
+  <li><code>parent</code> , <code>children</code>, <code>last</code>,
+    <code>next</code>, <code>prev</code>, <code>doc</code>,
+    <code>properties</code>: pointing to the associated element in the tree,
+    those may return None in case no such link exists.</li>
 </ul>
 
 <p>Also note the need to explicitely deallocate documents with freeDoc() .
@@ -1600,8 +1600,7 @@
 
 <p>last but not least, all tests starts with the following prologue:</p>
 <pre>#memory debug specific
-libxml2.debugMemory(1)
-</pre>
+libxml2.debugMemory(1)</pre>
 
 <p>and ends with the following epilogue:</p>
 <pre>#memory debug specific
@@ -1990,11 +1989,11 @@
 debugging, analysis or to implement a specific behaviour on memory management
 (like on embedded systems). Two function calls are available to do so:</p>
 <ul>
-  <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet ()</a>
-     which return the current set of functions in use by the parser</li>
+  <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet
+    ()</a> which return the current set of functions in use by the parser</li>
   <li><a
     href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a>
-     which allow to set up a new set of memory allocation functions</li>
+    which allow to set up a new set of memory allocation functions</li>
 </ul>
 
 <p>Of course a call to xmlMemSetup() should probably be done before calling
@@ -2010,15 +2009,13 @@
 reuse the parser immediately:</p>
 <ul>
   <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser
-    ()</a>
-     is a centralized routine to free the parsing states. Note that it won't
-    deallocate any produced tree if any (use the xmlFreeDoc() and related
-    routines for this).</li>
+    ()</a> is a centralized routine to free the parsing states. Note that it
+    won't deallocate any produced tree if any (use the xmlFreeDoc() and
+    related routines for this).</li>
   <li><a href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser
-    ()</a>
-     is the dual routine allowing to preallocate the parsing state which can
-    be useful for example to avoid initialization reentrancy problems when
-    using libxml in multithreaded applications</li>
+    ()</a> is the dual routine allowing to preallocate the parsing state
+    which can be useful for example to avoid initialization reentrancy
+    problems when using libxml in multithreaded applications</li>
 </ul>
 
 <p>Generally xmlCleanupParser() is safe, if needed the state will be rebuild
@@ -2035,15 +2032,14 @@
 <ul>
   <li><a
     href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMallocLoc()</a>
-     <a
+    <a
     href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlReallocLoc()</a>
     and <a
     href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemStrdupLoc()</a>
     are the memory debugging replacement allocation routines</li>
   <li><a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump
-    ()</a>
-     dumps all the informations about the allocated memory block lefts in the
-    <code>.memdump</code> file</li>
+    ()</a> dumps all the informations about the allocated memory block lefts
+    in the <code>.memdump</code> file</li>
 </ul>
 
 <p>When developping libxml memory debug is enabled, the tests programs call
@@ -2548,6 +2544,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document:
@@ -2623,9 +2620,8 @@
     James Clark. This is relatively old and not the preferred mode of
     operation of libxml.</li>
   <li><a href="http://www.oasis-open.org/committees/entity/spec.html">XML
-    Catalogs</a>
-     is far more flexible, more recent, uses an XML syntax and should scale
-    quite better. This is the default option of libxml.</li>
+    Catalogs</a> is far more flexible, more recent, uses an XML syntax and
+    should scale quite better. This is the default option of libxml.</li>
 </ul>
 
 <p></p>
@@ -3674,38 +3670,36 @@
     patches, Gary Pennington worked on the validation API, threading support
     and Solaris port.</li>
   <li>John Fleck helps maintaining the documentation and man pages.</li>
-  <li><a href="mailto:ari@lusis.org">Ari Johnson</a>
-     provides a  C++ wrapper for libxml:<br>
+  <li><a href="mailto:ari@lusis.org">Ari Johnson</a> provides a  C++ wrapper
+    for libxml:<br>
     Website: <a
     href="http://lusis.org/~ari/xml++/">http://lusis.org/~ari/xml++/</a><br>
     Download: <a
     href="http://lusis.org/~ari/xml++/libxml++.tar.gz">http://lusis.org/~ari/xml++/libxml++.tar.gz</a></li>
-  <li><a href="mailto:izlatkovic@daenet.de">Igor  Zlatkovic</a>
-     is now the maintainer of the Windows port, <a
+  <li><a href="mailto:izlatkovic@daenet.de">Igor  Zlatkovic</a> is now the
+    maintainer of the Windows port, <a
     href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
     provides binaries</a></li>
-  <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a>
-     provides <a href="http://garypennington.net/libxml2/">Solaris
-    binaries</a></li>
+  <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a> provides
+    <a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
   <li><a
     href="http://mail.gnome.org/archives/xml/2001-March/msg00014.html">Matt
-    Sergeant</a>
-     developped <a href="http://axkit.org/download/">XML::LibXSLT</a>, a perl
-    wrapper for libxml2/libxslt as part of the <a
-    href="http://axkit.com/">AxKit XML application server</a></li>
-  <li><a href="mailto:fnatter@gmx.net">Felix Natter</a>
-     and <a href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a
+    Sergeant</a> developped <a
+    href="http://axkit.org/download/">XML::LibXSLT</a>, a perl wrapper for
+    libxml2/libxslt as part of the <a href="http://axkit.com/">AxKit XML
+    application server</a></li>
+  <li><a href="mailto:fnatter@gmx.net">Felix Natter</a> and <a
+    href="mailto:geertk@ai.rug.nl">Geert Kloosterman</a> provide <a
     href="libxml-doc.el">an emacs module</a> to lookup libxml(2) functions
     documentation</li>
-  <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a>
-     provided <a href="http://xmlsoft.org/messages/0488.html">man
-  pages</a></li>
+  <li><a href="mailto:sherwin@nlm.nih.gov">Ziying Sherwin</a> provided <a
+    href="http://xmlsoft.org/messages/0488.html">man pages</a></li>
   <li>there is a module for <a
     href="http://acs-misc.sourceforge.net/nsxml.html">libxml/libxslt support
     in OpenNSD/AOLServer</a></li>
-  <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a>
-     provides libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers
-    for Python</a></li>
+  <li><a href="mailto:dkuhlman@cutter.rexx.com">Dave Kuhlman</a> provides
+    libxml/libxslt <a href="http://www.rexx.com/~dkuhlman">wrappers for
+    Python</a></li>
   <li>Petr Kozelka provides <a
     href="http://sourceforge.net/projects/libxml2-pas">Pascal units to glue
     libxml2</a> with Kylix and Delphi and other Pascal compilers</li>
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 2f59de3..e462338 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -246,6 +246,7 @@
 
 
 
+
 } </pre>
 </li>
 <li>And then use it to save the document:
diff --git a/doc/xmlmem.html b/doc/xmlmem.html
index a18b3ab..2542df1 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -107,11 +107,11 @@
 (like on embedded systems). Two function calls are available to do so:</p>
 <ul>
 <li>
-<a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet ()</a>
-     which return the current set of functions in use by the parser</li>
+<a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemGet
+    ()</a> which return the current set of functions in use by the parser</li>
 <li>
 <a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemSetup()</a>
-     which allow to set up a new set of memory allocation functions</li>
+    which allow to set up a new set of memory allocation functions</li>
 </ul>
 <p>Of course a call to xmlMemSetup() should probably be done before calling
 any other libxml routines (unless you are sure your allocations routines are
@@ -125,16 +125,14 @@
 <ul>
 <li>
 <a href="http://xmlsoft.org/html/libxml-parser.html">xmlCleanupParser
-    ()</a>
-     is a centralized routine to free the parsing states. Note that it won't
-    deallocate any produced tree if any (use the xmlFreeDoc() and related
-    routines for this).</li>
+    ()</a> is a centralized routine to free the parsing states. Note that it
+    won't deallocate any produced tree if any (use the xmlFreeDoc() and
+    related routines for this).</li>
 <li>
 <a href="http://xmlsoft.org/html/libxml-parser.html">xmlInitParser
-    ()</a>
-     is the dual routine allowing to preallocate the parsing state which can
-    be useful for example to avoid initialization reentrancy problems when
-    using libxml in multithreaded applications</li>
+    ()</a> is the dual routine allowing to preallocate the parsing state
+    which can be useful for example to avoid initialization reentrancy
+    problems when using libxml in multithreaded applications</li>
 </ul>
 <p>Generally xmlCleanupParser() is safe, if needed the state will be rebuild
 at the next invocation of parser routines, but be careful of the consequences
@@ -152,9 +150,8 @@
     are the memory debugging replacement allocation routines</li>
 <li>
 <a href="http://xmlsoft.org/html/libxml-xmlmemory.html">xmlMemoryDump
-    ()</a>
-     dumps all the informations about the allocated memory block lefts in the
-    <code>.memdump</code> file</li>
+    ()</a> dumps all the informations about the allocated memory block lefts
+    in the <code>.memdump</code> file</li>
 </ul>
 <p>When developping libxml memory debug is enabled, the tests programs call
 xmlMemoryDump () and the &quot;make test&quot; regression tests will check for any
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index 6a51a28..d80540a 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -27,21 +27,21 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.4.16"
+#define LIBXML_DOTTED_VERSION "2.4.17"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20416
+#define LIBXML_VERSION 20417
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20416"
+#define LIBXML_VERSION_STRING "20417"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -49,7 +49,7 @@
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20416);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20417);
 
 #if 0
 /**
diff --git a/python/libxml.c b/python/libxml.c
index 026b0bc..cf7b149 100644
--- a/python/libxml.c
+++ b/python/libxml.c
@@ -1730,8 +1730,13 @@
 #endif
 
 void initlibxml2mod(void) {
+    static int initialized = 0;
     PyObject *m;
+
+    if (initialized != 0)
+	return;
     m = Py_InitModule("libxml2mod", libxmlMethods);
+    initialized = 1;
     libxml_xmlErrorInitialize();
 
 #ifdef MERGED_MODULES
diff --git a/xpath.c b/xpath.c
index 5baacf0..96b3916 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3475,7 +3475,7 @@
  *
  * Create a new xmlXPathContext
  *
- * Returns the xmlXPathContext just allocated.
+ * Returns the xmlXPathContext just allocated. The caller will need to free it.
  */
 xmlXPathContextPtr
 xmlXPathNewContext(xmlDocPtr doc) {