jefft 2003/04/23 21:37:00
Modified: src/resources/schema/dtd document-v11.dtd document-v11.mod
Log:
As per http://marc.theaimsgroup.com/?l=forrest-dev&m=105075184927630&w=2 roll
back changes made since Forrest 0.4 was released, which are now in document-v12
Revision Changes Path
1.6 +4 -4 xml-forrest/src/resources/schema/dtd/document-v11.dtd
Index: document-v11.dtd
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v11.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- document-v11.dtd 11 Oct 2002 07:22:35 -0000 1.5
+++ document-v11.dtd 24 Apr 2003 04:36:59 -0000 1.6
@@ -6,13 +6,13 @@
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.
+ project. It has now been superceded by v1.2.
TYPICAL INVOCATION:
<!DOCTYPE document PUBLIC
- "-//APACHE//DTD Documentation Vx.y//EN"
- "document-vxy.dtd">
+ "-//APACHE//DTD Documentation V1.1//EN"
+ "document-v11.dtd">
where
@@ -102,7 +102,7 @@
20020613 Move the declarations of ISO character entity sets to module (DC)
COPYRIGHT:
- Copyright (c) 2002 The Apache Software Foundation.
+ Copyright (c) 2002-2003 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
1.11 +7 -14 xml-forrest/src/resources/schema/dtd/document-v11.mod
Index: document-v11.mod
===================================================================
RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v11.mod,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- document-v11.mod 19 Apr 2003 10:10:54 -0000 1.10
+++ document-v11.mod 24 Apr 2003 04:36:59 -0000 1.11
@@ -5,12 +5,13 @@
PURPOSE:
This DTD was developed to create a simple yet powerful document
type for software documentation for use with the Apache projects.
+ It has now been superceded by v1.2.
TYPICAL INVOCATION:
<!ENTITY % document PUBLIC
- "-//APACHE//ENTITIES Documentation Vxy//EN"
- "document-vxy.mod">
+ "-//APACHE//ENTITIES Documentation V1.1//EN"
+ "document-v11.mod">
%document;
where
@@ -27,13 +28,6 @@
FIXME:
CHANGE HISTORY:
-[Version 1.?]
- 20030320 Make @href required for link elements. (SN)
- 20030320 Allow paragraphs (p|source|note|warning|fixme) inside li. (SN)
- 20030320 Allow paragraphs (p|source|note|warning|fixme) and lists (ol|ul|dl) inside dd.
(SN)
- 20030320 Allow links (link|jump|fork) and inline elements (br|img|icon|acronym) inside
title. (SN)
-
-
[Version 1.0]
20020608 Initial version. (SN)
@@ -117,7 +111,7 @@
<!-- Link attributes ===================================================
Indicates that the element requires to have hyperlink attributes.
==================================================================== -->
-<!ENTITY % link.att 'href CDATA #REQUIRED
+<!ENTITY % link.att 'href CDATA #IMPLIED
role CDATA #IMPLIED
title CDATA #IMPLIED '>
<!-- =============================================================== -->
@@ -294,7 +288,7 @@
<!-- Lists -->
<!-- ==================================================== -->
<!-- List item -->
-<!ELEMENT li (%content.mix; | %lists; | %paragraphs; )*>
+<!ELEMENT li (%content.mix; | %lists;)*>
<!ATTLIST li
%common.att;
>
@@ -329,7 +323,7 @@
%common.att;
>
<!-- Definition description -->
-<!ELEMENT dd (%content.mix; | %lists; | %paragraphs; )*>
+<!ELEMENT dd (%content.mix;)*>
<!ATTLIST dd
%common.att;
>
@@ -345,7 +339,6 @@
width CDATA #IMPLIED
usemap CDATA #IMPLIED
ismap (ismap) #IMPLIED
- align CDATA #IMPLIED
%common.att;
>
<!-- anchor point (equivalent of <a name="...">, typically not rendered) -->
@@ -369,7 +362,7 @@
<!ATTLIST header
%common.att;
>
-<!ELEMENT title (%text; | %markup; | %links; | %special-inline;)*>
+<!ELEMENT title (%text; | %markup;)*>
<!ATTLIST title
%common.att;
>
|