diff --git a/doc/Doxyfile b/doc/Doxyfile
index 35a31124c9d8865995c33e706de7bc828f202acc..52800a52552638cd07d31a90d33c2f8c1e924c9d 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -25,7 +25,7 @@ PROJECT_NAME         = Xerces-C++
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER       = v1.7.0
+PROJECT_NUMBER       = v2.0.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
@@ -205,7 +205,7 @@ ENABLED_SECTIONS     =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                = ../src/xercesc/dom ../src/xercesc/idom ../src/xercesc/framework ../src/xercesc/sax ../src/xercesc/parsers ../src/xercesc/util ../src/xercesc/sax2
+INPUT                = ../src/xercesc/dom ../src/xercesc/framework ../src/xercesc/sax ../src/xercesc/parsers ../src/xercesc/util ../src/xercesc/sax2
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -230,13 +230,16 @@ EXCLUDE              =
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories.
 
-EXCLUDE_PATTERNS     = *Impl.hpp Janitor.hpp BitOps.hpp BitSet.hpp ChildNode.hpp \
-CountedPointer.hpp DomMemDebug.hpp MemDebug.hpp DStringPool.hpp TransENameMap.hpp \
-IDCasts.hpp IDChildNode.hpp IDDeepNodeListPool.hpp IDDOMImplementation.hpp \
-IDNodeIDMap.hpp IDNodeVector.hpp IDParentNode.hpp IDStringPool.hpp \
+EXCLUDE_PATTERNS     = *Impl.hpp DOM_*.hpp DOMParser.hpp \
+ChildNode.hpp DOM.hpp DomMemDebug.hpp MemDebug.hpp DStringPool.hpp \
+NodeIDMap.hpp NameNodeFilter.hpp NodeVector.hpp DOMString.hpp ParentNode.hpp \
+DOMCasts.hpp DOMChildNode.hpp DOMDeepNodeListPool.hpp \
+DOMNodeIDMap.hpp DOMNodeVector.hpp DOMParentNode.hpp DOMStringPool.hpp \
+NameIdPool.hpp KVStringPair.hpp Janitor.hpp BitOps.hpp BitSet.hpp \
+CountedPointer.hpp  TransENameMap.hpp \
 FlagJanitor.hpp HashBase.hpp HashPtr.hpp HashXMLCh.hpp KeyValuePair.hpp \
 KVStringPair.hpp NameIdPool.hpp NodeIDMap.hpp NameNodeFilter.hpp NodeVector.hpp \
-NodeImpl.hpp CommonParentNode.hpp RefArrayOf.hpp RefHash*.hpp RefStackOf.hpp \
+RefArrayOf.hpp RefHash*.hpp RefStackOf.hpp \
 RefVectorOf.hpp ValueArrayOf.hpp ValueStackOf.hpp ValueVectorOf.hpp \
 XML256TableTranscoder.hpp XML88591Transcoder.hpp XMLASCIITranscoder.hpp \
 XMLBufferMgr.hpp XMLBuffer.hpp XMLChTranscoder.hpp XMLEBCDICTranscoder.hpp \
diff --git a/doc/migration.xml b/doc/migration.xml
index 697f8863e234ecb841b98c185e0127f6b9386acd..e7481510ba0e47168fbe1102d3fa984cee7526e4 100644
--- a/doc/migration.xml
+++ b/doc/migration.xml
@@ -2,13 +2,14 @@
 <!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Migration">
-    <s2 title="Migrating from &XercesCName; &XercesCVersion160; to &XercesCName; &XercesCVersion;">
+    <s2 title="Migrating from &XercesCName; 1.7.0 to &XercesCName; &XercesCVersion;">
       <p>This document is a discussion of the technical differences between
-      &XercesCName; &XercesCVersion160; code base and the &XercesCName; &XercesCVersion;.</p>
+      &XercesCName; 1.7.0 code base and the &XercesCName; &XercesCVersion;.</p>
 
       <p>Topics discussed are:</p>
       <ul>
         <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion;</link></li>
+        <li><link anchor="LibraryChange">Library Name change in &XercesCName; &XercesCVersion;</link></li>
         <li><link anchor="DirChange">Directory change in &XercesCName; &XercesCVersion;</link></li>
         <li><link anchor="API">Public API Changes in &XercesCName; &XercesCVersion;</link></li>
         <ul>
@@ -17,129 +18,62 @@
             <li><link anchor="DeprecatedAPI">Deprecated Public API</link></li>
         </ul>
       </ul>
-    </s2>
 
     <anchor name="NewFeatures"/>
-    <s2 title="New features in &XercesCName; &XercesCVersion;">
+    <s3 title="New features in &XercesCName; &XercesCVersion;">
       <ul>
-        <li>Support SAX2-ext's DeclHandler.</li>
-        <li>Directory sane_include reorganization: add sub-directory 'xercesc' to src / include folder.
-            See <link anchor="DirChange">"Directory change in &XercesCName; &XercesCVersion;"</link>
-            below for detail.</li>
-        <li>More IDOM test cases - port IDOMMemTest, and merge ThreadTest and IThreadTest.</li>
-        <li>Support IconvFBSD in multi-threading environment.</li>
-        <li>Use IDOM in schema processing for faster performance.</li>
-        <li>Add Project files for BCB6.</li>
-        <li>Port to Caldera (SCO) OpenServer.</li>
-        <li>Support building with new MacOSURLAccessCF NetAccessor that doesn't require
-            Carbon but can allow Xerces to live solely within CoreServices layer.</li>
+        <li></li>
       </ul>
-    </s2>
+    </s3>
+
+    <anchor name="LibraryChange"/>
+    <s3 title="Library Name Change in &XercesCName; &XercesCVersion;">
+        <ul>
+            <li></li>
+        </ul>
+    </s3>
 
     <anchor name="DirChange"/>
-    <s2 title="Directory change in &XercesCName; &XercesCVersion;">
+    <s3 title="Directory change in &XercesCName; &XercesCVersion;">
         <ul>
-            <li>A new directory, <em>src/xercesc</em> is created to be the new parent directory of
-                all src's direct subdirectories.</li>
-            <li>And in the binary package, all the headers are distributed in <em>include/xercesc</em> directory.</li>
-            <li>Migration considerations:</li>
-            <ul>
-              <li>Windows application, <br/>
-                  either change the <em>include directories </em> setting to
-                  "..\..\..\..\..\src\<em>xercesc</em>" (Projects->settings->C/C++->Preprocessor), <br/>
-                  or <br/>
-                  change the relevant #include instances in the source/header files, accordingly, eg <br/>
-                  #include &lt;util/XMLString.hpp&gt; be changed to <br/>
-                  #include &lt;<em>xercesc</em>/util/XMLString.hpp&gt; </li>
-              <li>Unix application, <br/>
-                  either change the <em>include search path </em> in the Makefile to
-                  " -I &lt;installroot&gt;/include/<em>xercesc</em>", <br/>
-                  or <br/>
-                  change the relevant #include instances in the source/header files as shown above. </li>
-            </ul>
+            <li></li>
         </ul>
-    </s2>
+    </s3>
 
     <anchor name="API"/>
-    <s2 title="Public API Changes in &XercesCName; &XercesCVersion;">
+    <s3 title="Public API Changes in &XercesCName; &XercesCVersion;">
 
         <p>The following lists the public API changes between the &XercesCName;
-           &XercesCVersion; and the &XercesCName; &XercesCVersion; releases
+           1.7.0; and the &XercesCName; &XercesCVersion; releases
            of the parser. </p>
 
         <anchor name="NewAPI"/>
-        <s3 title="New Public API">
+        <s4 title="New Public API">
             <ul>
-              <li>Added SAX2-ext's DeclHandler class.
-                  See <jump href="api.html">the API documentation page</jump> for details.</li>
-              <li>To support SAX2-ext's DeclHandler, the following new methods are added
-                  in classes DefaultHandler and SAX2XMLReader:</li>
-              <ul>
-                <li>void DefaultHandler::elementDecl(const XMLCh* const name, const XMLCh* const model)</li>
-                <li>void DefaultHandler::attributeDecl(const XMLCh* const eName, const XMLCh* const aName,
-                    const XMLCh* const type, const XMLCh* const mode, const XMLCh* const value)</li>
-                <li>void DefaultHandler::internalEntityDecl(const XMLCh* const name, const XMLCh* const value)</li>
-                <li>void DefaultHandler::externalEntityDecl(const XMLCh* const name, const XMLCh* const publicId,
-                    const XMLCh* const systemId)</li>
-                <li>DeclHandler* SAX2XMLReader::getDeclarationHandler() const</li>
-                <li>void SAX2XMLReader::setDeclarationHandler(DeclHandler* const handler)</li>
-              </ul>
-              <li>To conform to DOM Level 2 specification, the following methods are added:</li>
-              <ul>
-                <li>DOM_Node DOM_NodeIterator::getRoot()</li>
-                <li>DOM_Node DOM_TreeWalker::getRoot()</li>
-                <li>bool DOM_Node::hasAttributes() const</li>
-                <li>bool DOM_Element::hasAttribute(const DOMString &amp;name) const</li>
-                <li>bool DOM_Element::hasAttributeNS(const DOMString &amp;namespaceURI,
-                                const DOMString &amp;localName) const</li>
-                <li>IDOM_Node* IDOM_NodeIterator::getRoot()</li>
-                <li>IDOM_Node* IDOM_TreeWalker::getRoot()</li>
-                <li>bool IDOM_Node::hasAttributes() const</li>
-                <li>bool IDOM_Element::hasAttribute(const XMLCh* name) const</li>
-                <li>bool IDOM_Element::hasAttributeNS(const XMLCh* namespaceURI,
-                                const XMLCh* localName) const</li>
-              </ul>
-              <li>To fix [Bug 5570], a copy constructor is added to DOM_Range</li>
+              <li></li>
             </ul>
-        </s3>
+        </s4>
 
         <anchor name="ModifiedAPI"/>
-        <s3 title="Modified Public API">
+        <s4 title="Modified Public API">
             <ul>
-              <li>To conform to the SAX2 specification, the namespace-prefixes feature
-                  in SAX2 is set to off as default.</li>
-              <li>To fix [Bug 6330], the Base64::encode and Base64::decode have been modified
-                  as follows</li>
-                  <ul>
-                  <li>static XMLByte* Base64::encode(const XMLByte* const inputData,
-                      const unsigned int   inputLength,
-                      unsigned int*        outputLength);</li>
-                  <li>static XMLByte* Base64::decode(const XMLByte* const inputData,
-                           unsigned int*        outputLength);</li>
-                  <li>static XMLCh* decode(const XMLCh* const inputData,
-                         unsigned int*      outputLength);</li>
-                  </ul>
-              <li>To conform to DOM Level 2 specification, the DOM_Node::supports and IDOM_Node::supports
-                  are modified to</li>
-              <ul>
-                <li>bool DOM_Node::isSupported(const DOMString &amp;feature, const DOMString &amp;version) const</li>
-                <li>bool IDOM_Node::isSupported(const XMLCh* feature, const XMLCh* version) const</li>
-              </ul>
+              <li></li>
             </ul>
-        </s3>
+        </s4>
 
         <anchor name="DeprecatedAPI"/>
-        <s3 title="Deprecated Public API">
+        <s4 title="Deprecated Public API">
             <ul>
-              <li>No Deprecated Public API in this release.</li>
+              <li></li>
             </ul>
-        </s3>
+        </s4>
 
+    </s3>
     </s2>
 
     <s2 title="Migration Archive">
 
-       <p>For migration information to &XercesCName; &XercesCVersion160; or earlier,
+       <p>For migration information to &XercesCName; 1.7.0 or earlier,
           please refer to <jump href="migrate_archive.html">Migration Archive. </jump></p>
 
     </s2>
