Merge r1787510 from trunk:

Add a warning in the docs about nested <If> blocks

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787736 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ec6c5d3a26d48b94a230e45d6499e1a92de56cd2..f02f80cdce0c9d80e4e2449a3f6dc2c9467809dd 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -2176,6 +2176,14 @@ satisfied by a request at runtime</description>
     <p>Only directives that support the <a href="directive-dict.html#Context"
     >directory context</a> can be used within this configuration section.</p>
 
+    <note><title>Not a scripting language</title>
+    The name of this directive is very familiar to programmers and admins 
+    but it should not be confused with its counterpart in scripting languages.
+    For example, the current implementation does not contemplate the possibility
+    of having a <directive type="section">If</directive> section inside another
+    one (the inner <directive type="section">If</directive> will be ignored).
+    </note>
+
     <note type="warning">
     Certain variables, such as <code>CONTENT_TYPE</code> and other
     response headers, are set after &lt;If&gt; conditions have already

diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml
index 520d50717e378557a5fdb2aeb3e9546238106f92..08807e46a403ddc1668c15ae35ed99dd2741547b 100644 (file)
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -381,7 +381,8 @@ inside <directive type="section" module="core">Directory</directive>.  On
 the other hand, <directive type="section" module="core">If</directive> can
 be used inside <directive type="section" module="core">Directory</directive>,
 <directive type="section" module="core">Location</directive>, and <directive
-type="section" module="core">Files</directive> sections. The regex
+type="section" module="core">Files</directive> sections (but not inside another
+<directive type="section" module="core">If</directive>). The regex
 counterparts of the named section behave identically.</p>
 
 <p>Nested sections are merged after non-nested sections of the same type.</p>