From f80ad897dfd7a8ac43551a2b93ee06e349456a4b Mon Sep 17 00:00:00 2001
From: Glen Stampoultzis <glens@apache.org>
Date: Sun, 13 Jul 2003 13:16:33 +0000
Subject: [PATCH] A few things for the 2.0-pre2 release.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_2_BRANCH@353208 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |  39 +-
 src/documentation/content/xdocs/status.xml    |  33 +-
 .../resources/images/group-logo.gif           | Bin 8146 -> 5258 bytes
 .../xdocs/dtd/book-cocoon-v10.dtd             |  70 ---
 src/documentation/xdocs/dtd/changes-v11.dtd   |  93 ---
 src/documentation/xdocs/dtd/document-v11.dtd  | 541 ------------------
 src/documentation/xdocs/dtd/faq-v11.dtd       |  76 ---
 .../xdocs/dtd/javadoc-v04draft.dtd            | 254 --------
 .../xdocs/dtd/specification-v11.dtd           |  92 ---
 src/documentation/xdocs/dtd/todo-v11.dtd      |  93 ---
 10 files changed, 55 insertions(+), 1236 deletions(-)
 delete mode 100755 src/documentation/xdocs/dtd/book-cocoon-v10.dtd
 delete mode 100644 src/documentation/xdocs/dtd/changes-v11.dtd
 delete mode 100644 src/documentation/xdocs/dtd/document-v11.dtd
 delete mode 100644 src/documentation/xdocs/dtd/faq-v11.dtd
 delete mode 100755 src/documentation/xdocs/dtd/javadoc-v04draft.dtd
 delete mode 100644 src/documentation/xdocs/dtd/specification-v11.dtd
 delete mode 100644 src/documentation/xdocs/dtd/todo-v11.dtd

diff --git a/build.xml b/build.xml
index 9984a9d874..187368f6fd 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 6a21002c8e..230d667304 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 543f6863a34fbfa9b8a270a74f34910dc76a5d23..472e47fd76ea1651984b5f4258cfd3c7c82154bc 100644
GIT binary patch
literal 5258
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
bAM>3bCz(G!DlbVrqxzonIB_!x0381h#(|+`

literal 8146
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
EKYY6w=>Px#

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 abd4410672..0000000000
--- 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 e753a9bb12..0000000000
--- 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 64252b6734..0000000000
--- 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 abaa043865..0000000000
--- 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 3a4301a4d1..0000000000
--- 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 b61242728b..0000000000
--- 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 3aaaa14dbd..0000000000
--- 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 -->
-<!-- =============================================================== -->
-- 
2.39.5