diff --git a/doc/migration_archive.xml b/doc/migration_archive.xml
index 4237894f5df3423b21987b7b55eaa93ede7e7118..3782298cbe9d650c64a77e73244348121a24c9d5 100644
--- a/doc/migration_archive.xml
+++ b/doc/migration_archive.xml
@@ -2,40 +2,154 @@
 <!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Migration Archive">
-    <s2 title="Migrating from &XercesCName; &XercesCVersion152; to &XercesCName; &XercesCVersion160;">
+    <s2 title="Migrating to earlier Releases">
+      <ul>
+        <li><link anchor="Migrateto170">Migrating from &XercesCName; 1.6.0 to 1.7.0</link></li>
+        <li><link anchor="Migrateto160">Migrating from &XercesCName; 1.5.2 to 1.6.0</link></li>
+        <li><link anchor="Migrateto152">Migrating from &XercesCName; 1.4.0 to 1.5.2</link></li>
+        <li><link anchor="Migrateto140">Migrating from XML4C 2.x to 1.4.0</link></li>
+      </ul>
+    </s2>
+
+    <anchor name="Migrateto170"/>
+    <s2 title="Migrating from &XercesCName; 1.6.0 to 1.7.0">
       <p>The following section is a discussion of the technical differences between
-      &XercesCName; &XercesCVersion152; code base and the &XercesCName; &XercesCVersion160; code base.</p>
+      &XercesCName; 1.6.0 code base and the &XercesCName; 1.7.0 code base.</p>
 
-      <p>Topics discussed are:</p>
+    <s3 title="New features in &XercesCName; 1.7.0">
       <ul>
-        <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion160;</link></li>
-        <li><link anchor="API">Public API Changes in &XercesCName; &XercesCVersion160;</link></li>
+        <li>Support SAX2-ext's DeclHandler.</li>
+        <li>Directory sane_include reorganization: add sub-directory 'xercesc' to src / include folder.
+            See <link anchor="DirChange2">"Directory change in &XercesCName; 1.7.0"</link>
+            below for detail.</li>
+        <li>More IDOM test cases - port IDOMMemTest, and merge ThreadTest and IThreadTest.</li>
+        <li>Support IconvFBSD in multi-threading environment.</li>
+        <li>Use IDOM in schema processing for faster performance.</li>
+        <li>Add Project files for BCB6.</li>
+        <li>Port to Caldera (SCO) OpenServer.</li>
+        <li>Support building with new MacOSURLAccessCF NetAccessor that doesn't require
+            Carbon but can allow Xerces to live solely within CoreServices layer.</li>
+      </ul>
+    </s3>
+
+    <anchor name="DirChange2"/>
+    <s3 title="Directory change in &XercesCName; 1.7.0">
         <ul>
-            <li><link anchor="NewAPI">New Public API</link></li>
-            <li><link anchor="ModifiedAPI">Modified Public API</link></li>
-            <li><link anchor="DeprecatedAPI">Deprecated Public API</link></li>
+            <li>A new directory, <em>src/xercesc</em> is created to be the new parent directory of
+                all src's direct subdirectories.</li>
+            <li>And in the binary package, all the headers are distributed in <em>include/xercesc</em> directory.</li>
+            <li>Migration considerations:</li>
+            <ul>
+              <li>Windows application, <br/>
+                  either change the <em>include directories </em> setting to
+                  "..\..\..\..\..\src\<em>xercesc</em>" (Projects->settings->C/C++->Preprocessor), <br/>
+                  or <br/>
+                  change the relevant #include instances in the source/header files, accordingly, eg <br/>
+                  #include &lt;util/XMLString.hpp&gt; be changed to <br/>
+                  #include &lt;<em>xercesc</em>/util/XMLString.hpp&gt; </li>
+              <li>Unix application, <br/>
+                  either change the <em>include search path </em> in the Makefile to
+                  " -I &lt;installroot&gt;/include/<em>xercesc</em>", <br/>
+                  or <br/>
+                  change the relevant #include instances in the source/header files as shown above. </li>
+            </ul>
         </ul>
-      </ul>
+    </s3>
+
+    <s3 title="Public API Changes in &XercesCName; 1.7.0">
+
+        <p>The following lists the public API changes between the &XercesCName;
+           1.7.0 and the &XercesCName; 1.7.0 releases
+           of the parser. </p>
+
+        <s4 title="New Public API">
+            <ul>
+              <li>Added SAX2-ext's DeclHandler class.
+                  See <jump href="api.html">the API documentation page</jump> for details.</li>
+              <li>To support SAX2-ext's DeclHandler, the following new methods are added
+                  in classes DefaultHandler and SAX2XMLReader:</li>
+              <ul>
+                <li>void DefaultHandler::elementDecl(const XMLCh* const name, const XMLCh* const model)</li>
+                <li>void DefaultHandler::attributeDecl(const XMLCh* const eName, const XMLCh* const aName,
+                    const XMLCh* const type, const XMLCh* const mode, const XMLCh* const value)</li>
+                <li>void DefaultHandler::internalEntityDecl(const XMLCh* const name, const XMLCh* const value)</li>
+                <li>void DefaultHandler::externalEntityDecl(const XMLCh* const name, const XMLCh* const publicId,
+                    const XMLCh* const systemId)</li>
+                <li>DeclHandler* SAX2XMLReader::getDeclarationHandler() const</li>
+                <li>void SAX2XMLReader::setDeclarationHandler(DeclHandler* const handler)</li>
+              </ul>
+              <li>To conform to DOM Level 2 specification, the following methods are added:</li>
+              <ul>
+                <li>DOM_Node DOM_NodeIterator::getRoot()</li>
+                <li>DOM_Node DOM_TreeWalker::getRoot()</li>
+                <li>bool DOM_Node::hasAttributes() const</li>
+                <li>bool DOM_Element::hasAttribute(const DOMString &amp;name) const</li>
+                <li>bool DOM_Element::hasAttributeNS(const DOMString &amp;namespaceURI,
+                                const DOMString &amp;localName) const</li>
+                <li>IDOM_Node* IDOM_NodeIterator::getRoot()</li>
+                <li>IDOM_Node* IDOM_TreeWalker::getRoot()</li>
+                <li>bool IDOM_Node::hasAttributes() const</li>
+                <li>bool IDOM_Element::hasAttribute(const XMLCh* name) const</li>
+                <li>bool IDOM_Element::hasAttributeNS(const XMLCh* namespaceURI,
+                                const XMLCh* localName) const</li>
+              </ul>
+              <li>To fix [Bug 5570], a copy constructor is added to DOM_Range</li>
+            </ul>
+        </s4>
+
+        <s4 title="Modified Public API">
+            <ul>
+              <li>To conform to the SAX2 specification, the namespace-prefixes feature
+                  in SAX2 is set to off as default.</li>
+              <li>To fix [Bug 6330], the Base64::encode and Base64::decode have been modified
+                  as follows</li>
+                  <ul>
+                  <li>static XMLByte* Base64::encode(const XMLByte* const inputData,
+                      const unsigned int   inputLength,
+                      unsigned int*        outputLength);</li>
+                  <li>static XMLByte* Base64::decode(const XMLByte* const inputData,
+                           unsigned int*        outputLength);</li>
+                  <li>static XMLCh* decode(const XMLCh* const inputData,
+                         unsigned int*      outputLength);</li>
+                  </ul>
+              <li>To conform to DOM Level 2 specification, the DOM_Node::supports and IDOM_Node::supports
+                  are modified to</li>
+              <ul>
+                <li>bool DOM_Node::isSupported(const DOMString &amp;feature, const DOMString &amp;version) const</li>
+                <li>bool IDOM_Node::isSupported(const XMLCh* feature, const XMLCh* version) const</li>
+              </ul>
+            </ul>
+        </s4>
+
+        <s4 title="Deprecated Public API">
+            <ul>
+              <li>No Deprecated Public API in this release.</li>
+            </ul>
+        </s4>
+
+    </s3>
     </s2>
 
-    <anchor name="NewFeatures"/>
-    <s2 title="New features in &XercesCName; &XercesCVersion160;">
+    <anchor name="Migrateto160"/>
+    <s2 title="Migrating from &XercesCName; 1.5.2 to 1.6.0">
+      <p>The following section is a discussion of the technical differences between
+      &XercesCName; 1.5.2 code base and the &XercesCName; 1.6.0 code base.</p>
+
+    <s3 title="New features in &XercesCName; 1.6.0">
       <ul>
         <li>Full Schema support is available in this release.
             See <jump href="schema.html">the Schema page</jump> for details.</li>
         <li>New sample SEnumVal to show how to enumerate the markup decls in a Schema Grammar is added.</li>
       </ul>
-    </s2>
+    </s3>
 
-    <anchor name="API"/>
-    <s2 title="Public API Changes in &XercesCName; &XercesCVersion160;">
+    <s3 title="Public API Changes in &XercesCName; 1.6.0">
 
         <p>The following lists the public API changes between the &XercesCName;
-           &XercesCVersion152; and the &XercesCName; &XercesCVersion160; releases
+           1.5.2 and the &XercesCName; 1.6.0 releases
            of the parser. </p>
 
-        <anchor name="NewAPI"/>
-        <s3 title="New Public API">
+        <s4 title="New Public API">
             <ul>
               <li>It should not be a fatal error if a schema InputSource is not found.
                   Add the following new methods:</li>
@@ -76,126 +190,33 @@
                 <li>QName* XMLAttr::getAttName() const</li>
               </ul>
             </ul>
-        </s3>
+        </s4>
 
-        <anchor name="ModifiedAPI"/>
-        <s3 title="Modified Public API">
+        <s4 title="Modified Public API">
             <ul>
               <li>To support attribute constraint checking, the constant values in XMLAttDef::DefAttTypes have been re-ordered.</li>
             </ul>
-        </s3>
+        </s4>
 
-        <anchor name="DeprecatedAPI"/>
-        <s3 title="Deprecated Public API">
+        <s4 title="Deprecated Public API">
             <ul>
               <li>Root Element check is moved from XMLValidator to XMLScanner.  Thus XMLValidator::checkRootElement() is deprecated.</li>
             </ul>
-        </s3>
+        </s4>
 
+    </s3>
     </s2>
 
-    <s2 title="Migrating from &XercesCName; &XercesCVersion140; to &XercesCName; &XercesCVersion152;">
+    <anchor name="Migrateto152"/>
+    <s2 title="Migrating from &XercesCName; 1.4.0 to 1.5.2">
       <p>The following section is a discussion of the technical differences between
