diff dtd/content.dtd @ 148:682163f2b298

Unified article/path and module/pathname into a single "path". "path" no longer emits double quotes so preserve them where needed. Replaced some misuses of "path" and "dirname".
author Ruslan Ermilov <ru@nginx.com>
date Tue, 25 Oct 2011 13:28:36 +0000
parents 2a88f137b1c6
children 9ba793943a93
line wrap: on
line diff
--- a/dtd/content.dtd	Tue Oct 25 12:45:29 2011 +0000
+++ b/dtd/content.dtd	Tue Oct 25 13:28:36 2011 +0000
@@ -9,7 +9,7 @@
                          i | b | nobr | table | url | code | command |
                          dirname | path | header | value | programlisting |
                          initial | development_version | stable_version |
-                         registered | pathname)* >
+                         registered)* >
 
 <!ELEMENT  a            (#PCDATA) >
 <!ATTLIST  a
@@ -30,7 +30,6 @@
 <!ELEMENT  command      (#PCDATA | value)* >
 <!ELEMENT  dirname      (#PCDATA | i)* >
 <!ELEMENT  path         (#PCDATA | development_version | stable_version)* >
-<!ELEMENT  pathname     (#PCDATA)* >
 <!ELEMENT  code         (#PCDATA | i)* >
 <!ELEMENT  header       (#PCDATA) >
 <!ELEMENT  initial      (#PCDATA) >
@@ -42,7 +41,7 @@
 <!ELEMENT  programlisting  (#PCDATA | i | b | dirname | path |
                             development_version | stable_version)* >
 
-<!ELEMENT  nobr         (#PCDATA | i | b | command | dirname | path)* >
+<!ELEMENT  nobr         (#PCDATA | i | b | code | command | dirname | path)* >
 
 <!ELEMENT  list         (item+ | listitem+) >
 <!ELEMENT  orderedlist  (item+) >