Mercurial > hg > nginx

changeset 4077:24f511e94057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New elements: "dq", "pathname"; new list type: "tag".
author Ruslan Ermilov <ru@nginx.com>
date Tue, 06 Sep 2011 10:41:44 +0000
parents 37da005a5808
children e922cc1755fa
files docs/dtd/module.dtd docs/xsls/content.xsls docs/xsls/directive.xsls
diffstat 3 files changed, 29 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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;- " >
--- a/docs/xsls/content.xsls
+++ b/docs/xsls/content.xsls
@@ -22,6 +22,12 @@ X:stylesheet {
 
     X:template = "command" { <code> !!; </code> }
 
+    X:template = "dq" {
+        X:text disable-output-escaping="yes" {&amp;ldquo;}
+        !!;
+        X:text disable-output-escaping="yes" {&amp;rdquo;}
+    }
+
     X:template = "example" { <blockquote><pre> !!; </pre></blockquote> }
 
     X:template = "emphasis" { <strong> !!; </strong> }
@@ -40,8 +46,15 @@ X:stylesheet {
     X:template = "list[@type='enum']" { <ol> !!; </ol> }
     X:template = "listitem" { <li> !!; </li> }
 
+    X:template = "list[@type='tag']" { <dl compact=""> !!; </dl> }
+    X:template = "tag-name" { <dt> !!; </dt> }
+    X:template = "tag-desc" { <dd> !!; </dd> }
+
+    X:template = "pathname" { <code> !!; </code> }
+
     X:template = "argument" { <code><i> !!; </i></code> }
     X:template = "parameter" { <code> !!; </code> }
+
     X:template = "value" { <code> !!; </code> }
 
     X:template = "var" { <code> !!; </code> }
--- a/docs/xsls/directive.xsls
+++ b/docs/xsls/directive.xsls
@@ -18,8 +18,8 @@ X:stylesheet {
             <strong>syntax</strong>:
         } else {
             <code>&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;</code>
-	}
-	<code> !!; </code> <br/>
+        }
+        <code> !!; </code> <br/>
     }
     
     X:template = "default" {