comparison dtd/module.dtd @ 271:4c6d2c614d2c

Cleaned up XML tag mess: - all of <parameter> and <code>, and some of <dirname>, <value>, and <command> were replaced by <literal>; - the rest of <dirname> were replaced by links; - <argument> were replaced by <value>; - <value> is now rendered in HTML in italic; - <literal> and <path> can now contain <value>. Cleaned up terminology mess: - directives take "parameters".
author Ruslan Ermilov <ru@nginx.com>
date Fri, 23 Dec 2011 17:29:59 +0000
parents 6eeaa9e1f3b5
children 71d99de7ff97
comparison
equal deleted inserted replaced
270:945d7299c26c 271:4c6d2c614d2c
15 <!ELEMENT directive (syntax+, default+, context*, appeared-in*, para+) > 15 <!ELEMENT directive (syntax+, default+, context*, appeared-in*, para+) >
16 <!ATTLIST directive 16 <!ATTLIST directive
17 name ID #REQUIRED 17 name ID #REQUIRED
18 > 18 >
19 19
20 <!ELEMENT syntax (#PCDATA | argument | code | parameter | value)* > 20 <!ELEMENT syntax (#PCDATA | literal | value)* >
21 <!ATTLIST syntax 21 <!ATTLIST syntax
22 block (yes | no) "no" 22 block (yes | no) "no"
23 > 23 >
24 24
25 <!ELEMENT default (#PCDATA)* > 25 <!ELEMENT default (#PCDATA)* >
26 26
27 <!ELEMENT context (#PCDATA)* > 27 <!ELEMENT context (#PCDATA)* >
28 28
29 <!ELEMENT appeared-in (#PCDATA)* > 29 <!ELEMENT appeared-in (#PCDATA)* >
30 30
31 <!ELEMENT para (#PCDATA | argument | c-def | c-func | code | command | 31 <!ELEMENT para (#PCDATA | c-def | c-func | command |
32 emphasis | example | header | http-status | link | 32 emphasis | example | header | http-status | link |
33 list | note | parameter | path | value | var)* > 33 list | literal | note | path | value | var)* >
34
35 <!ELEMENT argument (#PCDATA)* >
36 34
37 <!ELEMENT c-def (#PCDATA)* > 35 <!ELEMENT c-def (#PCDATA)* >
38 36
39 <!ELEMENT c-func (#PCDATA)* > 37 <!ELEMENT c-func (#PCDATA)* >
40
41 <!ELEMENT code (#PCDATA | value)* >
42 38
43 <!ELEMENT command (#PCDATA)* > 39 <!ELEMENT command (#PCDATA)* >
44 40
45 <!ELEMENT emphasis (#PCDATA | value)* > 41 <!ELEMENT emphasis (#PCDATA | value)* >
46 42
47 <!ELEMENT example (#PCDATA | value | emphasis)* > 43 <!ELEMENT example (#PCDATA | value | emphasis)* >
48 44
49 <!ELEMENT header (#PCDATA | argument)* > 45 <!ELEMENT header (#PCDATA | value)* >
50 46
51 <!ELEMENT http-status EMPTY > 47 <!ELEMENT http-status EMPTY >
52 <!ATTLIST http-status 48 <!ATTLIST http-status
53 code CDATA #REQUIRED 49 code CDATA #REQUIRED
54 text CDATA #IMPLIED 50 text CDATA #IMPLIED
68 64
69 <!ELEMENT listitem ANY > 65 <!ELEMENT listitem ANY >
70 <!ELEMENT tag-name ANY > 66 <!ELEMENT tag-name ANY >
71 <!ELEMENT tag-desc ANY > 67 <!ELEMENT tag-desc ANY >
72 68
69 <!ELEMENT literal (#PCDATA)* >
70
73 <!ELEMENT note ANY > 71 <!ELEMENT note ANY >
74
75 <!ELEMENT parameter (#PCDATA)* >
76 72
77 <!ELEMENT path (#PCDATA)* > 73 <!ELEMENT path (#PCDATA)* >
78 74
79 <!ELEMENT value (#PCDATA)* > 75 <!ELEMENT value (#PCDATA)* >
80 76