From d6119ccd7761ae0dfab3c33122044bffafe3f1d6 Mon Sep 17 00:00:00 2001
From: Tinny Ng <tng@apache.org>
Date: Wed, 13 Feb 2002 19:49:41 +0000
Subject: [PATCH] Modify the documentation source file to be able to build in
 xml-site environment.  Plus some other documentation update and Xerces-C++
 1.7 preparation.

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@173497 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/Doxyfile                       |  2 +-
 doc/apidocs.xml                    |  2 +-
 doc/bug-report.xml                 |  2 +-
 doc/build-misc.xml                 | 58 ++++++++++---------------
 doc/build-other.xml                | 30 +++++--------
 doc/build-winunix.xml              | 46 ++++++++------------
 doc/build.xml                      | 41 +++++++++++++++++
 doc/createdoc.xml                  |  2 +-
 doc/domcount.xml                   |  2 +-
 doc/domprint.xml                   |  2 +-
 doc/enumval.xml                    |  2 +-
 doc/faq-build.xml                  |  2 +-
 doc/faq-distrib.xml                | 10 ++---
 doc/faq-other.xml                  |  7 +--
 doc/faq-parse.xml                  |  4 +-
 doc/feedback.xml                   |  2 +-
 doc/html/apiDocs/header.html       |  4 +-
 doc/idomcount.xml                  |  2 +-
 doc/idomprint.xml                  |  2 +-
 doc/install.xml                    | 10 ++---
 doc/memparse.xml                   |  2 +-
 doc/migration.xml                  | 26 +++++------
 doc/migration_archive.xml          | 16 +++----
 doc/pdf-c.xml                      |  2 +-
 doc/pparse.xml                     |  2 +-
 doc/program-dom.xml                |  2 +-
 doc/program-idom.xml               |  2 +-
 doc/program-sax.xml                |  2 +-
 doc/program-sax2.xml               |  2 +-
 doc/program.xml                    | 30 ++++++++-----
 doc/readme.xml                     |  2 +-
 doc/redirect.xml                   |  2 +-
 doc/releases.xml                   | 53 +++++++++++++++++++++-
 doc/releases_archive.xml           |  2 +-
 doc/samples.xml                    |  2 +-
 doc/sax2count.xml                  |  2 +-
 doc/sax2print.xml                  |  2 +-
 doc/saxcount.xml                   |  2 +-
 doc/saxprint.xml                   |  2 +-
 doc/schema.xml                     |  4 +-
 doc/senumval.xml                   |  2 +-
 doc/stdinparse.xml                 |  2 +-
 doc/{ => style}/dtd/blocks.ent     |  0
 doc/{ => style}/dtd/book.dtd       |  0
 doc/{ => style}/dtd/changes.dtd    |  0
 doc/{ => style}/dtd/characters.ent |  0
 doc/{ => style}/dtd/document.dtd   |  0
 doc/{ => style}/dtd/entities.ent   | 11 ++---
 doc/{ => style}/dtd/faqs.dtd       |  0
 doc/{ => style}/dtd/links.ent      |  0
 doc/{ => style}/dtd/markup.ent     |  0
 doc/xerces-c_book.xml              | 70 +++++++++++++++---------------
 doc/y2k.xml                        | 34 +++++++--------
 53 files changed, 291 insertions(+), 219 deletions(-)
 create mode 100644 doc/build.xml
 rename doc/{ => style}/dtd/blocks.ent (100%)
 rename doc/{ => style}/dtd/book.dtd (100%)
 rename doc/{ => style}/dtd/changes.dtd (100%)
 rename doc/{ => style}/dtd/characters.ent (100%)
 rename doc/{ => style}/dtd/document.dtd (100%)
 rename doc/{ => style}/dtd/entities.ent (66%)
 rename doc/{ => style}/dtd/faqs.dtd (100%)
 rename doc/{ => style}/dtd/links.ent (100%)
 rename doc/{ => style}/dtd/markup.ent (100%)

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 40ec423da..f7a40b558 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.6.0
+PROJECT_NUMBER       = v1.7.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/apidocs.xml b/doc/apidocs.xml
index a4816ab90..d0a30aa59 100644
--- a/doc/apidocs.xml
+++ b/doc/apidocs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="API Documentation">
     <s2 title="API Docs for SAX and DOM">
diff --git a/doc/bug-report.xml b/doc/bug-report.xml
index 505d4f8bf..0de686364 100644
--- a/doc/bug-report.xml
+++ b/doc/bug-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Bug Reporting">
 
diff --git a/doc/build-misc.xml b/doc/build-misc.xml
index 50dce8938..4714bc14a 100644
--- a/doc/build-misc.xml
+++ b/doc/build-misc.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
-<faqs title="Other Build Instructions">
-    <faq title="Building &XercesCName; with ICU using bundled Perl scripts on Windows">
-    <q>Building &XercesCName; with ICU using bundled Perl scripts on Windows</q>
-    <a>
+<s1 title="Other Build Instructions">
+    <anchor name="ICUPerl"/>
+    <s2 title="Building &XercesCName; with ICU using bundled Perl scripts on Windows">
         <p>As mentioned earlier, &XercesCName; may be built in stand-alone mode using
         native encoding support and also using ICU where you get support over 180
         different encodings. ICU stands for International Components for Unicode and is an
@@ -67,12 +66,10 @@ perl packageBinaries.pl -s x:\&XercesCSrcInstallDir; -o x:\temp\&XercesCInstallD
 
         <p>For a description of options available, you can enter:</p>
 <source>perl packageBinaries.pl</source>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; COM Wrapper on Windows">
-    <q>Building &XercesCName; COM Wrapper on Windows</q>
-    <a>
+    <anchor name="WinCOM"/>
+    <s2 title="Building &XercesCName; COM Wrapper on Windows">
         <p>To build the COM module for use with XML on Windows platforms, you
         must first set up your machine appropriately with necessary tools and
         software modules and then try to compile it. The end result is an additional
@@ -126,13 +123,11 @@ perl packageBinaries.pl -s x:\&XercesCSrcInstallDir; -o x:\temp\&XercesCInstallD
         You will have to modify the documents in the NIST suite to load the
         Xerces COM object instead of the MSIE COM object.</p>
         </s3>
-    </a>
-    </faq>
+    </s2>
 
 
-    <faq title="Building User Documentation">
-    <q>Building User Documentation</q>
-    <a>
+    <anchor name="UserDoc"/>
+    <s2 title="Building User Documentation">
         <p>The user documentation (this very page that you are reading
         on the browser right now), was generated using an XML
         application called StyleBook. This application makes use of
@@ -167,13 +162,11 @@ perl packageBinaries.pl -s x:\&XercesCSrcInstallDir; -o x:\temp\&XercesCInstallD
 
         <p>This should generate the .html files in the 'doc/html'
         directory.</p>
