Commit ba79ecbf authored by Phillip J. Eby's avatar Phillip J. Eby

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.
parent 557868e8
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
<!ELEMENT metadefault (#PCDATA)*> <!ELEMENT metadefault (#PCDATA)*>
<!ELEMENT example (#PCDATA)*> <!ELEMENT example (#PCDATA)*>
<!ELEMENT sectiontype (description?, (section | key)*)> <!ELEMENT sectiontype (description?,
(section | key | multisection | multikey)*)>
<!ATTLIST sectiontype <!ATTLIST sectiontype
name NMTOKEN #REQUIRED name NMTOKEN #REQUIRED
prefix NMTOKEN #IMPLIED prefix NMTOKEN #IMPLIED
...@@ -60,7 +61,7 @@ ...@@ -60,7 +61,7 @@
<!ELEMENT key (description?, metadefault?, example?)> <!ELEMENT key (description?, metadefault?, example?)>
<!ATTLIST key <!ATTLIST key
name NMTOKEN #REQUIRED name PCDATA #REQUIRED
attribute NMTOKEN #IMPLIED attribute NMTOKEN #IMPLIED
datatype NMTOKEN #IMPLIED datatype NMTOKEN #IMPLIED
handler NMTOKEN #IMPLIED handler NMTOKEN #IMPLIED
...@@ -69,7 +70,7 @@ ...@@ -69,7 +70,7 @@
<!ELEMENT multikey (description?, metadefault?, example?, default*)> <!ELEMENT multikey (description?, metadefault?, example?, default*)>
<!ATTLIST multikey <!ATTLIST multikey
name NMTOKEN #REQUIRED name PCDATA #REQUIRED
attribute NMTOKEN #IMPLIED attribute NMTOKEN #IMPLIED
datatype NMTOKEN #IMPLIED datatype NMTOKEN #IMPLIED
handler NMTOKEN #IMPLIED handler NMTOKEN #IMPLIED
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
<!ELEMENT section (description?)> <!ELEMENT section (description?)>
<!ATTLIST section <!ATTLIST section
name NMTOKEN #REQUIRED name PCDATA #REQUIRED
attribute NMTOKEN #IMPLIED attribute NMTOKEN #IMPLIED
type NMTOKEN #REQUIRED type NMTOKEN #REQUIRED
handler NMTOKEN #IMPLIED handler NMTOKEN #IMPLIED
...@@ -86,7 +87,7 @@ ...@@ -86,7 +87,7 @@
<!ELEMENT multisection (description?)> <!ELEMENT multisection (description?)>
<!ATTLIST multisection <!ATTLIST multisection
name NMTOKEN #REQUIRED name PCDATA #REQUIRED
attribute NMTOKEN #IMPLIED attribute NMTOKEN #IMPLIED
type NMTOKEN #REQUIRED type NMTOKEN #REQUIRED
handler NMTOKEN #IMPLIED handler NMTOKEN #IMPLIED
......
...@@ -348,7 +348,8 @@ The following elements are used to describe a schema: ...@@ -348,7 +348,8 @@ The following elements are used to describe a schema:
\end{attributedesc} \end{attributedesc}
\end{elementdesc} \end{elementdesc}
\begin{elementdesc}{sectiontype}{description?, (section | key)*} \begin{elementdesc}{sectiontype}{description?, (section | key |
multisection | multikey)*}
Define a concrete section type. Define a concrete section type.
\begin{attributedesc}{datatype}{\datatype{basic-key} \begin{attributedesc}{datatype}{\datatype{basic-key}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment