diff --git a/build.xml b/build.xml
index 9984a9d87..187368f6f 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
         Glen Stampoultzis   glens at apache.org
 
 
-    This build was tested with and 1.5.3 although it will probably work with
+    This build was tested with ant 1.5.3 although it will probably work with
     other versions.  The following jar files should be installed
     into the ant lib directory:
 
@@ -83,7 +83,7 @@
     <property name="changelog.file" value="${build.site}/changelog.html"/>
     <property name="dist.dir" value="build/dist"/>
     <property name="jar.name" value="poi"/>
-    <property name="version.id" value="2.0-pre1"/>
+    <property name="version.id" value="2.0-pre2"/>
     <property name="halt.on.test.failure" value="true"/>
 
     <path id="main.classpath">
@@ -142,14 +142,17 @@
 
     <target name="check-jars">
         <condition property="jars.present">
+	    <or>
             <and>
                 <available file="${main.jar1.dir}"/>
                 <available file="${main.jar2.dir}"/>
                 <available file="${contrib.jar1.dir}"/>
                 <available file="${contrib.jar2.dir}"/>
-                <available file="${contrib.jar3.dir}"/>
-                <available file="${junit.jar1.dir}"/>
+              	<available file="${contrib.jar3.dir}"/>
+               	<available file="${junit.jar1.dir}"/>
             </and>
+			<isset property="disconnected"/>
+	    </or>
         </condition>
     </target>
 
@@ -401,6 +404,18 @@
         </condition>
     </target>
 
+    <target name="-cvschangelog" unless="disconnected">
+        <cvschangelog destfile="${changelog.file}" daysinpast="30"/>
+
+	<style in="${changelog.file}"
+            out="${build.site.src}/src/documentation/content/changelog.html"
+            style="changelog.xsl">
+            <param name="title" expression="POI Change Log"/>
+            <param name="module" expression="jakarta-poi"/>
+            <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/>
+        </style>
+    </target>
+
     <target name="reports" depends="-check-reports" unless="reports.notRequired"
         description="Creates junit,jdepend and javadoc reports">
         <antcall target="test">
@@ -440,15 +455,7 @@
             out="${jdepend.report.out.dir}/index.html"
             style="jdepend.xsl"/>
 
-        <cvschangelog destfile="${changelog.file}" daysinpast="30"/>
-
-        <style in="${changelog.file}"
-            out="${build.site.src}/src/documentation/content/changelog.html"
-            style="changelog.xsl">
-            <param name="title" expression="POI Change Log"/>
-            <param name="module" expression="jakarta-poi"/>
-            <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/>
-        </style>
+	<antcall target="-cvschangelog"/>
 
         <javadoc
             destdir="${apidocs.report.dir}"
@@ -562,9 +569,9 @@
 
         <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.tar.gz" compression="gzip">
             <tarfileset dir="${build.site}" prefix="docs"/>
-            <tarfileset file="${dist.dir}/${jar.name}-${version.id}.jar"/>
-            <tarfileset file="${dist.dir}/${jar.name}-contrib-${version.id}.jar"/>
-            <tarfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"/>
             <tarfileset dir="legal" prefix="legal"/>
         </tar>
 
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 6a21002c8..230d66730 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -54,6 +54,37 @@
 
         <title>History of Changes</title>
 
+        <release version="2.0-pre2" date="6 July 2003">
+        <action dev="POI-DEVELOPERS" type="fix">A nasty concurrency problem has been fixed. Any users working in a multithreaded environment should seriously consider upgrading to this release.</action>
+	<action dev="POI-DEVELOPERS" type="update">The EXTSST record has been implemented. This record is used by excel for optimized reading of strings.</action>
+        <action dev="POI-DEVELOPERS" type="update">When rows are shifted, the merged regions now move with them. If a row contains 2 merged cells, the resulting shifted row should have those cells merged as well.</action>
+        <action dev="POI-DEVELOPERS" type="fix">There were some issues when removing merged 
+		    regions (specifically, removing all of them and then adding some more) and have been resolved.</action>	    
+        <action dev="POI-DEVELOPERS" type="fix">When a sheet contained shared formulas (when a formula is 
+		    dragged across greater than 6 cells), the clone would fail. We now support cloning of 
+		    sheets that contain this Excel optimization. </action>
+        <action dev="POI-DEVELOPERS" type="add">Support added for reading formulas with UnaryPlus and UnaryMinus operators.</action>
+        </release>
+        <release version="2.0-pre1" date="17 May 2003">
+        <action dev="POI-DEVELOPERS" type="add">Patch applied for deep cloning of worksheets was provided</action>
+        <action dev="POI-DEVELOPERS" type="add">Patch applied to allow sheet reordering</action>
+        <action dev="POI-DEVELOPERS" type="add">Added additional print area setting methods using row/column numbers</action>
+        <action dev="POI-DEVELOPERS" type="fix">HDF:  Negative Array size fix</action>
+        <action dev="POI-DEVELOPERS" type="update">Added argument pointers to support the IF formula</action>
+        <action dev="POI-DEVELOPERS" type="update">Formulas: Added special character support for string literals, specifically for SUMIF formula support and addresses a bug as well</action>
+        <action dev="POI-DEVELOPERS" type="fix">BlockingInputStream committed to help ensure reads</action>
+        <action dev="POI-DEVELOPERS" type="fix">Fixed problem with NaN values differing from the investigated value from file reads in FormulaRecords</action>
+        <action dev="POI-DEVELOPERS" type="fix">Patch for getColumnWidth in HSSF</action>
+        <action dev="POI-DEVELOPERS" type="add">Patch for dealing with mult-level numbered lists in HDF</action>
+        <action dev="POI-DEVELOPERS" type="fix">Due to named reference work, several named-ranged bugs were closed</action>
+        <action dev="POI-DEVELOPERS" type="fix">Patch applied to prevent sheet corruption after a template modification</action>
+        <action dev="POI-DEVELOPERS" type="update">Shared Formulas now Supported</action>
+        <action dev="POI-DEVELOPERS" type="update">Added GreaterEqual, LessEqual and NotEqual to Formula Parser</action>
+        <action dev="POI-DEVELOPERS" type="update">Added GreaterThan and LessThan functionality to formulas</action>
+        <action dev="POI-DEVELOPERS" type="fix">Patches for i10n</action>
+        <action dev="POI-DEVELOPERS" type="update">POI Build System Updated</action>
+        <action dev="POI-DEVELOPERS" type="fix">font names can now be null</action>
+        </release>
         <release version="1.10-dev" date="19 Feb 2003">
             <action dev="POI-DEVELOPERS" type="add">Support for zoom level</action>
             <action dev="POI-DEVELOPERS" type="add">Freeze and split pane support</action>