-    </a>
-    </faq>
+    </s2>
 
 
-    <faq title="I wish to port &XercesCProjectName; to my favourite platform. Do you have any suggestions?">
-    <q>I wish to port &XercesCProjectName; to my favourite platform. Do you have any suggestions?</q>
-    <a>
+    <anchor name="PortInfo"/>
+    <s2 title="I wish to port &XercesCProjectName; to my favourite platform. Do you have any suggestions?">
       <p>All platform dependent code in &XercesCProjectName; has been
       isolated to a couple of files, which should ease the porting
       effort.  Here are the basic steps that should be followed to
@@ -261,13 +254,11 @@ perl packageBinaries.pl -s x:\&XercesCSrcInstallDir; -o x:\temp\&XercesCInstallD
       </ul>
 
       <p>That is the work required in a nutshell!</p>
-    </a>
-    </faq>
+    </s2>
 
 
-    <faq title="What should I define XMLCh to be?">
-    <q>What should I define XMLCh to be?</q>
-    <a>
+    <anchor name="XMLChInfo"/>
+    <s2 title="What should I define XMLCh to be?">
         <p>XMLCh should be defined to be a type suitable for holding a
            utf-16 encoded (16 bit) value, usually an <code>unsigned short</code>. </p>
 
@@ -311,21 +302,18 @@ perl packageBinaries.pl -s x:\&XercesCSrcInstallDir; -o x:\temp\&XercesCInstallD
                   are illegal in ucs-4 encoded wchar_t strings.
                </li>
            </ul>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Where can I look for more help?">
-    <q>Where can I look for more help?</q>
-    <a>
+    <anchor name="HelpInfo"/>
+    <s2 title="Where can I look for more help?">
         <p>If you have read this page, followed the instructions, and
         still cannot resolve your problem(s), there is more help. You
         can find out if others have
         solved this same problem before you, by checking the Apache XML
-        mailing list archives at <jump href="http://archive.covalent.net ">
-        http://archive.covalent.net</jump> and the
+        mailing list archives at <jump href="http://marc.theaimsgroup.com/?l=xerces-c-dev">
+        http://marc.theaimsgroup.com/?l=xerces-c-dev</jump> and the
 		<jump href="http://nagoya.apache.org/bugzilla/">Bugzilla</jump>
 		Apache bug database.</p>
-    </a>
-    </faq>
+    </s2>
 
-</faqs>
+</s1>
diff --git a/doc/build-other.xml b/doc/build-other.xml
index 1139de901..15dc3416a 100644
--- a/doc/build-other.xml
+++ b/doc/build-other.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
-<faqs title="Building on Other Platforms">
-    <faq title="Building &XercesCName; on iSeries (AS/400)">
-    <q>Building &XercesCName; on iSeries (AS/400)</q>
-    <a>
+<s1 title="Building on Other Platforms">
+    <anchor name="iSeries"/>
+    <s2 title="Building &XercesCName; on iSeries (AS/400)">
             <p>The following addresses the requirements and build of
            &XercesCName; natively on the iSeries.
             </p>
@@ -296,12 +295,10 @@ runConfigure -p os400 -x icc -c icc
 gmake </source>
 
         </s3>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; on OS/2 using Visual Age C++">
-    <q>Building &XercesCName; on OS/2 using Visual Age C++</q>
-    <a>
+    <anchor name="OS2VisualAge"/>
+    <s2 title="Building &XercesCName; on OS/2 using Visual Age C++">
           <p>OS/2 is a favourite IBM PC platforms. The only
           option in this platform is to use
           <jump href="http://www-4.ibm.com/software/ad/vacpp/">Visual Age C++ compiler</jump>.
@@ -457,12 +454,10 @@ gmake </source>
         </ul>
         </s3>
 
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; on Macintosh">
-    <q>Building &XercesCName; on Macintosh</q>
-    <a>
+    <anchor name="Mac"/>
+    <s2 title="Building &XercesCName; on Macintosh">
 		<p>The &XercesCName; Mac port has the key following attributes:
 		</p>
 		
@@ -689,6 +684,5 @@ make</source>
 				</li>
 			</ul>	
 		</s3>
-    </a>
-    </faq>
-</faqs>
+    </s2>
+</s1>
diff --git a/doc/build-winunix.xml b/doc/build-winunix.xml
index 122a93f70..1bbe67861 100644
--- a/doc/build-winunix.xml
+++ b/doc/build-winunix.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
-<faqs title="Building on Windows and UNIX">
-    <faq title="Building &XercesCName; on Windows NT/98">
-    <q>Building &XercesCName; on Windows NT/98</q>
-    <a>
+<s1 title="Building on Windows and UNIX">
+    <anchor name="WinNT"/>
+    <s2 title="Building &XercesCName; on Windows NT/2000">
         <p>&XercesCName; comes with Microsoft Visual C++ projects and workspaces to
         help you build &XercesCName;. The following describes the steps you need
         to build &XercesCName;.</p>
@@ -42,12 +41,10 @@
               on the selection. Then choose "Build (selection only)" to build all the
               samples in one shot.</p>
         </s3>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; on Windows using Visual Age C++">
-    <q>Building &XercesCName; on Windows using Visual Age C++</q>
-    <a>
+    <anchor name="WinVisualAge"/>
+    <s2 title="Building &XercesCName; on Windows using Visual Age C++">
         <p>A few unsupported projects are also packaged with &XercesCName;. Due to
         origins of &XercesCName; inside IBM labs, we do have projects for IBM's
         <jump href="http://www-4.ibm.com/software/ad/vacpp/">Visual Age C++ compiler</jump> on Windows.
@@ -88,12 +85,10 @@
             <note>These instructions assume that you install in drive d:\.
             Replace d with the appropriate drive letter.</note>
         </s3>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; on Windows using Borland C++Builder">
-    <q>Building &XercesCName; on Windows using Borland C++Builder</q>
-    <a>
+    <anchor name="WinBorland"/>
+    <s2 title="Building &XercesCName; on Windows using Borland C++Builder">
         <p>&XercesCName; comes with Borland C++Builder projects to help you
 		build &XercesCName;. The following describes the steps you need to build
 		&XercesCName;.</p>
@@ -124,12 +119,10 @@
            </p>
 
         </s3>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; on UNIX platforms">
-    <q>Building &XercesCName; on UNIX platforms</q>
-    <a>
+    <anchor name="UNIX"/>
+    <s2 title="Building &XercesCName; on UNIX platforms">
         <p>&XercesCName; uses
         <jump href="http://www.gnu.org">GNU</jump> tools like
         <jump href="http://www.gnu.org/software/autoconf/autoconf.html">Autoconf</jump> and
@@ -410,12 +403,10 @@ Usage: runConfigure "options"
          <p>To delete all the generated object files and executables, type:</p>
 <source>gmake clean</source>
         </s3>
