preparing release 2.6.5, rebuilt the docs, checked rngparser stuff does

* configure.in NEWS doc/*: preparing release 2.6.5, rebuilt the
  docs, checked rngparser stuff does not end up in the tarball
Daniel
diff --git a/ChangeLog b/ChangeLog
index 80674cd..cc932f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 25 21:45:03 CET 2004 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in NEWS doc/*: preparing release 2.6.5, rebuilt the
+	  docs, checked rngparser stuff does not end up in the tarball
+
 Sun Jan 25 20:59:20 CET 2004 Daniel Veillard <daniel@veillard.com>
 
 	* python/libxml.c: applied patch from Frederic Peters
diff --git a/NEWS b/NEWS
index eeded5c..69b2681 100644
--- a/NEWS
+++ b/NEWS
@@ -15,10 +15,34 @@
   Schemas
 
 
+2.6.5: Jan 25 2004:
+   - Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
+   - Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
+   - Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)
+   - XInclude: various fixes for conformance, problem related to dictionnary
+    references (William & me), recursion (William)
+   - xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), 
+   - xmlSchemas: normalizedString datatype (John Belmonte)
+   - code cleanup for strings functions (William)
+   - Windows: compiler patches (Mark Vakoc)
+   - Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
+
+
 2.6.4: Dec 24 2003:
    - Windows build fixes (Igor Zlatkovic)
-   - Some serious XInclude problems reported by Oleg Paraschenko and 
-   - Unix and Makefile packaging fixes (me, William Brack, 
+   - Some serious XInclude problems reported by Oleg Paraschenko and
+   - Unix and Makefile packaging fixes (me, William Brack,
    - Documentation improvements (John Fleck, William Brack), example fix
     (Lucas Brasilino)
    - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
diff --git a/configure.in b/configure.in
index cd93101..bc56453 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=6
-LIBXML_MICRO_VERSION=4
+LIBXML_MICRO_VERSION=5
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index 536d37c..707c44b 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -232,6 +232,7 @@
 </dd><dt>Compile</dt><dd><a href="html/libxml-xmlautomata.html#xmlAutomataCompile">xmlAutomataCompile</a><br />
 <a href="html/libxml-pattern.html#xmlPatterncompile">xmlPatterncompile</a><br />
 <a href="html/libxml-xpath.html#xmlXPathCompile">xmlXPathCompile</a><br />
+<a href="html/libxml-xpath.html#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a><br />
 <a href="html/libxml-xpathInternals.html#xmlXPathStringEvalNumber">xmlXPathStringEvalNumber</a><br />
 </dd><dt>Compress</dt><dd><a href="html/libxml-DOCBparser.html#docbCreateFileParserCtxt">docbCreateFileParserCtxt</a><br />
 <a href="html/libxml-DOCBparser.html#docbParseFile">docbParseFile</a><br />
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index 40985e7..5e82728 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -424,6 +424,7 @@
 <a href="html/libxml-debugXML.html#xmlShellPwd">xmlShellPwd</a><br />
 </dd><dt>compilation</dt><dd><a href="html/libxml-pattern.html#xmlPatterncompile">xmlPatterncompile</a><br />
 <a href="html/libxml-xpath.html#xmlXPathCompile">xmlXPathCompile</a><br />
+<a href="html/libxml-xpath.html#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a><br />
 </dd><dt>compile</dt><dd><a href="html/libxml-pattern.html#xmlPatterncompile">xmlPatterncompile</a><br />
 </dd><dt>compile-time</dt><dd><a href="html/libxml-DOCBparser.html#docbCreateFileParserCtxt">docbCreateFileParserCtxt</a><br />
 <a href="html/libxml-DOCBparser.html#docbParseFile">docbParseFile</a><br />
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index a52927c..5964ee6 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -342,23 +342,6 @@
 <a href="html/libxml-xmlschemas.html#xmlSchemaNewParserCtxt">xmlSchemaNewParserCtxt</a><br />
 </dd><dt>explored</dt><dd><a href="html/libxml-xpath.html#xmlXPathAxisFunc">xmlXPathAxisFunc</a><br />
 </dd><dt>exposing</dt><dd><a href="html/libxml-xmlreader.html#xmlTextReaderRead">xmlTextReaderRead</a><br />
-</dd><dt>expression</dt><dd><a href="html/libxml-xpath.html#_xmlXPathContext">_xmlXPathContext</a><br />
-<a href="html/libxml-xpath.html#_xmlXPathParserContext">_xmlXPathParserContext</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegFreeExecCtxt">xmlRegFreeExecCtxt</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegNewExecCtxt">xmlRegNewExecCtxt</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegexpCompile">xmlRegexpCompile</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegexpExec">xmlRegexpExec</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegexpIsDeterminist">xmlRegexpIsDeterminist</a><br />
-<a href="html/libxml-xmlregexp.html#xmlRegexpPrint">xmlRegexpPrint</a><br />
-<a href="html/libxml-xpath.html#xmlXPathCompile">xmlXPathCompile</a><br />
-<a href="html/libxml-xpath.html#xmlXPathCompiledEval">xmlXPathCompiledEval</a><br />
-<a href="html/libxml-xpathInternals.html#xmlXPathDebugDumpCompExpr">xmlXPathDebugDumpCompExpr</a><br />
-<a href="html/libxml-xpath.html#xmlXPathEval">xmlXPathEval</a><br />
-<a href="html/libxml-xpathInternals.html#xmlXPathEvalExpr">xmlXPathEvalExpr</a><br />
-<a href="html/libxml-xpath.html#xmlXPathEvalExpression">xmlXPathEvalExpression</a><br />
-<a href="html/libxml-xpathInternals.html#xmlXPathNewParserContext">xmlXPathNewParserContext</a><br />
-<a href="html/libxml-xpathInternals.html#xmlXPathStringEvalNumber">xmlXPathStringEvalNumber</a><br />
-<a href="html/libxml-xpointer.html#xmlXPtrEval">xmlXPtrEval</a><br />
 </dd><dt>expressions</dt><dd><a href="html/libxml-xmlversion.html#LIBXML_REGEXP_ENABLED">LIBXML_REGEXP_ENABLED</a><br />
 </dd><dt>exslSetsDistinctSorted</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathDistinct">xmlXPathDistinct</a><br />
 </dd><dt>exslSetsLeadingSorted</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathLeading">xmlXPathLeading</a><br />
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index 1b88e41..5ada767 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -200,6 +200,7 @@
 <a href="html/libxml-xmlreader.html#xmlReaderNewFile">xmlReaderNewFile</a><br />
 <a href="html/libxml-xmlreader.html#xmlReaderNewIO">xmlReaderNewIO</a><br />
 <a href="html/libxml-xmlreader.html#xmlReaderNewMemory">xmlReaderNewMemory</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 <a href="html/libxml-xinclude.html#xmlXIncludeSetFlags">xmlXIncludeSetFlags</a><br />
 </dd><dt>flat</dt><dd><a href="html/libxml-tree.html#xmlStringGetNodeList">xmlStringGetNodeList</a><br />
 <a href="html/libxml-tree.html#xmlStringLenGetNodeList">xmlStringLenGetNodeList</a><br />
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html
index 6ca853b..ea3ebe4 100644
--- a/doc/APIchunk15.html
+++ b/doc/APIchunk15.html
@@ -278,6 +278,7 @@
 <a href="html/libxml-xmlerror.html#xmlParserPrintFileInfo">xmlParserPrintFileInfo</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGGetValidErrors">xmlRelaxNGGetValidErrors</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetValidErrors">xmlRelaxNGSetValidErrors</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 <a href="html/libxml-SAX2.html#xmlSAX2EndElementNs">xmlSAX2EndElementNs</a><br />
 <a href="html/libxml-SAX2.html#xmlSAX2StartElementNs">xmlSAX2StartElementNs</a><br />
 <a href="html/libxml-xmlschemas.html#xmlSchemaSetValidErrors">xmlSchemaSetValidErrors</a><br />
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index d79c380..9dfb9a3 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -79,6 +79,7 @@
 <a href="html/libxml-xmlIO.html#xmlOutputBufferWriteString">xmlOutputBufferWriteString</a><br />
 </dd><dt>particular</dt><dd><a href="html/libxml-xpath.html#_xmlNodeSet">_xmlNodeSet</a><br />
 </dd><dt>pass</dt><dd><a href="html/libxml-parserInternals.html#xmlCurrentChar">xmlCurrentChar</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 <a href="html/libxml-xmlreader.html#xmlTextReaderSetErrorHandler">xmlTextReaderSetErrorHandler</a><br />
 </dd><dt>passed</dt><dd><a href="html/libxml-xpathInternals.html#CHECK_ARITY">CHECK_ARITY</a><br />
 <a href="html/libxml-xmlautomata.html#xmlAutomataNewTransition">xmlAutomataNewTransition</a><br />
@@ -322,6 +323,7 @@
 </dd><dt>prior</dt><dd><a href="html/libxml-parser.html#xmlSetupParserForBuffer">xmlSetupParserForBuffer</a><br />
 </dd><dt>private</dt><dd><a href="html/libxml-catalog.html#xmlCatalogLocalResolve">xmlCatalogLocalResolve</a><br />
 <a href="html/libxml-catalog.html#xmlCatalogLocalResolveURI">xmlCatalogLocalResolveURI</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 </dd><dt>problem</dt><dd><a href="html/libxml-parser.html#xmlParseBalancedChunkMemory">xmlParseBalancedChunkMemory</a><br />
 <a href="html/libxml-parser.html#xmlParseBalancedChunkMemoryRecover">xmlParseBalancedChunkMemoryRecover</a><br />
 <a href="html/libxml-parser.html#xmlParseCtxtExternalEntity">xmlParseCtxtExternalEntity</a><br />
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html
index b0a9ba8..01bc2c6 100644
--- a/doc/APIchunk25.html
+++ b/doc/APIchunk25.html
@@ -316,6 +316,7 @@
 </dd><dt>xmlRNewMutex</dt><dd><a href="html/libxml-threads.html#xmlNewRMutex">xmlNewRMutex</a><br />
 </dd><dt>xmlReader</dt><dd><a href="html/libxml-xmlversion.html#LIBXML_READER_ENABLED">LIBXML_READER_ENABLED</a><br />
 </dd><dt>xmlRefPtr</dt><dd><a href="html/libxml-valid.html#xmlAddRef">xmlAddRef</a><br />
+</dd><dt>xmlRelaxNGParserFlag</dt><dd><a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 </dd><dt>xmlRelaxNGValidatePushElement</dt><dd><a href="html/libxml-relaxng.html#xmlRelaxNGValidateFullElement">xmlRelaxNGValidateFullElement</a><br />
 </dd><dt>xmlSAX2Attribute</dt><dd><a href="html/libxml-SAX.html#attribute">attribute</a><br />
 </dd><dt>xmlSAX2AttributeDecl</dt><dd><a href="html/libxml-SAX.html#attributeDecl">attributeDecl</a><br />
@@ -406,6 +407,7 @@
 <a href="html/libxml-xpathInternals.html#xmlXPathPopNumber">xmlXPathPopNumber</a><br />
 <a href="html/libxml-xpathInternals.html#xmlXPathPopString">xmlXPathPopString</a><br />
 </dd><dt>xmlXPathCompExprPtr</dt><dd><a href="html/libxml-xpath.html#xmlXPathCompile">xmlXPathCompile</a><br />
+<a href="html/libxml-xpath.html#xmlXPathCtxtCompile">xmlXPathCtxtCompile</a><br />
 </dd><dt>xmlXPathContext</dt><dd><a href="html/libxml-xpath.html#xmlXPathFreeContext">xmlXPathFreeContext</a><br />
 <a href="html/libxml-xpath.html#xmlXPathNewContext">xmlXPathNewContext</a><br />
 <a href="html/libxml-xpointer.html#xmlXPtrNewContext">xmlXPtrNewContext</a><br />
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html
index 4c9005c..804196a 100644
--- a/doc/APIchunk6.html
+++ b/doc/APIchunk6.html
@@ -145,6 +145,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidatePopElement">xmlRelaxNGValidatePopElement</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidatePushCData">xmlRelaxNGValidatePushCData</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 <a href="html/libxml-xmlreader.html#xmlTextReaderRelaxNGSetSchema">xmlTextReaderRelaxNGSetSchema</a><br />
 <a href="html/libxml-xmlreader.html#xmlTextReaderRelaxNGValidate">xmlTextReaderRelaxNGValidate</a><br />
 </dd><dt>RelaxNGs</dt><dd><a href="html/libxml-relaxng.html#xmlRelaxNGNewDocParserCtxt">xmlRelaxNGNewDocParserCtxt</a><br />
@@ -315,6 +316,7 @@
 </dd><dt>See</dt><dd><a href="html/libxml-list.html#xmlLinkGetData">xmlLinkGetData</a><br />
 <a href="html/libxml-parserInternals.html#xmlParseNotationDecl">xmlParseNotationDecl</a><br />
 </dd><dt>Seems</dt><dd><a href="html/libxml-parserInternals.html#xmlParseTextDecl">xmlParseTextDecl</a><br />
+</dd><dt>Semi</dt><dd><a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 </dd><dt>Send</dt><dd><a href="html/libxml-nanoftp.html#xmlNanoFTPQuit">xmlNanoFTPQuit</a><br />
 </dd><dt>Set</dt><dd><a href="html/libxml-HTMLparser.html#htmlHandleOmittedElem">htmlHandleOmittedElem</a><br />
 <a href="html/libxml-xmlerror.html#initGenericErrorDefaultFunc">initGenericErrorDefaultFunc</a><br />
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index b4513b0..571ea72 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -841,7 +841,10 @@
 <a href="html/libxml-pattern.html#xmlPatternMatch">xmlPatternMatch</a><br />
 <a href="html/libxml-pattern.html#xmlPatternPtr">xmlPatternPtr</a><br />
 <a href="html/libxml-pattern.html#xmlPatterncompile">xmlPatterncompile</a><br />
-</p><h2><a name="relaxng" id="relaxng">Module relaxng</a>:</h2><p><a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTREXTRANS">XML_RELAXNG_ERR_ATTREXTRANS</a><br />
+</p><h2><a name="relaxng" id="relaxng">Module relaxng</a>:</h2><p><a href="html/libxml-relaxng.html#XML_RELAXNGP_CRNG">XML_RELAXNGP_CRNG</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNGP_FREE_DOC">XML_RELAXNGP_FREE_DOC</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNGP_NONE">XML_RELAXNGP_NONE</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTREXTRANS">XML_RELAXNG_ERR_ATTREXTRANS</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNAME">XML_RELAXNG_ERR_ATTRNAME</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNONS">XML_RELAXNG_ERR_ATTRNONS</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRVALID">XML_RELAXNG_ERR_ATTRVALID</a><br />
@@ -897,6 +900,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGParse">xmlRelaxNGParse</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetParserErrors">xmlRelaxNGSetParserErrors</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetValidErrors">xmlRelaxNGSetValidErrors</a><br />
@@ -910,6 +914,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 </p><h2><a name="schemasInternals" id="schemasInternals">Module schemasInternals</a>:</h2><p><a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ANYATTR_LAX">XML_SCHEMAS_ANYATTR_LAX</a><br />
 <a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ANYATTR_SKIP">XML_SCHEMAS_ANYATTR_SKIP</a><br />
 <a href="html/libxml-schemasInternals.html#XML_SCHEMAS_ANYATTR_STRICT">XML_SCHEMAS_ANYATTR_STRICT</a><br />
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index 858aefc..d9bae30 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -1660,6 +1660,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGGetParserErrors">xmlRelaxNGGetParserErrors</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGParse">xmlRelaxNGParse</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetParserErrors">xmlRelaxNGSetParserErrors</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 </p><h2>Type xmlRelaxNGPtr:</h2><p><a href="html/libxml-relaxng.html#xmlRelaxNGDump">xmlRelaxNGDump</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGDumpTree">xmlRelaxNGDumpTree</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGFree">xmlRelaxNGFree</a><br />
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 16401c5..253679b 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -510,6 +510,9 @@
 <a href="html/libxml-xmlreader.html#XML_READER_TYPE_WHITESPACE">XML_READER_TYPE_WHITESPACE</a><br />
 <a href="html/libxml-xmlreader.html#XML_READER_TYPE_XML_DECLARATION">XML_READER_TYPE_XML_DECLARATION</a><br />
 <a href="html/libxml-xmlerror.html#XML_REGEXP_COMPILE_ERROR">XML_REGEXP_COMPILE_ERROR</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNGP_CRNG">XML_RELAXNGP_CRNG</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNGP_FREE_DOC">XML_RELAXNGP_FREE_DOC</a><br />
+<a href="html/libxml-relaxng.html#XML_RELAXNGP_NONE">XML_RELAXNGP_NONE</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTREXTRANS">XML_RELAXNG_ERR_ATTREXTRANS</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNAME">XML_RELAXNG_ERR_ATTRNAME</a><br />
 <a href="html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNONS">XML_RELAXNG_ERR_ATTRNONS</a><br />
@@ -2024,6 +2027,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGParse">xmlRelaxNGParse</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGPtr">xmlRelaxNGPtr</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetParserErrors">xmlRelaxNGSetParserErrors</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGSetValidErrors">xmlRelaxNGSetValidErrors</a><br />
@@ -2037,6 +2041,7 @@
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidatePushElement">xmlRelaxNGValidatePushElement</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidityErrorFunc">xmlRelaxNGValidityErrorFunc</a><br />
 <a href="html/libxml-relaxng.html#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a><br />
+<a href="html/libxml-relaxng.html#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a><br />
 <a href="html/libxml-valid.html#xmlRemoveID">xmlRemoveID</a><br />
 <a href="html/libxml-tree.html#xmlRemoveProp">xmlRemoveProp</a><br />
 <a href="html/libxml-valid.html#xmlRemoveRef">xmlRemoveRef</a><br />
diff --git a/doc/apibuild.py b/doc/apibuild.py
index a0b3f28..688403f 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -27,6 +27,8 @@
   "testOOM.c": "out of memory tester",
   "testOOMlib.h": "out of memory tester",
   "testOOMlib.c": "out of memory tester",
+  "rngparser.c": "not yet integrated",
+  "rngparser.h": "not yet integrated",
 }
 
 ignored_words = {
diff --git a/doc/encoding.html b/doc/encoding.html
index 5f6166b..3b7e5a3 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -25,10 +25,10 @@
 more complex to handle in practice. UTF-16 use 2 bytes per character (and
 sometimes combines two pairs), it makes implementation easier, but looks a
 bit overkill for Western languages encoding. Moreover the XML specification
-allows the document to be encoded in other encodings at the condition that they
-are clearly labeled as such. For example the following is a wellformed XML
-document encoded in ISO-8859-1 and using accentuated letters that we French
-like for both markup and content:</p><pre>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
+allows the document to be encoded in other encodings at the condition that
+they are clearly labeled as such. For example the following is a wellformed
+XML document encoded in ISO-8859-1 and using accentuated letters that we
+French like for both markup and content:</p><pre>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 &lt;très&gt;là&lt;/très&gt;</pre><p>Having internationalization support in libxml2 means the following:</p><ul><li>the document is properly parsed</li>
   <li>informations about it's encoding are saved</li>
   <li>it can be modified</li>
@@ -92,8 +92,8 @@
 (internationalization) support get triggered only during I/O operation, i.e.
 when reading a document or saving one. Let's look first at the reading
 sequence:</p><ol><li>when a document is processed, we usually don't know the encoding, a
-    simple heuristic allows to detect UTF-16 and UCS-4 from encodings
-    where the ASCII range (0-0x7F) maps with ASCII</li>
+    simple heuristic allows to detect UTF-16 and UCS-4 from encodings where
+    the ASCII range (0-0x7F) maps with ASCII</li>
   <li>the xml declaration if available is parsed, including the encoding
     declaration. At that point, if the autodetected encoding is different
     from the one declared a call to xmlSwitchEncoding() is issued.</li>
@@ -154,8 +154,8 @@
     resume the conversion. This guarantees that any document will be saved
     without losses (except for markup names where this is not legal, this is
     a problem in the current version, in practice avoid using non-ascii
-    characters for tag or attribute names). A special "ascii" encoding
-    name is used to save documents to a pure ascii form can be used when
+    characters for tag or attribute names). A special "ascii" encoding name
+    is used to save documents to a pure ascii form can be used when
     portability is really crucial</li>
 </ol><p>Here are a few examples based on the same test document:</p><pre>~/XML -&gt; ./xmllint isolat1 
 &lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
diff --git a/doc/examples/examples.xml b/doc/examples/examples.xml
index c797383..7798863 100644
--- a/doc/examples/examples.xml
+++ b/doc/examples/examples.xml
@@ -144,39 +144,40 @@
       <include>&lt;libxml/xmlwriter.h&gt;</include>
     </includes>
     <uses>
-      <function line='1090' file='xmlwriter' name='xmlTextWriterEndElement'/>
-      <function line='895' file='xmlwriter' name='xmlTextWriterStartDocument'/>
-      <function line='1100' file='xmlwriter' name='xmlTextWriterEndDocument'/>
-      <function line='940' file='xmlwriter' name='xmlTextWriterWriteFormatComment'/>
-      <function line='905' file='xmlwriter' name='xmlTextWriterWriteComment'/>
+      <function line='1109' file='xmlwriter' name='xmlTextWriterEndElement'/>
+      <function line='899' file='tree' name='xmlDocSetRootElement'/>
+      <function line='911' file='xmlwriter' name='xmlTextWriterStartDocument'/>
+      <function line='1119' file='xmlwriter' name='xmlTextWriterEndDocument'/>
+      <function line='957' file='xmlwriter' name='xmlTextWriterWriteFormatComment'/>
+      <function line='923' file='xmlwriter' name='xmlTextWriterWriteComment'/>
       <function line='52' file='parser' name='xmlCleanupParser'/>
-      <variable line='1145' file='globals' name='xmlMalloc'/>
-      <function line='1052' file='xmlwriter' name='xmlTextWriterWriteFormatElement'/>
-      <function line='1135' file='encoding' name='xmlFindCharEncodingHandler'/>
-      <typedef line='1130' file='encoding' name='xmlCharEncodingHandlerPtr'/>
-      <function line='886' file='xmlwriter' name='xmlNewTextWriterTree'/>
-      <function line='73' file='xmlwriter' name='xmlNewTextWriterFilename'/>
-      <function line='1110' file='tree' name='xmlFreeDoc'/>
-      <typedef line='863' file='tree' name='xmlNodePtr'/>
-      <typedef line='862' file='tree' name='xmlDocPtr'/>
-      <typedef line='335' file='tree' name='xmlBufferPtr'/>
-      <function line='618' file='xmlwriter' name='xmlNewTextWriterDoc'/>
-      <function line='876' file='tree' name='xmlNewDocNode'/>
-      <function line='1108' file='tree' name='xmlSaveFileEnc'/>
+      <variable line='1164' file='globals' name='xmlMalloc'/>
+      <function line='1071' file='xmlwriter' name='xmlTextWriterWriteFormatElement'/>
+      <function line='1154' file='encoding' name='xmlFindCharEncodingHandler'/>
+      <typedef line='1149' file='encoding' name='xmlCharEncodingHandlerPtr'/>
+      <function line='902' file='xmlwriter' name='xmlNewTextWriterTree'/>
+      <function line='74' file='xmlwriter' name='xmlNewTextWriterFilename'/>
+      <function line='1129' file='tree' name='xmlFreeDoc'/>
+      <typedef line='878' file='tree' name='xmlNodePtr'/>
+      <typedef line='877' file='tree' name='xmlDocPtr'/>
+      <typedef line='339' file='tree' name='xmlBufferPtr'/>
+      <function line='630' file='xmlwriter' name='xmlNewTextWriterDoc'/>
+      <function line='892' file='tree' name='xmlNewDocNode'/>
+      <function line='1127' file='tree' name='xmlSaveFileEnc'/>
       <function line='56' file='xmlmemory' name='xmlMemoryDump'/>
-      <macro line='867' file='parser' name='XML_DEFAULT_VERSION'/>
-      <function line='348' file='xmlwriter' name='xmlNewTextWriterMemory'/>
-      <variable line='1159' file='globals' name='xmlFree'/>
-      <function line='883' file='tree' name='xmlDocSetRootElement'/>
-      <function line='1106' file='xmlwriter' name='xmlFreeTextWriter'/>
-      <function line='1075' file='xmlwriter' name='xmlTextWriterStartElement'/>
+      <macro line='883' file='parser' name='XML_DEFAULT_VERSION'/>
+      <function line='353' file='xmlwriter' name='xmlNewTextWriterMemory'/>
+      <variable line='1178' file='globals' name='xmlFree'/>
+      <function line='1094' file='xmlwriter' name='xmlTextWriterStartElement'/>
+      <function line='1125' file='xmlwriter' name='xmlFreeTextWriter'/>
+      <function line='345' file='tree' name='xmlBufferCreate'/>
       <macro line='38' file='xmlversion' name='LIBXML_TEST_VERSION'/>
-      <function line='340' file='tree' name='xmlBufferCreate'/>
-      <typedef line='861' file='xmlwriter' name='xmlTextWriterPtr'/>
-      <function line='1082' file='xmlwriter' name='xmlTextWriterWriteElement'/>
-      <function line='931' file='xmlwriter' name='xmlTextWriterWriteAttribute'/>
-      <variable line='1162' file='globals' name='xmlRealloc'/>
-      <function line='867' file='tree' name='xmlNewDoc'/>
+      <function line='611' file='tree' name='xmlBufferFree'/>
+      <typedef line='876' file='xmlwriter' name='xmlTextWriterPtr'/>
+      <function line='1101' file='xmlwriter' name='xmlTextWriterWriteElement'/>
+      <function line='947' file='xmlwriter' name='xmlTextWriterWriteAttribute'/>
+      <variable line='1181' file='globals' name='xmlRealloc'/>
+      <function line='883' file='tree' name='xmlNewDoc'/>
     </uses>
   </example>
   <example filename='reader1.c'>
@@ -313,6 +314,9 @@
     <symbol name='xmlBufferCreate'>
       <ref filename='testWriter.c'/>
     </symbol>
+    <symbol name='xmlBufferFree'>
+      <ref filename='testWriter.c'/>
+    </symbol>
     <symbol name='xmlBufferPtr'>
       <ref filename='testWriter.c'/>
     </symbol>
diff --git a/doc/html/libxml-relaxng.html b/doc/html/libxml-relaxng.html
index 515870b..7644e44 100644
--- a/doc/html/libxml-relaxng.html
+++ b/doc/html/libxml-relaxng.html
@@ -15,6 +15,7 @@
 </pre><pre class="programlisting">Structure <a href="#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a><br />struct _xmlRelaxNGParserCtxt
 The content of this structure is not made public by the API.
 </pre><pre class="programlisting">Typedef <a href="libxml-relaxng.html#xmlRelaxNGParserCtxt">xmlRelaxNGParserCtxt</a> * <a name="xmlRelaxNGParserCtxtPtr" id="xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a>
+</pre><pre class="programlisting">Enum <a href="#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a>
 </pre><pre class="programlisting">Typedef <a href="libxml-relaxng.html#xmlRelaxNG">xmlRelaxNG</a> * <a name="xmlRelaxNGPtr" id="xmlRelaxNGPtr">xmlRelaxNGPtr</a>
 </pre><pre class="programlisting">Structure <a href="#xmlRelaxNGValidCtxt">xmlRelaxNGValidCtxt</a><br />struct _xmlRelaxNGValidCtxt
 The content of this structure is not made public by the API.
@@ -46,12 +47,18 @@
 <pre class="programlisting">Function type: <a href="#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a>
 void	<a href="#xmlRelaxNGValidityWarningFunc">xmlRelaxNGValidityWarningFunc</a>	(void * ctx, <br />					 const char * msg, <br />					 ... ...)
 </pre>
+<pre class="programlisting">int	<a href="#xmlRelaxParserSetFlag">xmlRelaxParserSetFlag</a>		(<a href="libxml-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br />					 int flags)</pre>
 <h2>Description</h2>
 <h3><a name="xmlRelaxNG" id="xmlRelaxNG">Structure xmlRelaxNG</a></h3><pre class="programlisting">Structure xmlRelaxNG<br />struct _xmlRelaxNG {
 The content of this structure is not made public by the API.
 }</pre><h3><a name="xmlRelaxNGParserCtxt" id="xmlRelaxNGParserCtxt">Structure xmlRelaxNGParserCtxt</a></h3><pre class="programlisting">Structure xmlRelaxNGParserCtxt<br />struct _xmlRelaxNGParserCtxt {
 The content of this structure is not made public by the API.
-}</pre><h3><a name="xmlRelaxNGValidCtxt" id="xmlRelaxNGValidCtxt">Structure xmlRelaxNGValidCtxt</a></h3><pre class="programlisting">Structure xmlRelaxNGValidCtxt<br />struct _xmlRelaxNGValidCtxt {
+}</pre><h3>Enum <a name="xmlRelaxNGParserFlag" id="xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a></h3><pre class="programlisting">Enum xmlRelaxNGParserFlag {
+    <a name="XML_RELAXNGP_NONE" id="XML_RELAXNGP_NONE">XML_RELAXNGP_NONE</a> = 0
+    <a name="XML_RELAXNGP_FREE_DOC" id="XML_RELAXNGP_FREE_DOC">XML_RELAXNGP_FREE_DOC</a> = 1
+    <a name="XML_RELAXNGP_CRNG" id="XML_RELAXNGP_CRNG">XML_RELAXNGP_CRNG</a> = 2
+}
+</pre><h3><a name="xmlRelaxNGValidCtxt" id="xmlRelaxNGValidCtxt">Structure xmlRelaxNGValidCtxt</a></h3><pre class="programlisting">Structure xmlRelaxNGValidCtxt<br />struct _xmlRelaxNGValidCtxt {
 The content of this structure is not made public by the API.
 }</pre><h3>Enum <a name="xmlRelaxNGValidErr" id="xmlRelaxNGValidErr">xmlRelaxNGValidErr</a></h3><pre class="programlisting">Enum xmlRelaxNGValidErr {
     <a name="XML_RELAXNG_OK" id="XML_RELAXNG_OK">XML_RELAXNG_OK</a> = 0
@@ -141,4 +148,6 @@
 <h3><a name="xmlRelaxNGValidityWarningFunc" id="xmlRelaxNGValidityWarningFunc"></a>Function type: xmlRelaxNGValidityWarningFunc</h3><pre class="programlisting">Function type: xmlRelaxNGValidityWarningFunc
 void	xmlRelaxNGValidityWarningFunc	(void * ctx, <br />					 const char * msg, <br />					 ... ...)
 </pre><p></p><div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctx</tt></i>:</span></td><td></td></tr><tr><td><span class="term"><i><tt>msg</tt></i>:</span></td><td></td></tr><tr><td><span class="term"><i><tt>...</tt></i>:</span></td><td></td></tr></tbody></table></div><br />
-<p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>
+<h3><a name="xmlRelaxParserSetFlag" id="xmlRelaxParserSetFlag"></a>Function: xmlRelaxParserSetFlag</h3><pre class="programlisting">int	xmlRelaxParserSetFlag		(<a href="libxml-relaxng.html#xmlRelaxNGParserCtxtPtr">xmlRelaxNGParserCtxtPtr</a> ctxt, <br />					 int flags)<br />
+</pre><p>Semi private function used to pass informations to a parser context which are a combination of <a href="libxml-relaxng.html#xmlRelaxNGParserFlag">xmlRelaxNGParserFlag</a> .</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>a RelaxNG parser context</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>a set of flags values</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if success and -1 in case of error</td></tr></tbody></table></div><p><a href="../bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>
diff --git a/doc/html/libxml-xmlschemas.html b/doc/html/libxml-xmlschemas.html
index 3928985..4c298be 100644
--- a/doc/html/libxml-xmlschemas.html
+++ b/doc/html/libxml-xmlschemas.html
@@ -57,6 +57,7 @@
     <a href="libxml-hash.html#xmlHashTablePtr">xmlHashTablePtr</a>	groupDecl
     <a href="libxml-dict.html#xmlDictPtr">xmlDictPtr</a>	dict
     void *	includes	: the includes, this is opaque for now
+    int	preserve	: whether to free the document
 }</pre><h3><a name="xmlSchemaParserCtxt" id="xmlSchemaParserCtxt">Structure xmlSchemaParserCtxt</a></h3><pre class="programlisting">Structure xmlSchemaParserCtxt<br />struct _xmlSchemaParserCtxt {
 The content of this structure is not made public by the API.
 }</pre><h3><a name="xmlSchemaValidCtxt" id="xmlSchemaValidCtxt">Structure xmlSchemaValidCtxt</a></h3><pre class="programlisting">Structure xmlSchemaValidCtxt<br />struct _xmlSchemaValidCtxt {
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 137aef1..373c1ae 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -244,8 +244,8 @@
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>val</tt></i>:</span></td><td>an XPath object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new object, the old one is freed (or the operation is done directly on @val)</td></tr></tbody></table></div><h3><a name="xmlXPathConvertString" id="xmlXPathConvertString"></a>Function: xmlXPathConvertString</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	xmlXPathConvertString	(<a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> val)<br />
 </pre><p>Converts an existing object to its string() equivalent</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>val</tt></i>:</span></td><td>an XPath object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new object, the old one is freed (or the operation is done directly on @val)</td></tr></tbody></table></div><h3><a name="xmlXPathCtxtCompile" id="xmlXPathCtxtCompile"></a>Function: xmlXPathCtxtCompile</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a>	xmlXPathCtxtCompile	(<a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt, <br />						 const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str)<br />
-</pre><p></p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td></td></tr><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td></td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td></td></tr></tbody></table></div><h3><a name="xmlXPathEval" id="xmlXPathEval"></a>Function: xmlXPathEval</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	xmlXPathEval	(const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br />					 <a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx)<br />
+</pre><p>Compile an XPath expression</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>ctxt</tt></i>:</span></td><td>an XPath context</td></tr><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td>the XPath expression</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml-xpath.html#xmlXPathCompExprPtr">xmlXPathCompExprPtr</a> resulting from the compilation or NULL. the caller has to free the object.</td></tr></tbody></table></div><h3><a name="xmlXPathEval" id="xmlXPathEval"></a>Function: xmlXPathEval</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	xmlXPathEval	(const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br />					 <a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctx)<br />
 </pre><p>Evaluate the XPath Location Path in the given context.</p>
 <div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td>the XPath expression</td></tr><tr><td><span class="term"><i><tt>ctx</tt></i>:</span></td><td>the XPath context</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a> resulting from the evaluation or NULL. the caller has to free the object.</td></tr></tbody></table></div><h3><a name="xmlXPathEvalExpression" id="xmlXPathEvalExpression"></a>Function: xmlXPathEvalExpression</h3><pre class="programlisting"><a href="libxml-xpath.html#xmlXPathObjectPtr">xmlXPathObjectPtr</a>	xmlXPathEvalExpression	(const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br />						 <a href="libxml-xpath.html#xmlXPathContextPtr">xmlXPathContextPtr</a> ctxt)<br />
 </pre><p>Evaluate the XPath expression in the given context.</p>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 982fa63..4ebef9a 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -940,53 +940,57 @@
      <summary>implementation of the Relax-NG validation</summary>
      <description>implementation of the Relax-NG validation </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_RELAXNG_OK' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_DUPID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LISTEXTRA' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_VALELEM' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ATTRVALID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTRWRONGNS' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_LISTELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_EXTRACONTENT' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INTERNODATA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMWRONG' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INVALIDATTR' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LISTEXTRA' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ATTRNONS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LISTEMPTY' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_EXTRADATA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TEXTWRONG' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ELEMNONS' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ELEMEXTRANS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMWRONGNS' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_CONTENTVALID' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_DATATYPE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPEVAL' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_INTERNAL' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_LIST' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INTERNODATA' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPECMP' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_VALUE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NOGRAMMAR' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_MEMORY' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_NOELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_DATAELEM' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_INTERSEQ' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_LACKDATA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMNAME' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_DATAELEM' type='enum'/>
+     <exports symbol='XML_RELAXNGP_FREE_DOC' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTRNAME' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMNOTEMPTY' type='enum'/>
+     <exports symbol='XML_RELAXNG_OK' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_DATATYPE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ATTRWRONGNS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_EXTRACONTENT' type='enum'/>
+     <exports symbol='XML_RELAXNGP_NONE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMWRONG' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LISTEMPTY' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_ATTREXTRANS' type='enum'/>
+     <exports symbol='XML_RELAXNGP_CRNG' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TEXTWRONG' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INVALIDATTR' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMWRONGNS' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_CONTENTVALID' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPEVAL' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_LIST' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_TYPE' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NOELEM' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_MEMORY' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_ELEMNAME' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_NOGRAMMAR' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_NODEFINE' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_NOSTATE' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_VALELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ATTRNAME' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_INTEREXTRA' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_ELEMNOTEMPTY' type='enum'/>
+     <exports symbol='XML_RELAXNG_ERR_INTERNAL' type='enum'/>
      <exports symbol='XML_RELAXNG_ERR_NOTELEM' type='enum'/>
-     <exports symbol='XML_RELAXNG_ERR_TYPECMP' type='enum'/>
      <exports symbol='xmlRelaxNG' type='typedef'/>
      <exports symbol='xmlRelaxNGParserCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGParserCtxtPtr' type='typedef'/>
-     <exports symbol='xmlRelaxNGPtr' type='typedef'/>
+     <exports symbol='xmlRelaxNGParserFlag' type='typedef'/>
      <exports symbol='xmlRelaxNGValidErr' type='typedef'/>
      <exports symbol='xmlRelaxNGValidCtxt' type='typedef'/>
      <exports symbol='xmlRelaxNGValidCtxtPtr' type='typedef'/>
+     <exports symbol='xmlRelaxNGPtr' type='typedef'/>
      <exports symbol='xmlRelaxNGFreeValidCtxt' type='function'/>
      <exports symbol='xmlRelaxNGValidateFullElement' type='function'/>
      <exports symbol='xmlRelaxNGNewDocParserCtxt' type='function'/>
@@ -1008,6 +1012,7 @@
      <exports symbol='xmlRelaxNGValidatePushElement' type='function'/>
      <exports symbol='xmlRelaxNGCleanupTypes' type='function'/>
      <exports symbol='xmlRelaxNGValidatePushCData' type='function'/>
+     <exports symbol='xmlRelaxParserSetFlag' type='function'/>
      <exports symbol='xmlRelaxNGValidityWarningFunc' type='function'/>
     </file>
     <file name='schemasInternals'>
@@ -4042,6 +4047,9 @@
     <enum name='XML_READER_TYPE_WHITESPACE' file='xmlreader' value='13' type='xmlReaderTypes'/>
     <enum name='XML_READER_TYPE_XML_DECLARATION' file='xmlreader' value='17' type='xmlReaderTypes'/>
     <enum name='XML_REGEXP_COMPILE_ERROR' file='xmlerror' value='1450' type='xmlParserErrors'/>
+    <enum name='XML_RELAXNGP_CRNG' file='relaxng' value='2' type='xmlRelaxNGParserFlag'/>
+    <enum name='XML_RELAXNGP_FREE_DOC' file='relaxng' value='1' type='xmlRelaxNGParserFlag'/>
+    <enum name='XML_RELAXNGP_NONE' file='relaxng' value='0' type='xmlRelaxNGParserFlag'/>
     <enum name='XML_RELAXNG_ERR_ATTREXTRANS' file='relaxng' value='20' type='xmlRelaxNGValidErr'/>
     <enum name='XML_RELAXNG_ERR_ATTRNAME' file='relaxng' value='14' type='xmlRelaxNGValidErr'/>
     <enum name='XML_RELAXNG_ERR_ATTRNONS' file='relaxng' value='16' type='xmlRelaxNGValidErr'/>
@@ -5004,6 +5012,7 @@
     <struct name='xmlRelaxNG' file='relaxng' type='struct _xmlRelaxNG'/>
     <struct name='xmlRelaxNGParserCtxt' file='relaxng' type='struct _xmlRelaxNGParserCtxt'/>
     <typedef name='xmlRelaxNGParserCtxtPtr' file='relaxng' type='xmlRelaxNGParserCtxt *'/>
+    <typedef name='xmlRelaxNGParserFlag' file='relaxng' type='enum'/>
     <typedef name='xmlRelaxNGPtr' file='relaxng' type='xmlRelaxNG *'/>
     <struct name='xmlRelaxNGValidCtxt' file='relaxng' type='struct _xmlRelaxNGValidCtxt'/>
     <typedef name='xmlRelaxNGValidCtxtPtr' file='relaxng' type='xmlRelaxNGValidCtxt *'/>
@@ -5099,6 +5108,7 @@
       <field name='groupDecl' type='xmlHashTablePtr' info=''/>
       <field name='dict' type='xmlDictPtr' info=''/>
       <field name='includes' type='void *' info=' the includes, this is opaque for now'/>
+      <field name='preserve' type='int' info=' whether to free the document'/>
     </struct>
     <struct name='xmlSchemaAnnot' file='schemasInternals' type='struct _xmlSchemaAnnot'>
       <field name='next' type='struct _xmlSchemaAnnot *' info=''/>
@@ -10522,6 +10532,12 @@
       <arg name='msg' type='const char *' info=''/>
       <arg name='...' type='...' info=''/>
     </functype>
+    <function name='xmlRelaxParserSetFlag' file='relaxng'>
+      <info>Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .</info>
+      <return type='int' info='0 if success and -1 in case of error'/>
+      <arg name='ctxt' type='xmlRelaxNGParserCtxtPtr' info='a RelaxNG parser context'/>
+      <arg name='flags' type='int' info='a set of flags values'/>
+    </function>
     <function name='xmlRemoveID' file='valid'>
       <info>Remove the given attribute from the ID table maintained internally.</info>
       <return type='int' info='-1 if the lookup failed and 0 otherwise'/>
@@ -13795,10 +13811,10 @@
       <arg name='nargs' type='int' info='the number of arguments'/>
     </function>
     <function name='xmlXPathCtxtCompile' file='xpath'>
-      <info></info>
-      <return type='xmlXPathCompExprPtr' info=''/>
-      <arg name='ctxt' type='xmlXPathContextPtr' info=''/>
-      <arg name='str' type='const xmlChar *' info=''/>
+      <info>Compile an XPath expression</info>
+      <return type='xmlXPathCompExprPtr' info='the xmlXPathCompExprPtr resulting from the compilation or NULL. the caller has to free the object.'/>
+      <arg name='ctxt' type='xmlXPathContextPtr' info='an XPath context'/>
+      <arg name='str' type='const xmlChar *' info='the XPath expression'/>
     </function>
     <function name='xmlXPathDebugDumpCompExpr' file='xpathInternals'>
       <info>Dumps the tree of the compiled XPath expression.</info>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 16e99c3..b7112a9 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -504,6 +504,9 @@
     <reference name='XML_READER_TYPE_WHITESPACE' href='html/libxml-xmlreader.html#XML_READER_TYPE_WHITESPACE'/>
     <reference name='XML_READER_TYPE_XML_DECLARATION' href='html/libxml-xmlreader.html#XML_READER_TYPE_XML_DECLARATION'/>
     <reference name='XML_REGEXP_COMPILE_ERROR' href='html/libxml-xmlerror.html#XML_REGEXP_COMPILE_ERROR'/>
+    <reference name='XML_RELAXNGP_CRNG' href='html/libxml-relaxng.html#XML_RELAXNGP_CRNG'/>
+    <reference name='XML_RELAXNGP_FREE_DOC' href='html/libxml-relaxng.html#XML_RELAXNGP_FREE_DOC'/>
+    <reference name='XML_RELAXNGP_NONE' href='html/libxml-relaxng.html#XML_RELAXNGP_NONE'/>
     <reference name='XML_RELAXNG_ERR_ATTREXTRANS' href='html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTREXTRANS'/>
     <reference name='XML_RELAXNG_ERR_ATTRNAME' href='html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNAME'/>
     <reference name='XML_RELAXNG_ERR_ATTRNONS' href='html/libxml-relaxng.html#XML_RELAXNG_ERR_ATTRNONS'/>
@@ -2018,6 +2021,7 @@
     <reference name='xmlRelaxNGParse' href='html/libxml-relaxng.html#xmlRelaxNGParse'/>
     <reference name='xmlRelaxNGParserCtxt' href='html/libxml-relaxng.html#xmlRelaxNGParserCtxt'/>
     <reference name='xmlRelaxNGParserCtxtPtr' href='html/libxml-relaxng.html#xmlRelaxNGParserCtxtPtr'/>
+    <reference name='xmlRelaxNGParserFlag' href='html/libxml-relaxng.html#xmlRelaxNGParserFlag'/>
     <reference name='xmlRelaxNGPtr' href='html/libxml-relaxng.html#xmlRelaxNGPtr'/>
     <reference name='xmlRelaxNGSetParserErrors' href='html/libxml-relaxng.html#xmlRelaxNGSetParserErrors'/>
     <reference name='xmlRelaxNGSetValidErrors' href='html/libxml-relaxng.html#xmlRelaxNGSetValidErrors'/>
@@ -2031,6 +2035,7 @@
     <reference name='xmlRelaxNGValidatePushElement' href='html/libxml-relaxng.html#xmlRelaxNGValidatePushElement'/>
     <reference name='xmlRelaxNGValidityErrorFunc' href='html/libxml-relaxng.html#xmlRelaxNGValidityErrorFunc'/>
     <reference name='xmlRelaxNGValidityWarningFunc' href='html/libxml-relaxng.html#xmlRelaxNGValidityWarningFunc'/>
+    <reference name='xmlRelaxParserSetFlag' href='html/libxml-relaxng.html#xmlRelaxParserSetFlag'/>
     <reference name='xmlRemoveID' href='html/libxml-valid.html#xmlRemoveID'/>
     <reference name='xmlRemoveProp' href='html/libxml-tree.html#xmlRemoveProp'/>
     <reference name='xmlRemoveRef' href='html/libxml-valid.html#xmlRemoveRef'/>
@@ -3362,6 +3367,9 @@
       <ref name='XML_READER_TYPE_WHITESPACE'/>
       <ref name='XML_READER_TYPE_XML_DECLARATION'/>
       <ref name='XML_REGEXP_COMPILE_ERROR'/>
+      <ref name='XML_RELAXNGP_CRNG'/>
+      <ref name='XML_RELAXNGP_FREE_DOC'/>
+      <ref name='XML_RELAXNGP_NONE'/>
       <ref name='XML_RELAXNG_ERR_ATTREXTRANS'/>
       <ref name='XML_RELAXNG_ERR_ATTRNAME'/>
       <ref name='XML_RELAXNG_ERR_ATTRNONS'/>
@@ -4912,6 +4920,7 @@
       <ref name='xmlRelaxNGParse'/>
       <ref name='xmlRelaxNGParserCtxt'/>
       <ref name='xmlRelaxNGParserCtxtPtr'/>
+      <ref name='xmlRelaxNGParserFlag'/>
       <ref name='xmlRelaxNGPtr'/>
       <ref name='xmlRelaxNGSetParserErrors'/>
       <ref name='xmlRelaxNGSetValidErrors'/>
@@ -4925,6 +4934,7 @@
       <ref name='xmlRelaxNGValidatePushElement'/>
       <ref name='xmlRelaxNGValidityErrorFunc'/>
       <ref name='xmlRelaxNGValidityWarningFunc'/>
+      <ref name='xmlRelaxParserSetFlag'/>
       <ref name='xmlRemoveID'/>
       <ref name='xmlRemoveProp'/>
       <ref name='xmlRemoveRef'/>
@@ -8330,6 +8340,7 @@
       <ref name='xmlRelaxNGGetParserErrors'/>
       <ref name='xmlRelaxNGParse'/>
       <ref name='xmlRelaxNGSetParserErrors'/>
+      <ref name='xmlRelaxParserSetFlag'/>
     </type>
     <type name='xmlRelaxNGPtr'>
       <ref name='xmlRelaxNGDump'/>
@@ -9670,6 +9681,9 @@
       <ref name='xmlPatterncompile'/>
     </file>
     <file name='relaxng'>
+      <ref name='XML_RELAXNGP_CRNG'/>
+      <ref name='XML_RELAXNGP_FREE_DOC'/>
+      <ref name='XML_RELAXNGP_NONE'/>
       <ref name='XML_RELAXNG_ERR_ATTREXTRANS'/>
       <ref name='XML_RELAXNG_ERR_ATTRNAME'/>
       <ref name='XML_RELAXNG_ERR_ATTRNONS'/>
@@ -9726,6 +9740,7 @@
       <ref name='xmlRelaxNGParse'/>
       <ref name='xmlRelaxNGParserCtxt'/>
       <ref name='xmlRelaxNGParserCtxtPtr'/>
+      <ref name='xmlRelaxNGParserFlag'/>
       <ref name='xmlRelaxNGPtr'/>
       <ref name='xmlRelaxNGSetParserErrors'/>
       <ref name='xmlRelaxNGSetValidErrors'/>
@@ -9739,6 +9754,7 @@
       <ref name='xmlRelaxNGValidatePushElement'/>
       <ref name='xmlRelaxNGValidityErrorFunc'/>
       <ref name='xmlRelaxNGValidityWarningFunc'/>
+      <ref name='xmlRelaxParserSetFlag'/>
     </file>
     <file name='schemasInternals'>
       <ref name='XML_SCHEMAS_ANYATTR_LAX'/>
@@ -12386,6 +12402,7 @@
           <ref name='xmlAutomataCompile'/>
           <ref name='xmlPatterncompile'/>
           <ref name='xmlXPathCompile'/>
+          <ref name='xmlXPathCtxtCompile'/>
           <ref name='xmlXPathStringEvalNumber'/>
         </word>
         <word name='Compress'>
@@ -14600,6 +14617,7 @@
           <ref name='xmlRelaxNGValidatePopElement'/>
           <ref name='xmlRelaxNGValidatePushCData'/>
           <ref name='xmlRelaxNGValidatePushElement'/>
+          <ref name='xmlRelaxParserSetFlag'/>
           <ref name='xmlTextReaderRelaxNGSetSchema'/>
           <ref name='xmlTextReaderRelaxNGValidate'/>
         </word>
@@ -14849,6 +14867,9 @@
         <word name='Seems'>
           <ref name='xmlParseTextDecl'/>
         </word>
+        <word name='Semi'>
+          <ref name='xmlRelaxParserSetFlag'/>
+        </word>
         <word name='Send'>
           <ref name='xmlNanoFTPQuit'/>
         </word>
@@ -17308,6 +17329,7 @@
         <word name='compilation'>
           <ref name='xmlPatterncompile'/>
           <ref name='xmlXPathCompile'/>
+          <ref name='xmlXPathCtxtCompile'/>
         </word>
         <word name='compile'>
           <ref name='xmlPatterncompile'/>
@@ -19031,25 +19053,6 @@
         <word name='exposing'>
           <ref name='xmlTextReaderRead'/>
         </word>
-        <word name='expression'>
-          <ref name='_xmlXPathContext'/>
-          <ref name='_xmlXPathParserContext'/>
-          <ref name='xmlRegFreeExecCtxt'/>
-          <ref name='xmlRegNewExecCtxt'/>
-          <ref name='xmlRegexpCompile'/>
-          <ref name='xmlRegexpExec'/>
-          <ref name='xmlRegexpIsDeterminist'/>
-          <ref name='xmlRegexpPrint'/>
-          <ref name='xmlXPathCompile'/>
-          <ref name='xmlXPathCompiledEval'/>
-          <ref name='xmlXPathDebugDumpCompExpr'/>
-          <ref name='xmlXPathEval'/>
-          <ref name='xmlXPathEvalExpr'/>
-          <ref name='xmlXPathEvalExpression'/>
-          <ref name='xmlXPathNewParserContext'/>
-          <ref name='xmlXPathStringEvalNumber'/>
-          <ref name='xmlXPtrEval'/>
-        </word>
         <word name='expressions'>
           <ref name='LIBXML_REGEXP_ENABLED'/>
         </word>
@@ -19341,6 +19344,7 @@
           <ref name='xmlReaderNewFile'/>
           <ref name='xmlReaderNewIO'/>
           <ref name='xmlReaderNewMemory'/>
+          <ref name='xmlRelaxParserSetFlag'/>
           <ref name='xmlXIncludeSetFlags'/>
         </word>
         <word name='flat'>
@@ -20344,6 +20348,7 @@
           <ref name='xmlParserPrintFileInfo'/>
           <ref name='xmlRelaxNGGetValidErrors'/>
           <ref name='xmlRelaxNGSetValidErrors'/>
+          <ref name='xmlRelaxParserSetFlag'/>
           <ref name='xmlSAX2EndElementNs'/>
           <ref name='xmlSAX2StartElementNs'/>
           <ref name='xmlSchemaSetValidErrors'/>
@@ -22360,6 +22365,7 @@
         </word>
         <word name='pass'>
           <ref name='xmlCurrentChar'/>
+          <ref name='xmlRelaxParserSetFlag'/>
           <ref name='xmlTextReaderSetErrorHandler'/>
         </word>
         <word name='passed'>
@@ -22741,6 +22747,7 @@
         <word name='private'>
           <ref name='xmlCatalogLocalResolve'/>
           <ref name='xmlCatalogLocalResolveURI'/>
+          <ref name='xmlRelaxParserSetFlag'/>
         </word>
         <word name='problem'>
           <ref name='xmlParseBalancedChunkMemory'/>
@@ -26612,6 +26619,9 @@
         <word name='xmlRefPtr'>
           <ref name='xmlAddRef'/>
         </word>
+        <word name='xmlRelaxNGParserFlag'>
+          <ref name='xmlRelaxParserSetFlag'/>
+        </word>
         <word name='xmlRelaxNGValidatePushElement'>
           <ref name='xmlRelaxNGValidateFullElement'/>
         </word>
@@ -26825,6 +26835,7 @@
         </word>
         <word name='xmlXPathCompExprPtr'>
           <ref name='xmlXPathCompile'/>
+          <ref name='xmlXPathCtxtCompile'/>
         </word>
         <word name='xmlXPathContext'>
           <ref name='xmlXPathFreeContext'/>
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index bcc2f4b..cc34219 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,20 +8,30 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>2.6.4</version>
-    <last-release> Dec 24 2003</last-release>
+    <version>2.6.5</version>
+    <last-release> Jan 25 2004</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Windows build fixes (Igor Zlatkovic)
-   - Some serious XInclude problems reported by Oleg Paraschenko and 
-   - Unix and Makefile packaging fixes (me, William Brack, 
-   - Documentation improvements (John Fleck, William Brack), example fix
-    (Lucas Brasilino)
-   - bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
-    NULL strings (William Brack) , API building reader or parser from
-    filedescriptor should not close it, changed XPath sorting to be stable
-    again (William Brack), xmlGetNodePath() generating '(null)' (William
-    Brack), DTD validation and namespace bug (William Brack), XML Schemas
-    double inclusion behaviour
+    <changes>   - Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)
+   - Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.
+   - Python bindings: fixes (William), enum support (St&#xE9;phane Bidoul),
+    structured error reporting (St&#xE9;phane Bidoul)
+   - XInclude: various fixes for conformance, problem related to dictionnary
+    references (William &amp; me), recursion (William)
+   - xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), 
+   - xmlSchemas: normalizedString datatype (John Belmonte)
+   - code cleanup for strings functions (William)
+   - Windows: compiler patches (Mark Vakoc)
+   - Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.
 
 </changes>
   </product>
diff --git a/doc/news.html b/doc/news.html
index 73fb70c..eba19db 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -12,9 +12,30 @@
 to test those</p><ul><li>More testing on RelaxNG</li>
   <li>Finishing up <a href="http://www.w3.org/TR/xmlschema-1/">XML
   Schemas</a></li>
+</ul><h3>2.6.5: Jan 25 2004</h3><ul><li>Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)</li>
+  <li>Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.</li>
+  <li>Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)</li>
+  <li>XInclude: various fixes for conformance, problem related to dictionnary
+    references (William &amp; me), recursion (William)</li>
+  <li>xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), </li>
+  <li>xmlSchemas: normalizedString datatype (John Belmonte)</li>
+  <li>code cleanup for strings functions (William)</li>
+  <li>Windows: compiler patches (Mark Vakoc)</li>
+  <li>Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.</li>
 </ul><h3>2.6.4: Dec 24 2003</h3><ul><li>Windows build fixes (Igor Zlatkovic)</li>
-  <li>Some serious XInclude problems reported by Oleg Paraschenko and </li>
-  <li>Unix and Makefile packaging fixes (me, William Brack, </li>
+  <li>Some serious XInclude problems reported by Oleg Paraschenko and</li>
+  <li>Unix and Makefile packaging fixes (me, William Brack,</li>
   <li>Documentation improvements (John Fleck, William Brack), example fix
     (Lucas Brasilino)</li>
   <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
diff --git a/doc/xml.html b/doc/xml.html
index 47484b2..f703592 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -662,11 +662,36 @@
   Schemas</a></li>
 </ul>
 
+<h3>2.6.5: Jan 25 2004</h3>
+<ul>
+  <li>Bugfixes: dictionnaries for schemas (William Brack), regexp segfault
+    (William), xs:all problem (William), a number of XPointer bugfixes
+    (William), xmllint error go to stderr, DTD validation problem with
+    namespace, memory leak (William), SAX1 cleanup and minimal options fixes
+    (Mark Vadoc), parser context reset on error (Shaun McCance), XPath union
+    evaluation problem (William) , xmlReallocLoc with NULL (Aleksey Sanin),
+    XML Schemas double free (Steve Ball), XInclude with no href, argument
+    callbacks order for XPath callbacks (Frederic Peters)</li>
+  <li>Documentation: python scripts (William Brack), xslt stylesheets (John
+    Fleck), doc (Sven Zimmerman), I/O example.</li>
+  <li>Python bindings: fixes (William), enum support (Stéphane Bidoul),
+    structured error reporting (Stéphane Bidoul)</li>
+  <li>XInclude: various fixes for conformance, problem related to dictionnary
+    references (William &amp; me), recursion (William)</li>
+  <li>xmlWriter: indentation (Lucas Brasilino), memory leaks (Alfred
+    Mickautsch), </li>
+  <li>xmlSchemas: normalizedString datatype (John Belmonte)</li>
+  <li>code cleanup for strings functions (William)</li>
+  <li>Windows: compiler patches (Mark Vakoc)</li>
+  <li>Parser optimizations, a few new XPath and dictionnary APIs for future
+    XSLT optimizations.</li>
+</ul>
+
 <h3>2.6.4: Dec 24 2003</h3>
 <ul>
   <li>Windows build fixes (Igor Zlatkovic)</li>
-  <li>Some serious XInclude problems reported by Oleg Paraschenko and </li>
-  <li>Unix and Makefile packaging fixes (me, William Brack, </li>
+  <li>Some serious XInclude problems reported by Oleg Paraschenko and</li>
+  <li>Unix and Makefile packaging fixes (me, William Brack,</li>
   <li>Documentation improvements (John Fleck, William Brack), example fix
     (Lucas Brasilino)</li>
   <li>bugfixes: xmlTextReaderExpand() with xmlReaderWalker, XPath handling of
@@ -2776,10 +2801,10 @@
 more complex to handle in practice. UTF-16 use 2 bytes per character (and
 sometimes combines two pairs), it makes implementation easier, but looks a
 bit overkill for Western languages encoding. Moreover the XML specification
-allows the document to be encoded in other encodings at the condition that they
-are clearly labeled as such. For example the following is a wellformed XML
-document encoded in ISO-8859-1 and using accentuated letters that we French
-like for both markup and content:</p>
+allows the document to be encoded in other encodings at the condition that
+they are clearly labeled as such. For example the following is a wellformed
+XML document encoded in ISO-8859-1 and using accentuated letters that we
+French like for both markup and content:</p>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1"?&gt;
 &lt;très&gt;là&lt;/très&gt;</pre>
 
@@ -2871,8 +2896,8 @@
 sequence:</p>
 <ol>
   <li>when a document is processed, we usually don't know the encoding, a
-    simple heuristic allows to detect UTF-16 and UCS-4 from encodings
-    where the ASCII range (0-0x7F) maps with ASCII</li>
+    simple heuristic allows to detect UTF-16 and UCS-4 from encodings where
+    the ASCII range (0-0x7F) maps with ASCII</li>
   <li>the xml declaration if available is parsed, including the encoding
     declaration. At that point, if the autodetected encoding is different
     from the one declared a call to xmlSwitchEncoding() is issued.</li>
@@ -2937,8 +2962,8 @@
     resume the conversion. This guarantees that any document will be saved
     without losses (except for markup names where this is not legal, this is
     a problem in the current version, in practice avoid using non-ascii
-    characters for tag or attribute names). A special "ascii" encoding
-    name is used to save documents to a pure ascii form can be used when
+    characters for tag or attribute names). A special "ascii" encoding name
+    is used to save documents to a pure ascii form can be used when
     portability is really crucial</li>
 </ol>
 
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 8325abc..5441455 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -1013,6 +1013,7 @@
     # functions from module relaxng
     relaxNGFreeParserCtxt()
     relaxNGParse()
+    relaxParserSetFlag()
 
 
 Class outputBuffer(ioWriteWrapper)