-      &XercesCName; &XercesCVersion140; code base and the &XercesCName; &XercesCVersion152; code base.</p>
-
-      <p>Topics discussed are:</p>
-      <ul>
-        <li><link anchor="GenImprovements2">General Improvements</link></li>
-        <ul>
-            <li><link anchor="Compliance2">Compliance</link></li>
-            <li><link anchor="BugFixes2">Bug Fixes</link></li>
-            <li><link anchor="Speed2">Speed</link></li>
-        </ul>
-        <li><link anchor="Changes2">Changes required to migrate to &XercesCName; &XercesCVersion152;</link></li>
-        <ul>
-            <li><link anchor="Reorganization2">Validator directory Reorganization</link></li>
-            <li><link anchor="DTDValidator2">DTDValidator</link></li>
-        </ul>
-        <li><link anchor="NewFeatures2">New features in &XercesCName; &XercesCVersion152;</link></li>
-        <ul>
-            <li><link anchor="Schema2">Schema Subset Support</link></li>
-            <li><link anchor="IDOM2">Experimental IDOM</link></li>
-        </ul>
-      </ul>
-    </s2>
-
-    <anchor name="GenImprovements2"/>
-    <s2 title="General Improvements">
-
-        <p>The new version is improved in many ways. Some general improvements
-        are: significantly better conformance to the XML spec, cleaner
-        internal architecture, many bug fixes, and faster speed.</p>
-
-        <anchor name="Compliance2"/>
-        <s3 title="Compliance">
-            <p>Except for a couple of the very obscure (mostly related to
-            the 'standalone' mode), this version should be quite compliant
-            to <jump href="http://www.w3.org/TR/REC-xml">XML 1.0</jump>. It also
-            tracks the latest changes to DOM, SAX and Namespace Specification.
-            We have more than a thousand tests, some collected from various
-            public sources and some IBM generated, which are used to do
-            regression testing. The C++ parser is now passing all but a
-            handful of them.</p>
-        </s3>
-
-        <anchor name="BugFixes2"/>
-        <s3 title="Bug Fixes">
-            <p>This version has many bug fixes since last release.
-            Some of these were reported by users and some were brought up by
-            way of the conformance testing.</p>
-        </s3>
-
-        <anchor name="Speed2"/>
-        <s3 title="Speed">
-            <p>Much work was done to speed up this version. Some of the
-            new features, such as experimental IDOM ended
-            up eating up some of these gains, but overall the new version
-            is significantly faster than previous versions, even while doing
-            more.</p>
-        </s3>
-    </s2>
-
-
-    <anchor name="Changes2"/>
-    <s2 title="Changes required to migrate to &XercesCName; &XercesCVersion152;">
-
-        <p>There are some architectural changes between the &XercesCName;
-           &XercesCVersion140; and the &XercesCName; &XercesCVersion152; releases
-           of the parser, and as a result, some code has undergone restructuring
-           as shown below. </p>
-
-        <anchor name="Reorganization2"/>
-        <s3 title="Validator directory Reorganization">
-            <ul>
-              <li>common content model files such as DFAContentModel ...
-                  are moved to a new directory called src/validators/common</li>
-              <li>DTD related files are moved to a new directory called src/validators/DTD</li>
-              <li>new directory src/validators/Datatype is created to store all datatype validators</li>
-              <li>new directory src/validators/schema is created to store Schema related files</li>
-            </ul>
-        </s3>
-
-        <anchor name="DTDValidator2"/>
-        <s3 title="DTDValidator">
-            <p> DTDValidator was design to scan, validate and store the DTD in &XercesCName; &XercesCVersion140;
-                or earlier. In &XercesCName; &XercesCVersion152;, this process is broken down into three components:
-            </p>
-            <ul>
-              <li>new class DTDScanner - to scan the DTD</li>
-              <li>new class DTDGrammar - to store the DTD Grammar</li>
-              <li>DTDValidator - to validate the DTD only</li>
-            </ul>
-        </s3>
-
-    </s2>
+      &XercesCName; 1.4.0 code base and the &XercesCName; 1.5.2 code base.</p>
 
-    <anchor name="NewFeatures2"/>
-    <s2 title="New features in &XercesCName; &XercesCVersion152;">
+    <s3 title="New features in &XercesCName; 1.5.2">
         <p>Schema subset support and an experimental IDOM are available
            in this release.
         </p>
-        <anchor name="Schema2"/>
-        <s3 title="Schema Subset Support">
+        <s4 title="Schema Subset Support">
             <ul>
               <li>New function "setDoSchema" is added to DOM/SAX parser.</li>
               <li>New feature "http://apache.org/xml/features/validation/schema" is recognized by SAX2XMLReader.</li>
@@ -207,95 +228,64 @@
             <p>
                See <jump href="schema.html">the Schema page</jump> for details.
             </p>
-        </s3>
+        </s4>
 
-        <anchor name="IDOM2"/>
-        <s3 title="Experimental IDOM">
+        <s4 title="Experimental IDOM">
            <p>The experimental IDOM API is a new design of the C++ DOM API. If you would like
               to migrate from DOM to the experimental IDOM, please refer to
               <jump href="program-idom.html">
               IDOM programming guide.</jump> Please note that this experimental IDOM API is only
               a prototype and is subject to change.
            </p>
-        </s3>
+        </s4>
 
-    </s2>
+    </s3>
 
-    <s2 title="Migrating from XML4C 2.x to &XercesCName; &XercesCVersion140;">
-       <p>The following section is a discussion of the technical differences between
-       XML4C 2.x code base and the new &XercesCName; &XercesCVersion140; code base.</p>
+    <s3 title="Changes required to migrate to &XercesCName; 1.5.2">
 
-       <p>Topics discussed are:</p>
-       <ul>
-        <li><link anchor="GenImprovements">General Improvements</link></li>
-        <ul>
-            <li><link anchor="Compliance">Compliance</link></li>
-            <li><link anchor="BugFixes">Bug Fixes</link></li>
-            <li><link anchor="Speed">Speed</link></li>
-        </ul>
-        <li><link anchor="Summary">Summary of changes required to migrate from XML4C 2.x to &XercesCName; &XercesCVersion140;</link></li>
-        <li><link anchor="Samples">The Samples</link></li>
-        <li><link anchor="ParserClasses">Parser Classes</link></li>
-        <li><link anchor="DOMLevel2">DOM Level 2 support</link></li>
-        <li><link anchor="Progressive">Progressive Parsing</link></li>
-        <li><link anchor="Namespace">Namespace support</link></li>
-        <li><link anchor="MovedToSrcFramework">Moved Classes to src/framework</link></li>
-        <li><link anchor="LoadableMessageText">Loadable Message Text</link></li>
-        <li><link anchor="PluggableValidators">Pluggable Validators</link></li>
-        <li><link anchor="PluggableTranscoders">Pluggable Transcoders</link></li>
-        <li><link anchor="UtilReorg">Util directory Reorganization</link></li>
-        <ul>
-            <li><link anchor="UtilPlatform">util - The platform independent utility stuff</link></li>
-        </ul>
-       </ul>
-    </s2>
+        <p>There are some architectural changes between the &XercesCName;
+           1.4.0 and the &XercesCName; 1.5.2 releases
+           of the parser, and as a result, some code has undergone restructuring
+           as shown below. </p>
+
+        <s4 title="Validator directory Reorganization">
+            <ul>
+              <li>common content model files such as DFAContentModel ...
+                  are moved to a new directory called src/validators/common</li>
+              <li>DTD related files are moved to a new directory called src/validators/DTD</li>
+              <li>new directory src/validators/Datatype is created to store all datatype validators</li>
+              <li>new directory src/validators/schema is created to store Schema related files</li>
+            </ul>
+        </s4>
 
+        <s4 title="DTDValidator">
+            <p> DTDValidator was design to scan, validate and store the DTD in &XercesCName; 1.4.0
+                or earlier. In &XercesCName; 1.5.2, this process is broken down into three components:
+            </p>
+            <ul>
+              <li>new class DTDScanner - to scan the DTD</li>
+              <li>new class DTDGrammar - to store the DTD Grammar</li>
+              <li>DTDValidator - to validate the DTD only</li>
+            </ul>
+        </s4>
 
-    <anchor name="GenImprovements"/>
-    <s2 title="General Improvements">
-
-        <p>The new version is improved in many ways. Some general improvements
-        are: significantly better conformance to the XML spec, cleaner
-        internal architecture, many bug fixes, and faster speed.</p>
-
-        <anchor name="Compliance"/>
-        <s3 title="Compliance">
-            <p>Except for a couple of the very obscure (mostly related to
-            the 'standalone' mode), this version should be quite compliant.
-            We have more than a thousand tests, some collected from various
-            public sources and some IBM generated, which are used to do
-            regression testing. The C++ parser is now passing all but a
-            handful of them.</p>
-        </s3>
-
-        <anchor name="BugFixes"/>
-        <s3 title="Bug Fixes">
-            <p>This version has many bug fixes with regard to XML4C version 2.x.
-            Some of these were reported by users and some were brought up by
-            way of the conformance testing.</p>
-        </s3>
-
-        <anchor name="Speed"/>
-        <s3 title="Speed">
-            <p>Much work was done to speed up this version. Some of the
-            new features, such as namespaces, and conformance checks ended
-            up eating up some of these gains, but overall the new version
-            is significantly faster than previous versions, even while doing
-            more.</p>
-        </s3>
+    </s3>
     </s2>
 
+    <anchor name="Migrateto140"/>
+    <s2 title="Migrating from XML4C 2.x to &XercesCName; 1.4.0">
+       <p>The following section is a discussion of the technical differences between
+       XML4C 2.x code base and the new &XercesCName; 1.4.0 code base.</p>
 
-    <anchor name="Summary"/>
-    <s2 title="Summary of changes required to migrate from XML4C 2.x to &XercesCName; &XercesCVersion140;">
+    <s3 title="Summary of changes required to migrate from XML4C 2.x to &XercesCName; 1.4.0">
 
-        <p>As mentioned, there are some major architectural changes
-        between the 2.3.x and &XercesCName; &XercesCVersion140; releases
+        <p>There are some major architectural changes
+        between the 2.3.x and &XercesCName; 1.4.0 releases
         of the parser, and as a result the code has undergone
         significant restructuring. The list below mentions the public
         api's which existed in 2.3.x and no longer exist in
-        &XercesCName; &XercesCVersion140;. It also mentions the
-        &XercesCName; &XercesCVersion140; api which will give you the
+        &XercesCName; 1.4.0. It also mentions the
+        &XercesCName; 1.4.0 api which will give you the
         same functionality.  Note: This list is not exhaustive. The
         API docs (and ultimately the header files) supplement this
         information.</p>
@@ -376,12 +366,11 @@
             </ul>
         </ul>
 
-    </s2>
+    </s3>
 
 
 
-    <anchor name="Samples"/>
-    <s2 title="The Samples">
+    <s3 title="The Samples">
 
         <p>The sample programs no longer use any of the unsupported
         util/xxx classes. They only existed to allow us to write
@@ -403,11 +392,10 @@
            <li>StdInParse - Demonstrates use of the standard in input source</li>
            <li>EnumVal - Shows how to enumerate the markup decls in a DTD Validator</li>
         </ol>
-    </s2>
+    </s3>
 
 
-    <anchor name="ParserClasses"/>
-    <s2 title="Parser Classes">
+    <s3 title="Parser Classes">
 
         <p>In the XML4C 2.x code base, there were the following parser
         classes (in the src/parsers/ source directory):
@@ -453,122 +441,10 @@
         cleaned up for you automatically upon exit since you don't have to
         allocate it anymore.</p>
 
