Mercurial > hg > nginx-site

changeset 69:935beaa561b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- use of $document_root and $realpath_root in "root" is prohibited - "satisfy" can be specified in the "http" and "server" contexts; "satisfy all" behavior is cleared - "sendfile" can be specified in the "if in location" context
author Ruslan Ermilov <ru@nginx.com>
date Sun, 09 Oct 2011 18:01:18 +0000
parents 9de85defbcf8
children 272d99af0c15
files xml/en/docs/http/ngx_http_core_module.xml
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 17:51:27 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 18:01:18 2011 +0000
@@ -1528,7 +1528,8 @@
 </para>
 
 <para>
-The <argument>path</argument> value can contain variables.
+The <argument>path</argument> value can contain variables
+except <var>$document_root</var> and <var>$realpath_root</var>.
 </para>
 
 <para>
@@ -1544,10 +1545,12 @@
 <directive name="satisfy">
 <syntax>satisfy <value>all</value> | <value>any</value></syntax>
 <default>satisfy all</default>
+<context>http</context>
+<context>server</context>
 <context>location</context>
 
 <para>
-Allows access if any of the
+Allows access if <value>all</value> or <value>any</value> of the
 <link doc="ngx_http_access_module.xml">ngx_http_access_module</link>
 or <link doc="ngx_http_auth_basic_module.xml">ngx_http_auth_basic_module</link>
 modules grant access.
@@ -1570,10 +1573,13 @@
 <directive name="satisfy_any">
 <syntax>satisfy_any <value>on</value> | <value>off</value></syntax>
 <default>satisfy_any off</default>
+<context>http</context>
+<context>server</context>
 <context>location</context>
 
 <para>
-This directive was renamed to the <link id="satisfy">satisfy</link> directive.
+This directive was renamed to the <link id="satisfy">satisfy any</link>
+directive.
 </para>
 
 </directive>
@@ -1604,6 +1610,7 @@
 <context>http</context>
 <context>server</context>
 <context>location</context>
+<context>if in location</context>
 
 <para>
 Enables or disables the use of