Mercurial > hg > nginx-site

diff xml/en/docs/http/ngx_http_core_module.xml @ 108:72524ae53106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Explicitly marked directives with the block syntax. Such directives will have curly braces around their syntax and defaults appear automatically. Other directives will have a semicolon after their syntax and defaults.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 20 Oct 2011 07:47:21 +0000
parents 56457a474903
children b9e5155d8f5d
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Wed Oct 19 12:39:11 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Thu Oct 20 07:47:21 2011 +0000
@@ -658,7 +658,7 @@
 
 
 <directive name="limit_except">
-<syntax><argument>method</argument> ... { ... }</syntax>
+<syntax block="yes"><argument>method</argument> ...</syntax>
 <default/>
 <context>location</context>
 
@@ -986,14 +986,14 @@
 
 
 <directive name="location">
-<syntax>[
+<syntax block="yes">[
         <value>=</value> |
         <value>~</value> |
         <value>~*</value> |
         <value>^~</value>
         ] <argument>uri</argument>
-{ ... }</syntax>
-<syntax><value>@</value><argument>name</argument> { ... }</syntax>
+</syntax>
+<syntax block="yes"><value>@</value><argument>name</argument></syntax>
 <default/>
 <context>server</context>
 <context>location</context>
@@ -1621,7 +1621,7 @@
 
 
 <directive name="server">
-<syntax>{ ... }</syntax>
+<syntax block="yes"/>
 <default/>
 <context>http</context>
 
@@ -2016,13 +2016,11 @@
 
 
 <directive name="types">
-<syntax>{ ... }</syntax>
+<syntax block="yes"/>
 <default>
-{
     text/html  html;
     image/gif  gif;
     image/jpeg jpg;
-}
 </default>
 <context>http</context>
 <context>server</context>