Reorder sections.

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

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index 23fb4e46bd362b0762952112ec176d438101c53c..0adbd00f96fc260837f47b58f58400ade2821c0a 100644 (file)
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -42,10 +42,10 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#binop">Binary operators</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#unnop">Unary operators</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#functions">Functions</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#examples">Example expressions</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#other">Other</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#sslrequire">Comparison with SSLRequire</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#compatibility">Version History</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">Example expressions</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if">&lt;If&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#elseif">&lt;ElseIf&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#else">&lt;Else&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptokey">CryptoKey</a></code></li><li><code class="directive"><a href="./mod/mod_crypto.html#cryptoiv">CryptoIV</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a href="mod/mod_authnz_ldap.html#reqsearch">Require ldap-search</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a href="mod/mod_authz_groupfile.html#reqgroup">Require group</a></li><li><a href="mod/mod_authz_host.html#reqhost">Require host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><a href="#comments_section">Comments</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -598,6 +598,54 @@ DIGIT       ::= &lt;any US-ASCII digit "0".."9"&gt;</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="other" id="other">Other</a> <a title="Permanent link" href="#other" class="permalink">&para;</a></h2>
+    
+
+    <table class="bordered"><tr class="header"><th>Name</th><th>Alternative</th> <th>Description</th></tr>
+<tr><td><code>-in</code></td>
+        <td><code>in</code></td>
+        <td>string contained in list</td></tr>
+<tr class="odd"><td><code>/regexp/</code></td>
+        <td><code>m#regexp#</code></td>
+        <td>Regular expression (the second form allows different
+        delimiters than /)</td></tr>
+<tr><td><code>/regexp/i</code></td>
+        <td><code>m#regexp#i</code></td>
+        <td>Case insensitive regular expression</td></tr>
+<tr class="odd"><td><code>$0 ... $9</code></td>
+        <td />
+        <td>Regular expression backreferences</td></tr>
+</table>
+
+    <h3><a name="rebackref" id="rebackref">Regular expression backreferences</a></h3>
+        
+        <p>The strings <code>$0</code> ... <code>$9</code> allow to reference
+        the capture groups from a previously executed, successfully
+        matching regular expressions. They can normally only be used in the
+        same expression as the matching regex, but some modules allow special
+        uses.</p>
+    
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sslrequire" id="sslrequire">Comparison with SSLRequire</a> <a title="Permanent link" href="#sslrequire" class="permalink">&para;</a></h2>
+    
+    <p>The <em>ap_expr</em> syntax is mostly a superset of the syntax of the
+    deprecated <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code> directive.
+    The differences are described in <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code>'s documentation.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compatibility" id="compatibility">Version History</a> <a title="Permanent link" href="#compatibility" class="permalink">&para;</a></h2>
+    
+    <p>The <code>req_novary</code> <a href="#functions">function</a>
+    is available for versions 2.4.4 and later.</p>
+    <p>The <code>SERVER_PROTOCOL_VERSION</code>,
+    <code>SERVER_PROTOCOL_VERSION_MAJOR</code> and
+    <code>SERVER_PROTOCOL_VERSION_MINOR</code>
+    <a href="#vars">variables</a>
+    are available for versions 2.5.0 and later.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="examples" id="examples">Example expressions</a> <a title="Permanent link" href="#examples" class="permalink">&para;</a></h2>
 
     
@@ -669,54 +717,6 @@ Require expr "IP Address:%{REMOTE_ADDR}" -in split/, /, join PeerExtList('subjec
 CustomLog logs/access-errors.log common "expr=%{REQUEST_STATUS} &gt;= 400"
 CustomLog logs/access-errors-specific.log common "expr=%{REQUEST_STATUS} -in {'405','410'}"</pre>
 
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="other" id="other">Other</a> <a title="Permanent link" href="#other" class="permalink">&para;</a></h2>
-    
-
-    <table class="bordered"><tr class="header"><th>Name</th><th>Alternative</th> <th>Description</th></tr>
-<tr><td><code>-in</code></td>
-        <td><code>in</code></td>
-        <td>string contained in list</td></tr>
-<tr class="odd"><td><code>/regexp/</code></td>
-        <td><code>m#regexp#</code></td>
-        <td>Regular expression (the second form allows different
-        delimiters than /)</td></tr>
-<tr><td><code>/regexp/i</code></td>
-        <td><code>m#regexp#i</code></td>
-        <td>Case insensitive regular expression</td></tr>
-<tr class="odd"><td><code>$0 ... $9</code></td>
-        <td />
-        <td>Regular expression backreferences</td></tr>
-</table>
-
-    <h3><a name="rebackref" id="rebackref">Regular expression backreferences</a></h3>
-        
-        <p>The strings <code>$0</code> ... <code>$9</code> allow to reference
-        the capture groups from a previously executed, successfully
-        matching regular expressions. They can normally only be used in the
-        same expression as the matching regex, but some modules allow special
-        uses.</p>
-    
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sslrequire" id="sslrequire">Comparison with SSLRequire</a> <a title="Permanent link" href="#sslrequire" class="permalink">&para;</a></h2>
-    
-    <p>The <em>ap_expr</em> syntax is mostly a superset of the syntax of the
-    deprecated <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code> directive.
-    The differences are described in <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code>'s documentation.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compatibility" id="compatibility">Version History</a> <a title="Permanent link" href="#compatibility" class="permalink">&para;</a></h2>
-    
-    <p>The <code>req_novary</code> <a href="#functions">function</a>
-    is available for versions 2.4.4 and later.</p>
-    <p>The <code>SERVER_PROTOCOL_VERSION</code>,
-    <code>SERVER_PROTOCOL_VERSION_MAJOR</code> and
-    <code>SERVER_PROTOCOL_VERSION_MINOR</code>
-    <a href="#vars">variables</a>
-    are available for versions 2.5.0 and later.</p>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./en/expr.html" title="English">&nbsp;en&nbsp;</a> |

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index 837865bfdd57e27d15114a1da48b2352494d221e..87f56f1d7795d97572ae7d7ee1556350260d59c7 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -650,6 +650,58 @@ DIGIT       ::= <any US-ASCII digit "0".."9">
 
 </section>
 
+<section id="other">
+    <title>Other</title>
+
+    <table border="1" style="zebra">
+    <columnspec><column width=".2"/><column width=".2"/><column width=".6"/></columnspec>
+
+    <tr><th>Name</th><th>Alternative</th> <th>Description</th></tr>
+    <tr><td><code>-in</code></td>
+        <td><code>in</code></td>
+        <td>string contained in list</td></tr>
+    <tr><td><code>/regexp/</code></td>
+        <td><code>m#regexp#</code></td>
+        <td>Regular expression (the second form allows different
+        delimiters than /)</td></tr>
+    <tr><td><code>/regexp/i</code></td>
+        <td><code>m#regexp#i</code></td>
+        <td>Case insensitive regular expression</td></tr>
+    <tr><td><code>$0 ... $9</code></td>
+        <td></td>
+        <td>Regular expression backreferences</td></tr>
+    </table>
+
+    <section id="rebackref">
+        <title>Regular expression backreferences</title>
+        <p>The strings <code>$0</code> ... <code>$9</code> allow to reference
+        the capture groups from a previously executed, successfully
+        matching regular expressions. They can normally only be used in the
+        same expression as the matching regex, but some modules allow special
+        uses.</p>
+    </section>
+
+</section>
+
+<section id="sslrequire">
+    <title>Comparison with SSLRequire</title>
+    <p>The <em>ap_expr</em> syntax is mostly a superset of the syntax of the
+    deprecated <directive module="mod_ssl">SSLRequire</directive> directive.
+    The differences are described in <directive
+    module="mod_ssl">SSLRequire</directive>'s documentation.</p>
+</section>
+
+<section id="compatibility">
+    <title>Version History</title>
+    <p>The <code>req_novary</code> <a href="#functions">function</a>
+    is available for versions 2.4.4 and later.</p>
+    <p>The <code>SERVER_PROTOCOL_VERSION</code>,
+    <code>SERVER_PROTOCOL_VERSION_MAJOR</code> and
+    <code>SERVER_PROTOCOL_VERSION_MINOR</code>
+    <a href="#vars">variables</a>
+    are available for versions 2.5.0 and later.</p>
+</section>
+
 <section id="examples">
 
     <title>Example expressions</title>
@@ -725,56 +777,4 @@ CustomLog logs/access-errors-specific.log common "expr=%{REQUEST_STATUS} -in {'4
     </highlight>
 </section>
 
-<section id="other">
-    <title>Other</title>
-
-    <table border="1" style="zebra">
-    <columnspec><column width=".2"/><column width=".2"/><column width=".6"/></columnspec>
-
-    <tr><th>Name</th><th>Alternative</th> <th>Description</th></tr>
-    <tr><td><code>-in</code></td>
-        <td><code>in</code></td>
-        <td>string contained in list</td></tr>
-    <tr><td><code>/regexp/</code></td>
-        <td><code>m#regexp#</code></td>
-        <td>Regular expression (the second form allows different
-        delimiters than /)</td></tr>
-    <tr><td><code>/regexp/i</code></td>
-        <td><code>m#regexp#i</code></td>
-        <td>Case insensitive regular expression</td></tr>
-    <tr><td><code>$0 ... $9</code></td>
-        <td></td>
-        <td>Regular expression backreferences</td></tr>
-    </table>
-
-    <section id="rebackref">
-        <title>Regular expression backreferences</title>
-        <p>The strings <code>$0</code> ... <code>$9</code> allow to reference
-        the capture groups from a previously executed, successfully
-        matching regular expressions. They can normally only be used in the
-        same expression as the matching regex, but some modules allow special
-        uses.</p>
-    </section>
-
-</section>
-
-<section id="sslrequire">
-    <title>Comparison with SSLRequire</title>
-    <p>The <em>ap_expr</em> syntax is mostly a superset of the syntax of the
-    deprecated <directive module="mod_ssl">SSLRequire</directive> directive.
-    The differences are described in <directive
-    module="mod_ssl">SSLRequire</directive>'s documentation.</p>
-</section>
-
-<section id="compatibility">
-    <title>Version History</title>
-    <p>The <code>req_novary</code> <a href="#functions">function</a>
-    is available for versions 2.4.4 and later.</p>
-    <p>The <code>SERVER_PROTOCOL_VERSION</code>,
-    <code>SERVER_PROTOCOL_VERSION_MAJOR</code> and
-    <code>SERVER_PROTOCOL_VERSION_MINOR</code>
-    <a href="#vars">variables</a>
-    are available for versions 2.5.0 and later.</p>
-</section>
-
 </manualpage>