Return-Path: <cvs-return-60703-archive-asf-public=cust-asf.ponee.io@httpd.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 97287200C80
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 25 May 2017 10:44:57 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 95C08160BCA; Thu, 25 May 2017 08:44:57 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id DE42B160BC7
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 25 May 2017 10:44:56 +0200 (CEST)
Received: (qmail 20358 invoked by uid 500); 25 May 2017 08:44:56 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 20348 invoked by uid 99); 25 May 2017 08:44:56 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2017 08:44:56 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8292A3A0069
	for <cvs@httpd.apache.org>; Thu, 25 May 2017 08:44:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1796136 - /httpd/httpd/trunk/docs/manual/mod/core.html.en
Date: Thu, 25 May 2017 08:44:55 -0000
To: cvs@httpd.apache.org
From: elukey@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170525084455.8292A3A0069@svn01-us-west.apache.org>
archived-at: Thu, 25 May 2017 08:44:57 -0000

Author: elukey
Date: Thu May 25 08:44:55 2017
New Revision: 1796136

URL: http://svn.apache.org/viewvc?rev=1796136&view=rev
Log:
Core documentation update

Modified:
    httpd/httpd/trunk/docs/manual/mod/core.html.en

Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=1796136&r1=1796135&r2=1796136&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Thu May 25 08:44:55 2017
@@ -1132,6 +1132,7 @@ satisfied by a request at runtime</td></
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Nested conditions are evaluated in 2.4.26 and later</td></tr>
 </table>
     <p>The <code class="directive">&lt;Else&gt;</code> applies the enclosed
     directives if and only if the most recent
@@ -1179,6 +1180,7 @@ satisfied</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Nested conditions are evaluated in 2.4.26 and later</td></tr>
 </table>
     <p>The <code class="directive">&lt;ElseIf&gt;</code> applies the enclosed
     directives if and only if both the given condition evaluates to true and
@@ -2182,6 +2184,7 @@ satisfied by a request at runtime</td></
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Nested conditions are evaluated in 2.4.26 and later</td></tr>
 </table>
     <p>The <code class="directive">&lt;If&gt;</code> directive
     evaluates an expression at runtime, and applies the enclosed
@@ -2209,14 +2212,6 @@ satisfied by a request at runtime</td></
 
     <p>Only directives that support the <a href="directive-dict.html#Context">directory context</a> can be used within this configuration section.</p>
 
-    <div class="note"><h3>Not a scripting language</h3>
-    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 <code class="directive">&lt;If&gt;</code> section inside another
-    one (the inner <code class="directive">&lt;If&gt;</code> will be ignored).
-    </div>
-
     <div class="warning">
     Certain variables, such as <code>CONTENT_TYPE</code> and other
     response headers, are set after &lt;If&gt; conditions have already