From: Eric Covener <covener@apache.org>
Date: Sat, 3 Dec 2022 15:37:02 +0000 (+0000)
Subject: Merge r1905716 from trunk:
X-Git-Tag: 2.4.55-rc1-candidate~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a8a6c5375dc88e26156c67771c7a532f2f84c7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1905716 from trunk:

mention some non-inuititive <If> stuff




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

diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml
index 67e98481735..a24cd23c4db 100644
--- a/docs/manual/sections.xml
+++ b/docs/manual/sections.xml
@@ -480,7 +480,8 @@ are interpreted, it is important to understand how this works.</p>
       and <directive type="section"
       module="core">LocationMatch</directive> done simultaneously</li>
 
-      <li><directive type="section" module="core">If</directive>
+      <li><directive type="section" module="core">If</directive> sections, even when
+      they are enclosed in any of the preceding contexts.
       </li>
 
     </ol>
@@ -518,6 +519,15 @@ are interpreted, it is important to understand how this works.</p>
         container takes the place of the <directive module="core"
         type="section">Directory</directive> container in the processing
         order.</li>
+        <li> Caution should be exercised when mixing related configuration
+        directives inside and outside of <directive type="section" module="core"
+        >If</directive> because of the effect on merging order.  Explicit use
+        of <directive type="section" module="core" >Else</directive> can help.
+        </li>
+        <li> When <directive type="section" module="core" >If</directive> is 
+        used in <code>.htaccess</code>, the enclosed directives in a parent 
+        directory will be merged <em>after</em> non-enclosed directives in a 
+        subdirectory.</li>
     </ul>
 
     <note><title>Technical Note</title>