-    </s2>
+    </s3>
 
 
-    <anchor name="DOMLevel2"/>
-    <s2 title="DOM Level 2 support">
-
-        <p>Experimental early support for some parts of the DOM level
-        2 specification have been added. These address some of the
-        shortcomings in our DOM implementation,
-        such as a simple, standard mechanism for tree traversal.</p>
-
-    </s2>
-
-
-    <anchor name="Progressive"/>
-    <s2 title="Progressive Parsing">
-
-        <p>The new parser classes support, in addition to the
-        <ref>parse()</ref> method, two new parsing methods,
-        <ref>parseFirst()</ref> and <ref>parseNext()</ref>.  These are
-        designed to support 'progressive parsing', so that you don't
-        have to depend upon throwing an exception to terminate the
-        parsing operation. Calling parseFirst() will cause the DTD (or
-        in the future, Schema) to be parsed (both internal and
-        external subsets) and any pre-content, i.e. everything up to
-        but not including the root element. Subsequent calls to
-        parseNext() will cause one more pieces of markup to be parsed,
-        and spit out from the core scanning code to the parser (and
-        hence either on to you if using SAX or into the DOM tree if
-        using DOM.) You can quit the parse any time by just not
-        calling parseNext() anymore and breaking out of the loop. When
-        you call parseNext() and the end of the root element is the
-        next piece of markup, the parser will continue on to the end
-        of the file and return false, to let you know that the parse
-        is done. So a typical progressive parse loop will look like
-        this:</p>
-
-<source>// Create a progressive scan token
-XMLPScanToken token;
-
-if (!parser.parseFirst(xmlFile, token))
-{
-  cerr &lt;&lt; "scanFirst() failed\n" &lt;&lt; endl;
-  return 1;
-}
-
-//
-// We started ok, so lets call scanNext()
-// until we find what we want or hit the end.
-//
-bool gotMore = true;
-while (gotMore &amp;&amp; !handler.getDone())
-  gotMore = parser.parseNext(token);</source>
-
-        <p>In this case, our event handler object (named 'handler'
-        surprisingly enough) is watching form some criteria and will
-        return a status from its getDone() method. Since the handler
-        sees the SAX events coming out of the SAXParser, it can tell
-        when it finds what it wants. So we loop until we get no more
-        data or our handler indicates that it saw what it wanted to
-        see.</p>
-
-        <p>When doing non-progressive parses, the parser can easily
-        know when the parse is complete and insure that any used
-        resources are cleaned up. Even in the case of a fatal parsing
-        error, it can clean up all per-parse resources. However, when
-        progressive parsing is done, the client code doing the parse
-        loop might choose to stop the parse before the end of the
-        primary file is reached. In such cases, the parser will not
-        know that the parse has ended, so any resources will not be
-        reclaimed until the parser is destroyed or another parse is started.</p>
-
-        <p>This might not seem like such a bad thing; however, in this case,
-        the files and sockets which were opened in order to parse the
-        referenced XML entities will remain open. This could cause
-        serious problems. Therefore, you should destroy the parser instance
-        in such cases, or restart another parse immediately. In a future
-        release, a reset method will be provided to do this more cleanly.</p>
-
-        <p>Also note that you must create a scan token and pass it
-        back in on each call. This insures that things don't get done
-        out of sequence. When you call parseFirst() or parse(), any
-        previous scan tokens are invalidated and will cause an error
-        if used again. This prevents incorrect mixed use of the two
-        different parsing schemes or incorrect calls to
-        parseNext().</p>
-
-    </s2>
-
-
-    <anchor name="Namespace"/>
-    <s2 title="Namespace support">
-
-        <p>The C++ parser now supports namespaces. With current XML
-        interfaces (SAX/DOM) this doesn't mean very much because these
-        APIs are incapable of passing on the namespace information.
-        However, if you are using our internal APIs to write your own
-        parsers, you can make use of this new information. Since the
-        internal event APIs must be able to now support both namespace
-        and non-namespace information, they have more
-        parameters. These allow namespace information to be passed
-        along.</p>
-
-        <p>Most of the samples now have a new command line parameter
-        to turn on namespace support. You turn on namespaces like
-        this:</p>
-
-<source>SAXParser myParser;
-// Tell it whether to do namespace
-myParser.setDoNamespaces(true);</source>
-    </s2>
-
-
-
-    <anchor name="MovedToSrcFramework"/>
-    <s2 title="Moved Classes to src/framework">
+    <s3 title="Moved Classes to src/framework">
 
         <p>Some of the classes previously in the src/internal/
         directory have been moved to their more correct location in
@@ -584,111 +460,16 @@ myParser.setDoNamespaces(true);</source>
         to rename some of the names of the classes, if you used any of
         the ones whose names were changed.</p>
 
-    </s2>
-
-
-    <anchor name="LoadableMessageText"/>
-    <s2 title="Loadable Message Text">
-
-        <p>The system now supports loadable message text, instead of
-        having it hard coded into the program. The current drop still
-        just supports English, but it can now support other
-        languages. Anyone interested in contributing any translations
-        should contact us. This would be an extremely useful
-        service.</p>
-
-        <p>In order to support the local message loading services, we
-        have created a pretty flexible framework for supporting
-        loadable text. Firstly, there is now an XML file, in the
-        src/NLS/ directory, which contains all of the error messages.
-        There is a simple program, in the Tools/NLSXlat/ directory,
-        which can spit out that text in various formats. It currently
-        supports a simple 'in memory' format (i.e. an array of
-        strings), the Win32 resource format, and the message catalog
-        format.  The 'in memory' format is intended for very simple
-        installations or for use when porting to a new platform (since
-        you can use it until you can get your own local message
-        loading support done.)</p>
-
-        <p>In the src/util/ directory, there is now an XMLMsgLoader
-        class.  This is an abstraction from which any number of
-        message loading services can be derived. Your platform driver
-        file can create whichever type of message loader it wants to
-        use on that platform.  We currently have versions for the in
-        memory format, the Win32 resource format, and the message
-        catalog format. An ICU one is present but not implemented
-        yet. Some of the platforms can support multiple message
-        loaders, in which case a #define token is used to control
-        which one is used. You can set this in your build projects to
-        control the message loader type used.</p>
-
-        <p>Both the Java and C++ parsers emit the same messages for an XML error
-        since they are being taken from the same message file.</p>
-
-    </s2>
-
-
-    <anchor name="PluggableValidators"/>
-    <s2 title="Pluggable Validators">
-
-        <p>In a preliminary move to support Schemas, and to make them
-        first class citizens just like DTDs, the system has been
-        reworked internally to make validators completely pluggable.
-        So now the DTD validator code is under the src/validators/DTD/
-        directory, with a future Schema validator probably going into
-        the src/validators. The core scanner architecture now works
-        completely in terms of the framework/XMLValidator abstract
-        interface and knows almost nothing about DTDs or Schemas. For
-        now, if you don't pass in a validator to the parsers, they
-        will just create a DTDValidator. This means that,
-        theoretically, you could write your own validator. But we
-        would not encourage this for a while, until the semantics of
-        the XMLValidator interface are completely worked out and
-        proven to handle DTD and Schema cleanly.</p>
-
-    </s2>
-
-
-    <anchor name="PluggableTranscoders"/>
-    <s2 title="Pluggable Transcoders">
-
-        <p>Another abstract framework added in the src/util/ directory
-        is to support pluggable transcoding services. The
-        XMLTransService class is an abstract API that can be derived
-        from, to support any desired transcoding
-        service. XMLTranscoder is the abstract API for a particular
-        instance of a transcoder for a particular encoding. The
-        platform driver file decides what specific type of transcoder
-        to use, which allows each platform to use its native
-        transcoding services, or the ICU service if desired.</p>
-
-        <p>Implementations are provided for Win32 native services, ICU
-        services, and the <ref>iconv</ref> services available on many
-        Unix platforms. The Win32 version only provides native code
-        page services, so it can only handle XML code in the intrinsic
-        encodings ASCII, UTF-8, UTF-16 (Big/Small Endian), UCS4
-        (Big/Small Endian), EBCDIC code pages IBM037 and
-        IBM1140 encodings, ISO-8859-1 (aka Latin1) and Windows-1252. The ICU version
-        provides all of the encodings that ICU supports. The
-        <ref>iconv</ref> version will support the encodings supported
-        by the local system. You can use transcoders we provide or
-        create your own if you feel ours are insufficient in some way,
-        or if your platform requires an implementation that we do not
-        provide.</p>
-
-    </s2>
-
+    </s3>
 
-    <anchor name="UtilReorg"/>
-    <s2 title="Util directory Reorganization">
+    <s3 title="Util directory Reorganization">
 
         <p>The src/util directory was becoming somewhat of a dumping
         ground of platform and compiler stuff. So we reworked that
         directory to better spread things out. The new scheme is:
         </p>
 
-        <anchor name="UtilPlatform"/>
-        <s3 title="util - The platform independent utility stuff">
+        <s4 title="util - The platform independent utility stuff">
             <ul>
                 <li>MsgLoaders - Holds the msg loader implementations</li>
                 <ol>
@@ -714,7 +495,7 @@ myParser.setDoNamespaces(true);</source>
                     <li>Win32</li>
                 </ol>
             </ul>
-        </s3>
+        </s4>
 
         <p>This organization makes things much easier to understand.
         And it makes it easier to find which files you need and which
@@ -725,6 +506,7 @@ myParser.setDoNamespaces(true);</source>
         ICU headers. The rest of the system works only in terms of the
         abstraction APIs.</p>
 
+    </s3>
     </s2>
 
 </s1>
diff --git a/doc/releases.xml b/doc/releases.xml
index 822917d267ccc31268652e32852755bfe04d6e78..910f581246e99252fbe403b5ed4da30d673a4f74 100644
--- a/doc/releases.xml
+++ b/doc/releases.xml
@@ -3,7 +3,7 @@
 
 <s1 title="Releases">
 
-<s2 title="&XercesCName; Latest Changes since March 8, 2002">
+<s2 title="&XercesCName; &XercesCVersion;: XXXX, 2002">
 <table>
     <tr>
         <td>Date</td>
@@ -11,6 +11,91 @@
         <td>Description</td>
     </tr>
 
+    <tr>
+        <td>2002-05-21</td>
+        <td>Tinny Ng</td>
+        <td>DOM Reorganization (rename IDOM and deprecate old DOM) and other documentation update.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-19</td>
+        <td>James Berry</td>
+        <td>[Bug 9237] Encoding spec in lower case (DTD/XML) not recognized.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-10</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 8967] Default element behaviour is incorrect (schema only).
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-08</td>
+        <td>Martin Kalen</td>
+        <td>[Bug 7701] NameIdPoolEnumerator copy constructor should call base class.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-08</td>
+        <td>PeiYong Zhang</td>
+        <td>[Bug 8899] Missing implementation of Op::Op(const Op&amp;) causes Intel C++ Win32 link to fail.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-08</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 8301] INFINITY used as enum member.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-08</td>
+        <td>David Bertoni</td>
+        <td>[Bug 8381] XMLScanner performance fixes.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-08</td>
+        <td>PeiYong Zhang</td>
+        <td>[Bug 8898] SchemaElementDecl doesn't compile with Intel C++ for IA32.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-07</td>
+        <td>Tinny Ng</td>
+        <td>Schema Fix: re-add the ID, IDREF ... datatype validators only if they were not there.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-07</td>
+        <td>Khaled Noaman</td>
+        <td>Update SAX2 documentation to tell users it is necessary to delete
+            the parser returned by XMLReaderFactory::createXMLReader.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-07</td>
+        <td>David Bertoni</td>
+        <td>[Bug 8852] UnixHTTPURLInputStream.cpp includes unneeded file.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-05-06</td>
+        <td>David Bertoni</td>
+        <td>[Bug 8492] Incorrect HP link options.
+        </td>
+    </tr>
+
     <tr>
         <td>2002-05-03</td>
         <td>Martin Kalen</td>
@@ -217,7 +302,7 @@
     <tr>
         <td>2002-03-27</td>
         <td>Tinny Ng</td>
-        <td>Fix: not all the children of EntityReference Node is set to readOnly.s
+        <td>Fix: not all the children of EntityReference Node is set to readOnly.
         </td>
     </tr>
 
@@ -380,1206 +465,9 @@
 </table>
 </s2>
 