-    </a>
-    </faq>
+    </s2>
 
-    <faq title="Building &XercesCName; as a single-threaded library on Unix platforms">
-    <q>Building &XercesCName; as a single-threaded library on Unix platforms</q>
-    <a>
+    <anchor name="UNIX_SingleThread"/>
+    <s2 title="Building &XercesCName; as a single-threaded library on Unix platforms">
          <p>To build a single-threaded library on Unix platforms you have to update
          one or more of the following files <code>Makefile.incl, Makefile.in, runConfigure</code>.
          The following steps guide you to create a single-threaded library for each platform:</p>
@@ -458,7 +449,6 @@ Usage: runConfigure "options"
      <li>Remove threading defines like <code>-D_PTHREADS_DRAFT4 ,
         -DXML_USE_DCE</code></li>
     </ul>
-   </a>
-   </faq>
+   </s2>
 
-</faqs>
+</s1>
diff --git a/doc/build.xml b/doc/build.xml
new file mode 100644
index 000000000..72e882f6e
--- /dev/null
+++ b/doc/build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
+
+<s1 title="Build Instructions">
+
+  <s2 title="Building on Windows and UNIX">
+    <p>Read the <jump href="build-winunix.html">Building on Windows and UNIX</jump> document
+      or jump directly to:</p>
+    <ul>
+       <li><jump href="build-winunix.html#WinNT">Building &XercesCName; on Windows NT/2000</jump></li>
+       <li><jump href="build-winunix.html#WinVisualAge">Building &XercesCName; on Windows using Visual Age C++</jump></li>
+       <li><jump href="build-winunix.html#WinBorland">Building &XercesCName; on Windows using Borland C++Builder</jump></li>
+       <li><jump href="build-winunix.html#UNIX">Building &XercesCName; on UNIX platforms</jump></li>
+       <li><jump href="build-winunix.html#UNIX_SingleThread">Building &XercesCName; as a single-threaded library on Unix platforms</jump></li>
+    </ul>
+  </s2>
+
+  <s2 title="Building on Other Platforms">
+    <p>Read the <jump href="build-other.html">Building on Other Platforms</jump> document
+      or jump directly to:</p>
+    <ul>
+       <li><jump href="build-other.html#iSeries">Building &XercesCName; on iSeries (AS/400)</jump></li>
+       <li><jump href="build-other.html#OS2VisualAge">Building &XercesCName; on OS/2 using Visual Age C++</jump></li>
+       <li><jump href="build-other.html#Mac">Building &XercesCName; on Macintosh</jump></li>
+    </ul>
+  </s2>
+
+  <s2 title="Other Build Instructions">
+    <p>Read the <jump href="build-misc.html">Other Build Instructions</jump> document
+      or jump directly to:</p>
+    <ul>
+       <li><jump href="build-misc.html#ICUPerl">Building &XercesCName; with ICU using bundled Perl scripts on Windows</jump></li>
+       <li><jump href="build-misc.html#WinCOM">Building &XercesCName; COM Wrapper on Windows</jump></li>
+       <li><jump href="build-misc.html#UserDoc">Building User Documentation</jump></li>
+       <li><jump href="build-misc.html#PortInfo">I wish to port &XercesCProjectName; to my favourite platform. Do you have any suggestions?</jump></li>
+       <li><jump href="build-misc.html#XMLChInfo">What should I define XMLCh to be?</jump></li>
+       <li><jump href="build-misc.html#HelpInfo">Where can I look for more help?</jump></li>
+    </ul>
+  </s2>
+
+</s1>
diff --git a/doc/createdoc.xml b/doc/createdoc.xml
index 467ceea1b..d81323ecc 100644
--- a/doc/createdoc.xml
+++ b/doc/createdoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 10: CreateDOMDocument">
 
diff --git a/doc/domcount.xml b/doc/domcount.xml
index ff7d5c877..cc6456c1a 100644
--- a/doc/domcount.xml
+++ b/doc/domcount.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 3: DOMCount">
 
diff --git a/doc/domprint.xml b/doc/domprint.xml
index af1237ce1..96d6009f2 100644
--- a/doc/domprint.xml
+++ b/doc/domprint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 4: DOMPrint">
 
diff --git a/doc/enumval.xml b/doc/enumval.xml
index 7c67b316d..352eabde4 100644
--- a/doc/enumval.xml
+++ b/doc/enumval.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 9: EnumVal">
 
diff --git a/doc/faq-build.xml b/doc/faq-build.xml
index 41b3bd358..90f5efb05 100644
--- a/doc/faq-build.xml
+++ b/doc/faq-build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding = "iso-8859-1" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE faqs SYSTEM "sbk:/style/dtd/faqs.dtd">
 
 <faqs title="Building / Running FAQs">
 
diff --git a/doc/faq-distrib.xml b/doc/faq-distrib.xml
index c571e900e..12a1f260a 100644
--- a/doc/faq-distrib.xml
+++ b/doc/faq-distrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE faqs SYSTEM "sbk:/style/dtd/faqs.dtd">
 
 <faqs title="Distributing &XercesCName;">
 
@@ -18,7 +18,7 @@
           <td><em>Compiler</em></td>
         </tr>
         <tr>
-          <td>Windows NT 4.0 SP5/98</td>
+          <td>Windows NT 4.0 SP5/2000</td>
           <td>MSVC 6.0 SP3</td>
         </tr>
         <tr>
@@ -91,7 +91,7 @@
             site</jump> site, then you only need to distribute
             <em>one</em> file:<br></br>
 
-            &XercesCWindowsDLL;.dll for Windows NT/95/98, or<br/>
+            &XercesCWindowsDLL;.dll for Windows NT/2000, or<br/>
             &XercesCUnixLib;.a for AIX, or<br/>
             &XercesCUnixLib;.so for Solaris/Linux, or<br/>
             &XercesCUnixLib;.sl for HP-UX.</p>
@@ -102,13 +102,13 @@
 
             <ol>
                 <li><em>ICU shared library file</em>:<br></br>
-                    icuuc.dll for Windows NT/95/98, or<br></br>
+                    icuuc.dll for Windows NT/2000, or<br></br>
                     libicuuc.a for AIX, or<br></br>
                     libicuuc.so for Solaris/Linux, or<br></br>
                     libicuuc.sl for HP-UX.</li>
 
                 <li><em>ICU converter data shared library file:</em><br></br>
-                    icudata.dll for Windows NT/95/98, or<br></br>
+                    icudata.dll for Windows NT/2000, or<br></br>
                     libicudata.a for AIX, or<br></br>
                     libicudata.so for Solaris/Linux, or<br></br>
                     libicudata.sl for HP-UX.</li>