@@ -149,4 +180,4 @@
 
     </changes>
 
-</status>
\ No newline at end of file
+</status>
diff --git a/src/documentation/resources/images/group-logo.gif b/src/documentation/resources/images/group-logo.gif
index 543f6863a..472e47fd7 100644
Binary files a/src/documentation/resources/images/group-logo.gif and b/src/documentation/resources/images/group-logo.gif differ
diff --git a/src/documentation/xdocs/dtd/book-cocoon-v10.dtd b/src/documentation/xdocs/dtd/book-cocoon-v10.dtd
deleted file mode 100755
index abd441067..000000000
--- a/src/documentation/xdocs/dtd/book-cocoon-v10.dtd
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- ===================================================================
-     
-     Apache Cocoon Documentation Book DTD (Version 1.0)
-
-PURPOSE:
-This DTD defines the */book.xml documentation configuration files.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE book PUBLIC
-       "-//APACHE//DTD Cocoon Documentation Book Vx.yz//EN"
-       "book-cocoon-vxyz.dtd">
-
-  where 
-  
-    x := major version
-    y := minor version
-    z := status identifier (optional)
-      
-NOTES:
-We need to replace this DTD with the proper one.
-We are only using this DTD to enable validation during "build docs"
-because every XML instance must declare its ruleset.
-
-This initial minimal DTD has been reverse-engineered from the structure
-of the current documents, e.g. 
- documentation/xdocs/book.xml
-  
-AUTHORS:
-  David Crossley <crossley@apache.org>
-  
-FIXME:
-  - find the proper DTD for book.xml
-
-CHANGE HISTORY:
-  20011031 Initial version. (DC)
-    
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-  
-  Permission to copy in any form is granted provided this notice is 
-  included in all copies. Permission to redistribute is granted 
-  provided this file is distributed untouched in all its parts and 
-  included files.
-  
-==================================================================== -->
-
-<!ELEMENT book (menu+)> 
-<!ELEMENT menu (menu-item|external)*>
-<!ELEMENT menu-item EMPTY>
-<!ELEMENT external EMPTY>
-<!ATTLIST book software CDATA #REQUIRED
-               title CDATA #REQUIRED
-               copyright CDATA #REQUIRED
-               xmlns:xlink CDATA #IMPLIED
->
-<!ATTLIST menu label CDATA #REQUIRED
->
-<!ATTLIST menu-item label CDATA #REQUIRED
-                    href CDATA #REQUIRED
-                    type (visible|hidden) "visible"
->
-<!ATTLIST external  label CDATA #REQUIRED
-                    href CDATA #REQUIRED
-                    type (visible|hidden) "visible"
->
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/changes-v11.dtd b/src/documentation/xdocs/dtd/changes-v11.dtd
deleted file mode 100644
index e753a9bb1..000000000
--- a/src/documentation/xdocs/dtd/changes-v11.dtd
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- ===================================================================
-
-     Apache Changes DTD (Version 1.1)
-
-PURPOSE:
-  This DTD was developed to create a simple yet powerful document
-  type for software development changes for use with the Apache projects.
-  It is an XML-compliant DTD and it's maintained by the Apache XML
-  project.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD Changes Vx.y//EN"
-       "changes-vxy.dtd">
-
-  where
-
-    x := major version
-    y := minor version
-
-NOTES:
-  It is important, expecially in open developped software projects, to keep
-  track of software changes both to give users indications of bugs that might
-  have been resolved, as well, and not less important, to provide credits
-  for the support given to the project. It is considered vital to provide
-  adequate payback using recognition and credits to let users and developers
-  feel part of the community, thus increasing development power.
-
-AUTHORS:
-  Stefano Mazzocchi <stefano@apache.org>
-
-FIXME:
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991129 Initial version. (SM)
-  20000316 Added bugfixing attribute. (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities (SM)
-  
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-
-  Permission to copy in any form is granted provided this notice is
-  included in all copies. Permission to redistribute is granted
-  provided this file is distributed untouched in all its parts and
-  included files.
-
-==================================================================== -->
-
-<!-- =============================================================== -->
-<!-- Include the Documentation DTD -->
-<!-- =============================================================== -->
-
-<!ENTITY % document PUBLIC
-    "-//APACHE//DTD Documentation V1.1//EN"
-    "document-v11.dtd">
-%document;
-
-<!-- =============================================================== -->
-<!-- Common entities -->
-<!-- =============================================================== -->
-
-<!ENTITY % types "add|remove|update|fix">
-
-<!-- =============================================================== -->
-<!-- Document Type Definition -->
-<!-- =============================================================== -->
-
-<!ELEMENT changes (devs, release*)>
-<!ATTLIST changes %common.att;
-                  %title.att;>
-
-    <!ELEMENT devs (person+)>
-    <!ATTLIST devs %common.att;>
-
-    <!ELEMENT release (action+)>
-    <!ATTLIST release %common.att;
-                      version  CDATA  #REQUIRED
-                      date     CDATA  #REQUIRED>
-
-        <!ELEMENT action (%content.mix;)*>
-        <!ATTLIST action %common.att;
-                         dev  IDREF  #REQUIRED
-                         type (%types;)  #IMPLIED
-                         due-to CDATA #IMPLIED
-                         due-to-email CDATA #IMPLIED
-                         fixes-bug CDATA #IMPLIED>
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/document-v11.dtd b/src/documentation/xdocs/dtd/document-v11.dtd
deleted file mode 100644
index 64252b673..000000000
--- a/src/documentation/xdocs/dtd/document-v11.dtd
+++ /dev/null
@@ -1,541 +0,0 @@
-<!-- ===================================================================
-
-     Apache Documentation DTD (Version 1.1)
-
-PURPOSE:
-  This DTD was developed to create a simple yet powerful document
-  type for software documentation for use with the Apache projects.
-  It is an XML-compliant DTD and it's maintained by the Apache XML
-  project.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD Documentation Vx.y//EN"
-       "document-vxy.dtd">
-
-  where
-
-    x := major version
-    y := minor version
-
-NOTES:
-  Many of the design patterns used in this DTD were take from the
-  W3C XML Specification DTD edited by Eve Maler <elm@arbortext.com>.
-
-  Where possible, great care has been used to reuse HTML tag
-  names to reduce learning efforts and to allow HTML editors to be
-  used for complex authorings like tables and lists.
-
-EXTENSIBILITY:
-  This DTD includes several empty placeholders that can be used to
-  extend it. These placeholders are implemented with empty entities. Here
-  is the list of those empty entities and what they are used for:
-  
-    - local.inline: this entity should contain extended definitions of 
-                    elements that can be used 'inline', or directly inside
-                    the content. An example for this entity could be 
-
-                        <!ENTITY % local.inline "|citation">
-
-    - local.blocks: this entity should contain extended definitions of
-                    elements that behave as 'blocks', thus can be visually
-                    rendered as areas on the canvas. An example for this
-                    entity could be:
-
-                        <!ENTITY % local.blocks "|poem">
-
-    - local.sections: this entity should contain extended definitions of
-                      elements that behave as 'sections', thus can be considered
-                      containers of block-level elements. An example for
-                      this entity could be:
-
-                        <!ENTITY % local.sections "|chapter">
-
-    - local.headers: this entity should contain extended definitions of
-                     elements that behave as parts of the document header.
-                     An example for this header could be:
-
-                        <!ENTITY % local.headers ", notes?">
-
-    - local.footers: this entity should contain extended definitions of
-                     elements that behave as parts of the document footer.
-                     An example for this header could be:
-
-                        <!ENTITY % local.footers ", annotations*">
-  
-  
-AUTHORS:
-  Stefano Mazzocchi <stefano@apache.org>
-  Steven Noels <stevenn@outerthought.org>
-
-FIXME:
-  - should "form" tags be included?
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991121 Initial version. (SM)
-  19991123 Replaced "res" with more standard "strong" for emphasis. (SM)
-  19991124 Added "fork" element for window forking behavior. (SM)
-  19991124 Added "img-inline" element to separate from "img". (SM)
-  19991129 Removed "affiliation" from "author". (SM)
-  19991129 Made "author" empty and moved "name|email" as attributes. (SM)
-  19991215 Simplified table section. (SM)
-  19991215 Changed "img-block" in more friendly "figure". (SM)
-  20000125 Added the "icon" image. (SM)
-  20000126 Allowed "anchor" in all levels. (SM)
-  20000404 Removed the "role" attribute from common-xxx.att. (SM)
-  20000815 Allowed "code" inside "strong" and "em". (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities. (SM)
-  20011212 Removed xlink attributes since not used. (SM)
-  20011212 Removed "connect" since not required at this level. (SM) 
-  20011218 Added "warning" as a block level object. (SM)
-  20011218 Removed explicitly numbered sections ("s1|s2|s3|s4"). (SM)
-  20011218 Added "section" element. (SM)  
-  20011218 Allowed "body" to have blocks without a section. (SM)
-  20011218 Removed "sl" since not really different from "ul". (SM)
-  20020214 Moved empty placeholder entity declarations up front (SNS)
-  20020214 Corrected content model of content.mix parameter entity (SNS)
-
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-
-  Permission to copy in any form is granted provided this notice is
-  included in all copies. Permission to redistribute is granted
-  provided this file is distributed untouched in all its parts and
-  included files.
-
-==================================================================== -->
-
-
-
-
-<!-- =============================================================== -->
-<!-- Common character entities (included from external file) -->
-<!-- =============================================================== -->
-
-<!ENTITY % ISOlat1 PUBLIC
-    "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
-    "ISOlat1.pen">
-%ISOlat1;
-
-<!ENTITY % ISOpub PUBLIC
-    "ISO 8879:1986//ENTITIES Publishing//EN//XML"
-    "ISOpub.pen">
-%ISOpub;
-
-<!ENTITY % ISOtech PUBLIC
-    "ISO 8879:1986//ENTITIES General Technical//EN//XML"
-    "ISOtech.pen">
-%ISOtech;
-
-<!ENTITY % ISOnum PUBLIC
-    "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
-    "ISOnum.pen">
-%ISOnum;
-
-<!ENTITY % ISOdia PUBLIC
-    "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
-    "ISOdia.pen">
-%ISOdia;
-
-<!-- =============================================================== -->
-<!-- Useful entities for increased DTD readability -->
-<!-- =============================================================== -->
-
-<!ENTITY % text "#PCDATA">
-
-<!-- Entities referred to later on are defined up front -->
-
-<!ENTITY % markup "strong|em|code|sub|sup">
-<!ENTITY % special-inline "br|img|icon">
-<!ENTITY % links "link|jump|fork">
-<!ENTITY % paragraphs "p|source|note|warning|fixme">
-<!ENTITY % tables "table">
-<!ENTITY % lists "ol|ul|dl">
-<!ENTITY % special-blocks "figure|anchor">
-
-
-<!-- =============================================================== -->
-<!-- Entities for general XML compliance -->
-<!-- =============================================================== -->
-
-<!-- Common attributes
-        Every element has an ID attribute (sometimes required,
-        but usually optional) for links. %common.att;
-        is for common attributes where the ID is optional, and
-        %common-idreq.att; is for common attributes where the
-        ID is required.
--->
-<!ENTITY % common.att
-        'id                     ID              #IMPLIED
-         xml:lang               NMTOKEN         #IMPLIED'>
-<!ENTITY % common-idreq.att
-        'id                     ID              #REQUIRED
-         xml:lang               NMTOKEN         #IMPLIED'>
-
-
-<!-- xml:space attribute ===============================================
-        Indicates that the element contains white space
-        that the formatter or other application should retain,
-        as appropriate to its function.
-==================================================================== -->
-<!ENTITY % xmlspace.att
-        'xml:space (default|preserve) #FIXED "preserve"'>
-
-
-<!-- def attribute =====================================================
-        Points to the element where the relevant definition can be
-        found, using the IDREF mechanism.  %def.att; is for optional
-        def attributes, and %def-req.att; is for required def
-        attributes.
-==================================================================== -->
-<!ENTITY % def.att
-        'def                    IDREF           #IMPLIED'>
-<!ENTITY % def-req.att
-        'def                    IDREF           #REQUIRED'>
-
-
-<!-- ref attribute =====================================================
-        Points to the element where more information can be found,
-        using the IDREF mechanism.  %ref.att; is for optional
-        ref attributes, and %ref-req.att; is for required ref
-        attributes.
-================================================================== -->
-<!ENTITY % ref.att
-        'ref                    IDREF           #IMPLIED'>
-<!ENTITY % ref-req.att
-        'ref                    IDREF           #REQUIRED'>
-
-
-<!-- =============================================================== -->
-<!-- Entities for general usage -->
-<!-- =============================================================== -->
-
-
-<!-- Key attribute =====================================================
-        Optionally provides a sorting or indexing key, for cases when
-        the element content is inappropriate for this purpose.
-==================================================================== -->
-<!ENTITY % key.att
-        'key                    CDATA           #IMPLIED'>
-
-
-
-<!-- Title attributes ==================================================
-        Indicates that the element requires to have a title attribute.
-==================================================================== -->
-<!ENTITY % title.att
-        'title                  CDATA           #REQUIRED'>
-
-
-
-<!-- Name attributes ==================================================
-        Indicates that the element requires to have a name attribute.
-==================================================================== -->
-<!ENTITY % name.att
-        'name                   CDATA           #REQUIRED'>
-
-
-
-<!-- Email attributes ==================================================
-        Indicates that the element requires to have an email attribute.
-==================================================================== -->
-<!ENTITY % email.att
-        'email                  CDATA           #REQUIRED'>
-
-
-<!-- Link attributes ===================================================
-        Indicates that the element requires to have hyperlink attributes.
-==================================================================== -->
-
-<!ENTITY % link.att
-        'href      CDATA                         #IMPLIED
-         role      CDATA                         #IMPLIED
-         title     CDATA                         #IMPLIED '>
-
-
-
-<!-- =============================================================== -->
-<!-- General definitions -->
-<!-- =============================================================== -->
-
-<!-- A person is a general human entity -->
-<!ELEMENT person EMPTY>
-<!ATTLIST person %common.att;
-                 %name.att;
-                 %email.att;>
-
-
-
-<!-- =============================================================== -->
-<!-- Content definitions -->
-<!-- =============================================================== -->
-
-<!ENTITY % local.inline "">
-
-<!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
-
-<!ENTITY % content.mix "%link-content.mix;|%links;">
-
-    <!-- ==================================================== -->
-    <!-- Phrase Markup -->
-    <!-- ==================================================== -->
-
-    <!-- Strong (typically bold) -->
-    <!ELEMENT strong (%text;|code)*>
-    <!ATTLIST strong %common.att;>
-
-    <!-- Emphasis (typically italic) -->
-    <!ELEMENT em (%text;|code)*>
-    <!ATTLIST em %common.att;>
-    
-    <!-- Code (typically monospaced) -->
-    <!ELEMENT code (%text;)>
-    <!ATTLIST code %common.att;>
-
-    <!-- Superscript (typically smaller and higher) -->
-    <!ELEMENT sup (%text;)>
-    <!ATTLIST sup %common.att;>
-
-    <!-- Subscript (typically smaller and lower) -->
-    <!ELEMENT sub (%text;)>
-    <!ATTLIST sub %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Hypertextual Links -->
-    <!-- ==================================================== -->
-
-    <!-- hyperlink (equivalent of <a ...>) -->
-    <!ELEMENT link (%link-content.mix;)*>
-    <!ATTLIST link %common.att;
-                   %link.att;>
-
-    <!-- windows-replacing link (equivalent of <a ... target="_top">) -->
-    <!ELEMENT jump (%link-content.mix;)*>
-    <!ATTLIST jump %common.att;
-                   %link.att;>
-
-    <!-- window-forking link (equivalent of <a ... target="_new">) -->
-    <!ELEMENT fork (%link-content.mix;)*>
-    <!ATTLIST fork %common.att;
-                   %link.att;>
-
-    <!-- ==================================================== -->
-    <!-- Specials -->
-    <!-- ==================================================== -->
-
-    <!-- Breakline Object (typically forces line break) -->
-    <!ELEMENT br EMPTY>
-    <!ATTLIST br %common.att;>
-
-    <!-- Image Object (typically an inlined image) -->
-    <!ELEMENT img EMPTY>
-    <!ATTLIST img src    CDATA  #REQUIRED
-                  alt    CDATA  #REQUIRED
-                  height CDATA  #IMPLIED
-                  width  CDATA  #IMPLIED
-                  usemap CDATA  #IMPLIED
-                  ismap  (ismap) #IMPLIED
-                  %common.att;>
-
-    <!-- Image Icon (typically an inlined image placed as graphical item) -->
-    <!ELEMENT icon EMPTY>
-    <!ATTLIST icon src    CDATA  #REQUIRED
-                   alt    CDATA  #REQUIRED
-                   height CDATA  #IMPLIED
-                   width  CDATA  #IMPLIED
-                   %common.att;>
-
-
-<!-- =============================================================== -->
-<!-- Blocks definitions -->
-<!-- =============================================================== -->
-
-<!ENTITY % local.blocks "">
-
-<!ENTITY % blocks "%paragraphs;|%tables;|%lists;|%special-blocks; %local.blocks;">
-
-    <!-- ==================================================== -->
-    <!-- Paragraphs -->
-    <!-- ==================================================== -->
-
-    <!-- Text Paragraph (normally vertically space delimited) -->
-    <!ELEMENT p (%content.mix;)*>
-    <!ATTLIST p %common.att;>
-
-    <!-- Source Paragraph (normally space is preserved) -->
-    <!ELEMENT source (%content.mix;)*>
-    <!ATTLIST source %common.att;
-                     %xmlspace.att;>
-
-    <!-- Note Paragraph (normally shown encapsulated) -->
-    <!ELEMENT note (%content.mix;)*>
-    <!ATTLIST note %common.att;>
-
-    <!-- Warning Paragraph (normally shown with eye-catching colors) -->
-    <!ELEMENT warning (%content.mix;)*>
-    <!ATTLIST warning %common.att;>
-
-    <!-- Fixme Paragraph (normally not shown) -->
-    <!ELEMENT fixme (%content.mix;)*>
-    <!ATTLIST fixme author CDATA #REQUIRED
-                    %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Tables -->
-    <!-- ==================================================== -->
-
-    <!-- Attributes that indicate the spanning of the table cell -->
-    <!ENTITY % cell.span 
-        'colspan CDATA "1"
-         rowspan CDATA "1"'>
-
-    <!-- Table element -->
-    <!ELEMENT table (caption?, tr+)>
-    <!ATTLIST table %common.att;>
-
-        <!-- The table title -->
-        <!ELEMENT caption (%content.mix;)*>
-        <!ATTLIST caption %common.att;>
-
-        <!-- The table row element -->
-        <!ELEMENT tr (th|td)+>
-        <!ATTLIST tr %common.att;>
-
-            <!-- The table row header element -->
-            <!ELEMENT th (%content.mix;)*>
-            <!ATTLIST th %common.att;
-                         %cell.span;>
-
-            <!-- The table row description element -->
-            <!ELEMENT td (%content.mix;)*>
-            <!ATTLIST td %common.att;
-                         %cell.span;>
-
-    <!-- ==================================================== -->
-    <!-- Lists -->
-    <!-- ==================================================== -->
-
-    <!-- List item -->
-    <!ELEMENT li (%content.mix;|%lists;)*>
-    <!ATTLIST li %common.att;>
-    
-    <!-- Unordered list (typically bulleted) -->
-    <!ELEMENT ul (li|%lists;)+>
-    <!--    spacing attribute:
-            Use "normal" to get normal vertical spacing for items;
-            use "compact" to get less spacing.  The default is dependent
-            on the stylesheet. -->
-    <!ATTLIST ul
-            %common.att;
-            spacing         (normal|compact)        #IMPLIED>
-
-    <!-- Ordered list (typically numbered) -->
-    <!ELEMENT ol (li|%lists;)+>
-    <!--    spacing attribute:
-            Use "normal" to get normal vertical spacing for items;
-            use "compact" to get less spacing.  The default is dependent
-            on the stylesheet. -->
-    <!ATTLIST ol
-            %common.att;
-            spacing         (normal|compact)        #IMPLIED>
-
-    <!-- Definition list (typically two-column) -->
-    <!ELEMENT dl (dt,dd)+>
-    <!ATTLIST dl %common.att;>
-
-        <!-- Definition term -->
-        <!ELEMENT dt (%content.mix;)*>
-        <!ATTLIST dt %common.att;>
-
-        <!-- Definition description -->
-        <!ELEMENT dd (%content.mix;)*>
-        <!ATTLIST dd %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Special Blocks -->
-    <!-- ==================================================== -->
-
-    <!-- Image Block (typically a separated and centered image) -->
-    <!ELEMENT figure EMPTY>
-    <!ATTLIST figure src    CDATA  #REQUIRED
-                     alt    CDATA  #REQUIRED
-                     height CDATA  #IMPLIED
-                     width  CDATA  #IMPLIED
-                     usemap CDATA  #IMPLIED
-                     ismap  (ismap) #IMPLIED
-                     %common.att;>
-
-    <!-- anchor point (equivalent of <a name="...">, typically not rendered) -->
-    <!ELEMENT anchor EMPTY>
-    <!ATTLIST anchor %common-idreq.att;>
-
-
-<!-- =============================================================== -->
-<!-- Document -->
-<!-- =============================================================== -->
-
-<!ELEMENT document (header?, body, footer?)>
-<!ATTLIST document %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Header -->
-    <!-- ==================================================== -->
-
-    <!ENTITY % local.headers "">
-
-    <!ELEMENT header (title, subtitle?, version?, type?, authors,
-                      notice*, abstract? %local.headers;)>
-    <!ATTLIST header %common.att;>
-
-    <!ELEMENT title (%text;)>
-    <!ATTLIST title %common.att;>
-
-    <!ELEMENT subtitle (%text;)>
-    <!ATTLIST subtitle %common.att;>
-
-    <!ELEMENT version (%text;)>
-    <!ATTLIST version %common.att;>
-
-    <!ELEMENT type (%text;)>
-    <!ATTLIST type %common.att;>
-
-    <!ELEMENT authors (person+)>
-    <!ATTLIST authors %common.att;>
-
-    <!ELEMENT notice (%content.mix;)*>
-    <!ATTLIST notice %common.att;>
-
-    <!ELEMENT abstract (%content.mix;)*>
-    <!ATTLIST abstract %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Body -->
-    <!-- ==================================================== -->
-
-    <!ENTITY % local.sections "">
-
-    <!ENTITY % sections "section %local.sections;">
-
-    <!ELEMENT body (%sections;|%blocks;)+>
-    <!ATTLIST body %common.att;>
-
-    <!ELEMENT section (%sections;|%blocks;)*>
-    <!ATTLIST section %title.att; %common.att;>
-
-    <!-- ==================================================== -->
-    <!-- Footer -->
-    <!-- ==================================================== -->
-
-    <!ENTITY % local.footers "">
-
-    <!ELEMENT footer (legal %local.footers;)>
-
-        <!ELEMENT legal (%content.mix;)*>
-        <!ATTLIST legal %common.att;>
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/faq-v11.dtd b/src/documentation/xdocs/dtd/faq-v11.dtd
deleted file mode 100644
index abaa04386..000000000
--- a/src/documentation/xdocs/dtd/faq-v11.dtd
+++ /dev/null
@@ -1,76 +0,0 @@
-<!-- ===================================================================
-     
-     Apache FAQ DTD (Version 1.1)
-
-PURPOSE:
-  This DTD was developed to create a simple yet powerful document 
-  type for software FAQ's for use with the Apache projects.  
-  It is an XML-compliant DTD and it's maintained by the Apache XML 
-  project.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD FAQ Vx.y//EN"
-       "faq-vxy.dtd">
-
-  where 
-  
-    x := major version
-    y := minor version
-      
-NOTES:  
-  FAQs represent a powerful knowledge base and a very good way of solving
-  common user problems reducing messages on mail lists and reducing the effort
-  required for software installation and usage. Thid DTD want to be a common
-  format for FAQ interchange to allow FAQ-O-Matic-type workgroup services to 
-  be published in other formats as well as enhancing data interchange.
-  
-AUTHORS:
-  Stefano Mazzocchi <stefano@apache.org>
-  
-FIXME:
-
-CHANGE HISTORY:
-  19991129 Initial version. (SM)
-  20011212 Used public identifiers for external entities (SM)
-    
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-  
-  Permission to copy in any form is granted provided this notice is 
-  included in all copies. Permission to redistribute is granted 
-  provided this file is distributed untouched in all its parts and 
-  included files.
-  
-==================================================================== -->
-
-<!-- =============================================================== -->
-<!-- Include the Documentation DTD -->
-<!-- =============================================================== -->
-
-<!ENTITY % document PUBLIC
-    "-//APACHE//DTD Documentation V1.1//EN"
-    "document-v11.dtd">
-%document;
-
-<!-- =============================================================== -->
-<!-- Document Type Definition -->
-<!-- =============================================================== -->
-
-<!ELEMENT faqs (authors?, faq)+>
-<!ATTLIST faqs %common.att; 
-               %title.att;>
-
-    <!ELEMENT faq (question, answer)>
-    <!ATTLIST faq %common.att;>
-    
-        <!ELEMENT question (%content.mix;)*>
-        <!ATTLIST question %common.att;>
-            
-        <!ELEMENT answer (%blocks;)*>
-        <!ATTLIST answer author IDREF #IMPLIED>
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/javadoc-v04draft.dtd b/src/documentation/xdocs/dtd/javadoc-v04draft.dtd
deleted file mode 100755
index 3a4301a4d..000000000
--- a/src/documentation/xdocs/dtd/javadoc-v04draft.dtd
+++ /dev/null
@@ -1,254 +0,0 @@
-<!-- ===================================================================
-     
-     Apache JavaDoc DTD (version 0.4-draft)
-
-PURPOSE:
-  This DTD is designed to capture the output of JavaDoc as an XML document
-  through the use of the JavaDocXML Doclet. The hope is that by having the
-  JavaDoc documentation in an XML format, it will be easier for application
-  developers working with XML to treat their java source documentation in the
-  same way they treat any other XML document within their publication framework.
-  
-  This DTD should reflect the information contained within the RootDoc object 
-  passed to the JavaDocXML Doclet by JavaDoc. The RootDoc object and the rest 
-  of the javaDoc Doclet API is specified at
-  
-  http://java.sun.com/products/jdk/1.2/docs/tooldocs/javadoc/doclet/index.html
-  
-  The only information that appears to be difficult to derive from this DTD
-  that is easy to obtain from the RootDoc object is the information about 
-  serialization. However, this information should be derivable by manually 
-  looking for the correct serialization methods and other related structures.
-  
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD JavaDoc Vx.yz//EN"
-       "javadoc-vxyz.dtd">
-
-  where 
-  
-    x := major version
-    y := minor version
-    z := status identifier (optional)
-      
-NOTES:  
-  The authors would like to thank the Cocoon's mail list subscribers for 
-  providing such great support and feedback for this DTD.
-  
-AUTHORS:
-  Kenneth Murphy <murphyk@umsystem.edu>
-  
-FIXME:
-
-CHANGE HISTORY:
-  199909?? Original idea of XML doclet. (KM)
-  199910?? Initial version of this DTD. (KM)
-  19991129 Cleaned up DTD. (SM)
-    
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-  
-  Permission to copy in any form is granted provided this notice is 
-  included in all copies. Permission to redistribute is granted 
-  provided this file is distributed untouched in all its parts and 
-  included files.
-  
-==================================================================== -->
-
-<!-- =============================================================== -->
-<!-- Common Attribute Entities -->
-<!-- =============================================================== -->
-
-<!ENTITY % name 'name CDATA #REQUIRED'>
-<!ENTITY % dimension 'dimension CDATA #REQUIRED'>
-
-<!ENTITY % abstract 'abstract (true | false) "false"'>
-<!ENTITY % anonymous 'anonymous (true | false) "false"'>
-<!ENTITY % synthetic 'synthetic (true | false) "false"'>
-<!ENTITY % static 'static (true | false) "false"'>
-<!ENTITY % final 'final (true | false) "false"'>
-<!ENTITY % transient 'transient (true | false) "false"'>
-<!ENTITY % volatile 'volatile (true | false) "false"'>
-<!ENTITY % native 'native (true | false) "false"'>
-<!ENTITY % synchronized 'synchronized (true | false) "false"'>
-
-<!ENTITY % access 'access (private | package | protected | public) "package"'>
-<!ENTITY % class.access 'access (package | public) "package"'>
-
-<!ENTITY % extensibility 'extensibility (abstract | final | default) "default"'>
-
-
-<!-- =============================================================== -->
-<!-- Javadoc -->
-<!-- =============================================================== -->
-
-<!ELEMENT javadoc (package*, class*, interface*)>
-
-<!-- =============================================================== -->
-<!-- Package -->
-<!-- =============================================================== -->
-
-<!ELEMENT package (doc?, package*, class*, interface*)>
-<!ATTLIST package %name;>
-
-<!-- =============================================================== -->
-<!-- Class -->
-<!-- =============================================================== -->
-
-<!ELEMENT class (doc?,
-                 extends_class?,
-                 implements?,
-                 field*, 
-                 constructor*, 
-                 method*,
-                 innerclass*)>
-<!ATTLIST class
-          %name;
-          %extensibility;
-          %class.access;>
-
-<!ELEMENT extends_class (classref+)>
-          
-<!ELEMENT innerclass (doc?,
-                      extends?,
-                      implements?,
-                      field*, 
-                      constructor*, 
-                      method*)>
-<!ATTLIST innerclass
-          %name;
-          %access;
-          %abstract;
-          %anonymous;
-          %final;
-          %static;>
-          
-<!-- =============================================================== -->
-<!-- Interface -->
-<!-- =============================================================== -->
-          
-<!ELEMENT interface (doc?,
-                     extends_interface?,
-                     field*,
-                     method*)>
-<!ATTLIST interface
-          %name;
-          %access;>
-          
-<!ELEMENT extends_interface (interfaceref+)>
-
-<!-- =============================================================== -->
-<!-- Elements -->
-<!-- =============================================================== -->
-
-<!ELEMENT implements (interfaceref+)>
-
-<!ELEMENT throws (classref)+>
-
-<!ELEMENT classref EMPTY>
-<!ATTLIST classref %name;>
-          
-<!ELEMENT interfaceref EMPTY>
-<!ATTLIST interfaceref %name;>
-          
-<!ELEMENT methodref EMPTY>
-<!ATTLIST methodref %name;>
-          
-<!ELEMENT packageref EMPTY>
-<!ATTLIST packageref %name;>
-          
-<!ELEMENT primitive EMPTY>
-<!ATTLIST primitive
-          type (void | boolean | int | long | byte | short | double | float | char) #REQUIRED>
-          
-<!ELEMENT field (doc?, (classref | interfaceref | primitive))>
-<!ATTLIST field
-          %name;
-          %access;
-          %dimension;
-          %synthetic;
-          %static;
-          %final;
-          %transient;
-          %volatile;>
-          
-<!ELEMENT constructor (doc?, parameter*, throws*)>
-<!ATTLIST constructor
-          %name;
-          %access;
-          %synthetic;>
-          
-<!ELEMENT method (doc?, returns, parameter*, throws*)>
-<!ATTLIST method
-          %name;
-          %access;
-          %extensibility;
-          %native;
-          %synthetic;
-          %static;
-          %synchronized;>
-          
-<!ELEMENT returns (classref | interfaceref | primitive)>
-<!ATTLIST returns %dimension;>
-          
-<!ELEMENT parameter (classref | interfaceref | primitive)>
-<!ATTLIST parameter
-          %name;
-          %final;
-          %dimension;>
-          
-<!ELEMENT dimension (#PCDATA)>
-
-<!ELEMENT doc (#PCDATA | 
-               linktag |
-               authortag |
-               versiontag |
-               paramtag |
-               returntag |
-               exceptiontag |
-               throwstag |
-               seetag |
-               sincetag |
-               deprecatedtag |
-               serialtag |
-               serialfieldtag |
-               serialdatatag)*>
-               
-<!ELEMENT linktag (#PCDATA)>
-<!ATTLIST linktag
-          src CDATA #REQUIRED>
-          
-<!ELEMENT authortag (#PCDATA | linktag)*>
-
-<!ELEMENT versiontag (#PCDATA | linktag)*>
-
-<!ELEMENT paramtag (#PCDATA | linktag)*>
-<!ATTLIST paramtag %name;>
-          
-<!ELEMENT returntag (#PCDATA | linktag)*>
-
-<!ELEMENT exceptiontag (#PCDATA | classref | linktag)*>
-
-<!ELEMENT throwstag (#PCDATA | classref | linktag)*>
-
-<!ELEMENT seetag (#PCDATA | linktag)*>
-<!ATTLIST seetag
-          src CDATA #REQUIRED>
-          
-<!ELEMENT sincetag (#PCDATA | linktag)*>
-
-<!ELEMENT deprecatedtag (#PCDATA | linktag)*>
-
-<!ELEMENT serialtag (#PCDATA | linktag)*>
-
-<!ELEMENT serialfieldtag (#PCDATA | linktag)*>
-<!ATTLIST serialfieldtag
-          fieldname CDATA #REQUIRED
-          fieldtype CDATA #REQUIRED>
-          
-<!ELEMENT serialdatatag (#PCDATA | linktag)*>
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/specification-v11.dtd b/src/documentation/xdocs/dtd/specification-v11.dtd
deleted file mode 100644
index b61242728..000000000
--- a/src/documentation/xdocs/dtd/specification-v11.dtd
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- ===================================================================
-     
-     Apache Specification DTD (Version 1.1)
-
-PURPOSE:
-  This DTD was developed to create a simple yet powerful document 
-  type for software specifications for use with the Apache projects.  
-  It is an XML-compliant DTD and it's maintained by the Apache XML 
-  project.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD Specification Vx.y//EN"
-       "specification-vxy.dtd">
-
-  where 
-  
-    x := major version
-    y := minor version
-      
-NOTES:  
-
-AUTHORS:
-  Stefano Mazzocchi <stefano@apache.org>
-  
-FIXME:
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991129 Initial version. (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities (SM)
-    
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-  
-  Permission to copy in any form is granted provided this notice is 
-  included in all copies. Permission to redistribute is granted 
-  provided this file is distributed untouched in all its parts and 
-  included files.
-  
-==================================================================== -->
-
-<!-- =============================================================== -->
-<!-- Include the Documentation DTD -->
-<!-- =============================================================== -->
-
-<!ENTITY % document PUBLIC
-    "-//APACHE//DTD Documentation V1.1//EN"
-    "document-v11.dtd">
-%document;
-
-
-<!-- =============================================================== -->
-<!-- Extend the Documentation DTD -->
-<!-- =============================================================== -->
-
-<!-- extend the local.xxx entities -->
-<!ENTITY % local.blocks "|bl">
-
-
-<!-- =============================================================== -->
-<!-- Document Type Definition -->
-<!-- =============================================================== -->
-
-<!ELEMENT specification (header?, body, appendices?, footer?)>
-<!ATTLIST specification %common.att;>
-
-    <!ELEMENT appendices (%sections;)+>
-    <!ATTLIST appendices %common.att;>
-
-<!-- =============================================================== -->
-<!-- Bibliography List -->
-<!-- =============================================================== -->
-
-    <!-- Bibliography list -->
-    <!ELEMENT bl (bi)+>
-    <!ATTLIST bl %common.att;>
-
-        <!-- Book item -->
-        <!ELEMENT bi EMPTY>
-        <!ATTLIST bi %common.att;
-                     %name.att;
-                     %title.att;
-                     %link.att;
-                     authors CDATA #REQUIRED
-                     date    CDATA #IMPLIED>
-
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->
diff --git a/src/documentation/xdocs/dtd/todo-v11.dtd b/src/documentation/xdocs/dtd/todo-v11.dtd
deleted file mode 100644
index 3aaaa14db..000000000
--- a/src/documentation/xdocs/dtd/todo-v11.dtd
+++ /dev/null
@@ -1,93 +0,0 @@
-<!-- ===================================================================
-     
-     Apache Todos DTD (Version 1.1)
-
-PURPOSE:
-  This DTD was developed to create a simple yet powerful document 
-  type for software development todo lists for use with the Apache projects.  
-  It is an XML-compliant DTD and it's maintained by the Apache XML 
-  project.
-
-TYPICAL INVOCATION:
-
-  <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD Todo Vx.y//EN"
-       "todo-vxy.dtd">
-
-  where 
-  
-    x := major version
-    y := minor version
-      
-NOTES:  
-  It is important, expecially in open developped software projects, to keep
-  track of software changes that need to be done, planned features, development
-  assignment, etc. in order to allow better work parallelization and create
-  an entry point for people that want to help. This DTD wants to provide
-  a solid foundation to provide such information and to allow it to be
-  published as well as distributed in a common format.
-
-AUTHORS:
-  Stefano Mazzocchi <stefano@apache.org>
-  
-FIXME:
-  - do we need anymore working contexts? (SM)
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991129 Initial version. (SM)
-  19991225 Added actions element for better structure (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities (SM)
-    
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-  
-  Permission to copy in any form is granted provided this notice is 
-  included in all copies. Permission to redistribute is granted 
-  provided this file is distributed untouched in all its parts and 
-  included files.
-  
-==================================================================== -->
-
-<!-- =============================================================== -->
-<!-- Include the Documentation DTD -->
-<!-- =============================================================== -->
-
-<!ENTITY % document PUBLIC
-    "-//APACHE//DTD Documentation V1.1//EN"
-    "document-v11.dtd">
-%document;
-
-
-<!-- =============================================================== -->
-<!-- Common entities -->
-<!-- =============================================================== -->
-
-<!ENTITY % priorities "showstopper|high|medium|low|wish|dream">
-
-<!ENTITY % contexts "build|docs|code|admin|design">
-
-<!-- =============================================================== -->
-<!-- Document Type Definition -->
-<!-- =============================================================== -->
-
-<!ELEMENT todo (devs, actions*)>
-<!ATTLIST todo %common.att; 
-               %title.att;>
-
-    <!ELEMENT devs (person+)>
-    <!ATTLIST devs %common.att;>
-
-    <!ELEMENT actions (action+)>
-    <!ATTLIST actions %common.att;
-                     priority     (%priorities;)  #IMPLIED>
-
-        <!ELEMENT action (%content.mix;)*>
-        <!ATTLIST action %common.att;
-                         assigned-to  IDREF           #IMPLIED
-                         context      (%contexts;)    #REQUIRED>
-    
-<!-- =============================================================== -->
-<!-- End of DTD -->
-<!-- =============================================================== -->