Mercurial > hg > nginx-site
diff dtd/content.dtd @ 461:6135f3c95bf6
Unified markup for lists.
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Tue, 27 Mar 2012 14:30:18 +0000 |
| parents | 04ad7c1b1b04 |
| children | cac48e2d0d9b |
line wrap: on
line diff
--- a/dtd/content.dtd +++ b/dtd/content.dtd @@ -5,7 +5,7 @@ name CDATA #IMPLIED > -<!ELEMENT para (#PCDATA | link | links | br | list | orderedlist | note | +<!ELEMENT para (#PCDATA | link | links | br | list | note | i | b | nobr | table | url | literal | command | path | header | value | programlisting | initial | development_version | stable_version | @@ -40,15 +40,16 @@ <!ELEMENT nobr (#PCDATA | b | command | i | literal | path)* > -<!ELEMENT list (item+ | listitem+) > -<!ELEMENT orderedlist (item+) > -<!ELEMENT item (#PCDATA | para | br | nobr | list | i | b | url | - path | command | value | programlisting | - link | registered | literal)* > +<!ELEMENT list (listitem+) > +<!ATTLIST list + type (bullet | enum) #REQUIRED + > + <!ELEMENT listitem (#PCDATA | para | br | nobr | list | i | b | url | - path | literal | value | programlisting)* > + path | literal | value | programlisting | + link | registered)* > -<!ELEMENT note (#PCDATA | para | br | list | orderedlist | i | b | +<!ELEMENT note (#PCDATA | para | br | list | i | b | nobr | table | url | literal | command | path | header | programlisting | initial | paypal | development_version | stable_version )* > @@ -87,6 +88,7 @@ changes CDATA #REQUIRED > +<!ELEMENT item EMPTY > <!ATTLIST item ver CDATA #IMPLIED pgp CDATA #IMPLIED