From a49d5f8e5c9f95247645d4aa402fa575ed219489 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@nginx.com>
Date: Tue, 6 Sep 2011 10:41:44 +0000
Subject: New elements: "dq", "pathname"; new list type: "tag".

---
 docs/dtd/module.dtd | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'docs/dtd/module.dtd')

diff --git a/docs/dtd/module.dtd b/docs/dtd/module.dtd
index c6e89dc6c..0b21673ef 100644
--- a/docs/dtd/module.dtd
+++ b/docs/dtd/module.dtd
@@ -5,7 +5,7 @@
             id          ID #REQUIRED
 >
 
-<!ELEMENT   section     (directive+ | para+) >
+<!ELEMENT   section     (directive | para)+ >
 <!ATTLIST   section
             name        CDATA #REQUIRED
             id          ID #IMPLIED
@@ -23,7 +23,9 @@
 
 <!ELEMENT   context     (#PCDATA)* >
 
-<!ELEMENT   para        (#PCDATA | argument | c-def | c-func | code | command | emphasis | example | header | http-error | link | list | note | parameter | value | var)* >
+<!ELEMENT   para        (#PCDATA | argument | c-def | c-func | code | command |
+                         dq | emphasis | example | header | http-error | link |
+                         list | note | parameter | pathname | value | var)* >
 
 <!ELEMENT   argument    (#PCDATA)* >
 
@@ -35,11 +37,13 @@
 
 <!ELEMENT   command     (#PCDATA)* >
 
+<!ELEMENT   dq          ANY >
+
 <!ELEMENT   emphasis    (#PCDATA)* >
 
 <!ELEMENT   example     (#PCDATA)* >
 
-<!ELEMENT   header      (#PCDATA)* >
+<!ELEMENT   header      (#PCDATA | argument)* >
 
 <!ELEMENT   http-error  EMPTY >
 <!ATTLIST   http-error
@@ -53,20 +57,24 @@
             id          CDATA #IMPLIED
 >
 
-<!ELEMENT   list        (listitem+) >
+<!ELEMENT   list        (listitem+ | (tag-name | tag-desc)+) >
 <!ATTLIST   list
-            type        (bullet | enum) #REQUIRED
+            type        (bullet | enum | tag) #REQUIRED
 >
 
 <!ELEMENT   listitem    ANY >
+<!ELEMENT   tag-name    ANY >
+<!ELEMENT   tag-desc    ANY >
 
 <!ELEMENT   note        ANY >
 
 <!ELEMENT   parameter   (#PCDATA)* >
 
+<!ELEMENT   pathname    (#PCDATA)* >
+
 <!ELEMENT   value       (#PCDATA)* >
 
 <!ELEMENT   var         (#PCDATA)* >
 
 <!ENTITY    nbsp        "&#xA0;" >
-<!ENTITY    mdash       "&#xA0;- " >
+<!ENTITY    mdash       "&nbsp;- " >
-- 
cgit