diff --git a/doc/faq-other.xml b/doc/faq-other.xml
index e5e142e4f..09fb562a8 100644
--- a/doc/faq-other.xml
+++ b/doc/faq-other.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "dtd/faqs.dtd">
+<!DOCTYPE faqs SYSTEM "sbk:/style/dtd/faqs.dtd">
 <faqs title="Other &XercesCName; Questions">
 
   <faq title="How do I determine the version of &XercesCName; I am using?">
@@ -11,7 +11,7 @@
            something similar). This is the version of &XercesCName; you are using.</p>
 
            <p>If you don't have the header files, you have to find the version
-           information from the shared library name. On Windows NT/95/98 right click on
+           information from the shared library name. On Windows right click on
            the DLL name &XercesCWindowsDLL;.dll in the bin directory and look up
            properties. The version information may be found on the Version tab.</p>
 
@@ -69,7 +69,8 @@
         <jump
          href="http://xml.apache.org/mail.html">http://xml.apache.org/mail.html</jump>.
         Archives of the lists are available from
-        <jump href="http://archive.covalent.net">http://archive.covalent.net</jump>
+        <jump href="http://marc.theaimsgroup.com/?l=xerces-c-dev">
+        http://marc.theaimsgroup.com/?l=xerces-c-dev</jump>
         </p>
 
     </a>
diff --git a/doc/faq-parse.xml b/doc/faq-parse.xml
index 4f11309b7..1d1303a28 100644
--- a/doc/faq-parse.xml
+++ b/doc/faq-parse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding = "iso-8859-1" standalone="no"?>
-<!DOCTYPE faqs SYSTEM "./dtd/faqs.dtd">
+<!DOCTYPE faqs SYSTEM "sbk:/style/dtd/faqs.dtd">
 
 <faqs title="Programming/Parsing FAQs">
 
@@ -39,7 +39,7 @@
       <p>If you find any Schema feature which is specified in the W3C XML Schema Language
          Recommendation does not work with &XercesCName; &XercesCVersion;, we encourage
          the submission of bugs as described in
-         <jump href="http://xml.apache.org/xerces-c/bug-report.html">Bug-Reporting</jump> page.
+         <jump href="bug-report.html">Bug-Reporting</jump> page.
        </p>
 
     </a>
diff --git a/doc/feedback.xml b/doc/feedback.xml
index 8d8ac1a30..292512cb2 100644
--- a/doc/feedback.xml
+++ b/doc/feedback.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Feedback Procedures">
     <s2 title="Questions or Comments">
diff --git a/doc/html/apiDocs/header.html b/doc/html/apiDocs/header.html
index aca8ab6b3..7b9babfcb 100644
--- a/doc/html/apiDocs/header.html
+++ b/doc/html/apiDocs/header.html
@@ -35,8 +35,8 @@
 
   <IMG border="0" height="6" hspace="0" src="../resources/separator.gif" vspace="0" width="120"><BR>
 
-  <A href="http://xml.apache.org/websrc/cvsweb.cgi/xml-xerces/c/" onMouseOut="rolloverOff('side-ext-50');" onMouseOver="rolloverOn('side-ext-50');"><IMG alt="CVS Repository" border="0" height="12" hspace="0" name="side-ext-50" onLoad="rolloverLoad('side-ext-50','../graphics/ext-50-label-2.jpg','../graphics/ext-50-label-3.jpg');" src="../graphics/ext-50-label-3.jpg" vspace="0" width="120"></A><BR>
-  <A href="http://marc.theaimsgroup.com/?l=xerces-c-dev" onMouseOut="rolloverOff('side-ext-52');" onMouseOver="rolloverOn('side-ext-52');"><IMG alt="Mail Archive" border="0" height="12" hspace="0" name="side-ext-52" onLoad="rolloverLoad('side-ext-52','../graphics/ext-52-label-2.jpg','../graphics/ext-52-label-3.jpg');" src="../graphics/ext-52-label-3.jpg" vspace="0" width="120"></A><BR>
+  <A href="http://xml.apache.org/websrc/cvsweb.cgi/xml-xerces/c/" onMouseOut="rolloverOff('side-ext-94');" onMouseOver="rolloverOn('side-ext-94');"><IMG alt="CVS Repository" border="0" height="12" hspace="0" name="side-ext-94" onLoad="rolloverLoad('side-ext-94','../graphics/ext-94-label-2.jpg','../graphics/ext-94-label-3.jpg');" src="../graphics/ext-94-label-3.jpg" vspace="0" width="120"></A><BR>
+  <A href="http://marc.theaimsgroup.com/?l=xerces-c-dev" onMouseOut="rolloverOff('side-ext-96');" onMouseOver="rolloverOn('side-ext-96');"><IMG alt="Mail Archive" border="0" height="12" hspace="0" name="side-ext-96" onLoad="rolloverLoad('side-ext-96','../graphics/ext-96-label-2.jpg','../graphics/ext-96-label-3.jpg');" src="../graphics/ext-96-label-3.jpg" vspace="0" width="120"></A><BR>
 
 <IMG border="0" height="14" hspace="0" src="../resources/close.gif" vspace="0" width="120"><BR></TD><TD align="left" valign="top" width="500"><TABLE border="0" cellpadding="3" cellspacing="0"><TR><TD>
     <TABLE border="0" cellpadding="0" cellspacing="0" width="494"><TR><TD bgcolor="#FFFFFF" colspan="2" width="494"><TABLE border="0" cellpadding="0" cellspacing="0" width="494"><TR><TD bgcolor="#039acc" height="1" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD><TD bgcolor="#039acc" height="1" width="492"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="492"></TD><TD bgcolor="#0086b2" height="1" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD></TR><TR><TD bgcolor="#039acc" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD><TD bgcolor="#0086b2" width="492"><FONT color="#ffffff" face="arial,helvetica,sanserif" size="+1"><IMG border="0" height="2" hspace="0" src="../resources/void.gif" vspace="0" width="2"><B>API Docs for SAX and DOM</B></FONT></TD><TD bgcolor="#017299" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD></TR><TR><TD bgcolor="#0086b2" height="1" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD><TD bgcolor="#017299" height="1" width="492"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="492"></TD><TD bgcolor="#017299" height="1" width="1"><IMG border="0" height="1" hspace="0" src="../resources/void.gif" vspace="0" width="1"></TD></TR></TABLE></TD></TR><TR><TD width="10">&nbsp;</TD><TD width="484"><FONT color="#000000" face="arial,helvetica,sanserif">
diff --git a/doc/idomcount.xml b/doc/idomcount.xml
index 5d9c51d0b..de323869d 100644
--- a/doc/idomcount.xml
+++ b/doc/idomcount.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 13: IDOMCount">
 
diff --git a/doc/idomprint.xml b/doc/idomprint.xml
index 2a9a7ec64..7e5825542 100644
--- a/doc/idomprint.xml
+++ b/doc/idomprint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 14: IDOMPrint">
 
diff --git a/doc/install.xml b/doc/install.xml
index 348d41c65..a273e7756 100644
--- a/doc/install.xml
+++ b/doc/install.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Installation">
 
 
-    <s2 title="Window NT/98">
+    <s2 title="Windows NT/2000">
         <p>Install the binary &XercesCName; release by using <code>unzip</code>
 		on the <ref>file</ref>-win32.zip archive in the Windows environment. You can
 		use WinZip, or any other UnZip utility.</p>
@@ -20,7 +20,7 @@
 		double click on System and select the &apos;Environment&apos; tab.
 		Locate the PATH variable under system variables
         and add &lt;full_path_to_&XercesCInstallDir;>\bin to the PATH variable.
-		To do this under Windows 95/98 add this line to your AUTOEXEC.BAT file:</p>
+		To do this under Windows 2000 add this line to your AUTOEXEC.BAT file:</p>
 <source>SET PATH=&lt;full_path_to_&XercesCInstallDir;>\bin;%PATH%</source>
 		<p>or run the <code>SET PATH</code> command in your shell window.</p>
     </s2>
@@ -67,8 +67,8 @@ setenv LD_LIBRARY_PATH "$XERCESCROOT/lib:$LD_LIBRARY_PATH" (on Solaris, Linux)
 setenv SHLIB_PATH "$XERCESCROOT/lib:$SHLIB_PATH" (on HP-UX)</source>
 
         <note>If you need to build the samples after installation,
-        make sure you read and follow the build instructions given in the
-		<jump href="build.html">FAQ</jump>.</note>
+        make sure you read and follow the <jump href="build.html">
+        Build Instructions</jump>.</note>
 
    </s2>
 </s1>
\ No newline at end of file
diff --git a/doc/memparse.xml b/doc/memparse.xml
index 1cc771876..33d6a83ba 100644
--- a/doc/memparse.xml
+++ b/doc/memparse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 5: MemParse">
 
diff --git a/doc/migration.xml b/doc/migration.xml
index dfd80a87e..0e1c6de72 100644
--- a/doc/migration.xml
+++ b/doc/migration.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Migration">
-    <s2 title="Migrating from &XercesCName; &XercesCVersion; to &XercesCName; latest code base">
+    <s2 title="Migrating from &XercesCName; &XercesCVersion160; to &XercesCName; &XercesCVersion;">
       <p>This document is a discussion of the technical differences between
-      &XercesCName; &XercesCVersion; code base and the &XercesCName; latest code base.</p>
+      &XercesCName; &XercesCVersion160; code base and the &XercesCName; &XercesCVersion; code base.</p>
 
       <p>Topics discussed are:</p>
       <ul>
-        <li><link anchor="NewFeatures">New features in &XercesCName; latest code base</link></li>
-        <li><link anchor="API">Public API Changes in &XercesCName; latest code base</link></li>
+        <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion; code base</link></li>
+        <li><link anchor="API">Public API Changes in &XercesCName; &XercesCVersion; code base</link></li>
         <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>
         </ul>
-        <li><link anchor="DirChange">Directory change in &XercesCName; latest code base</link></li>
+        <li><link anchor="DirChange">Directory change in &XercesCName; &XercesCVersion; code base</link></li>
       </ul>
     </s2>
 
     <anchor name="NewFeatures"/>
-    <s2 title="New features in &XercesCName; latest code base">
+    <s2 title="New features in &XercesCName; &XercesCVersion; code base">
       <ul>
         <li>SAX2-ext's DeclHandler.</li>
       </ul>
     </s2>
 
     <anchor name="API"/>
-    <s2 title="Public API Changes in &XercesCName; latest code base">
+    <s2 title="Public API Changes in &XercesCName; &XercesCVersion; code base">
 
         <p>The following lists the public API changes between the &XercesCName;
-           &XercesCVersion; and the &XercesCName; latest code base releases
+           &XercesCVersion; and the &XercesCName; &XercesCVersion; code base releases
            of the parser. </p>
 
         <anchor name="NewAPI"/>
@@ -71,7 +71,7 @@
     </s2>
 
     <anchor name="DirChange"/>
-    <s2 title="Directory change in &XercesCName; latest code base">
+    <s2 title="Directory change in &XercesCName; &XercesCVersion; code base">
       <ul>
         <li>
             A new directory, <em>src/xercesc</em> is created to be the new parent directory to
@@ -79,14 +79,14 @@
         <li>
             Windows application, <br/>
 			shall either change the <em>additional include directories </em> setting,
-			to "..\..\..\..\..\src\<em>xercesc</em>" (Projects->settings->C/C++->Preprocessor). 
+			to "..\..\..\..\..\src\<em>xercesc</em>" (Projects->settings->C/C++->Preprocessor).
 			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/>
-			shall either add the line to the Makefile " -I &lt;installroot&gt;/include/<em>xercesc</em>", 
+			shall either add the line to the Makefile " -I &lt;installroot&gt;/include/<em>xercesc</em>",
 			or <br/>
 			change the relevant #include instances in the source/header files as shown above. </li>
       </ul>
@@ -94,7 +94,7 @@
 
     <s2 title="Migration Archive">
 
-       <p>For migration information to &XercesCName; &XercesCVersion; or earlier,
+       <p>For migration information to &XercesCName; &XercesCVersion160; 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 b9d5ea850..1f604c260 100644
--- a/doc/migration_archive.xml
+++ b/doc/migration_archive.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Migration Archive">
-    <s2 title="Migrating from &XercesCName; &XercesCVersion152; to &XercesCName; &XercesCVersion;">
+    <s2 title="Migrating from &XercesCName; &XercesCVersion152; to &XercesCName; &XercesCVersion160;">
       <p>The following section is a discussion of the technical differences between
-      &XercesCName; &XercesCVersion152; code base and the &XercesCName; &XercesCVersion; code base.</p>
+      &XercesCName; &XercesCVersion152; code base and the &XercesCName; &XercesCVersion160; code base.</p>
 
       <p>Topics discussed are:</p>
       <ul>
-        <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion;</link></li>
-        <li><link anchor="API">Public API Changes in &XercesCName; &XercesCVersion;</link></li>
+        <li><link anchor="NewFeatures">New features in &XercesCName; &XercesCVersion160;</link></li>
+        <li><link anchor="API">Public API Changes in &XercesCName; &XercesCVersion160;</link></li>
         <ul>
             <li><link anchor="NewAPI">New Public API</link></li>
             <li><link anchor="ModifiedAPI">Modified Public API</link></li>
@@ -19,7 +19,7 @@
     </s2>
 
     <anchor name="NewFeatures"/>
-    <s2 title="New features in &XercesCName; &XercesCVersion;">
+    <s2 title="New features in &XercesCName; &XercesCVersion160;">
       <ul>
         <li>Full Schema support is available in this release.
             See <jump href="schema.html">the Schema page</jump> for details.</li>
