preparing release 2.5.7 updated and rebuilt the docs fixed the script

* NEWS configure.in: preparing release 2.5.7
* doc/*: updated and rebuilt the docs
* doc/apibuild.py: fixed the script
Daniel
diff --git a/ChangeLog b/ChangeLog
index e55f541..336565e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 25 01:09:23 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* NEWS configure.in: preparing release 2.5.7
+	* doc/*: updated and rebuilt the docs
+	* doc/apibuild.py: fixed the script
+
 Thu Apr 24 19:11:12 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
 	* Makefile.am doc/apibuild.py: make sure the OOM code don't
diff --git a/NEWS b/NEWS
index 6db6ea5..35af519 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,26 @@
 
 
 
+2.5.7: Apr 25 2003:
+   - Relax-NG: Compiling to regexp and streaming validation on top of the
+    xmlReader interface, added to xmllint --stream
+   - xmlReader: Expand(), Next() and DOM access glue, bug fixes
+   - Support for large files: RGN validated a 4.5GB instance
+   - Thread support is now configured in by default
+   - Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes
+    (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser
+    and zero bytes handling, some missing Windows file path conversions,
+    behaviour of the parser and validator in the presence of "out of memory"
+    error conditions 
+   - extended the API to be able to plug a garbage collecting memory
+    allocator, added xmlMallocAtomic() and modified the allocations
+    accordingly.
+   - Performances: removed excessive malloc() calls, speedup of the push and
+    xmlReader interfaces, removed excessive thread locking
+   - Documentation: man page (John Fleck), xmlReader documentation
+   - Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)
+
+
 2.5.6: Apr 1 2003:
    - Fixed W3C XML Schemas datatype, should be compliant now except for
     binHex and base64 which are not supported yet.
diff --git a/configure.in b/configure.in
index 92dab42..b790929 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=5
-LIBXML_MICRO_VERSION=6
+LIBXML_MICRO_VERSION=7
 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/apibuild.py b/doc/apibuild.py
index f0308bc..b80809b 100755
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -22,9 +22,9 @@
   "acconfig.h": "generated portability layer",
   "config.h": "generated portability layer",
   "libxml.h": "internal only",
-  "testOOM.c": "out of memory tester"
-  "testOOMlib.h": "out of memory tester"
-  "testOOMlib.c": "out of memory tester"
+  "testOOM.c": "out of memory tester",
+  "testOOMlib.h": "out of memory tester",
+  "testOOMlib.c": "out of memory tester",
 }
 
 ignored_words = {
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index f9ea8f0..f3e6d7d 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -837,27 +837,6 @@
      <exports symbol='WITH_TRIO'/>
      <exports symbol='xmlCheckVersion'/>
     </file>
-    <file name='threads'>
-     <exports symbol='xmlCleanupThreads'/>
-     <exports symbol='xmlFreeMutex'/>
-     <exports symbol='xmlFreeRMutex'/>
-     <exports symbol='xmlGetGlobalState'/>
-     <exports symbol='xmlGetThreadId'/>
-     <exports symbol='xmlInitThreads'/>
-     <exports symbol='xmlIsMainThread'/>
-     <exports symbol='xmlLockLibrary'/>
-     <exports symbol='xmlMutex'/>
-     <exports symbol='xmlMutexLock'/>
-     <exports symbol='xmlMutexPtr'/>
-     <exports symbol='xmlMutexUnlock'/>
-     <exports symbol='xmlNewMutex'/>
-     <exports symbol='xmlNewRMutex'/>
-     <exports symbol='xmlRMutex'/>
-     <exports symbol='xmlRMutexLock'/>
-     <exports symbol='xmlRMutexPtr'/>
-     <exports symbol='xmlRMutexUnlock'/>
-     <exports symbol='xmlUnlockLibrary'/>
-    </file>
     <file name='valid'>
      <exports symbol='_xmlValidCtxt'/>
      <exports symbol='xmlAddAttributeDecl'/>
@@ -993,15 +972,142 @@
      <exports symbol='htmlStatus'/>
      <exports symbol='htmlTagLookup'/>
     </file>
-    <file name='testOOMlib'>
-     <exports symbol='TEST_OOM_LIB_H'/>
-     <exports symbol='TestMemoryFunction'/>
-     <exports symbol='test_free'/>
-     <exports symbol='test_get_malloc_blocks_outstanding'/>
-     <exports symbol='test_malloc'/>
-     <exports symbol='test_oom_handling'/>
-     <exports symbol='test_realloc'/>
-     <exports symbol='test_strdup'/>
+    <file name='parser'>
+     <exports symbol='XML_COMPLETE_ATTRS'/>
+     <exports symbol='XML_DEFAULT_VERSION'/>
+     <exports symbol='XML_DETECT_IDS'/>
+     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE'/>
+     <exports symbol='XML_PARSER_CDATA_SECTION'/>
+     <exports symbol='XML_PARSER_COMMENT'/>
+     <exports symbol='XML_PARSER_CONTENT'/>
+     <exports symbol='XML_PARSER_DTD'/>
+     <exports symbol='XML_PARSER_END_TAG'/>
+     <exports symbol='XML_PARSER_ENTITY_DECL'/>
+     <exports symbol='XML_PARSER_ENTITY_VALUE'/>
+     <exports symbol='XML_PARSER_EOF'/>
+     <exports symbol='XML_PARSER_EPILOG'/>
+     <exports symbol='XML_PARSER_IGNORE'/>
+     <exports symbol='XML_PARSER_MISC'/>
+     <exports symbol='XML_PARSER_PI'/>
+     <exports symbol='XML_PARSER_PROLOG'/>
+     <exports symbol='XML_PARSER_PUBLIC_LITERAL'/>
+     <exports symbol='XML_PARSER_START'/>
+     <exports symbol='XML_PARSER_START_TAG'/>
+     <exports symbol='XML_PARSER_SYSTEM_LITERAL'/>
+     <exports symbol='XML_SKIP_IDS'/>
+     <exports symbol='_xmlParserCtxt'/>
+     <exports symbol='_xmlParserInput'/>
+     <exports symbol='_xmlParserNodeInfo'/>
+     <exports symbol='_xmlParserNodeInfoSeq'/>
+     <exports symbol='_xmlSAXHandler'/>
+     <exports symbol='_xmlSAXLocator'/>
+     <exports symbol='attributeDeclSAXFunc'/>
+     <exports symbol='attributeSAXFunc'/>
+     <exports symbol='cdataBlockSAXFunc'/>
+     <exports symbol='charactersSAXFunc'/>
+     <exports symbol='commentSAXFunc'/>
+     <exports symbol='elementDeclSAXFunc'/>
+     <exports symbol='endDocumentSAXFunc'/>
+     <exports symbol='endElementSAXFunc'/>
+     <exports symbol='entityDeclSAXFunc'/>
+     <exports symbol='errorSAXFunc'/>
+     <exports symbol='externalSubsetSAXFunc'/>
+     <exports symbol='fatalErrorSAXFunc'/>
+     <exports symbol='getEntitySAXFunc'/>
+     <exports symbol='getParameterEntitySAXFunc'/>
+     <exports symbol='hasExternalSubsetSAXFunc'/>
+     <exports symbol='hasInternalSubsetSAXFunc'/>
+     <exports symbol='ignorableWhitespaceSAXFunc'/>
+     <exports symbol='internalSubsetSAXFunc'/>
+     <exports symbol='isStandaloneSAXFunc'/>
+     <exports symbol='notationDeclSAXFunc'/>
+     <exports symbol='processingInstructionSAXFunc'/>
+     <exports symbol='referenceSAXFunc'/>
+     <exports symbol='resolveEntitySAXFunc'/>
+     <exports symbol='setDocumentLocatorSAXFunc'/>
+     <exports symbol='startDocumentSAXFunc'/>
+     <exports symbol='startElementSAXFunc'/>
+     <exports symbol='unparsedEntityDeclSAXFunc'/>
+     <exports symbol='warningSAXFunc'/>
+     <exports symbol='xmlCharStrdup'/>
+     <exports symbol='xmlCharStrndup'/>
+     <exports symbol='xmlCleanupParser'/>
+     <exports symbol='xmlClearNodeInfoSeq'/>
+     <exports symbol='xmlClearParserCtxt'/>
+     <exports symbol='xmlCreateDocParserCtxt'/>
+     <exports symbol='xmlCreateIOParserCtxt'/>
+     <exports symbol='xmlCreatePushParserCtxt'/>
+     <exports symbol='xmlExternalEntityLoader'/>
+     <exports symbol='xmlFreeParserCtxt'/>
+     <exports symbol='xmlGetExternalEntityLoader'/>
+     <exports symbol='xmlGetFeature'/>
+     <exports symbol='xmlGetFeaturesList'/>
+     <exports symbol='xmlGetWarningsDefaultValue'/>
+     <exports symbol='xmlIOParseDTD'/>
+     <exports symbol='xmlInitNodeInfoSeq'/>
+     <exports symbol='xmlInitParser'/>
+     <exports symbol='xmlInitParserCtxt'/>
+     <exports symbol='xmlKeepBlanksDefault'/>
+     <exports symbol='xmlLineNumbersDefault'/>
+     <exports symbol='xmlLoadExternalEntity'/>
+     <exports symbol='xmlNewIOInputStream'/>
+     <exports symbol='xmlParseBalancedChunkMemory'/>
+     <exports symbol='xmlParseBalancedChunkMemoryRecover'/>
+     <exports symbol='xmlParseChunk'/>
+     <exports symbol='xmlParseCtxtExternalEntity'/>
+     <exports symbol='xmlParseDTD'/>
+     <exports symbol='xmlParseDoc'/>
+     <exports symbol='xmlParseDocument'/>
+     <exports symbol='xmlParseEntity'/>
+     <exports symbol='xmlParseExtParsedEnt'/>
+     <exports symbol='xmlParseExternalEntity'/>
+     <exports symbol='xmlParseFile'/>
+     <exports symbol='xmlParseMemory'/>
+     <exports symbol='xmlParserAddNodeInfo'/>
+     <exports symbol='xmlParserFindNodeInfo'/>
+     <exports symbol='xmlParserFindNodeInfoIndex'/>
+     <exports symbol='xmlParserInputDeallocate'/>
+     <exports symbol='xmlParserInputGrow'/>
+     <exports symbol='xmlParserInputRead'/>
+     <exports symbol='xmlParserInputState'/>
+     <exports symbol='xmlParserNodeInfo'/>
+     <exports symbol='xmlParserNodeInfoPtr'/>
+     <exports symbol='xmlParserNodeInfoSeq'/>
+     <exports symbol='xmlParserNodeInfoSeqPtr'/>
+     <exports symbol='xmlParserVersion'/>
+     <exports symbol='xmlPedanticParserDefault'/>
+     <exports symbol='xmlRecoverDoc'/>
+     <exports symbol='xmlRecoverFile'/>
+     <exports symbol='xmlRecoverMemory'/>
+     <exports symbol='xmlSAXParseDTD'/>
+     <exports symbol='xmlSAXParseDoc'/>
+     <exports symbol='xmlSAXParseEntity'/>
+     <exports symbol='xmlSAXParseFile'/>
+     <exports symbol='xmlSAXParseFileWithData'/>
+     <exports symbol='xmlSAXParseMemory'/>
+     <exports symbol='xmlSAXParseMemoryWithData'/>
+     <exports symbol='xmlSAXUserParseFile'/>
+     <exports symbol='xmlSAXUserParseMemory'/>
+     <exports symbol='xmlSetExternalEntityLoader'/>
+     <exports symbol='xmlSetFeature'/>
+     <exports symbol='xmlSetupParserForBuffer'/>
+     <exports symbol='xmlStopParser'/>
+     <exports symbol='xmlStrEqual'/>
+     <exports symbol='xmlStrcasecmp'/>
+     <exports symbol='xmlStrcasestr'/>
+     <exports symbol='xmlStrcat'/>
+     <exports symbol='xmlStrchr'/>
+     <exports symbol='xmlStrcmp'/>
+     <exports symbol='xmlStrdup'/>
+     <exports symbol='xmlStrlen'/>
+     <exports symbol='xmlStrncasecmp'/>
+     <exports symbol='xmlStrncat'/>
+     <exports symbol='xmlStrncmp'/>
+     <exports symbol='xmlStrndup'/>
+     <exports symbol='xmlStrstr'/>
+     <exports symbol='xmlStrsub'/>
+     <exports symbol='xmlSubstituteEntitiesDefault'/>
+     <exports symbol='xmlSubstituteEntitiesDefaultValue'/>
     </file>
     <file name='xmlreader'>
      <exports symbol='XML_PARSER_DEFAULTATTRS'/>
@@ -1204,142 +1310,26 @@
      <exports symbol='xmlTreeIndentString'/>
      <exports symbol='xmlTreeIndentString'/>
     </file>
-    <file name='parser'>
-     <exports symbol='XML_COMPLETE_ATTRS'/>
-     <exports symbol='XML_DEFAULT_VERSION'/>
-     <exports symbol='XML_DETECT_IDS'/>
-     <exports symbol='XML_PARSER_ATTRIBUTE_VALUE'/>
-     <exports symbol='XML_PARSER_CDATA_SECTION'/>
-     <exports symbol='XML_PARSER_COMMENT'/>
-     <exports symbol='XML_PARSER_CONTENT'/>
-     <exports symbol='XML_PARSER_DTD'/>
-     <exports symbol='XML_PARSER_END_TAG'/>
-     <exports symbol='XML_PARSER_ENTITY_DECL'/>
-     <exports symbol='XML_PARSER_ENTITY_VALUE'/>
-     <exports symbol='XML_PARSER_EOF'/>
-     <exports symbol='XML_PARSER_EPILOG'/>
-     <exports symbol='XML_PARSER_IGNORE'/>
-     <exports symbol='XML_PARSER_MISC'/>
-     <exports symbol='XML_PARSER_PI'/>
-     <exports symbol='XML_PARSER_PROLOG'/>
-     <exports symbol='XML_PARSER_PUBLIC_LITERAL'/>
-     <exports symbol='XML_PARSER_START'/>
-     <exports symbol='XML_PARSER_START_TAG'/>
-     <exports symbol='XML_PARSER_SYSTEM_LITERAL'/>
-     <exports symbol='XML_SKIP_IDS'/>
-     <exports symbol='_xmlParserCtxt'/>
-     <exports symbol='_xmlParserInput'/>
-     <exports symbol='_xmlParserNodeInfo'/>
-     <exports symbol='_xmlParserNodeInfoSeq'/>
-     <exports symbol='_xmlSAXHandler'/>
-     <exports symbol='_xmlSAXLocator'/>
-     <exports symbol='attributeDeclSAXFunc'/>
-     <exports symbol='attributeSAXFunc'/>
-     <exports symbol='cdataBlockSAXFunc'/>
-     <exports symbol='charactersSAXFunc'/>
-     <exports symbol='commentSAXFunc'/>
-     <exports symbol='elementDeclSAXFunc'/>
-     <exports symbol='endDocumentSAXFunc'/>
-     <exports symbol='endElementSAXFunc'/>
-     <exports symbol='entityDeclSAXFunc'/>
-     <exports symbol='errorSAXFunc'/>
-     <exports symbol='externalSubsetSAXFunc'/>
-     <exports symbol='fatalErrorSAXFunc'/>
-     <exports symbol='getEntitySAXFunc'/>
-     <exports symbol='getParameterEntitySAXFunc'/>
-     <exports symbol='hasExternalSubsetSAXFunc'/>
-     <exports symbol='hasInternalSubsetSAXFunc'/>
-     <exports symbol='ignorableWhitespaceSAXFunc'/>
-     <exports symbol='internalSubsetSAXFunc'/>
-     <exports symbol='isStandaloneSAXFunc'/>
-     <exports symbol='notationDeclSAXFunc'/>
-     <exports symbol='processingInstructionSAXFunc'/>
-     <exports symbol='referenceSAXFunc'/>
-     <exports symbol='resolveEntitySAXFunc'/>
-     <exports symbol='setDocumentLocatorSAXFunc'/>
-     <exports symbol='startDocumentSAXFunc'/>
-     <exports symbol='startElementSAXFunc'/>
-     <exports symbol='unparsedEntityDeclSAXFunc'/>
-     <exports symbol='warningSAXFunc'/>
-     <exports symbol='xmlCharStrdup'/>
-     <exports symbol='xmlCharStrndup'/>
-     <exports symbol='xmlCleanupParser'/>
-     <exports symbol='xmlClearNodeInfoSeq'/>
-     <exports symbol='xmlClearParserCtxt'/>
-     <exports symbol='xmlCreateDocParserCtxt'/>
-     <exports symbol='xmlCreateIOParserCtxt'/>
-     <exports symbol='xmlCreatePushParserCtxt'/>
-     <exports symbol='xmlExternalEntityLoader'/>
-     <exports symbol='xmlFreeParserCtxt'/>
-     <exports symbol='xmlGetExternalEntityLoader'/>
-     <exports symbol='xmlGetFeature'/>
-     <exports symbol='xmlGetFeaturesList'/>
-     <exports symbol='xmlGetWarningsDefaultValue'/>
-     <exports symbol='xmlIOParseDTD'/>
-     <exports symbol='xmlInitNodeInfoSeq'/>
-     <exports symbol='xmlInitParser'/>
-     <exports symbol='xmlInitParserCtxt'/>
-     <exports symbol='xmlKeepBlanksDefault'/>
-     <exports symbol='xmlLineNumbersDefault'/>
-     <exports symbol='xmlLoadExternalEntity'/>
-     <exports symbol='xmlNewIOInputStream'/>
-     <exports symbol='xmlParseBalancedChunkMemory'/>
-     <exports symbol='xmlParseBalancedChunkMemoryRecover'/>
-     <exports symbol='xmlParseChunk'/>
-     <exports symbol='xmlParseCtxtExternalEntity'/>
-     <exports symbol='xmlParseDTD'/>
-     <exports symbol='xmlParseDoc'/>
-     <exports symbol='xmlParseDocument'/>
-     <exports symbol='xmlParseEntity'/>
-     <exports symbol='xmlParseExtParsedEnt'/>
-     <exports symbol='xmlParseExternalEntity'/>
-     <exports symbol='xmlParseFile'/>
-     <exports symbol='xmlParseMemory'/>
-     <exports symbol='xmlParserAddNodeInfo'/>
-     <exports symbol='xmlParserFindNodeInfo'/>
-     <exports symbol='xmlParserFindNodeInfoIndex'/>
-     <exports symbol='xmlParserInputDeallocate'/>
-     <exports symbol='xmlParserInputGrow'/>
-     <exports symbol='xmlParserInputRead'/>
-     <exports symbol='xmlParserInputState'/>
-     <exports symbol='xmlParserNodeInfo'/>
-     <exports symbol='xmlParserNodeInfoPtr'/>
-     <exports symbol='xmlParserNodeInfoSeq'/>
-     <exports symbol='xmlParserNodeInfoSeqPtr'/>
-     <exports symbol='xmlParserVersion'/>
-     <exports symbol='xmlPedanticParserDefault'/>
-     <exports symbol='xmlRecoverDoc'/>
-     <exports symbol='xmlRecoverFile'/>
-     <exports symbol='xmlRecoverMemory'/>
-     <exports symbol='xmlSAXParseDTD'/>
-     <exports symbol='xmlSAXParseDoc'/>
-     <exports symbol='xmlSAXParseEntity'/>
-     <exports symbol='xmlSAXParseFile'/>
-     <exports symbol='xmlSAXParseFileWithData'/>
-     <exports symbol='xmlSAXParseMemory'/>
-     <exports symbol='xmlSAXParseMemoryWithData'/>
-     <exports symbol='xmlSAXUserParseFile'/>
-     <exports symbol='xmlSAXUserParseMemory'/>
-     <exports symbol='xmlSetExternalEntityLoader'/>
-     <exports symbol='xmlSetFeature'/>
-     <exports symbol='xmlSetupParserForBuffer'/>
-     <exports symbol='xmlStopParser'/>
-     <exports symbol='xmlStrEqual'/>
-     <exports symbol='xmlStrcasecmp'/>
-     <exports symbol='xmlStrcasestr'/>
-     <exports symbol='xmlStrcat'/>
-     <exports symbol='xmlStrchr'/>
-     <exports symbol='xmlStrcmp'/>
-     <exports symbol='xmlStrdup'/>
-     <exports symbol='xmlStrlen'/>
-     <exports symbol='xmlStrncasecmp'/>
-     <exports symbol='xmlStrncat'/>
-     <exports symbol='xmlStrncmp'/>
-     <exports symbol='xmlStrndup'/>
-     <exports symbol='xmlStrstr'/>
-     <exports symbol='xmlStrsub'/>
-     <exports symbol='xmlSubstituteEntitiesDefault'/>
-     <exports symbol='xmlSubstituteEntitiesDefaultValue'/>
+    <file name='threads'>
+     <exports symbol='xmlCleanupThreads'/>
+     <exports symbol='xmlFreeMutex'/>
+     <exports symbol='xmlFreeRMutex'/>
+     <exports symbol='xmlGetGlobalState'/>
+     <exports symbol='xmlGetThreadId'/>
+     <exports symbol='xmlInitThreads'/>
+     <exports symbol='xmlIsMainThread'/>
+     <exports symbol='xmlLockLibrary'/>
+     <exports symbol='xmlMutex'/>
+     <exports symbol='xmlMutexLock'/>
+     <exports symbol='xmlMutexPtr'/>
+     <exports symbol='xmlMutexUnlock'/>
+     <exports symbol='xmlNewMutex'/>
+     <exports symbol='xmlNewRMutex'/>
+     <exports symbol='xmlRMutex'/>
+     <exports symbol='xmlRMutexLock'/>
+     <exports symbol='xmlRMutexPtr'/>
+     <exports symbol='xmlRMutexUnlock'/>
+     <exports symbol='xmlUnlockLibrary'/>
     </file>
     <file name='hash'>
      <exports symbol='xmlHashAddEntry'/>
@@ -2155,8 +2145,6 @@
       <info>Skips the end of line chars.</info>
       <arg name='p' info='and UTF8 string pointer'/>
     </macro>
-    <macro name='TEST_OOM_LIB_H' file='testOOMlib'>
-    </macro>
     <macro name='WITHOUT_TRIO' file='xmlversion'>
       <info>defined if the trio support should not be configured in</info>
     </macro>
@@ -3272,7 +3260,7 @@
     <variable name='xmlFree' file='globals' type='xmlFreeFunc'/>
     <variable name='xmlGenericError' file='globals' type='xmlGenericErrorFunc'/>
     <variable name='xmlGenericErrorContext' file='globals' type='void *'/>
-    <variable name='xmlGetWarningsDefaultValue' file='globals' type='int'/>
+    <variable name='xmlGetWarningsDefaultValue' file='parser' type='int'/>
     <variable name='xmlIndentTreeOutput' file='globals' type='int'/>
     <variable name='xmlKeepBlanksDefaultValue' file='globals' type='int'/>
     <variable name='xmlLineNumbersDefaultValue' file='globals' type='int'/>
@@ -3281,7 +3269,7 @@
     <variable name='xmlMallocAtomic' file='globals' type='xmlMallocFunc'/>
     <variable name='xmlMemStrdup' file='globals' type='xmlStrdupFunc'/>
     <variable name='xmlParserDebugEntities' file='globals' type='int'/>
-    <variable name='xmlParserVersion' file='globals' type='const char *'/>
+    <variable name='xmlParserVersion' file='parser' type='const char *'/>
     <variable name='xmlPedanticParserDefaultValue' file='globals' type='int'/>
     <variable name='xmlRealloc' file='globals' type='xmlReallocFunc'/>
     <variable name='xmlRegisterNodeDefaultValue' file='globals' type='xmlRegisterNodeFunc'/>
@@ -3289,16 +3277,11 @@
     <variable name='xmlStringComment' file='parserInternals' type='const xmlCharxmlStringComment[]'/>
     <variable name='xmlStringText' file='parserInternals' type='const xmlCharxmlStringText[]'/>
     <variable name='xmlStringTextNoenc' file='parserInternals' type='const xmlCharxmlStringTextNoenc[]'/>
-    <variable name='xmlSubstituteEntitiesDefaultValue' file='globals' type='int'/>
+    <variable name='xmlSubstituteEntitiesDefaultValue' file='parser' type='int'/>
     <variable name='xmlTreeIndentString' file='globals' type='const char *'/>
     <variable name='xmlXPathNAN' file='xpath' type='double'/>
     <variable name='xmlXPathNINF' file='xpath' type='double'/>
     <variable name='xmlXPathPINF' file='xpath' type='double'/>
-    <functype name='TestMemoryFunction' file='testOOMlib'>
-      <info></info>
-      <return type='int' info=''/>
-      <arg name='data' type='void *' info=''/>
-    </functype>
     <function name='UTF8ToHtml' file='HTMLparser'>
       <info>Take a block of UTF-8 chars in and try to convert it to an ASCII plus HTML entities block of chars out.</info>
       <return type='int' info='0 if success, -2 if the transcoding fails, or -1 otherwise The value of @inlen after return is the number of octets consumed as the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.'/>
@@ -4147,37 +4130,6 @@
       <arg name='name' type='const xmlChar *' info='The element name, including namespace prefix'/>
       <arg name='atts' type='const xmlChar **' info='An array of name/value attributes pairs, NULL terminated'/>
     </functype>
-    <function name='test_free' file='testOOMlib'>
-      <info></info>
-      <return type='void'/>
-      <arg name='memory' type='void *' info=''/>
-    </function>
-    <function name='test_get_malloc_blocks_outstanding' file='testOOMlib'>
-      <info></info>
-      <return type='int' info=''/>
-    </function>
-    <function name='test_malloc' file='testOOMlib'>
-      <info></info>
-      <return type='void *' info=''/>
-      <arg name='bytes' type='size_t' info=''/>
-    </function>
-    <function name='test_oom_handling' file='testOOMlib'>
-      <info></info>
-      <return type='int' info=''/>
-      <arg name='func' type='TestMemoryFunction' info=''/>
-      <arg name='data' type='void *' info=''/>
-    </function>
-    <function name='test_realloc' file='testOOMlib'>
-      <info></info>
-      <return type='void *' info=''/>
-      <arg name='memory' type='void *' info=''/>
-      <arg name='bytes' type='size_t' info=''/>
-    </function>
-    <function name='test_strdup' file='testOOMlib'>
-      <info></info>
-      <return type='char *' info=''/>
-      <arg name='str' type='const char *' info=''/>
-    </function>
     <function name='unparsedEntityDecl' file='SAX'>
       <info>What to do when an unparsed entity declaration is parsed</info>
       <return type='void'/>
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 262869e..d023db1 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,18 +8,26 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>2.5.6</version>
-    <last-release> Apr 1 2003</last-release>
+    <version>2.5.7</version>
+    <last-release> Apr 25 2003</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Fixed W3C XML Schemas datatype, should be compliant now except for
-    binHex and base64 which are not supported yet.
-   - bug fixes: non-ASCII IDs, HTML output, XInclude on large docs and
-    XInclude entities handling, encoding detection on external subsets, XML
-    Schemas bugs and memory leaks, HTML parser (James Bursa)
-   - portability: python/trio (Albert Chin), Sun compiler warnings
-   - documentation: added --relaxng option to xmllint man page (John)
-   - improved error reporting: xml:space, start/end tag mismatches, Relax NG
-    errors
+    <changes>   - Relax-NG: Compiling to regexp and streaming validation on top of the
+    xmlReader interface, added to xmllint --stream
+   - xmlReader: Expand(), Next() and DOM access glue, bug fixes
+   - Support for large files: RGN validated a 4.5GB instance
+   - Thread support is now configured in by default
+   - Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes
+    (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser
+    and zero bytes handling, some missing Windows file path conversions,
+    behaviour of the parser and validator in the presence of &quot;out of memory&quot;
+    error conditions 
+   - extended the API to be able to plug a garbage collecting memory
+    allocator, added xmlMallocAtomic() and modified the allocations
+    accordingly.
+   - Performances: removed excessive malloc() calls, speedup of the push and
+    xmlReader interfaces, removed excessive thread locking
+   - Documentation: man page (John Fleck), xmlReader documentation
+   - Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)
 
 </changes>
   </product>
diff --git a/doc/news.html b/doc/news.html
index deb2655..3d52637 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -105,6 +105,26 @@
   Schemas</a>
 </li>
 </ul>
+<h3>2.5.7: Apr 25 2003</h3>
+<ul>
+<li>Relax-NG: Compiling to regexp and streaming validation on top of the
+    xmlReader interface, added to xmllint --stream</li>
+  <li>xmlReader: Expand(), Next() and DOM access glue, bug fixes</li>
+  <li>Support for large files: RGN validated a 4.5GB instance</li>
+  <li>Thread support is now configured in by default</li>
+  <li>Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes
+    (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser
+    and zero bytes handling, some missing Windows file path conversions,
+    behaviour of the parser and validator in the presence of &quot;out of memory&quot;
+    error conditions </li>
+  <li>extended the API to be able to plug a garbage collecting memory
+    allocator, added xmlMallocAtomic() and modified the allocations
+    accordingly.</li>
+  <li>Performances: removed excessive malloc() calls, speedup of the push and
+    xmlReader interfaces, removed excessive thread locking</li>
+  <li>Documentation: man page (John Fleck), xmlReader documentation</li>
+  <li>Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)</li>
+</ul>
 <h3>2.5.6: Apr 1 2003</h3>
 <ul>
 <li>Fixed W3C XML Schemas datatype, should be compliant now except for
diff --git a/doc/xml.html b/doc/xml.html
index 2c45b25..7930429 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -635,6 +635,27 @@
   Schemas</a></li>
 </ul>
 
+<h3>2.5.7: Apr 25 2003</h3>
+<ul>
+  <li>Relax-NG: Compiling to regexp and streaming validation on top of the
+    xmlReader interface, added to xmllint --stream</li>
+  <li>xmlReader: Expand(), Next() and DOM access glue, bug fixes</li>
+  <li>Support for large files: RGN validated a 4.5GB instance</li>
+  <li>Thread support is now configured in by default</li>
+  <li>Fixes: update of the Trio code (Bjorn), WXS Date and Duration fixes
+    (Charles Bozeman), DTD and namespaces (Brent Hendricks), HTML push parser
+    and zero bytes handling, some missing Windows file path conversions,
+    behaviour of the parser and validator in the presence of "out of memory"
+    error conditions </li>
+  <li>extended the API to be able to plug a garbage collecting memory
+    allocator, added xmlMallocAtomic() and modified the allocations
+    accordingly.</li>
+  <li>Performances: removed excessive malloc() calls, speedup of the push and
+    xmlReader interfaces, removed excessive thread locking</li>
+  <li>Documentation: man page (John Fleck), xmlReader documentation</li>
+  <li>Python: adding binding for xmlCatalogAddLocal (Brent M Hendricks)</li>
+</ul>
+
 <h3>2.5.6: Apr 1 2003</h3>
 <ul>
   <li>Fixed W3C XML Schemas datatype, should be compliant now except for
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index ae92f0d..1e6808a 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -132,10 +132,6 @@
 relaxNGNewMemParserCtxt()
 relaxNGNewParserCtxt()
 
-# functions from module testOOMlib
-test_get_malloc_blocks_outstanding()
-test_strdup()
-
 # functions from module tree
 buildQName()
 compressMode()