-
-<s2 title="&XercesCName; Version 1.7.0: March 8, 2002">
-<table>
-    <tr>
-        <td>Date</td>
-        <td>Contributor</td>
-        <td>Description</td>
-    </tr>
-
-    <tr>
-        <td>2002-03-07</td>
-        <td>Tinny Ng</td>
-        <td>Add a keys file to store public key of committers who sign and upload packages to Apache.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-07</td>
-        <td>PeiYong Zhang</td>
-        <td>Call Terminate() to avoid memory tools reporting memory leak in Traversal test cases.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-06</td>
-        <td>PeiYong Zhang</td>
-        <td>Schema: Allow [+]? [0]* '.'? [0]* and normalize the input to positive zero string.
-            And similarly input conforming to '-' [0]* '.'? [0]* is normalized to negative zero.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-04</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 2869] AIX 4.3.3 mutex/atomic-operation changes for build.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-04</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 6834] apparently correct schema/instance not validating.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-03-01</td>
-        <td>Tinny Ng</td>
-        <td>NodeIDMap informational message about growing only be printed if debug is on.
-            Besides the throw message should be encap in the XMLErrList_EN_US.Xml, not hardcoded in the code.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-28</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 2717] Unterminated INCLUDE section causes infinite loop with setExitOnFirstFatalError(false)
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-28</td>
-        <td>Tinny Ng</td>
-        <td>Fix: ReaderMgr Should check if XMLReader is created successfully.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-28</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 1368] improper DOMStringHandle locking.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-28</td>
-        <td>Martin Kalen</td>
-        <td>[Bug 6445] Caldera (SCO) OpenServer Port.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-27</td>
-        <td>Tinny Ng</td>
-        <td>Fix: default attribute are not added when namespace is on and validation is off.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-27</td>
-        <td>Tinny Ng</td>
-        <td>Fix: SAX AttributeList::getName should attach prefix if present
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-26</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6672] SAXValidator results in an access violation when validating against schema
-            with empty element that has default value.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-26</td>
-        <td>Khaled Noaman</td>
-        <td>Fix: Create ZeroOrOne node for PCDATA only if needed.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-25</td>
-        <td>Tinny Ng</td>
-        <td>Schema Fix: Thread-safe the built-in datatype validator registry.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-25</td>
-        <td>Tinny Ng</td>
-        <td>Schema Fix: Ensure no invalid uri index for UPA checking.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-25</td>
-        <td>Tinny Ng</td>
-        <td>Merge IThreadTest and ThreadTest.  Modify ThreadTest to do schema processing, and
-            add ThreadTest to sanityTest.pl
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-20</td>
-        <td>Don Mastrovito</td>
-        <td>Project files for BCB6.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-20</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 2845] HP-UX 10.20 with CC A.10.40 needs +Z instead of +z.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-20</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5977] Warnings on generating apiDocs.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-18</td>
-        <td>PeiYong Zhang</td>
-        <td>Fix: Add code for ContentSpecNode::All in formatNode.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-18</td>
-        <td>James Berry</td>
-        <td>Add support for building with new MacOSURLAccessCF NetAccessor that doesn't
-            require Carbon but can allow Xerces to live solely within CoreServices layer.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-17</td>
-        <td>James Berry</td>
-        <td>[Bug 6092] stricmp and strnicmp not present in FreeBSD.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-17</td>
-        <td>James Berry</td>
-        <td>Update Mac OS projects to reflect "sane includes" changes.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-15</td>
-        <td>Tinny Ng</td>
-        <td>Add IDOM to API documentation.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-15</td>
-        <td>PeiYong Zhang</td>
-        <td>Base64 interface redefined for conversion in XMLByte.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-14</td>
-        <td>PeiYong Zhang</td>
-        <td>Add getEnumString to DatatypeValidator.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-14</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 6461] Unexpected recursion errors reported against schema.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-13</td>
-        <td>Khaled Noaman</td>
-        <td>Add constraint checking for the extension of an 'all' content model.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-13</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 4581] erroneous static cast in programming examples.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-13</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 6336] Output of XMLString::transcode not freed?
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-13</td>
-        <td>Khaled Noaman</td>
-        <td>Update samples to use SAX2 features/properties constants from XMLUni.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-11</td>
-        <td>PeiYong Zhang</td>
-        <td>[Bug 6330] Base64::encode does not work.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-11</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 2715] Build recursion suppresses make failures.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-11</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 2496] libxerces-c1_5_0 fails to build correctly on Solaris.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-06</td>
-        <td>Khaled Noaman</td>
-        <td>Added a new flag '-p' to SAX2 samples to set the 'namespace-prefixes' feature.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-06</td>
-        <td>Khaled Noaman</td>
-        <td>Use IDOM for schema processing.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-05</td>
-        <td>Tinny Ng</td>
-        <td>Remove 3rd party jar style-apachexmljar, expand into physical files.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-05</td>
-        <td>Tinny Ng</td>
-        <td>Add IDOMMemTest.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-05</td>
-        <td>Tinny Ng</td>
-        <td>Modify InitTermTest to take option flag like -s, -f , and -n.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-05</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5716] Can't parse with Validation more than one file.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-05</td>
-        <td>Tinny Ng</td>
-        <td>Recognize IBM01140 (IANA encoding) as alias of intrinsic encoding IBM1140.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-04</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 6114] Memory leaks on IDOM getElementsByTagName().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-04</td>
-        <td>Tinny Ng</td>
-        <td>Add DOM Level2 missing functions: NodeIterator::getRoot, TreeWalker::getRoot
-            Element::hasAttribute, Element::hasAttributeNS and Node::hasAttribute
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-04</td>
-        <td>Tinny Ng</td>
-        <td>Memory leak fix in samples / test cases.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-02-01</td>
-        <td>PeiYong Zhang</td>
-        <td>src and include folder reorganization for "sane_include".
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-28</td>
-        <td>Khaled Noaman</td>
-        <td>Fix: some SAX calls were not passed to the LexicalHandler.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-29</td>
-        <td>Tinny Ng</td>
-        <td>Remove those jar files that are not clear in license issue.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-28</td>
-        <td>Khaled Noaman</td>
-        <td>Add a 'null' string constant in XMLUni.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-28</td>
-        <td>Khaled Noaman</td>
-        <td>Add SAX2-ext's DeclHandler support.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-28</td>
-        <td>Khaled Noaman</td>
-        <td>The namespace-prefixes feature in SAX2 should be off by default.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-24</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-23</td>
-        <td>Tinny Ng</td>
-        <td>Progressive parse does not do post-validation and thus ID/IDREF are not checked.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-23</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5545] Progressive Parse trashes when encountering "&lt;!  ... "
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-23</td>
-        <td>Tinny Ng</td>
-        <td>Update DOM/IDOM hasFeature method to correctly reflect current status.
-            And add more hasFeature test to DOMMemTest.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-21</td>
-        <td>Tinny Ng</td>
-        <td>Some intrinsic encodings support (e.g. UTF-16) only work as input encoding
-            while reading in XML data; but do not work as output encoding in XMLformatter.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-21</td>
-        <td>Tinny Ng</td>
-        <td>Document encoding alias for intrinsic encoding support.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-21</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5847] ICUMsgLoader can't be compiled with gcc 3.0.3 and ICU2.
-            And also fix the memory leak introduced by Bug 2730 fix.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-18</td>
-        <td>Max Gotlib</td>
-        <td>Adds the capability to compile the tests under FreeBSD and either ICU or
-            IconvFBSD transservice (the transcoding service is automatically detected
-            during configuration stage), with or without pthreads.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-18</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5371] runConfigure extra linker options ignored in Makefiles for tests and samples.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-18</td>
-        <td>Tinny Ng</td>
-        <td>Break program.xml which takes too long to load, into program-sax.xml, program-sax2.xml
-            program-dom.xml, program-idom.xml.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-18</td>
-        <td>Tinny Ng</td>
-        <td>Break faq-parse.xml which becomes longer and longer into faq-parse.xml and faq-build.xml
-            to better categorize the FAQ, and update the FAQ
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-18</td>
-        <td>Tinny Ng</td>
-        <td>Create symbolic link to those duplicate ICU libraries, instead of physical duplicate copies.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-15</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 5807] Parser produces unexpected errors from 'Good' document.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-14</td>
-        <td>PeiYong Zhang</td>
-        <td>XMLURi bug fix: related to Authority and wellformedAddress
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-14</td>
-        <td>Max Gotlib</td>
-        <td>[Bug 5570] DOM_Range lacks the copy constructor.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-14</td>
-        <td>Max Gotlib</td>
-        <td>Support IconvFBSD in multi-threading environment with all the possible
-            combinations of threading and transcoding options.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-10</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 5786] Unexpected Schema errors.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-03</td>
-        <td>Khaled Noaman</td>
-        <td>Fix for identity constraints - union operation.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-03</td>
-        <td>Khaled Noaman</td>
-        <td>Resolve namespace first before resolving the schema location in &lt;import&gt;.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-03</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 5675] Use of setExternalSchemaLocation() yields inconsistent behavior.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-02</td>
-        <td>Khaled Noaman</td>
-        <td>Fix for validity constraint check for standalone documents.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-02</td>
-        <td>Khaled Noaman</td>
-        <td>Fix for regular expression patterns that begin with ".".
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-02</td>
-        <td>Khaled Noaman</td>
-        <td>Fix for error message when checking for attributes with a namespace prefix.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-02</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 5569] &lt;extension&gt; does not work -- ancestor elements not recognized.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2002-01-02</td>
-        <td>Tinny Ng</td>
-        <td>Schema Fix: should not store a temp value as the key in the element
-            pool and the attribute pool.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-22</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 4953] Propagate existing CFLAGS and CXXFLAGS.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 5514] XMLEnumerator needs virtual destructor.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 2680] Remove '-instances=static' from the compile step.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 1833] LexicalHandler::startDTD not called correctly.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Frank Balluffi</td>
-        <td>[Bug 5466] Memory Leak: ElementImpl.cpp's ElementImpl::ElementImpl copy
-            constructor does not cleanup attributes before assignment.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Frank Balluffi</td>
-        <td>[Bug 5464] Memory Leak: DocumentImpl::importNode does not delete
-            old attribute if its reference count equals zero.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-21</td>
-        <td>Tinny Ng</td>
-        <td>Schema fix: leading whitespace should be preserved for CData type.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-14</td>
-        <td>Khaled Noaman</td>
-        <td>Add surrogate support to comments and processing instructions.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-14</td>
-        <td>Tinny Ng</td>
-        <td>Performance: Do not transcode twice in DOMString constructor.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-14</td>
-        <td>Tinny Ng</td>
-        <td>update BUILDINSTRUCTIONS.TXT to be in sync with build instruction in build*.xml.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-13</td>
-        <td>PeiYong Zhang</td>
-        <td>Fix: Invalid Argument to FreeLibrary (Hint: 0x0000000).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-13</td>
-        <td>Linda Swan</td>
-        <td>iSeries (AS/400) documentation update and other iSeries related fixes.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-13</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 5410] non-schema &lt;attribute&gt; attributes cause error.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-12</td>
-        <td>Tinny Ng</td>
-        <td>Fix typos in messages.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-12</td>
-        <td>PeiYong Zhang</td>
-        <td>Memory leak: fRedefineList.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-12</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5367] Progressive parse does not throw error when file is empty.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-12</td>
-        <td>Tinny Ng</td>
-        <td>Performance: Remove obsolete code in ElemStack.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-11</td>
-        <td>Max Gotlib</td>
-        <td>More changes to IconvFBSDTransService.  Allow using "old" TransServece implementation
-            (via '-t native' option to runConfigure) or to employ libiconv (it is a part of FreeBSD
-            ports-collection) services.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-11</td>
-        <td>Christopher Just</td>
-        <td>[Bug 5320] 1.5.2 Build fails on IRIX.  The variable "atomicOpsMutex" has been defined twice.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001/12/10</td>
-        <td>PeiYong Zhang</td>
-        <td>Swap checking to avoid "dangling pointer" reported by BoundsChecker.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-10</td>
-        <td>PeiYong Zhang</td>
-        <td>Memory Leak: fLeafNameTypeVector.
-        </td>
-    </tr>
-
-</table>
-</s2>
-
-<s2 title="&XercesCName; Version 1.6.0: December 6, 2001">
-<table>
-    <tr>
-        <td>Date</td>
-        <td>Contributor</td>
-        <td>Description</td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Khaled Noaman</td>
-        <td>Schema: Add Identity Constraint(Key, KeyRef, Unique, Selector, Field, and Partial XPath Support). <br/>
-            Add XPathSymbols, <br/>
-            XPathMatcherStack, <br/>
-            XPathMatcher, <br/>
-            XPathException, <br/>
-            XercesXPath, <br/>
-            ValueStoreCache, <br/>
-            ValueStore, <br/>
-            IdentityConstraint, <br/>
-            IC_Unique, <br/>
-            IC_Selector, <br/>
-            IC_KeyRef, <br/>
-            IC_Key, <br/>
-            IC_Field, <br/>
-            FieldValueMap, <br/>
-            FieldActivator. <br/>
-            Support Particle Derivation Constraint Checking.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>PeiYong Zhang</td>
-        <td>DatatypeValidator:<br/>
-             Support DateTimeValidator, <br/>
-             DateTimeDatatypeValidator, <br/>
-             DateDatatypeValidator, <br/>
-             TimeDatatypeValidator, <br/>
-             DayDatatypeValidator, <br/>
-             MonthDatatypeValidator, <br/>
-             MonthDayDatatypeValidator, <br/>
-             YearDatatypeValidator, <br/>
-             YearMonthDatatypeValidator, <br/>
-             DurationDatatypeValidator. <br/>
-             Add SchemaDataTimeException, <br/>
-             XMLAbstractDoubleFloat, <br/>
-             XMLDateTime.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 1959] setNodeValue throws exception when spec specifies NOP.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Erik Rydgren</td>
-        <td>[Bug 2174] Bug in NamedNodeMapImpl.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Henry Zongaro</td>
-        <td>Performance Enhancement.  Added setNPrefix and setNLocalPart methods in QName that
-            allow code to take advantage of the fact that it knows the length of the prefix and
-            local name, when possible.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Henry Zongaro</td>
-        <td>Performance Enhancement.  Added a second ContentSpecNode constructor that allows
-            the QName to be just assigned, not copied.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Henry Zongaro</td>
-        <td>Performance Enhancement.  Added a second CMLeaf constructor that indicated the
-            QName passed in was to be adopted.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Henry Zongaro</td>
-        <td>Performance Enhancement.  Modify the handling of the fNEL option so that it results
-            in fgCharCharsTable being modified, instead of having all of the low-level routines check
-            the option.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-06</td>
-        <td>Tinny Ng</td>
-        <td>Make the runConfigure and associated config*, Makefile* in folders tests,
-            samples and src more consistent.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-05</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 1236] Incorrect NMTOKENS attribute normalization.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-05</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 2752] Surrogate support incomplete.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-05</td>
-        <td>Edward Avis</td>
-        <td>Fix runConfigure which can run into infinite loop with invalid argument
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-05</td>
-        <td>Tinny Ng</td>
-        <td>Generate linker map for certain platforms
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-03</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5237] PATH_MAX undefined during build without threading support.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-03</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 5179] Misprint in downcasting description.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-12-03</td>
-        <td>Max Gotlib</td>
-        <td>Add FreeBSD native transcoder (IconvFBSD).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-30</td>
-        <td>PeiYong Zhang</td>
-        <td>Build all tests on HP-UX 11.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-29</td>
-        <td>Michael Huedepohl</td>
-        <td>Add FreeBSD Support.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>PeiYong Zhang</td>
-        <td>DOMMemTest: delete compiler generated temporary DOMString object "Hello Goodbye".
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Tinny Ng</td>
-        <td>Fix broken ParserTest.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Tinny Ng</td>
-        <td>Do not increment the error count if it is a warning.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Phil Brown</td>
-        <td>[Bug 4019] XMLReader::getNextChar can over read (UTF-16).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 4544] DOM_NodeList::getLength incorrect when called twice for empty list.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Artur Klauser</td>
-        <td>[Bug 2238]libWWW problems with broken proxys and range requests.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Artur Klauser</td>
-        <td>[Bug 2237] libWWW redirect error.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Matt Lovett</td>
-        <td>[Bug 4422] BinMemInputStream::readBytes is inefficient.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 3683] Access Violations when performing custom schema validation.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-28</td>
-        <td>Tinny Ng</td>
-        <td>Check tohash pointer before accessing content in XMLString::hash.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-27</td>
-        <td>Tinny Ng</td>
-        <td>Fix packageBinaries.pl to correctly strip the zip file name from the target
-            directory which has "." dot in it.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-26</td>
-        <td>Don Mastrovito</td>
-        <td>BCB4 can use wchar_t.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>Support ICU 2.0.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>Eliminate Warning from Solaris Forte C++:
-            Warning (Anachronism): Formal argument start_routine of type extern "C".
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>Eliminate Warning from Solaris Forte C++:
-            Warning: String literal converted to char* in initialization.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>Eliminate Warning from AIX xlC 3.6:1540-399.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 4655] config.status be included in all future binary releases.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-23</td>
-        <td>Tinny Ng</td>
-        <td>[Bug 4873] ICU 2.0 breaks Xerces 1.5.2 build.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-22</td>
-        <td>PeiYong Zhang</td>
-        <td>Eliminate Visual C++ compiler warning C4273.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-22</td>
-        <td>PeiYong Zhang</td>
-        <td>Schema: Allow "0.0" to be a valid lexcial representation of ZERO.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-21</td>
-        <td>Peter A. Volchek and PeiYong Zhang</td>
-        <td>Add sample SEnumVal.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-21</td>
-        <td>Tinny Ng</td>
-        <td>New method InputSource::get/setIssueFatalErrorIfNotFound to tell the parser
-            whether to issue fatal error or not if cannot find it (the InputSource).
-            This is required for schema processing as it shouldn't be a fatal error if the
-            schema is not found.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-20</td>
-        <td>Tinny Ng</td>
-        <td>Allow schemaLocation and noNamespaceSchemaLocation to be specified outside the
-            instance document.  New methods setExternalSchemaLocation and
-            setExternalNoNamespaceSchemaLocation are added (for SAX2, two new properties are added).
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-19</td>
-        <td>PeiYong Zhang</td>
-        <td>XMLFloat and XMLDouble boundary Values updated.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-16</td>
-        <td>Tinny Ng</td>
-        <td>Add test case InitTermTest to test XMLPlatformUtils:Initialize/Terminate() pair.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-16</td>
-        <td>Khaled Noaman</td>
-        <td>Design change: GeneralAttributeCheck is not longer a singleton class.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-15</td>
-        <td>Khaled Noaman</td>
-        <td>Re-organize constant values in XMLAttDef.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-13</td>
-        <td>Tinny Ng</td>
-        <td>Move root element check from XMLValidator to XMLScanner
-            and deprecate XMLValidator::checkRootElement().
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-13</td>
-        <td>Tinny Ng</td>
-        <td>Update documentation for SAX2XMLReader, DefaultHandler and DOMParser.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-09</td>
-        <td>Tinny Ng</td>
-        <td>Regular Expression: Update the Block Names and Block Range to comply to the latest standard.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-09</td>
-        <td>Carolyn Weiss</td>
-        <td>DOMIDTest/MemParse fix: Pulled the hardcoded encoding out of the document
-            itself and made it a #define to make it easier to support other encodings.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-09</td>
-        <td>Carolyn Weiss</td>
-        <td>DOMMemTest fix: Changed some literal values to their equivalent hex values
-            so they work correctly on both ASCII and EBCDIC systems.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-09</td>
-        <td>Linda Swan</td>
-        <td>Bug Fix: maxChars in XMLString::copyNString is more related to the target than the src.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-07</td>
-        <td>Tinny Ng</td>
-        <td>Performance: Create QName in ContentSpecNode only if it is a leaf/Any/PCDataNode.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-07</td>
-        <td>Tinny Ng</td>
-        <td>Performance: move getRawName() to outer loop in DFAContentModel so that it
-            is called only once per outer loop.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-06</td>
-        <td>Khaled Noaman</td>
-        <td>[Bug 4644] Memory leak in schema traverser.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-02</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 4133] --prefix not used properly in configure.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-01</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 2730] Can't build xerces-c-1.5.1 with ICUMsgLoader.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-01</td>
-        <td>Jason Stewart</td>
-        <td>[Bug 4578] No documentation for XMLTranscoder.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-11-01</td>
-        <td>Tinny Ng</td>
-        <td>IDOM: Leak: should allocate the fNodeListPool with the overloaded new.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001/10/29</td>
-        <td>Tinny Ng</td>
-        <td>Update samples doc to reflect the latest changes.  Also update runConfigure usage
-            in build doc to reflect the latest changes.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-10-26</td>
-        <td>PeiYong Zhang</td>
-        <td>Thread safe XMLFloat and XMLDouble.
-        </td>
-    </tr>
-
-    <tr>
-        <td>2001-10-26</td>
-        <td>Tinny Ng</td>
-        <td>Update SAX standard web link.
-        </td>
-    </tr>
-
-</table>
-</s2>
-
 <s2 title="Releases Archive">
 
