From: Eric Covener <covener@apache.org>
Date: Fri, 26 Aug 2016 13:00:47 +0000 (+0000)
Subject: Merge r1757838 from trunk:
X-Git-Tag: 2.4.24~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dc2155ee844e2ff346709c1794f9b01fcc56948;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1757838 from trunk:

add [flags] to syntax

per http://httpd.apache.org/docs/2.4/mod/mod_rewrite.html#comment_5728

split list of flags out of the massive CondPattern list.




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

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 49d11b4a994..1b0028f1529 100644
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -423,7 +423,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
 <description>Defines a condition under which rewriting will take place
 </description>
 <syntax> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></syntax>
+      <em>TestString</em> <em>CondPattern</em> [<em>flags</em>]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
@@ -951,14 +951,14 @@ RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"
 RewriteRule "^/images" "-" [F]
            </highlight>
         </li>
+     </ol>
 
-        <li>You can also set special flags for
-      <em>CondPattern</em> by appending
+     <p>You can also set special flags for <em>CondPattern</em> by appending
         <strong><code>[</code><em>flags</em><code>]</code></strong>
       as the third argument to the <code>RewriteCond</code>
       directive, where <em>flags</em> is a comma-separated list of any of the
-      following flags:
-
+      following flags:</p>
+      
       <ul>
         <li>'<strong><code>nocase|NC</code></strong>'
         (<strong>n</strong>o <strong>c</strong>ase)<br />
@@ -996,8 +996,6 @@ RewriteRule ...some special stuff for any of these hosts...
         is well understood.
         </li>
       </ul>
-      </li>
-     </ol>
 
       <p><strong>Example:</strong></p>