From: Luca Toscano <elukey@apache.org>
Date: Thu, 25 May 2017 08:44:09 +0000 (+0000)
Subject: Remove warning about nested If/ElseIf/Else evaluation
X-Git-Tag: 2.5.0-alpha~408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a66bceda86eab24f4f977894c947169dd614d519;p=apache

Remove warning about nested If/ElseIf/Else evaluation

As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1796135 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 18b28209ed..e8609f28af 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1067,6 +1067,7 @@ satisfied by a request at runtime</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">Else</directive> applies the enclosed
@@ -1113,6 +1114,7 @@ satisfied</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">ElseIf</directive> applies the enclosed
@@ -2187,6 +2189,7 @@ satisfied by a request at runtime</description>
 <context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>All</override>
+<compatibility>Nested conditions are evaluated in 2.4.26 and later</compatibility>
 
 <usage>
     <p>The <directive type="section">If</directive> directive
@@ -2218,14 +2221,6 @@ 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