Return-Path: <stevenn@apache.org>
Mailing-List: contact forrest-dev-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list forrest-dev@xml.apache.org
Received: (qmail 33012 invoked by uid 500); 6 Jun 2002 14:33:44 -0000
Delivered-To: apmail-xml-forrest-cvs@apache.org
Received: (qmail 33009 invoked from network); 6 Jun 2002 14:33:44 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 6 Jun 2002 14:33:43 -0000
Received: (qmail 8528 invoked by uid 1454); 6 Jun 2002 14:33:43 -0000
Date: 6 Jun 2002 14:33:43 -0000
Message-ID: <20020606143343.8527.qmail@icarus.apache.org>
From: stevenn@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/schema/dtd changes-v11.dtd
 document-v11.dtd document-v11.mod faq-v11.mod specification-v11.dtd
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

stevenn     2002/06/06 07:33:43

  Modified:    src/resources/schema/dtd changes-v11.dtd document-v11.dtd
                        document-v11.mod faq-v11.mod specification-v11.dtd
  Log:
  updated dtds according recent discussion on the mailing list
  
  Revision  Changes    Path
  1.2       +3 -4      xml-forrest/src/resources/schema/dtd/changes-v11.dtd
  
  Index: changes-v11.dtd
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/changes-v11.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- changes-v11.dtd	1 Mar 2002 07:28:25 -0000	1.1
  +++ changes-v11.dtd	6 Jun 2002 14:33:43 -0000	1.2
  @@ -38,7 +38,7 @@
     20000316 Added bugfixing attribute. (SM)
   [Version 1.1]
     20011212 Used public identifiers for external entities (SM)
  -  
  +
   COPYRIGHT:
     Copyright (c) @year@ The Apache Software Foundation.
   
  @@ -68,9 +68,8 @@
   <!-- Document Type Definition -->
   <!-- =============================================================== -->
   
  -<!ELEMENT changes (devs, release*)>
  -<!ATTLIST changes %common.att;
  -                  %title.att;>
  +<!ELEMENT changes (title, devs, release*)>
  +<!ATTLIST changes %common.att;>
   
       <!ELEMENT devs (person+)>
       <!ATTLIST devs %common.att;>
  
  
  
  1.3       +1 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document-v11.dtd	19 May 2002 18:56:42 -0000	1.2
  +++ document-v11.dtd	6 Jun 2002 14:33:43 -0000	1.3
  @@ -97,6 +97,7 @@
     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)
  +  20020606 Made title into an child element of its parent instead of an attribute (SNS)
   
   COPYRIGHT:
     Copyright (c) @year@ The Apache Software Foundation.
  
  
  
  1.3       +6 -6      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document-v11.mod	3 Jun 2002 03:17:45 -0000	1.2
  +++ document-v11.mod	6 Jun 2002 14:33:43 -0000	1.3
  @@ -335,7 +335,7 @@
   <!-- Document -->
   <!-- =============================================================== -->
   
  -<!ELEMENT document (header?, body, footer?)>
  +<!ELEMENT document (header, body, footer?)>
   <!ATTLIST document %common.att;>
   
       <!-- ==================================================== -->
  @@ -344,14 +344,14 @@
   
       <!ENTITY % local.headers "">
   
  -    <!ELEMENT header (title, subtitle?, version?, type?, authors,
  +    <!ELEMENT header (title, subtitle?, version?, type?, authors?,
                         notice*, abstract? %local.headers;)>
       <!ATTLIST header %common.att;>
   
  -    <!ELEMENT title (%text;)>
  +    <!ELEMENT title (%text; | %markup;)*>
       <!ATTLIST title %common.att;>
   
  -    <!ELEMENT subtitle (%text;)>
  +    <!ELEMENT subtitle (%text; | %markup;)*>
       <!ATTLIST subtitle %common.att;>
   
       <!ELEMENT version (%text;)>
  @@ -380,8 +380,8 @@
       <!ELEMENT body (%sections;|%blocks;)+>
       <!ATTLIST body %common.att;>
   
  -    <!ELEMENT section (%sections;|%blocks;)*>
  -    <!ATTLIST section %title.att; %common.att;>
  +    <!ELEMENT section (title, (%sections;|%blocks;)*)>
  +    <!ATTLIST section %common.att;>
   
       <!-- ==================================================== -->
       <!-- Footer -->
  
  
  
  1.2       +2 -2      xml-forrest/src/resources/schema/dtd/faq-v11.mod
  
  Index: faq-v11.mod
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/faq-v11.mod,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- faq-v11.mod	19 May 2002 18:56:42 -0000	1.1
  +++ faq-v11.mod	6 Jun 2002 14:33:43 -0000	1.2
  @@ -3,8 +3,8 @@
   <!ATTLIST faqs %common.att;
                  %title.att;>
   
  -    <!ELEMENT part ((faq | part)+) >
  -    <!ATTLIST part %title.att; %common.att;>
  +    <!ELEMENT part (title, (faq | part)+) >
  +    <!ATTLIST part %common.att;>
   
       <!ELEMENT faq (question, answer)>
       <!ATTLIST faq %common.att;>
  
  
  
  1.2       +17 -18    xml-forrest/src/resources/schema/dtd/specification-v11.dtd
  
  Index: specification-v11.dtd
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/specification-v11.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- specification-v11.dtd	1 Mar 2002 07:28:25 -0000	1.1
  +++ specification-v11.dtd	6 Jun 2002 14:33:43 -0000	1.2
  @@ -1,11 +1,11 @@
   <!-- ===================================================================
  -     
  +
        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 
  +  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:
  @@ -14,16 +14,16 @@
          "-//APACHE//DTD Specification Vx.y//EN"
          "specification-vxy.dtd">
   
  -  where 
  -  
  +  where
  +
       x := major version
       y := minor version
  -      
  -NOTES:  
  +
  +NOTES:
   
   AUTHORS:
     Stefano Mazzocchi <stefano@apache.org>
  -  
  +
   FIXME:
   
   CHANGE HISTORY:
  @@ -31,15 +31,15 @@
     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 
  +
  +  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.
  -  
  +
   ==================================================================== -->
   
   <!-- =============================================================== -->
  @@ -47,8 +47,8 @@
   <!-- =============================================================== -->
   
   <!ENTITY % document PUBLIC
  -    "-//APACHE//DTD Documentation V1.1//EN"
  -    "document-v11.dtd">
  +    "-//APACHE//ENTITIES Documentation V1.1//EN"
  +    "document-v11.mod">
   %document;
   
   
  @@ -82,7 +82,6 @@
           <!ELEMENT bi EMPTY>
           <!ATTLIST bi %common.att;
                        %name.att;
  -                     %title.att;
                        %link.att;
                        authors CDATA #REQUIRED
                        date    CDATA #IMPLIED>