@@ -28,10 +28,10 @@
     </s2>
 
     <anchor name="API"/>
-    <s2 title="Public API Changes in &XercesCName; &XercesCVersion;">
+    <s2 title="Public API Changes in &XercesCName; &XercesCVersion160;">
 
         <p>The following lists the public API changes between the &XercesCName;
-           &XercesCVersion152; and the &XercesCName; &XercesCVersion; releases
+           &XercesCVersion152; and the &XercesCName; &XercesCVersion160; releases
            of the parser. </p>
 
         <anchor name="NewAPI"/>
diff --git a/doc/pdf-c.xml b/doc/pdf-c.xml
index 6acd0d54e..2cd552027 100644
--- a/doc/pdf-c.xml
+++ b/doc/pdf-c.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="PDF Documentation">
 	<s2 title="PDF Documentation">
diff --git a/doc/pparse.xml b/doc/pparse.xml
index a9582d132..680af3671 100644
--- a/doc/pparse.xml
+++ b/doc/pparse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 7: PParse">
 
diff --git a/doc/program-dom.xml b/doc/program-dom.xml
index e11bf9cdb..40f465809 100644
--- a/doc/program-dom.xml
+++ b/doc/program-dom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="DOM Programming Guide">
 
diff --git a/doc/program-idom.xml b/doc/program-idom.xml
index 346a6128e..2e6062ce2 100644
--- a/doc/program-idom.xml
+++ b/doc/program-idom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Experimental IDOM Programming Guide">
     <anchor name="IDOMProgGuide"/>
diff --git a/doc/program-sax.xml b/doc/program-sax.xml
index b522044f0..c1ebc5579 100644
--- a/doc/program-sax.xml
+++ b/doc/program-sax.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="SAX1 Programming Guide">
 
diff --git a/doc/program-sax2.xml b/doc/program-sax2.xml
index 8e183eb97..7e6bb2bd6 100644
--- a/doc/program-sax2.xml
+++ b/doc/program-sax2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="SAX2 Programming Guide">
 
diff --git a/doc/program.xml b/doc/program.xml
index ceadeea6d..74456697b 100644
--- a/doc/program.xml
+++ b/doc/program.xml
@@ -1,23 +1,31 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Programming Guide">
 
-  <p>The Programming Guide has the following topics:</p>
-  <ul>
-    <li><jump href="program-sax.html">SAX Programming Guide</jump></li>
+  <s2 title="SAX Programming Guide">
+    <p>Read the <jump href="program-sax.html">SAX Programming Guide</jump> document
+      or jump directly to:</p>
     <ul>
       <li><jump href="program-sax.html#ConstructParser">Constructing a parser</jump></li>
       <li><jump href="program-sax.html#UsingSAX1API">Using the SAX API</jump></li>
     </ul>
-    <li><jump href="program-sax2.html">SAX2 Programming Guide</jump></li>
+  </s2>
+
+  <s2 title="SAX2 Programming Guide">
+    <p>Read the <jump href="program-sax2.html">SAX2 Programming Guide</jump> document
+      or jump directly to:</p>
     <ul>
       <li><jump href="program-sax2.html#ConstructParser2">Constructing an XML Reader</jump></li>
       <li><jump href="program-sax2.html#UsingSAX2API">Using the SAX2 API</jump></li>
       <li><jump href="program-sax2.html#SAX2Features">Supported Features</jump></li>
       <li><jump href="program-sax2.html#SAX2Properties">Supported Properties</jump></li>
     </ul>
-    <li><jump href="program-dom.html">DOM Programming Guide</jump></li>
+  </s2>
+
+  <s2 title="DOM Programming Guide">
+    <p>Read the <jump href="program-dom.html">DOM Programming Guide</jump> document
+      or jump directly to:</p>
     <ul>
       <li><jump href="program-dom.html#JAVAandCPP">Comparision of Java and C++ DOM's</jump></li>
       <ul>
@@ -32,7 +40,11 @@
       <li><jump href="program-dom.html#Downcasting">Downcasting</jump></li>
       <li><jump href="program-dom.html#Subclassing">Subclassing</jump></li>
     </ul>
-    <li><jump href="program-idom.html">Experimental IDOM Programming Guide</jump></li>
+  </s2>
+
+  <s2 title="Experimental IDOM Programming Guide">
+    <p>Read the <jump href="program-idom.html">Experimental IDOM Programming Guide</jump> document
+      or jump directly to:</p>
     <ul>
       <li><jump href="program-idom.html#ConstructIDOMParser">Constructing a parser</jump></li>
       <li><jump href="program-idom.html#DOMandIDOM">Comparision of C++ DOM and IDOM</jump></li>
@@ -48,7 +60,5 @@
         <li><jump href="program-idom.html#DOMStringXMCh">DOMString vs. XMLCh</jump></li>
       </ul>
     </ul>
-  </ul>
-
-
+  </s2>
 </s1>
diff --git a/doc/readme.xml b/doc/readme.xml
index d88dc96f6..38b351153 100644
--- a/doc/readme.xml
+++ b/doc/readme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCFullName;">
 
diff --git a/doc/redirect.xml b/doc/redirect.xml
index 34917f3e3..507ae3beb 100644
--- a/doc/redirect.xml
+++ b/doc/redirect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 6: Redirect">
 
diff --git a/doc/releases.xml b/doc/releases.xml
index 24bd2d5bf..2d7c26a02 100644
--- a/doc/releases.xml
+++ b/doc/releases.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Releases">
 
-<s2 title="&XercesCName; Latest Changes in CVS since December 6, 2001">
+<s2 title="&XercesCName; Version 1.7.0: March 5, 2002">
 <table>
     <tr>
         <td>Date</td>
@@ -11,6 +11,55 @@
         <td>Description</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>
diff --git a/doc/releases_archive.xml b/doc/releases_archive.xml
index 4788f3d55..eaa0ea8cc 100644
--- a/doc/releases_archive.xml
+++ b/doc/releases_archive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="iso-8859-1" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Releases Archive">
 
diff --git a/doc/samples.xml b/doc/samples.xml
index da6591249..08f1a4eee 100644
--- a/doc/samples.xml
+++ b/doc/samples.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Samples">
 
diff --git a/doc/sax2count.xml b/doc/sax2count.xml
index 4692004b4..02d262015 100644
--- a/doc/sax2count.xml
+++ b/doc/sax2count.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 11: SAX2Count">
 
diff --git a/doc/sax2print.xml b/doc/sax2print.xml
index fefe709a6..b334bf7f1 100644
--- a/doc/sax2print.xml
+++ b/doc/sax2print.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 12: SAX2Print">
 