-    <p> For release information about &XercesCName; 1.5.2 or earlier,
+    <p> For release information about &XercesCName; 1.7.0 or earlier,
         please refer to <jump href="releases_archive.html">Releases Archive</jump>.
     </p>
 </s2>
diff --git a/doc/releases_archive.xml b/doc/releases_archive.xml
index 9c16359588cf231bea5b0e55c153d38f5fbcecd2..cd9ee439acb378b7b20486764b8b170aaa98b7e8 100644
--- a/doc/releases_archive.xml
+++ b/doc/releases_archive.xml
@@ -3,7 +3,1203 @@
 
 <s1 title="Releases Archive">
 
-<s2 title="&XercesCName; Version 1.5.2: October 26, 2001">
+<s2 title="&XercesCName; 1.7.0: March 8, 2002">
+<table>
+    <tr>
+        <td>Date</td>
+        <td>Contributor</td>
+        <td>Description</td>
+    </tr>
+
+    <tr>
+        <td>2002-03-07</td>
+        <td>Tinny Ng</td>
+        <td>Add a keys file to store public key of committers who sign and upload packages to Apache.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-03-07</td>
+        <td>PeiYong Zhang</td>
+        <td>Call Terminate() to avoid memory tools reporting memory leak in Traversal test cases.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-03-06</td>
+        <td>PeiYong Zhang</td>
+        <td>Schema: Allow [+]? [0]* '.'? [0]* and normalize the input to positive zero string.
+            And similarly input conforming to '-' [0]* '.'? [0]* is normalized to negative zero.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-03-04</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 2869] AIX 4.3.3 mutex/atomic-operation changes for build.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-03-04</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 6834] apparently correct schema/instance not validating.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-03-01</td>
+        <td>Tinny Ng</td>
+        <td>NodeIDMap informational message about growing only be printed if debug is on.
+            Besides the throw message should be encap in the XMLErrList_EN_US.Xml, not hardcoded in the code.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-28</td>
+        <td>PeiYong Zhang</td>
+        <td>[Bug 2717] Unterminated INCLUDE section causes infinite loop with setExitOnFirstFatalError(false)
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-28</td>
+        <td>Tinny Ng</td>
+        <td>Fix: ReaderMgr Should check if XMLReader is created successfully.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-28</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 1368] improper DOMStringHandle locking.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-28</td>
+        <td>Martin Kalen</td>
+        <td>[Bug 6445] Caldera (SCO) OpenServer Port.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-27</td>
+        <td>Tinny Ng</td>
+        <td>Fix: default attribute are not added when namespace is on and validation is off.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-27</td>
+        <td>Tinny Ng</td>
+        <td>Fix: SAX AttributeList::getName should attach prefix if present
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-26</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 6672] SAXValidator results in an access violation when validating against schema
+            with empty element that has default value.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-26</td>
+        <td>Khaled Noaman</td>
+        <td>Fix: Create ZeroOrOne node for PCDATA only if needed.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-25</td>
+        <td>Tinny Ng</td>
+        <td>Schema Fix: Thread-safe the built-in datatype validator registry.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-25</td>
+        <td>Tinny Ng</td>
+        <td>Schema Fix: Ensure no invalid uri index for UPA checking.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-25</td>
+        <td>Tinny Ng</td>
+        <td>Merge IThreadTest and ThreadTest.  Modify ThreadTest to do schema processing, and
+            add ThreadTest to sanityTest.pl
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-20</td>
+        <td>Don Mastrovito</td>
+        <td>Project files for BCB6.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-20</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 2845] HP-UX 10.20 with CC A.10.40 needs +Z instead of +z.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-20</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5977] Warnings on generating apiDocs.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-18</td>
+        <td>PeiYong Zhang</td>
+        <td>Fix: Add code for ContentSpecNode::All in formatNode.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-18</td>
+        <td>James Berry</td>
+        <td>Add support for building with new MacOSURLAccessCF NetAccessor that doesn't
+            require Carbon but can allow Xerces to live solely within CoreServices layer.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-17</td>
+        <td>James Berry</td>
+        <td>[Bug 6092] stricmp and strnicmp not present in FreeBSD.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-17</td>
+        <td>James Berry</td>
+        <td>Update Mac OS projects to reflect "sane includes" changes.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-15</td>
+        <td>Tinny Ng</td>
+        <td>Add IDOM to API documentation.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-15</td>
+        <td>PeiYong Zhang</td>
+        <td>Base64 interface redefined for conversion in XMLByte.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-14</td>
+        <td>PeiYong Zhang</td>
+        <td>Add getEnumString to DatatypeValidator.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-14</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 6461] Unexpected recursion errors reported against schema.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-13</td>
+        <td>Khaled Noaman</td>
+        <td>Add constraint checking for the extension of an 'all' content model.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-13</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 4581] erroneous static cast in programming examples.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-13</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 6336] Output of XMLString::transcode not freed?
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-13</td>
+        <td>Khaled Noaman</td>
+        <td>Update samples to use SAX2 features/properties constants from XMLUni.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-11</td>
+        <td>PeiYong Zhang</td>
+        <td>[Bug 6330] Base64::encode does not work.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-11</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 2715] Build recursion suppresses make failures.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-11</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 2496] libxerces-c1_5_0 fails to build correctly on Solaris.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-06</td>
+        <td>Khaled Noaman</td>
+        <td>Added a new flag '-p' to SAX2 samples to set the 'namespace-prefixes' feature.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-06</td>
+        <td>Khaled Noaman</td>
+        <td>Use IDOM for schema processing.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-05</td>
+        <td>Tinny Ng</td>
+        <td>Remove 3rd party jar style-apachexmljar, expand into physical files.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-05</td>
+        <td>Tinny Ng</td>
+        <td>Add IDOMMemTest.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-05</td>
+        <td>Tinny Ng</td>
+        <td>Modify InitTermTest to take option flag like -s, -f , and -n.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-05</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5716] Can't parse with Validation more than one file.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-05</td>
+        <td>Tinny Ng</td>
+        <td>Recognize IBM01140 (IANA encoding) as alias of intrinsic encoding IBM1140.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-04</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 6114] Memory leaks on IDOM getElementsByTagName().
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-04</td>
+        <td>Tinny Ng</td>
+        <td>Add DOM Level2 missing functions: NodeIterator::getRoot, TreeWalker::getRoot
+            Element::hasAttribute, Element::hasAttributeNS and Node::hasAttribute
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-04</td>
+        <td>Tinny Ng</td>
+        <td>Memory leak fix in samples / test cases.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-02-01</td>
+        <td>PeiYong Zhang</td>
+        <td>src and include folder reorganization for "sane_include".
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-28</td>
+        <td>Khaled Noaman</td>
+        <td>Fix: some SAX calls were not passed to the LexicalHandler.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-29</td>
+        <td>Tinny Ng</td>
+        <td>Remove those jar files that are not clear in license issue.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-28</td>
+        <td>Khaled Noaman</td>
+        <td>Add a 'null' string constant in XMLUni.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-28</td>
+        <td>Khaled Noaman</td>
+        <td>Add SAX2-ext's DeclHandler support.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-28</td>
+        <td>Khaled Noaman</td>
+        <td>The namespace-prefixes feature in SAX2 should be off by default.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-24</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 3111] Problem with LexicalHandler::startDTD() and LexicalHandler::endDTD().
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-23</td>
+        <td>Tinny Ng</td>
+        <td>Progressive parse does not do post-validation and thus ID/IDREF are not checked.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-23</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5545] Progressive Parse trashes when encountering "&lt;!  ... "
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-23</td>
+        <td>Tinny Ng</td>
+        <td>Update DOM/IDOM hasFeature method to correctly reflect current status.
+            And add more hasFeature test to DOMMemTest.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-21</td>
+        <td>Tinny Ng</td>
+        <td>Some intrinsic encodings support (e.g. UTF-16) only work as input encoding
+            while reading in XML data; but do not work as output encoding in XMLformatter.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-21</td>
+        <td>Tinny Ng</td>
+        <td>Document encoding alias for intrinsic encoding support.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-21</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5847] ICUMsgLoader can't be compiled with gcc 3.0.3 and ICU2.
+            And also fix the memory leak introduced by Bug 2730 fix.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-18</td>
+        <td>Max Gotlib</td>
+        <td>Adds the capability to compile the tests under FreeBSD and either ICU or
+            IconvFBSD transservice (the transcoding service is automatically detected
+            during configuration stage), with or without pthreads.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-18</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5371] runConfigure extra linker options ignored in Makefiles for tests and samples.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-18</td>
+        <td>Tinny Ng</td>
+        <td>Break program.xml which takes too long to load, into program-sax.xml, program-sax2.xml
+            program-dom.xml, program-idom.xml.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-18</td>
+        <td>Tinny Ng</td>
+        <td>Break faq-parse.xml which becomes longer and longer into faq-parse.xml and faq-build.xml
+            to better categorize the FAQ, and update the FAQ
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-18</td>
+        <td>Tinny Ng</td>
+        <td>Create symbolic link to those duplicate ICU libraries, instead of physical duplicate copies.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-15</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 5807] Parser produces unexpected errors from 'Good' document.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-14</td>
+        <td>PeiYong Zhang</td>
+        <td>XMLURi bug fix: related to Authority and wellformedAddress
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-14</td>
+        <td>Max Gotlib</td>
+        <td>[Bug 5570] DOM_Range lacks the copy constructor.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-14</td>
+        <td>Max Gotlib</td>
+        <td>Support IconvFBSD in multi-threading environment with all the possible
+            combinations of threading and transcoding options.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-10</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 5786] Unexpected Schema errors.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-03</td>
+        <td>Khaled Noaman</td>
+        <td>Fix for identity constraints - union operation.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-03</td>
+        <td>Khaled Noaman</td>
+        <td>Resolve namespace first before resolving the schema location in &lt;import&gt;.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-03</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 5675] Use of setExternalSchemaLocation() yields inconsistent behavior.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-02</td>
+        <td>Khaled Noaman</td>
+        <td>Fix for validity constraint check for standalone documents.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-02</td>
+        <td>Khaled Noaman</td>
+        <td>Fix for regular expression patterns that begin with ".".
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-02</td>
+        <td>Khaled Noaman</td>
+        <td>Fix for error message when checking for attributes with a namespace prefix.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-02</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 5569] &lt;extension&gt; does not work -- ancestor elements not recognized.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2002-01-02</td>
+        <td>Tinny Ng</td>
+        <td>Schema Fix: should not store a temp value as the key in the element
+            pool and the attribute pool.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-22</td>
+        <td>Jason Stewart</td>
+        <td>[Bug 4953] Propagate existing CFLAGS and CXXFLAGS.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Jason Stewart</td>
+        <td>[Bug 5514] XMLEnumerator needs virtual destructor.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 2680] Remove '-instances=static' from the compile step.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 1833] LexicalHandler::startDTD not called correctly.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Frank Balluffi</td>
+        <td>[Bug 5466] Memory Leak: ElementImpl.cpp's ElementImpl::ElementImpl copy
+            constructor does not cleanup attributes before assignment.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Frank Balluffi</td>
+        <td>[Bug 5464] Memory Leak: DocumentImpl::importNode does not delete
+            old attribute if its reference count equals zero.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-21</td>
+        <td>Tinny Ng</td>
+        <td>Schema fix: leading whitespace should be preserved for CData type.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-14</td>
+        <td>Khaled Noaman</td>
+        <td>Add surrogate support to comments and processing instructions.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-14</td>
+        <td>Tinny Ng</td>
+        <td>Performance: Do not transcode twice in DOMString constructor.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-14</td>
+        <td>Tinny Ng</td>
+        <td>update BUILDINSTRUCTIONS.TXT to be in sync with build instruction in build*.xml.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-13</td>
+        <td>PeiYong Zhang</td>
+        <td>Fix: Invalid Argument to FreeLibrary (Hint: 0x0000000).
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-13</td>
+        <td>Linda Swan</td>
+        <td>iSeries (AS/400) documentation update and other iSeries related fixes.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-13</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 5410] non-schema &lt;attribute&gt; attributes cause error.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-12</td>
+        <td>Tinny Ng</td>
+        <td>Fix typos in messages.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-12</td>
+        <td>PeiYong Zhang</td>
+        <td>Memory leak: fRedefineList.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-12</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5367] Progressive parse does not throw error when file is empty.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-12</td>
+        <td>Tinny Ng</td>
+        <td>Performance: Remove obsolete code in ElemStack.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-11</td>
+        <td>Max Gotlib</td>
+        <td>More changes to IconvFBSDTransService.  Allow using "old" TransServece implementation
+            (via '-t native' option to runConfigure) or to employ libiconv (it is a part of FreeBSD
+            ports-collection) services.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-11</td>
+        <td>Christopher Just</td>
+        <td>[Bug 5320] 1.5.2 Build fails on IRIX.  The variable "atomicOpsMutex" has been defined twice.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001/12/10</td>
+        <td>PeiYong Zhang</td>
+        <td>Swap checking to avoid "dangling pointer" reported by BoundsChecker.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-10</td>
+        <td>PeiYong Zhang</td>
+        <td>Memory Leak: fLeafNameTypeVector.
+        </td>
+    </tr>
+
+</table>
+</s2>
+
+<s2 title="&XercesCName; 1.6.0: December 6, 2001">
+<table>
+    <tr>
+        <td>Date</td>
+        <td>Contributor</td>
+        <td>Description</td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Khaled Noaman</td>
+        <td>Schema: Add Identity Constraint(Key, KeyRef, Unique, Selector, Field, and Partial XPath Support). <br/>
+            Add XPathSymbols, <br/>
+            XPathMatcherStack, <br/>
+            XPathMatcher, <br/>
+            XPathException, <br/>
+            XercesXPath, <br/>
+            ValueStoreCache, <br/>
+            ValueStore, <br/>
+            IdentityConstraint, <br/>
+            IC_Unique, <br/>
+            IC_Selector, <br/>
+            IC_KeyRef, <br/>
+            IC_Key, <br/>
+            IC_Field, <br/>
+            FieldValueMap, <br/>
+            FieldActivator. <br/>
+            Support Particle Derivation Constraint Checking.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>PeiYong Zhang</td>
+        <td>DatatypeValidator:<br/>
+             Support DateTimeValidator, <br/>
+             DateTimeDatatypeValidator, <br/>
+             DateDatatypeValidator, <br/>
+             TimeDatatypeValidator, <br/>
+             DayDatatypeValidator, <br/>
+             MonthDatatypeValidator, <br/>
+             MonthDayDatatypeValidator, <br/>
+             YearDatatypeValidator, <br/>
+             YearMonthDatatypeValidator, <br/>
+             DurationDatatypeValidator. <br/>
+             Add SchemaDataTimeException, <br/>
+             XMLAbstractDoubleFloat, <br/>
+             XMLDateTime.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 1959] setNodeValue throws exception when spec specifies NOP.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Erik Rydgren</td>
+        <td>[Bug 2174] Bug in NamedNodeMapImpl.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Henry Zongaro</td>
+        <td>Performance Enhancement.  Added setNPrefix and setNLocalPart methods in QName that
+            allow code to take advantage of the fact that it knows the length of the prefix and
+            local name, when possible.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Henry Zongaro</td>
+        <td>Performance Enhancement.  Added a second ContentSpecNode constructor that allows
+            the QName to be just assigned, not copied.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Henry Zongaro</td>
+        <td>Performance Enhancement.  Added a second CMLeaf constructor that indicated the
+            QName passed in was to be adopted.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Henry Zongaro</td>
+        <td>Performance Enhancement.  Modify the handling of the fNEL option so that it results
+            in fgCharCharsTable being modified, instead of having all of the low-level routines check
+            the option.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-06</td>
+        <td>Tinny Ng</td>
+        <td>Make the runConfigure and associated config*, Makefile* in folders tests,
+            samples and src more consistent.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-05</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 1236] Incorrect NMTOKENS attribute normalization.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-05</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 2752] Surrogate support incomplete.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-05</td>
+        <td>Edward Avis</td>
+        <td>Fix runConfigure which can run into infinite loop with invalid argument
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-05</td>
+        <td>Tinny Ng</td>
+        <td>Generate linker map for certain platforms
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-03</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5237] PATH_MAX undefined during build without threading support.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-03</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 5179] Misprint in downcasting description.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-12-03</td>
+        <td>Max Gotlib</td>
+        <td>Add FreeBSD native transcoder (IconvFBSD).
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-30</td>
+        <td>PeiYong Zhang</td>
+        <td>Build all tests on HP-UX 11.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-29</td>
+        <td>Michael Huedepohl</td>
+        <td>Add FreeBSD Support.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>PeiYong Zhang</td>
+        <td>DOMMemTest: delete compiler generated temporary DOMString object "Hello Goodbye".
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Tinny Ng</td>
+        <td>Fix broken ParserTest.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Tinny Ng</td>
+        <td>Do not increment the error count if it is a warning.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Phil Brown</td>
+        <td>[Bug 4019] XMLReader::getNextChar can over read (UTF-16).
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 4544] DOM_NodeList::getLength incorrect when called twice for empty list.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Artur Klauser</td>
+        <td>[Bug 2238]libWWW problems with broken proxys and range requests.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Artur Klauser</td>
+        <td>[Bug 2237] libWWW redirect error.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Matt Lovett</td>
+        <td>[Bug 4422] BinMemInputStream::readBytes is inefficient.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 3683] Access Violations when performing custom schema validation.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-28</td>
+        <td>Tinny Ng</td>
+        <td>Check tohash pointer before accessing content in XMLString::hash.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-27</td>
+        <td>Tinny Ng</td>
+        <td>Fix packageBinaries.pl to correctly strip the zip file name from the target
+            directory which has "." dot in it.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-26</td>
+        <td>Don Mastrovito</td>
+        <td>BCB4 can use wchar_t.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>Support ICU 2.0.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>Eliminate Warning from Solaris Forte C++:
+            Warning (Anachronism): Formal argument start_routine of type extern "C".
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>Eliminate Warning from Solaris Forte C++:
+            Warning: String literal converted to char* in initialization.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>Eliminate Warning from AIX xlC 3.6:1540-399.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 4655] config.status be included in all future binary releases.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-23</td>
+        <td>Tinny Ng</td>
+        <td>[Bug 4873] ICU 2.0 breaks Xerces 1.5.2 build.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-22</td>
+        <td>PeiYong Zhang</td>
+        <td>Eliminate Visual C++ compiler warning C4273.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-22</td>
+        <td>PeiYong Zhang</td>
+        <td>Schema: Allow "0.0" to be a valid lexcial representation of ZERO.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-21</td>
+        <td>Peter A. Volchek and PeiYong Zhang</td>
+        <td>Add sample SEnumVal.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-21</td>
+        <td>Tinny Ng</td>
+        <td>New method InputSource::get/setIssueFatalErrorIfNotFound to tell the parser
+            whether to issue fatal error or not if cannot find it (the InputSource).
+            This is required for schema processing as it shouldn't be a fatal error if the
+            schema is not found.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-20</td>
+        <td>Tinny Ng</td>
+        <td>Allow schemaLocation and noNamespaceSchemaLocation to be specified outside the
+            instance document.  New methods setExternalSchemaLocation and
+            setExternalNoNamespaceSchemaLocation are added (for SAX2, two new properties are added).
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-19</td>
+        <td>PeiYong Zhang</td>
+        <td>XMLFloat and XMLDouble boundary Values updated.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-16</td>
+        <td>Tinny Ng</td>
+        <td>Add test case InitTermTest to test XMLPlatformUtils:Initialize/Terminate() pair.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-16</td>
+        <td>Khaled Noaman</td>
+        <td>Design change: GeneralAttributeCheck is not longer a singleton class.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-15</td>
+        <td>Khaled Noaman</td>
+        <td>Re-organize constant values in XMLAttDef.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-13</td>
+        <td>Tinny Ng</td>
+        <td>Move root element check from XMLValidator to XMLScanner
+            and deprecate XMLValidator::checkRootElement().
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-13</td>
+        <td>Tinny Ng</td>
+        <td>Update documentation for SAX2XMLReader, DefaultHandler and DOMParser.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-09</td>
+        <td>Tinny Ng</td>
+        <td>Regular Expression: Update the Block Names and Block Range to comply to the latest standard.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-09</td>
+        <td>Carolyn Weiss</td>
+        <td>DOMIDTest/MemParse fix: Pulled the hardcoded encoding out of the document
+            itself and made it a #define to make it easier to support other encodings.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-09</td>
+        <td>Carolyn Weiss</td>
+        <td>DOMMemTest fix: Changed some literal values to their equivalent hex values
+            so they work correctly on both ASCII and EBCDIC systems.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-09</td>
+        <td>Linda Swan</td>
+        <td>Bug Fix: maxChars in XMLString::copyNString is more related to the target than the src.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-07</td>
+        <td>Tinny Ng</td>
+        <td>Performance: Create QName in ContentSpecNode only if it is a leaf/Any/PCDataNode.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-07</td>
+        <td>Tinny Ng</td>
+        <td>Performance: move getRawName() to outer loop in DFAContentModel so that it
+            is called only once per outer loop.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-06</td>
+        <td>Khaled Noaman</td>
+        <td>[Bug 4644] Memory leak in schema traverser.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-02</td>
+        <td>Jason Stewart</td>
+        <td>[Bug 4133] --prefix not used properly in configure.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-01</td>
+        <td>Jason Stewart</td>
+        <td>[Bug 2730] Can't build xerces-c-1.5.1 with ICUMsgLoader.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-01</td>
+        <td>Jason Stewart</td>
+        <td>[Bug 4578] No documentation for XMLTranscoder.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-11-01</td>
+        <td>Tinny Ng</td>
+        <td>IDOM: Leak: should allocate the fNodeListPool with the overloaded new.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001/10/29</td>
+        <td>Tinny Ng</td>
+        <td>Update samples doc to reflect the latest changes.  Also update runConfigure usage
+            in build doc to reflect the latest changes.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-10-26</td>
+        <td>PeiYong Zhang</td>
+        <td>Thread safe XMLFloat and XMLDouble.
+        </td>
+    </tr>
+
+    <tr>
+        <td>2001-10-26</td>
+        <td>Tinny Ng</td>
+        <td>Update SAX standard web link.
+        </td>
+    </tr>
+
+</table>
+</s2>
+
+<s2 title="&XercesCName; 1.5.2: October 26, 2001">
 <table>
     <tr>
         <td>Date</td>
