Mercurial > hg > nginx-site
diff dtd/content.dtd @ 76:4a4caa566120
Russian documentation import.
Changes in module.dtd: <example> now allowed to contain <value> and
<emphasis> elements (we need this to show important parts in examples),
less strict checking of <directive> syntax (we don't want to fully
document some directives, notably deprecated ones).
Known issues:
1. <syntax> elements are preserved as is, they will require manual conversion
(likely to some not-yet-existed format a la DocBook cmdsynopsis, as
currently used one seems to be incomplete);
2. <value> no longer corresponds to replaceable content, and it's use in
examples isn't correct;
3. <link doc="document#fragment"> doesn't work with current xslt, either
should be supported or changed to <link doc="document" id="fragment">.
The following files are intentionally omitted: maillists.xml (support.xml
should be used instead), experimental.xml (obsolete), faq.xml (conflicts
with existing one, needs discussion).
Not yet linked to site.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Tue, 11 Oct 2011 12:57:50 +0000 |
| parents | 2bf4cd2787c5 |
| children | 3179774f938e |
line wrap: on
line diff
--- a/dtd/content.dtd Mon Oct 10 14:47:09 2011 +0000 +++ b/dtd/content.dtd Tue Oct 11 12:57:50 2011 +0000 @@ -3,45 +3,60 @@ <!ATTLIST section name CDATA #IMPLIED title CDATA #IMPLIED + id ID #IMPLIED > -<!ELEMENT para (#PCDATA | a | br | list | orderedlist | note | i | b | - nobr | table | url | code | dirname | path | header | - programlisting | initial | development_version | - stable_version )* > +<!ELEMENT para (#PCDATA | a | link | br | list | orderedlist | note | + i | b | nobr | table | url | code | command | + dirname | path | header | value | programlisting | + initial | development_version | stable_version )* > <!ELEMENT a (#PCDATA) > <!ATTLIST a href CDATA #REQUIRED > +<!ELEMENT link (#PCDATA) > +<!ATTLIST link + doc CDATA #IMPLIED + id CDATA #IMPLIED + url CDATA #IMPLIED +> + <!ELEMENT br EMPTY > <!ELEMENT i (#PCDATA) > <!ELEMENT b (#PCDATA) > +<!ELEMENT command (#PCDATA | value)* > <!ELEMENT dirname (#PCDATA | i)* > <!ELEMENT path (#PCDATA | development_version | stable_version)* > <!ELEMENT code (#PCDATA | i)* > <!ELEMENT header (#PCDATA) > <!ELEMENT initial (#PCDATA) > <!ELEMENT url (#PCDATA) > +<!ELEMENT value (#PCDATA) > <!ELEMENT programlisting (#PCDATA | i | b | dirname | path | development_version | stable_version)* > -<!ELEMENT nobr (#PCDATA | i | b | dirname | path)* > +<!ELEMENT nobr (#PCDATA | i | b | command | dirname | path)* > -<!ELEMENT list (item+) > +<!ELEMENT list (item+ | listitem+) > <!ELEMENT orderedlist (item+) > <!ELEMENT item (#PCDATA | para | a | br | nobr | list | i | b | url | - dirname | path)* > + dirname | path | command | value | programlisting)* > +<!ELEMENT listitem (#PCDATA | para | a | br | nobr | list | i | b | url | + dirname | path | command | value | programlisting)* > -<!ELEMENT note (#PCDATA | para | a | br | nobr | list | i | b | url | - dirname | path | programlisting | paypal)* > +<!ELEMENT note (#PCDATA | para | a | br | list | orderedlist | i | b | + nobr | table | url | code | command | dirname | path | + header | programlisting | initial | paypal | + development_version | stable_version )* > <!ELEMENT table (tr+) > <!ATTLIST table note CDATA #IMPLIED + width CDATA #IMPLIED > <!ELEMENT tr (td+) > <!ELEMENT td (#PCDATA | code | i)* >