diff --git a/doc/saxcount.xml b/doc/saxcount.xml
index ac1124bce..5b5d29226 100644
--- a/doc/saxcount.xml
+++ b/doc/saxcount.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 1: SAXCount">
 
diff --git a/doc/saxprint.xml b/doc/saxprint.xml
index 8847ab8ff..faf39d9c2 100644
--- a/doc/saxprint.xml
+++ b/doc/saxprint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 2: SAXPrint">
 
diff --git a/doc/schema.xml b/doc/schema.xml
index 2f25b4aae..0248afbf1 100644
--- a/doc/schema.xml
+++ b/doc/schema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 <s1 title="Schema">
        <s2 title="Introduction">
                <p>This package contains an implementation of the W3C XML Schema
@@ -14,7 +14,7 @@
                <p>We would very much appreciate feedback on the package via the &XercesCName; mailing list
                  <jump href="mailto:&XercesCEmailAddress;">&XercesCEmailAddress; </jump>, and we
                  encourage the submission of bugs as described in
-                 <jump href="http://xml.apache.org/xerces-c/bug-report.html">Bug-Reporting</jump> page.
+                 <jump href="bug-report.html">Bug-Reporting</jump> page.
                  Please read this document before using this package.
                </p>
        </s2>
diff --git a/doc/senumval.xml b/doc/senumval.xml
index a30678236..98bca715f 100644
--- a/doc/senumval.xml
+++ b/doc/senumval.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 9: SEnumVal">
 
diff --git a/doc/stdinparse.xml b/doc/stdinparse.xml
index 595d68548..b734a2986 100644
--- a/doc/stdinparse.xml
+++ b/doc/stdinparse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="&XercesCName; Sample 8: StdInParse">
 
diff --git a/doc/dtd/blocks.ent b/doc/style/dtd/blocks.ent
similarity index 100%
rename from doc/dtd/blocks.ent
rename to doc/style/dtd/blocks.ent
diff --git a/doc/dtd/book.dtd b/doc/style/dtd/book.dtd
similarity index 100%
rename from doc/dtd/book.dtd
rename to doc/style/dtd/book.dtd
diff --git a/doc/dtd/changes.dtd b/doc/style/dtd/changes.dtd
similarity index 100%
rename from doc/dtd/changes.dtd
rename to doc/style/dtd/changes.dtd
diff --git a/doc/dtd/characters.ent b/doc/style/dtd/characters.ent
similarity index 100%
rename from doc/dtd/characters.ent
rename to doc/style/dtd/characters.ent
diff --git a/doc/dtd/document.dtd b/doc/style/dtd/document.dtd
similarity index 100%
rename from doc/dtd/document.dtd
rename to doc/style/dtd/document.dtd
diff --git a/doc/dtd/entities.ent b/doc/style/dtd/entities.ent
similarity index 66%
rename from doc/dtd/entities.ent
rename to doc/style/dtd/entities.ent
index 3bd8c3f42..632d38bf8 100644
--- a/doc/dtd/entities.ent
+++ b/doc/style/dtd/entities.ent
@@ -4,12 +4,13 @@
 <!ENTITY XercesCName          "Xerces-C++">                   <!-- productname -->
 <!ENTITY XercesCVersion140    "1.4.0">                        <!-- versionnumber -->
 <!ENTITY XercesCVersion152    "1.5.2">                        <!-- versionnumber -->
-<!ENTITY XercesCVersion       "1.6.0">                        <!-- versionnumber -->
+<!ENTITY XercesCVersion160    "1.6.0">                        <!-- versionnumber -->
+<!ENTITY XercesCVersion       "1.7.0">                        <!-- versionnumber -->
 <!ENTITY XercesCProjectName   "Xerces">                       <!-- projectname -->
-<!ENTITY XercesCInstallDir    "xerces-c1_6_0">                <!-- installdirname -->
-<!ENTITY XercesCSrcInstallDir "xerces-c-src1_6_0">            <!-- sourcedirectory -->
+<!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_6_0">               <!-- windowsDLLname -->
-<!ENTITY XercesCUnixLib       "libxerces-c1_6_0">             <!-- unixlibname -->
+<!ENTITY XercesCWindowsDLL    "xerces-c_1_7_0">               <!-- windowsDLLname -->
+<!ENTITY XercesCUnixLib       "libxerces-c1_7_0">             <!-- unixlibname -->
 <!ENTITY XercesCEmailAddress  "xerces-c-dev@xml.apache.org "> <!-- emailaddress -->
 <!ENTITY XercesDistDir        "xml.apache.org/dist/xerces-c"> <!-- download directory -->
diff --git a/doc/dtd/faqs.dtd b/doc/style/dtd/faqs.dtd
similarity index 100%
rename from doc/dtd/faqs.dtd
rename to doc/style/dtd/faqs.dtd
diff --git a/doc/dtd/links.ent b/doc/style/dtd/links.ent
similarity index 100%
rename from doc/dtd/links.ent
rename to doc/style/dtd/links.ent
diff --git a/doc/dtd/markup.ent b/doc/style/dtd/markup.ent
similarity index 100%
rename from doc/dtd/markup.ent
rename to doc/style/dtd/markup.ent
diff --git a/doc/xerces-c_book.xml b/doc/xerces-c_book.xml
index 3457cfed8..3f3ce4419 100644
--- a/doc/xerces-c_book.xml
+++ b/doc/xerces-c_book.xml
@@ -1,71 +1,69 @@
 <?xml version="1.0"?>
-<!DOCTYPE book SYSTEM "./dtd/book.dtd">
+<!DOCTYPE book SYSTEM "sbk:/style/dtd/book.dtd">
 
 <book title="&XercesCName; Documentation" copyright="2001 The Apache Software Foundation">
   <external href="../index.html"  label="Home"/>
 
   <separator/>
 
-  <document  id="index"       label="Readme"             source="readme.xml"/>
-  <external href="http://&XercesDistDir;/"                        label="Download"/>
-  <document  id="install"     label="Installation"       source="install.xml"/>
-  <group id="build"           title="Build Instructions" label="Build Instructions">
-     <entry id="build-winunix" source="build-winunix.xml"/>
-     <entry id="build-other" source="build-other.xml"/>
-     <entry id="build-misc"   source="build-misc.xml"/>
-  </group>
+  <document id="index"       label="Readme"             source="readme.xml"/>
+  <external href="http://&XercesDistDir;/"              label="Download"/>
+  <document id="install"     label="Installation"       source="install.xml"/>
+  <document id="build"       label="Build Instructions" source="build.xml"/>
+  <hidden   id="build-winunix" source="build-winunix.xml"/>
+  <hidden   id="build-other" source="build-other.xml"/>
+  <hidden   id="build-misc"  source="build-misc.xml"/>
 
   <separator/>
 
   <document id="api"         label="API Docs"     source="apidocs.xml"/>
 
