[Zodb-checkins] CVS: ZODB3/ZConfig/doc - schema.dtd:1.3

[Fred L. Drake, Jr.]

Update of /cvs-repository/ZODB3/ZConfig/doc
In directory cvs.zope.org:/tmp/cvs-serv13522

Modified Files:
	schema.dtd 
Log Message:
- update names to reflect changes in the schema language
- re-organize for easier reading


=== ZODB3/ZConfig/doc/schema.dtd 1.2 => 1.3 ===
--- ZODB3/ZConfig/doc/schema.dtd:1.2	Tue Jan  7 16:34:41 2003
+++ ZODB3/ZConfig/doc/schema.dtd	Thu Jan  9 21:56:21 2003
@@ -2,7 +2,7 @@
 
 <!ELEMENT schema (description?, metadefault?, example?,
                   import*,
-                  (sectiontype | sectiongroup)*,
+                  (sectiontype | abstracttype)*,
                   (section | key | multisection | multikey)*)>
 <!ATTLIST schema
           prefix     NMTOKEN  #IMPLIED
@@ -10,22 +10,37 @@
           keytype    NMTOKEN  #IMPLIED
           datatype   NMTOKEN  #IMPLIED>
 
-<!ELEMENT component (description?, (sectiontype | sectiongroup)*)>
+<!ELEMENT component (description?, (sectiontype | abstracttype)*)>
 <!ATTLIST component
           prefix     NMTOKEN  #IMPLIED>
 
-<!ELEMENT extension (description?, (sectiontype | sectiongroup)*)>
+<!ELEMENT extension (description?, (sectiontype | abstracttype)*)>
 <!ATTLIST extension
           prefix     NMTOKEN  #IMPLIED>
 
 <!ELEMENT import EMPTY>
 <!ATTLIST import
-          src        CDATA    #REQUIRED>
+          package    NMTOKEN  #IMPLIED
+          src        CDATA    #IMPLIED>
 
 <!ELEMENT description (#PCDATA)*>
 <!ELEMENT metadefault (#PCDATA)*>
 <!ELEMENT example     (#PCDATA)*>
 
+<!ELEMENT sectiontype (description?, (section | key)*)>
+<!ATTLIST sectiontype
+          name       NMTOKEN  #REQUIRED
+          prefix     NMTOKEN  #IMPLIED
+          keytype    NMTOKEN  #IMPLIED
+          datatype   NMTOKEN  #IMPLIED
+          implements NMTOKEN  #IMPLIED
+          extends    NMTOKEN  #IMPLIED>
+
+<!ELEMENT abstracttype (description?)>
+<!ATTLIST abstracttype
+          name       NMTOKEN  #REQUIRED
+          prefix     NMTOKEN  #IMPLIED>
+
 <!ELEMENT key (description?, metadefault?, example?)>
 <!ATTLIST key
           name       NMTOKEN  #REQUIRED
@@ -42,20 +57,6 @@
           datatype   NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
           required   (yes|no) "no">
-
-<!ELEMENT sectiontype (description?, (section | key)*)>
-<!ATTLIST sectiontype
-          type       NMTOKEN  #REQUIRED
-          prefix     NMTOKEN  #IMPLIED
-          keytype    NMTOKEN  #IMPLIED
-          datatype   NMTOKEN  #IMPLIED
-          group      NMTOKEN  #IMPLIED
-          extends    NMTOKEN  #IMPLIED>
-
-<!ELEMENT sectiongroup (description?, sectiontype+)>
-<!ATTLIST sectiongroup
-          type       NMTOKEN  #REQUIRED
-          prefix     NMTOKEN  #IMPLIED>
 
 <!ELEMENT section (description?)>
 <!ATTLIST section