@@ -592,7 +1788,7 @@
 </table>
 </s2>
 
-<s2 title="&XercesCName; Version 1.5.1: July 18, 2001">
+<s2 title="&XercesCName; 1.5.1: July 18, 2001">
 <table>
     <tr>
         <td>Date</td>
@@ -994,7 +2190,7 @@
 </s2>
 
 
-<s2 title="&XercesCName; Version 1.5.0: June 15, 2001">
+<s2 title="&XercesCName; 1.5.0: June 15, 2001">
 
 <table>
     <tr>
@@ -1513,7 +2709,7 @@
 
 </s2>
 
-<s2 title="&XercesCName; Version 1.4.0: January 31, 2001">
+<s2 title="&XercesCName; 1.4.0: January 31, 2001">
 
 <table>
     <tr>
@@ -2099,7 +3295,7 @@
 </table>
 </s2>
 
-<s2 title="&XercesCName; Version 1.3.0: Sept 21, 2000">
+<s2 title="&XercesCName; 1.3.0: Sept 21, 2000">
 
 <table >
     <tr>
@@ -2562,7 +3758,7 @@
     </table>
     </s2>
 
-    <s2 title="&XercesCName; Version 1.2.0: June 22, 2000">
+    <s2 title="&XercesCName; 1.2.0: June 22, 2000">
 
     <table>
     <tr>