-  <container id="samples"    label="Samples"      source="samples.xml">
-     <entry id="saxcount"    source="saxcount.xml"/>
-     <entry id="saxprint"    source="saxprint.xml"/>
-     <entry id="domcount"    source="domcount.xml"/>
-     <entry id="domprint"    source="domprint.xml"/>
-     <entry id="memparse"    source="memparse.xml"/>
-     <entry id="redirect"    source="redirect.xml"/>
-     <entry id="pparse"      source="pparse.xml"/>
-     <entry id="stdinparse"  source="stdinparse.xml"/>
-     <entry id="enumval"     source="enumval.xml"/>
-     <entry id="createdoc"   source="createdoc.xml"/>
-     <entry id="sax2count"   source="sax2count.xml"/>
-     <entry id="sax2print"   source="sax2print.xml"/>
-     <entry id="idomcount"   source="idomcount.xml"/>
-     <entry id="idomprint"   source="idomprint.xml"/>
-     <entry id="senumval"    source="senumval.xml"/>
-  </container>
+  <document id="samples"     label="Samples"      source="samples.xml"/>
+  <hidden   id="saxcount"    source="saxcount.xml"/>
+  <hidden   id="saxprint"    source="saxprint.xml"/>
+  <hidden   id="domcount"    source="domcount.xml"/>
+  <hidden   id="domprint"    source="domprint.xml"/>
+  <hidden   id="memparse"    source="memparse.xml"/>
+  <hidden   id="redirect"    source="redirect.xml"/>
+  <hidden   id="pparse"      source="pparse.xml"/>
+  <hidden   id="stdinparse"  source="stdinparse.xml"/>
+  <hidden   id="enumval"     source="enumval.xml"/>
+  <hidden   id="createdoc"   source="createdoc.xml"/>
+  <hidden   id="sax2count"   source="sax2count.xml"/>
+  <hidden   id="sax2print"   source="sax2print.xml"/>
+  <hidden   id="idomcount"   source="idomcount.xml"/>
+  <hidden   id="idomprint"   source="idomprint.xml"/>
+  <hidden   id="senumval"    source="senumval.xml"/>
 
   <document id="schema"      label="Schema"       source="schema.xml"/>
   <separator/>
 
-  <group    id="faqs"        title="Frequently Asked Questions" label="FAQs">
+  <group    id="faqs"        label="FAQs">
      <entry id="faq-distrib" source="faq-distrib.xml"/>
      <entry id="faq-build"   source="faq-build.xml"/>
      <entry id="faq-parse"   source="faq-parse.xml"/>
      <entry id="faq-other"   source="faq-other.xml"/>
   </group>
 
-  <container id="program"     label="Programming"  source="program.xml">
-     <entry id="program-sax"  source="program-sax.xml"/>
-     <entry id="program-sax2" source="program-sax2.xml"/>
-     <entry id="program-dom"  source="program-dom.xml"/>
-     <entry id="program-idom" source="program-idom.xml"/>
-  </container>
+  <document id="program"     label="Programming"  source="program.xml"/>
+  <hidden   id="program-sax" source="program-sax.xml"/>
+  <hidden   id="program-sax2" source="program-sax2.xml"/>
+  <hidden   id="program-dom" source="program-dom.xml"/>
+  <hidden   id="program-idom" source="program-idom.xml"/>
 
   <document id="migrate"     label="Migration"    source="migration.xml"/>
-  <hidden id="migrate_archive"                    source="migration_archive.xml"/>
+  <hidden   id="migrate_archive" source="migration_archive.xml"/>
 
   <separator/>
 
   <document id="releases"    label="Releases"     source="releases.xml"/>
   <hidden id="releases_archive"                   source="releases_archive.xml"/>
-  <document id="bug-report"    label="Bug-Reporting"     source="bug-report.xml"/>
+
+  <document id="bug-report"  label="Bug-Reporting" source="bug-report.xml"/>
   <document id="feedback"    label="Feedback"     source="feedback.xml"/>
 
   <separator/>
-  <document id="y2k"         label="Y2K Compliance"  source="y2k.xml"/>
+  <document id="y2k"         label="Y2K Compliance" source="y2k.xml"/>
   <document id="pdf"         label="PDF Document" source="pdf-c.xml"/>
 
   <separator/>
diff --git a/doc/y2k.xml b/doc/y2k.xml
index 93fc8e0fd..cc9622837 100644
--- a/doc/y2k.xml
+++ b/doc/y2k.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE s1 SYSTEM "./dtd/document.dtd">
+<!DOCTYPE s1 SYSTEM "sbk:/style/dtd/document.dtd">
 
 <s1 title="Y2K Compliance">
 	<s2 title="Apache Xerces Parser Year-2000 Readiness">
 		<p>Q: Are the Xerces parsers Year-2000-compliant? </p>
-		<p>Yes, Xerces-J and Xerces-C are Year 2000 compliant. 
-		They do not currently use any dates at all (at least until the XML 
-		Schema date datatypes are fully supported).  However, you may still 
-		have Y2K problems if the underlying OS or Java implementation has 
-		problems with dates past year 2000 (e.g. OS calls which accept or 
+		<p>Yes, Xerces-J and Xerces-C are Year 2000 compliant.
+		They do not currently use any dates at all (at least until the XML
+		Schema date datatypes are fully supported).  However, you may still
+		have Y2K problems if the underlying OS or Java implementation has
+		problems with dates past year 2000 (e.g. OS calls which accept or
 		return year numbers).</p>
-		<p>Most (UNIX) systems store dates internally as signed 32-bit 
-		integers which contain the number of seconds since 1st January 1970, 
-		so the magic boundary to worry about is the year 2038 and not 2000. 
+		<p>Most (UNIX) systems store dates internally as signed 32-bit
+		integers which contain the number of seconds since 1st January 1970,
+		so the magic boundary to worry about is the year 2038 and not 2000.
 		But modern operating systems shouldn't cause any trouble at all.</p>
 		
-		<p>The Apache Xerces project is an open-source software product 
-		of the Apache Software Foundation. The project and the Foundation 
-		cannot and does not offer legal assurances regarding any suitability 
-		of the software for your application. There are several commercial 
-		support organizations and derivative products available that may be 
-		able to certify the software and provide you with any assurances you 
-		may require (IBM's Websphere product is one of them).</p> 
-		<p>The Apache HTTP server software is distributed with the following 
+		<p>The Apache Xerces project is an open-source software product
+		of the Apache Software Foundation. The project and the Foundation
+		cannot and does not offer legal assurances regarding any suitability
+		of the software for your application. There are several commercial
+		support organizations and derivative products available that may be
+		able to certify the software and provide you with any assurances you
+		may require (IBM's Websphere product is one of them).</p>
+		<p>The Apache HTTP server software is distributed with the following
 		disclaimer, found in the software license: 	</p>
 <source>THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-- 
GitLab