--- a/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 16:35:32 2011 +0000
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Sun Oct 09 16:56:56 2011 +0000
@@ -996,9 +996,7 @@
 <syntax>location <value>@</value><argument>name</argument> { ... }</syntax>
 <default/>
 <context>server</context>
-<!--
 <context>location</context>
--->
 
 <para>
 Sets a configuration based on a request URI.
@@ -1018,6 +1016,10 @@
 </para>
 
 <para>
+Locations can be nested, with some exceptions mentioned below.
+</para>
+
+<para>
 For case-insensitive operating systems such as Mac OS X and Cygwin,
 the string matching ignores a case (0.7.7).
 However, comparison is limited to one-byte locales.
@@ -1041,13 +1043,16 @@
 defining <dq><code>location = /</code></dq> will speed up the processing
 of these requests, as search terminates right after the first
 comparison.
+Such a location cannot obviously contain nested locations.
 </para>
 
 <para>
+<note>
 In versions from 0.7.1 to 0.8.41, if a request matched the prefix
 location without the <dq><value>=</value></dq> and <dq><value>^~</value></dq>
 prefixes, the search also terminated and regular expressions were
 not checked.
+</note>
 </para>
 
 <para>
@@ -1080,6 +1085,7 @@
 The <dq><value>@</value></dq> prefix defines a named location.
 Such a location is not used for a regular request processing, but instead
 used for request redirection.
+They cannot be nested, and cannot contain nested locations.
 </para>
 
 <!--