[Zodb-checkins] CVS: Zope3/src/ZConfig/doc - schema.dtd:1.6 zconfig.tex:1.69

[Phillip J. Eby]

Update of /cvs-repository/Zope3/src/ZConfig/doc
In directory cvs.zope.org:/tmp/cvs-serv15935/doc

Modified Files:
	schema.dtd zconfig.tex 
Log Message:
DTD/doc fixes: 'sectiontype' allows 'multikey' and 'multisection'; and
the 'name' attr is '#PCDATA' not '#NMTOKEN', because name fields need to
allow the '*' or '+' sign in the content.


=== Zope3/src/ZConfig/doc/schema.dtd 1.5 => 1.6 ===
--- Zope3/src/ZConfig/doc/schema.dtd:1.5	Thu Jan 16 11:18:22 2003
+++ Zope3/src/ZConfig/doc/schema.dtd	Mon Apr 21 09:22:13 2003
@@ -44,7 +44,8 @@
 <!ELEMENT metadefault (#PCDATA)*>
 <!ELEMENT example     (#PCDATA)*>
 
-<!ELEMENT sectiontype (description?, (section | key)*)>
+<!ELEMENT sectiontype (description?, 
+                       (section | key | multisection | multikey)*)>
 <!ATTLIST sectiontype
           name       NMTOKEN  #REQUIRED
           prefix     NMTOKEN  #IMPLIED
@@ -60,7 +61,7 @@
 
 <!ELEMENT key (description?, metadefault?, example?)>
 <!ATTLIST key
-          name       NMTOKEN  #REQUIRED
+          name       PCDATA   #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           datatype   NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
@@ -69,7 +70,7 @@
 
 <!ELEMENT multikey (description?, metadefault?, example?, default*)>
 <!ATTLIST multikey
-          name       NMTOKEN  #REQUIRED
+          name       PCDATA   #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           datatype   NMTOKEN  #IMPLIED
           handler    NMTOKEN  #IMPLIED
@@ -77,7 +78,7 @@
 
 <!ELEMENT section (description?)>
 <!ATTLIST section
-          name       NMTOKEN  #REQUIRED
+          name       PCDATA   #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           type       NMTOKEN  #REQUIRED
           handler    NMTOKEN  #IMPLIED
@@ -86,7 +87,7 @@
 
 <!ELEMENT multisection (description?)>
 <!ATTLIST multisection
-          name       NMTOKEN  #REQUIRED
+          name       PCDATA   #REQUIRED
           attribute  NMTOKEN  #IMPLIED
           type       NMTOKEN  #REQUIRED
           handler    NMTOKEN  #IMPLIED


=== Zope3/src/ZConfig/doc/zconfig.tex 1.68 => 1.69 ===
--- Zope3/src/ZConfig/doc/zconfig.tex:1.68	Tue Mar 25 10:20:59 2003
+++ Zope3/src/ZConfig/doc/zconfig.tex	Mon Apr 21 09:22:13 2003
@@ -348,7 +348,8 @@
   \end{attributedesc}
 \end{elementdesc}
 
-\begin{elementdesc}{sectiontype}{description?, (section | key)*}
+\begin{elementdesc}{sectiontype}{description?, (section | key |
+                                  multisection | multikey)*}
   Define a concrete section type.
 
   \begin{attributedesc}{datatype}{\datatype{basic-key}