[Zodb-checkins] CVS: Packages/ZConfig/xml - schema.dtd:1.1.2.6

[Fred L. Drake, Jr.]

Update of /cvs-repository/Packages/ZConfig/xml
In directory cvs.zope.org:/tmp/cvs-serv26069

Modified Files:
      Tag: zconfig-schema-devel-branch
	schema.dtd 
Log Message:
- Add some missing attributes to the schema element
- Simply content model for section elements: don't provide for
  children other than description unless we really need them; that
  complicates things a bunch.  Refactor first.


=== Packages/ZConfig/xml/schema.dtd 1.1.2.5 => 1.1.2.6 ===
--- Packages/ZConfig/xml/schema.dtd:1.1.2.5	Thu Dec 12 07:51:19 2002
+++ Packages/ZConfig/xml/schema.dtd	Thu Dec 12 10:39:30 2002
@@ -6,7 +6,9 @@
 <!ATTLIST schema
           prefix     NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
-          keytype    NMTOKEN  #IMPLIED>
+          keytype    NMTOKEN  #IMPLIED
+          type       NMTOKEN  #IMPLIED
+          valuetype  NMTOKEN  #IMPLIED>
 
 <!ELEMENT description (#PCDATA)*>
 <!ELEMENT metadefault (#PCDATA)*>
@@ -31,14 +33,10 @@
 
 <!ELEMENT sectiongroup (description?, sectiontype+)>
 <!ATTLIST sectiongroup
-          prefix     NMTOKEN  #IMPLIED
-          name       NMTOKEN  #IMPLIED
-          minOccurs  NMTOKEN  #IMPLIED
-          maxOccurs  NMTOKEN  #IMPLIED>
+          name       NMTOKEN  #REQUIRED
+          prefix     NMTOKEN  #IMPLIED>
 
-<!ELEMENT section (description? (section | key)*)>
-<!-- XXX  The (section | key)* here is used to override defaults
-          defined by the relevant sectiontype element. -->
+<!ELEMENT section (description?)>
 <!ATTLIST section
           name       NMTOKEN  #REQUIRED
           attribute  NMTOKEN  #IMPLIED