update transforms

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

diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 4806f97303211b8f3e471b8d95c0db4f02b44082..4ab972c80a707c0b87cab633125adfef2b092c3d 100644 (file)
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -31,7 +31,7 @@ use configuration section containers or <code>.htaccess</code> files
 to change the scope of other configuration directives.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">Types of Configuration Section Containers</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Filesystem and Webspace</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Filesystem, Webspace, and Boolean Expressions</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Virtual Hosts</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#proxy">Proxy</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">What Directives are Allowed?</a></li>
@@ -108,7 +108,7 @@ Also, these sections can be nested to achieve more complex
 restrictions.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="file-and-web" id="file-and-web">Filesystem and Webspace</a></h2>
+<h2><a name="file-and-web" id="file-and-web">Filesystem, Webspace, and Boolean Expressions</a></h2>
 
 <p>The most commonly used configuration section containers are the
 ones that change the configuration of particular places in the
@@ -278,6 +278,20 @@ Deny from all<br />
 
 
 
+<h3><a name="expressions" id="expressions">Boolean expressions</a></h3>
+<p>The <code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code>
+directive change the configuration depending on a condition which can be
+expressed by a boolean expression. For example, the following configuration
+denies access if the HTTP Referer header does not start with
+"http://www.example.com/".</p>
+<div class="example"><p><code>
+&lt;If "!(%{HTTP_REFERER} -strmatch 'http://www.example.com/*')"&gt;<br />
+Require all denied<br />
+&lt;/If&gt;
+</code></p></div>
+
+
+
 <h3><a name="whichwhen" id="whichwhen">What to use When</a></h3>
 
 <p>Choosing between filesystem containers and webspace containers is
@@ -322,6 +336,20 @@ rule.  Putting configuration restrictions in a <code>&lt;Location
 to all requests regardless of the specific URL.</p>
 
 
+<h3><a name="nesting" id="nesting">Nesting of sections</a></h3>
+
+<p>Some section types can be nested inside other section types. One the one
+hand, <code class="directive"><a href="./mod/core.html#file">&lt;File&gt;</a></code> can be used
+inside <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>.  On
+the other hand, <code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code> can
+be used inside <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, and <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> sections. The regex
+counterparts of the named section behave identically.</p>
+
+<p>Nested sections are merged after non-nested sections of the same type.</p>
+
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="virtualhost" id="virtualhost">Virtual Hosts</a></h2>
@@ -405,6 +433,10 @@ are interpreted, it is important to understand how this works.</p>
 
       <li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
       and <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> done simultaneously</li>
+
+      <li><code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code>
+      </li>
+
     </ol>
 
     <p>Apart from <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, each group is processed in