Commit b259ad91 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Fix the -H|-h flag as spotted by Pete in the online doc. 

Add the missing -ne in RewriteCond
Add some missing hyperlinks to the corresponding directives.
(r1737767 and r1737769 in trunk)

+ synch with trunk (trailing space removal)

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

docs/manual/mod/mod_rewrite.xml

+44 −34
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ URLs on the fly</description> 
      <code>RewriteEngine on</code> directive for each virtual host

      in which you wish to use rewrite rules.</p>



      <p><directive>RewriteMap</directive> directives of the type <code>prg</code>

      <p><directive module="mod_rewrite">RewriteMap</directive> directives

      of the type <code>prg</code>

      are not started during server initialization if they're defined in a

      context that does not have <directive>RewriteEngine</directive> set to

      <code>on</code></p>
@@ -383,8 +384,8 @@ RewriteRule "^/ex/(.*)" "${examplemap:$1}" 
<usage>

      <p>The <directive>RewriteBase</directive> directive specifies the

      URL prefix to be used for per-directory (htaccess)

      <directive>RewriteRule</directive> directives that substitute a relative

      path.</p>

      <directive module="mod_rewrite">RewriteRule</directive> directives that

      substitute a relative path.</p>

      <p> This directive is <em>required</em> when you use a relative path

      in a substitution in per-directory (htaccess) context unless either

      of the following conditions are true:</p>
@@ -394,7 +395,8 @@ RewriteRule "^/ex/(.*)" "${examplemap:$1}" 
               (as opposed to reachable by other means, such as

               <directive module="mod_alias">Alias</directive>).</li>

          <li> The <em>filesystem</em> path to the directory containing the

               <directive>RewriteRule</directive>, suffixed by the relative 

               <directive module="mod_rewrite">RewriteRule</directive>,

               suffixed by the relative

               substitution is also valid as a URL path on the server

               (this is rare).</li>

          <li> In Apache HTTP Server 2.4.11 and later, this directive may be
@@ -842,6 +844,13 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" 
            <strong>-l</strong> by using the <strong>-L</strong> or

            <strong>-h</strong> variant.</dd>



            <dt><strong>-ne</strong></dt>

            <dd>Is numerically <strong>n</strong>ot <strong>e</strong>qual to<br />

            The <em>TestString</em> is treated as an integer, and is

            numerically compared to the <em>CondPattern</em>. True if

            the two are numerically different. This is equivalent to

            <code>!-ne</code></dd>



           </dl>

        </li>
@@ -875,7 +884,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" 
            it can impact your server's performance!

           </dd>



            <dt><strong>-H</strong></dt>

            <dt><strong>-h</strong></dt>

            <dd>Is symbolic link, bash convention.<br />

            See <strong>-l</strong>.

            </dd>
@@ -1043,7 +1052,6 @@ RewriteRule "^/$" "/homepage.std.html" [L] 
      path relative to that per-directory context. Subsequent patterns

      are matched against the output of the last matching RewriteRule.</p>





<note><title><a id="what_is_matched" name="what_is_matched">What is matched?</a></title>

      <p>In <directive module="core">VirtualHost</directive> context,

      The <em>Pattern</em> will initially be matched against the part of the
@@ -1094,7 +1102,7 @@ relative substitutions.</li> 


<li> If you wish to match against the full URL-path in a per-directory

(htaccess) RewriteRule, use the <code>%{REQUEST_URI}</code> variable in

a <directive>RewriteCond</directive>.</li>

a <directive module="mod_rewrite">RewriteCond</directive>.</li>



<li>The removed prefix always ends with a slash, meaning the matching occurs against a string which

<em>never</em> has a leading slash.  Therefore, a <em>Pattern</em> with <code>^/</code> never
@@ -1205,9 +1213,11 @@ cannot use <code>$N</code> in the substitution string! 
      (<strong>N</strong>=0..9), which will be replaced

      by the contents of the <strong>N</strong>th group of the

      matched <em>Pattern</em>. The server-variables are the same

      as for the <em>TestString</em> of a <code>RewriteCond</code>

      as for the <em>TestString</em> of a

      <directive module="mod_rewrite">RewriteCond</directive>

      directive. The mapping-functions come from the

      <code>RewriteMap</code> directive and are explained there.

      <directive module="mod_rewrite">RewriteMap</directive>

      directive and are explained there.

      These three types of variables are expanded in the order above.</p>



      <p>Rewrite rules are applied to the results of previous rewrite
@@ -1236,7 +1246,7 @@ cannot use <code>$N</code> in the substitution string! 
      <p>Additionally you can set special <a name="rewriteflags"

      id="rewriteflags">actions</a> to be performed by

      appending <strong><code>[</code><em>flags</em><code>]</code></strong>

      as the third argument to the <code>RewriteRule</code>

      as the third argument to the <directive>RewriteRule</directive>

      directive. <em>Flags</em> is a comma-separated list, surround by square

      brackets, of any of the flags in the following table. More

      details, and examples, for each flag, are available in the <a