@@ -2578,7 +3774,7 @@
     <tr>
         <td >2000-06-20</td>
         <td >Rahul, Joe, Arundhati</td>
-        <td >Many doc updates in preparation for release of version 1.2</td>
+        <td >Many doc updates in preparation for release of 1.2</td>
     </tr>
     <tr>
         <td >2000-06-19</td>
@@ -2976,7 +4172,7 @@
      </table>
      </s2>
 
-     <s2 title="&XercesCName; Version 1.1.0: Feb 28, 2000">
+     <s2 title="&XercesCName; 1.1.0: Feb 28, 2000">
 
      <table>
 
@@ -3130,7 +4326,7 @@
 
 
 
-    <s2 title="&XercesCName; Version 1.0.1: December 15, 1999">
+    <s2 title="&XercesCName; 1.0.1: December 15, 1999">
         <ul>
             <li>Port to Solaris.</li>
             <li>Improved error recovery and clarified error messages.</li>
@@ -3138,7 +4334,7 @@
         </ul>
     </s2>
 
-    <s2 title="&XercesCFullName; Version 1.0.0: December 7, 1999">
+    <s2 title="&XercesCFullName; 1.0.0: December 7, 1999">
         <ul>
             <li>Released &XercesCName; after incorporating ICU as a value-added plug-in.</li>
             <li>Has bug fixes, better conformance, better speed and cleaner internal architecture</li>
diff --git a/doc/style/dtd/entities.ent b/doc/style/dtd/entities.ent
index 632d38bf8349ed303afda31f2bd568576b67d837..8bfcb04d8ba9b7b8cb789ea87952bf6f476f2924 100644
--- a/doc/style/dtd/entities.ent
+++ b/doc/style/dtd/entities.ent
@@ -2,15 +2,13 @@
 
 <!ENTITY XercesCFullName      "Xerces C++ Parser">            <!-- fullproductname -->
 <!ENTITY XercesCName          "Xerces-C++">                   <!-- productname -->
-<!ENTITY XercesCVersion140    "1.4.0">                        <!-- versionnumber -->
-<!ENTITY XercesCVersion152    "1.5.2">                        <!-- versionnumber -->
-<!ENTITY XercesCVersion160    "1.6.0">                        <!-- versionnumber -->
-<!ENTITY XercesCVersion       "1.7.0">                        <!-- versionnumber -->
+<!ENTITY XercesCVersion       "2.0.0">                        <!-- versionnumber -->
 <!ENTITY XercesCProjectName   "Xerces">                       <!-- projectname -->
-<!ENTITY XercesCInstallDir    "xerces-c1_7_0">                <!-- installdirname -->
-<!ENTITY XercesCSrcInstallDir "xerces-c-src1_7_0">            <!-- sourcedirectory -->
-<!ENTITY XercesCWindowsLib    "xerces-c_1">                   <!-- windowslibname -->
-<!ENTITY XercesCWindowsDLL    "xerces-c_1_7_0">               <!-- windowsDLLname -->
-<!ENTITY XercesCUnixLib       "libxerces-c1_7_0">             <!-- unixlibname -->
+<!ENTITY XercesCInstallDir    "xerces-c2_0_0">                <!-- installdirname -->
+<!ENTITY XercesCSrcInstallDir "xerces-c-src2_0_0">            <!-- sourcedirectory -->
+<!ENTITY XercesCWindowsLib    "xerces-c_2">                   <!-- windowslibname -->
+<!ENTITY XercesCWindowsDLL    "xerces-c_2_0_0">               <!-- windowsDLLname -->
+<!ENTITY XercesCUnixSoName    "20.0">                         <!-- unixlibname -->
+<!ENTITY XercesCUnixLib       "libxerces-c">                  <!-- unixlibname -->
 <!ENTITY XercesCEmailAddress  "xerces-c-dev@xml.apache.org "> <!-- emailaddress -->
 <!ENTITY XercesDistDir        "xml.apache.org/dist/xerces-c"> <!-- download directory -->