diff --git a/ChangeLog b/ChangeLog
index dd38317..30207dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon May 27 16:44:04 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+	* HTMLparser.c win32/libxml2.def.src win32/dsp/libxml2.def.src
+	  include/libxml/HTMLparser.h: fixing #79334 making htmlParseDocument
+	  a public entry point.
+	* doc/*: rebuilt the API and docs
+
 Mon May 27 14:16:28 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
 	* xpath.c: patch from Richard Jinks to fix a problem introduced
diff --git a/HTMLparser.c b/HTMLparser.c
index 4c819d1..82202aa 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -3578,7 +3578,7 @@
  *                as a result of the parsing.
  */
 
-static int
+int
 htmlParseDocument(htmlParserCtxtPtr ctxt) {
     xmlDtdPtr dtd;
 
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index 22abefd..7aa417f 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -239,7 +239,6 @@
 <dt>Disabled</dt>
 <dd>
 <a href="html/libxml-globals.html#XMLDOVALIDITYCHECKINGDEFAULTVALUE">xmlDoValidityCheckingDefaultValue</a>
-<a href="html/libxml-globals.html#XMLINDENTTREEOUTPUT">xmlIndentTreeOutput</a>
 <a href="html/libxml-globals.html#XMLLINENUMBERSDEFAULTVALUE">xmlLineNumbersDefaultValue</a>
 <a href="html/libxml-globals.html#XMLLOADEXTDTDDEFAULTVALUE">xmlLoadExtDtdDefaultValue</a>
 <a href="html/libxml-globals.html#XMLPARSERDEBUGENTITIES">xmlParserDebugEntities</a>
@@ -436,6 +435,10 @@
 <dd>
 <a href="html/libxml-parserinternals.html#XMLPARSESTARTTAG">xmlParseStartTag</a>
 </dd>
+<dt>Enabled</dt>
+<dd>
+<a href="html/libxml-globals.html#XMLINDENTTREEOUTPUT">xmlIndentTreeOutput</a>
+</dd>
 <dt>Encapsulating</dt>
 <dd>
 <a href="html/libxml-tree.html#XMLNODEGETBASE">xmlNodeGetBase</a>
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index f1776ef..3247616 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -178,6 +178,9 @@
 <a href="html/libxml-xmlio.html#XMLINPUTOPENCALLBACK">xmlInputOpenCallback</a>
 <a href="html/libxml-xmlio.html#XMLOUTPUTOPENCALLBACK">xmlOutputOpenCallback</a>
 <a href="html/libxml-xmlio.html#XMLIOHTTPOPENW">xmlIOHTTPOpenW</a>
+<a href="">xmlFileOpen</a>
+<a href="">xmlIOHTTPOpen</a>
+<a href="">xmlIOFTPOpen</a>
 <a href="html/libxml-xmlmemory.html#XMLMALLOCFUNC">xmlMallocFunc</a>
 <a href="html/libxml-xmlmemory.html#XMLREALLOCFUNC">xmlReallocFunc</a>
 <a href="html/libxml-xmlmemory.html#XMLMALLOCLOC">xmlMallocLoc</a>
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 9ae53f1..6c6806d 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -133,6 +133,7 @@
 <a href="html/libxml-htmlparser.html#HTMLPARSEENTITYREF">htmlParseEntityRef</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSECHARREF">htmlParseCharRef</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSEELEMENT">htmlParseElement</a>
+<a href="">htmlParseDocument</a>
 <a href="html/libxml-htmlparser.html#HTMLSAXPARSEDOC">htmlSAXParseDoc</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSEDOC">htmlParseDoc</a>
 <a href="html/libxml-htmlparser.html#HTMLSAXPARSEFILE">htmlSAXParseFile</a>
@@ -379,6 +380,7 @@
 <a href="html/libxml-globals.html#XMLGENERICERRORCONTEXT">xmlGenericErrorContext</a>
 <a href="html/libxml-globals.html#XMLGETWARNINGSDEFAULTVALUE">xmlGetWarningsDefaultValue</a>
 <a href="html/libxml-globals.html#XMLINDENTTREEOUTPUT">xmlIndentTreeOutput</a>
+<a href="">xmlTreeIndentString</a>
 <a href="html/libxml-globals.html#XMLKEEPBLANKSDEFAULTVALUE">xmlKeepBlanksDefaultValue</a>
 <a href="html/libxml-globals.html#XMLLINENUMBERSDEFAULTVALUE">xmlLineNumbersDefaultValue</a>
 <a href="html/libxml-globals.html#XMLLOADEXTDTDDEFAULTVALUE">xmlLoadExtDtdDefaultValue</a>
@@ -1127,6 +1129,18 @@
 <a href="html/libxml-xmlio.html#XMLIOHTTPOPENW">xmlIOHTTPOpenW</a>
 <a href="html/libxml-xmlio.html#XMLREGISTERHTTPPOSTCALLBACKS">xmlRegisterHTTPPostCallbacks</a>
 <a href="html/libxml-xmlio.html#XMLNONETEXTERNALENTITYLOADER">xmlNoNetExternalEntityLoader</a>
+<a href="">xmlFileMatch</a>
+<a href="">xmlFileOpen</a>
+<a href="">xmlFileRead</a>
+<a href="">xmlFileClose</a>
+<a href="">xmlIOHTTPMatch</a>
+<a href="">xmlIOHTTPOpen</a>
+<a href="">xmlIOHTTPRead</a>
+<a href="">xmlIOHTTPClose</a>
+<a href="">xmlIOFTPMatch</a>
+<a href="">xmlIOFTPOpen</a>
+<a href="">xmlIOFTPRead</a>
+<a href="">xmlIOFTPClose</a>
 </p>
 <h2>
 <a name="xmlerror">Module xmlerror</a>:</h2>
@@ -1344,6 +1358,7 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">xmlXPathNewValueTree</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
+<a href="">xmlXPathNodeSetAddNs</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETSORT">xmlXPathNodeSetSort</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHROOT">xmlXPathRoot</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHEVALEXPR">xmlXPathEvalExpr</a>
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index 061fde6..34042c8 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -601,6 +601,7 @@
 <a href="html/libxml-htmlparser.html#HTMLPARSEENTITYREF">htmlParseEntityRef</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSECHARREF">htmlParseCharRef</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSEELEMENT">htmlParseElement</a>
+<a href="">htmlParseDocument</a>
 <a href="html/libxml-htmlparser.html#HTMLFREEPARSERCTXT">htmlFreeParserCtxt</a>
 <a href="html/libxml-htmlparser.html#HTMLPARSECHUNK">htmlParseChunk</a>
 </p>
@@ -773,6 +774,12 @@
 <a href="html/libxml-xmlio.html#XMLOUTPUTCLOSECALLBACK">xmlOutputCloseCallback</a>
 <a href="html/libxml-xmlio.html#XMLPARSERINPUTBUFFERCREATEIO">xmlParserInputBufferCreateIO</a>
 <a href="html/libxml-xmlio.html#XMLOUTPUTBUFFERCREATEIO">xmlOutputBufferCreateIO</a>
+<a href="">xmlFileRead</a>
+<a href="">xmlFileClose</a>
+<a href="">xmlIOHTTPRead</a>
+<a href="">xmlIOHTTPClose</a>
+<a href="">xmlIOFTPRead</a>
+<a href="">xmlIOFTPClose</a>
 <a href="html/libxml-xmlerror.html#XMLGENERICERRORFUNC">xmlGenericErrorFunc</a>
 <a href="html/libxml-xmlerror.html#XMLSETGENERICERRORFUNC">xmlSetGenericErrorFunc</a>
 <a href="html/libxml-xmlerror.html#XMLPARSERERROR">xmlParserError</a>
@@ -1487,6 +1494,7 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEWVALUETREE">xmlXPathNewValueTree</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
+<a href="">xmlXPathNodeSetAddNs</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETDEL">xmlXPathNodeSetDel</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTSELF">xmlXPathNextSelf</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNEXTCHILD">xmlXPathNextChild</a>
@@ -1549,6 +1557,7 @@
 <a href="html/libxml-xpathinternals.html#XMLXPATHTRAILING">xmlXPathTrailing</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADD">xmlXPathNodeSetAdd</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETADDUNIQUE">xmlXPathNodeSetAddUnique</a>
+<a href="">xmlXPathNodeSetAddNs</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETSORT">xmlXPathNodeSetSort</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
 <a href="html/libxml-xpathinternals.html#XMLXPATHNODESETMERGE">xmlXPathNodeSetMerge</a>
@@ -1587,6 +1596,7 @@
 <a href="html/libxml-tree.html#XMLCOPYNAMESPACELIST">xmlCopyNamespaceList</a>
 <a href="html/libxml-tree.html#XMLSETNSPROP">xmlSetNsProp</a>
 <a href="html/libxml-tree.html#XMLUNSETNSPROP">xmlUnsetNsProp</a>
+<a href="">xmlXPathNodeSetAddNs</a>
 </p>
 <h2>Type xmlOutputBufferPtr:</h2>
 <p>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 4966f15..5531e74 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -235,6 +235,7 @@
      <exports symbol='htmlParseEntityRef'/>
      <exports symbol='htmlParseCharRef'/>
      <exports symbol='htmlParseElement'/>
+     <exports symbol='htmlParseDocument'/>
      <exports symbol='htmlSAXParseDoc'/>
      <exports symbol='htmlParseDoc'/>
      <exports symbol='htmlSAXParseFile'/>
@@ -782,6 +783,7 @@
      <exports symbol='xmlXPathNewValueTree'/>
      <exports symbol='xmlXPathNodeSetAdd'/>
      <exports symbol='xmlXPathNodeSetAddUnique'/>
+     <exports symbol='xmlXPathNodeSetAddNs'/>
      <exports symbol='xmlXPathNodeSetSort'/>
      <exports symbol='xmlXPathRoot'/>
      <exports symbol='xmlXPathEvalExpr'/>
@@ -953,6 +955,7 @@
      <exports symbol='xmlGenericErrorContext'/>
      <exports symbol='xmlGetWarningsDefaultValue'/>
      <exports symbol='xmlIndentTreeOutput'/>
+     <exports symbol='xmlTreeIndentString'/>
      <exports symbol='xmlKeepBlanksDefaultValue'/>
      <exports symbol='xmlLineNumbersDefaultValue'/>
      <exports symbol='xmlLoadExtDtdDefaultValue'/>
@@ -1227,6 +1230,18 @@
      <exports symbol='xmlIOHTTPOpenW'/>
      <exports symbol='xmlRegisterHTTPPostCallbacks'/>
      <exports symbol='xmlNoNetExternalEntityLoader'/>
+     <exports symbol='xmlFileMatch'/>
+     <exports symbol='xmlFileOpen'/>
+     <exports symbol='xmlFileRead'/>
+     <exports symbol='xmlFileClose'/>
+     <exports symbol='xmlIOHTTPMatch'/>
+     <exports symbol='xmlIOHTTPOpen'/>
+     <exports symbol='xmlIOHTTPRead'/>
+     <exports symbol='xmlIOHTTPClose'/>
+     <exports symbol='xmlIOFTPMatch'/>
+     <exports symbol='xmlIOFTPOpen'/>
+     <exports symbol='xmlIOFTPRead'/>
+     <exports symbol='xmlIOFTPClose'/>
     </file>
     <file name='xpath'>
      <exports symbol='xmlXPathContext'/>
@@ -2374,6 +2389,10 @@
       <arg name='cur' type='xmlChar *' info='a pointer to an array of xmlChar '/>
       <arg name='encoding' type='const char *' info='a free form C string describing the HTML document encoding, or NULL '/>
     </function>
+    <function name='htmlParseDocument' file='HTMLparser'>
+      <return type='int'/>
+      <arg name='ctxt' type='htmlParserCtxtPtr'/>
+    </function>
     <function name='htmlParseElement' file='HTMLparser'>
       <info>parse an HTML element, this is highly recursive </info>
       <return type='void'/>
@@ -3655,6 +3674,24 @@
       <arg name='ID' type='const char *' info='The Public ID of the resource requested '/>
       <arg name='context' type='xmlParserCtxtPtr' info='the XML parser context '/>
     </functype>
+    <function name='xmlFileClose' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+    </function>
+    <function name='xmlFileMatch' file='xmlIO'>
+      <return type='int'/>
+      <arg name='filename' type='const char *'/>
+    </function>
+    <function name='xmlFileOpen' file='xmlIO'>
+      <return type='void *'/>
+      <arg name='filename' type='const char *'/>
+    </function>
+    <function name='xmlFileRead' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+      <arg name='buffer' type='char *'/>
+      <arg name='len' type='int'/>
+    </function>
     <function name='xmlFindCharEncodingHandler' file='encoding'>
       <info>Search in the registered set the handler able to read/write that encoding.</info>
       <return type='xmlCharEncodingHandlerPtr' info='the handler or NULL if not found '/>
@@ -4165,12 +4202,48 @@
     <struct name='xmlID' file='tree' info='An XML ID instance.'/>
     <typedef name='xmlIDPtr' file='tree'/>
     <typedef name='xmlIDTablePtr' file='valid'/>
+    <function name='xmlIOFTPClose' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+    </function>
+    <function name='xmlIOFTPMatch' file='xmlIO'>
+      <return type='int'/>
+      <arg name='filename' type='const char *'/>
+    </function>
+    <function name='xmlIOFTPOpen' file='xmlIO'>
+      <return type='void *'/>
+      <arg name='filename' type='const char *'/>
+    </function>
+    <function name='xmlIOFTPRead' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+      <arg name='buffer' type='char *'/>
+      <arg name='len' type='int'/>
+    </function>
+    <function name='xmlIOHTTPClose' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+    </function>
+    <function name='xmlIOHTTPMatch' file='xmlIO'>
+      <return type='int'/>
+      <arg name='filename' type='const char *'/>
+    </function>
+    <function name='xmlIOHTTPOpen' file='xmlIO'>
+      <return type='void *'/>
+      <arg name='filename' type='const char *'/>
+    </function>
     <function name='xmlIOHTTPOpenW' file='xmlIO'>
       <info>Open a temporary buffer to collect the document for a subsequent HTTP POST request. Non-static as is called from the output buffer creation routine.</info>
       <return type='void *'/>
       <arg name='post_uri' type='const char *' info='The destination URI for the document '/>
       <arg name='compression' type='int' info='The compression desired for the document. '/>
     </function>
+    <function name='xmlIOHTTPRead' file='xmlIO'>
+      <return type='int'/>
+      <arg name='context' type='void *'/>
+      <arg name='buffer' type='char *'/>
+      <arg name='len' type='int'/>
+    </function>
     <function name='xmlIOParseDTD' file='parser'>
       <info>Load and parse a DTD</info>
       <return type='xmlDtdPtr' info='input will be freed at parsing end. '/>
@@ -4179,7 +4252,7 @@
       <arg name='enc' type='xmlCharEncoding' info='the charset encoding if known '/>
     </function>
     <macro name='xmlIndentTreeOutput' file='globals'>
-      <info>Global setting, asking the serializer to indent the output tree by default Disabled by default</info>
+      <info>Global setting, asking the serializer to indent the output tree by default Enabled by default</info>
     </macro>
     <function name='xmlInitCharEncodingHandlers' file='encoding'>
       <info>Initialize the char encoding support, it registers the default encoding supported. NOTE: while public, this function usually doesn&apos;t need to be called in normal processing.</info>
@@ -6448,6 +6521,8 @@
       <arg name='first' type='xmlNodePtr' info='the first text node '/>
       <arg name='second' type='xmlNodePtr' info='the second text node being merged '/>
     </function>
+    <macro name='xmlTreeIndentString' file='globals'>
+    </macro>
     <struct name='xmlURI' file='uri' info='A parsed URI reference. This is a struct containing the various fields as described in RFC 2396 but separated for further processing.'/>
     <function name='xmlURIEscape' file='uri'>
       <info>Escaping routine, does not do validity checks ! It will try to escape the chars needing this, but this is heuristic based it&apos;s impossible to be sure.</info>
@@ -7243,6 +7318,12 @@
       <arg name='cur' type='xmlNodeSetPtr' info='the initial node set '/>
       <arg name='val' type='xmlNodePtr' info='a new xmlNodePtr '/>
     </function>
+    <function name='xmlXPathNodeSetAddNs' file='xpathInternals'>
+      <return type='void'/>
+      <arg name='cur' type='xmlNodeSetPtr'/>
+      <arg name='node' type='xmlNodePtr'/>
+      <arg name='ns' type='xmlNsPtr'/>
+    </function>
     <function name='xmlXPathNodeSetAddUnique' file='xpathInternals'>
       <info>add a new xmlNodePtr to an existing NodeSet, optimized version when we are sure the node is not already in the set.</info>
       <return type='void'/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index e82e802..3a9cc28 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -3033,6 +3033,9 @@
       <ref name='xmlInputOpenCallback'/>
       <ref name='xmlOutputOpenCallback'/>
       <ref name='xmlIOHTTPOpenW'/>
+      <ref name='xmlFileOpen'/>
+      <ref name='xmlIOHTTPOpen'/>
+      <ref name='xmlIOFTPOpen'/>
       <ref name='xmlMallocFunc'/>
       <ref name='xmlReallocFunc'/>
       <ref name='xmlMallocLoc'/>
@@ -3926,6 +3929,7 @@
       <ref name='htmlParseEntityRef'/>
       <ref name='htmlParseCharRef'/>
       <ref name='htmlParseElement'/>
+      <ref name='htmlParseDocument'/>
       <ref name='htmlFreeParserCtxt'/>
       <ref name='htmlParseChunk'/>
     </type>
@@ -4091,6 +4095,12 @@
       <ref name='xmlOutputCloseCallback'/>
       <ref name='xmlParserInputBufferCreateIO'/>
       <ref name='xmlOutputBufferCreateIO'/>
+      <ref name='xmlFileRead'/>
+      <ref name='xmlFileClose'/>
+      <ref name='xmlIOHTTPRead'/>
+      <ref name='xmlIOHTTPClose'/>
+      <ref name='xmlIOFTPRead'/>
+      <ref name='xmlIOFTPClose'/>
       <ref name='xmlGenericErrorFunc'/>
       <ref name='xmlSetGenericErrorFunc'/>
       <ref name='xmlParserError'/>
@@ -4748,6 +4758,7 @@
       <ref name='xmlXPathNewValueTree'/>
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
+      <ref name='xmlXPathNodeSetAddNs'/>
       <ref name='xmlXPathNodeSetDel'/>
       <ref name='xmlXPathNextSelf'/>
       <ref name='xmlXPathNextChild'/>
@@ -4808,6 +4819,7 @@
       <ref name='xmlXPathTrailing'/>
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
+      <ref name='xmlXPathNodeSetAddNs'/>
       <ref name='xmlXPathNodeSetSort'/>
       <ref name='xmlXPathNodeSetMerge'/>
       <ref name='xmlXPathNodeSetMerge'/>
@@ -4843,6 +4855,7 @@
       <ref name='xmlCopyNamespaceList'/>
       <ref name='xmlSetNsProp'/>
       <ref name='xmlUnsetNsProp'/>
+      <ref name='xmlXPathNodeSetAddNs'/>
     </type>
     <type name='xmlOutputBufferPtr'>
       <ref name='htmlNodeDumpFormatOutput'/>
@@ -5259,6 +5272,7 @@
       <ref name='htmlParseEntityRef'/>
       <ref name='htmlParseCharRef'/>
       <ref name='htmlParseElement'/>
+      <ref name='htmlParseDocument'/>
       <ref name='htmlSAXParseDoc'/>
       <ref name='htmlParseDoc'/>
       <ref name='htmlSAXParseFile'/>
@@ -5489,6 +5503,7 @@
       <ref name='xmlGenericErrorContext'/>
       <ref name='xmlGetWarningsDefaultValue'/>
       <ref name='xmlIndentTreeOutput'/>
+      <ref name='xmlTreeIndentString'/>
       <ref name='xmlKeepBlanksDefaultValue'/>
       <ref name='xmlLineNumbersDefaultValue'/>
       <ref name='xmlLoadExtDtdDefaultValue'/>
@@ -6211,6 +6226,18 @@
       <ref name='xmlIOHTTPOpenW'/>
       <ref name='xmlRegisterHTTPPostCallbacks'/>
       <ref name='xmlNoNetExternalEntityLoader'/>
+      <ref name='xmlFileMatch'/>
+      <ref name='xmlFileOpen'/>
+      <ref name='xmlFileRead'/>
+      <ref name='xmlFileClose'/>
+      <ref name='xmlIOHTTPMatch'/>
+      <ref name='xmlIOHTTPOpen'/>
+      <ref name='xmlIOHTTPRead'/>
+      <ref name='xmlIOHTTPClose'/>
+      <ref name='xmlIOFTPMatch'/>
+      <ref name='xmlIOFTPOpen'/>
+      <ref name='xmlIOFTPRead'/>
+      <ref name='xmlIOFTPClose'/>
     </file>
     <file name='xmlerror'>
       <ref name='xmlParserErrors'/>
@@ -6418,6 +6445,7 @@
       <ref name='xmlXPathNewValueTree'/>
       <ref name='xmlXPathNodeSetAdd'/>
       <ref name='xmlXPathNodeSetAddUnique'/>
+      <ref name='xmlXPathNodeSetAddNs'/>
       <ref name='xmlXPathNodeSetSort'/>
       <ref name='xmlXPathRoot'/>
       <ref name='xmlXPathEvalExpr'/>
@@ -7184,7 +7212,6 @@
         </word>
         <word name='Disabled'>
           <ref name='xmlDoValidityCheckingDefaultValue'/>
-          <ref name='xmlIndentTreeOutput'/>
           <ref name='xmlLineNumbersDefaultValue'/>
           <ref name='xmlLoadExtDtdDefaultValue'/>
           <ref name='xmlParserDebugEntities'/>
@@ -7357,6 +7384,9 @@
         <word name='EmptyElement'>
           <ref name='xmlParseStartTag'/>
         </word>
+        <word name='Enabled'>
+          <ref name='xmlIndentTreeOutput'/>
+        </word>
         <word name='Encapsulating'>
           <ref name='xmlNodeGetBase'/>
         </word>
diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h
index 20f304b..f092137 100644
--- a/include/libxml/HTMLparser.h
+++ b/include/libxml/HTMLparser.h
@@ -72,6 +72,7 @@
 int			htmlParseCharRef(htmlParserCtxtPtr ctxt);
 void			htmlParseElement(htmlParserCtxtPtr ctxt);
 
+int			htmlParseDocument(htmlParserCtxtPtr ctxt);
 htmlDocPtr		htmlSAXParseDoc	(xmlChar *cur,
 					 const char *encoding,
 					 htmlSAXHandlerPtr sax,
diff --git a/win32/dsp/libxml2.def.src b/win32/dsp/libxml2.def.src
index b0fdff1..ae09318 100644
--- a/win32/dsp/libxml2.def.src
+++ b/win32/dsp/libxml2.def.src
@@ -323,6 +323,7 @@
 	htmlParseEntityRef
 	htmlParseCharRef
 	htmlParseElement
+	htmlParseDocument
 	htmlSAXParseDoc
 	htmlParseDoc
 	htmlSAXParseFile
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index f0cb31a..e19e384 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -323,6 +323,7 @@
 	htmlParseEntityRef
 	htmlParseCharRef
 	htmlParseElement
+	htmlParseDocument
 	htmlSAXParseDoc
 	htmlParseDoc
 	htmlSAXParseFile