Add descriptions of the new RewriteCond test flags, -L, -h, and the new

>= and <= syntax, added by wrowe in r997553.

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

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 52ecb6e48ae7b9ba248fe774d54dbaec15738aed..6b599bdf9cbfb55660219cc8e41429115cf2e076 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -442,6 +442,22 @@ RewriteRule ^index\.html$  newsite.html
             is <code>""</code> (two quotation marks) this
             compares <em>TestString</em> to the empty string.</li>
 
+            <li>'<strong>&lt;=CondPattern</strong>' (lexicographically
+            less than or equal to)<br />
+            Treats the <em>CondPattern</em> as a plain string and
+            compares it lexicographically to <em>TestString</em>. True
+            if <em>TestString</em> lexicographically precedes
+            <em>CondPattern</em>, or is equal to <em>CondPattern</em>
+            (the two strings are equal, character for character).</li>
+
+            <li>'<strong>&gt;=CondPattern</strong>' (lexicographically
+            greater than or equal to)<br />
+            Treats the <em>CondPattern</em> as a plain string and
+            compares it lexicographically to <em>TestString</em>. True
+            if <em>TestString</em> lexicographically follows
+            <em>CondPattern</em>, or is equal to <em>CondPattern</em>
+            (the two strings are equal, character for character).</li>
+
             <li>'<strong>-d</strong>' (is
             <strong>d</strong>irectory)<br />
              Treats the <em>TestString</em> as a pathname and tests
@@ -452,24 +468,6 @@ RewriteRule ^index\.html$  newsite.html
              Treats the <em>TestString</em> as a pathname and tests
             whether or not it exists, and is a regular file.</li>
 
-            <li>'<strong>-s</strong>' (is regular file, with
-            <strong>s</strong>ize)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and is a regular file with size greater
-            than zero.</li>
-
-            <li>'<strong>-l</strong>' (is symbolic
-            <strong>l</strong>ink)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and is a symbolic link.</li>
-
-            <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable
-            permissions)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and has executable permissions.
-            These permissions are determined according to
-            the underlying OS.</li>
-
             <li>'<strong>-F</strong>' (is existing file, via
             subrequest)<br />
             Checks whether or not <em>TestString</em> is a valid file,
@@ -478,6 +476,26 @@ RewriteRule ^index\.html$  newsite.html
             subrequest to do the check, so use it with care -
             it can impact your server's performance!</li>
 
+            <li>'<strong>-H</strong>' (is symbolic link, bash convention)<br />
+            See <strong>-l</strong>.</li>
+
+            <li>'<strong>-l</strong>' (is symbolic
+            <strong>l</strong>ink)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and is a symbolic link. May also
+            use the bash convention of <strong>-L</strong> or
+            <strong>-h</strong> if there's a possibility of confusion
+            such as when using the <strong>-lt</strong> test.</li>
+
+            <li>'<strong>-L</strong>' (is symbolic link, bash convention)<br />
+            See <strong>-l</strong>.</li>
+
+            <li>'<strong>-s</strong>' (is regular file, with
+            <strong>s</strong>ize)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and is a regular file with size greater
+            than zero.</li>
+
             <li>'<strong>-U</strong>' (is existing URL, via
             subrequest)<br />
             Checks whether or not <em>TestString</em> is a valid URL,
@@ -485,6 +503,14 @@ RewriteRule ^index\.html$  newsite.html
             access controls for that path. This uses an internal
             subrequest to do the check, so use it with care -
             it can impact your server's performance!</li>
+
+            <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable
+            permissions)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and has executable permissions.
+            These permissions are determined according to
+            the underlying OS.</li>
+
           </ul>
 
 <div class="note"><h3>Note:</h3>

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 49edb3791281840b6a732117685969d678c7150a..39d1a51e337ce847a9f5f703da138db8e257184e 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -596,6 +596,22 @@ RewriteRule ^index\.html$  newsite.html
             is <code>""</code> (two quotation marks) this
             compares <em>TestString</em> to the empty string.</li>
 
+            <li>'<strong>&lt;=CondPattern</strong>' (lexicographically
+            less than or equal to)<br />
+            Treats the <em>CondPattern</em> as a plain string and
+            compares it lexicographically to <em>TestString</em>. True
+            if <em>TestString</em> lexicographically precedes
+            <em>CondPattern</em>, or is equal to <em>CondPattern</em>
+            (the two strings are equal, character for character).</li>
+
+            <li>'<strong>&gt;=CondPattern</strong>' (lexicographically
+            greater than or equal to)<br />
+            Treats the <em>CondPattern</em> as a plain string and
+            compares it lexicographically to <em>TestString</em>. True
+            if <em>TestString</em> lexicographically follows
+            <em>CondPattern</em>, or is equal to <em>CondPattern</em>
+            (the two strings are equal, character for character).</li>
+
             <li>'<strong>-d</strong>' (is
             <strong>d</strong>irectory)<br />
              Treats the <em>TestString</em> as a pathname and tests
@@ -606,24 +622,6 @@ RewriteRule ^index\.html$  newsite.html
              Treats the <em>TestString</em> as a pathname and tests
             whether or not it exists, and is a regular file.</li>
 
-            <li>'<strong>-s</strong>' (is regular file, with
-            <strong>s</strong>ize)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and is a regular file with size greater
-            than zero.</li>
-
-            <li>'<strong>-l</strong>' (is symbolic
-            <strong>l</strong>ink)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and is a symbolic link.</li>
-
-            <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable
-            permissions)<br />
-            Treats the <em>TestString</em> as a pathname and tests
-            whether or not it exists, and has executable permissions.
-            These permissions are determined according to
-            the underlying OS.</li>
-
             <li>'<strong>-F</strong>' (is existing file, via
             subrequest)<br />
             Checks whether or not <em>TestString</em> is a valid file,
@@ -632,6 +630,26 @@ RewriteRule ^index\.html$  newsite.html
             subrequest to do the check, so use it with care -
             it can impact your server's performance!</li>
 
+            <li>'<strong>-H</strong>' (is symbolic link, bash convention)<br />
+            See <strong>-l</strong>.</li>
+
+            <li>'<strong>-l</strong>' (is symbolic
+            <strong>l</strong>ink)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and is a symbolic link. May also
+            use the bash convention of <strong>-L</strong> or
+            <strong>-h</strong> if there's a possibility of confusion
+            such as when using the <strong>-lt</strong> test.</li>
+
+            <li>'<strong>-L</strong>' (is symbolic link, bash convention)<br />
+            See <strong>-l</strong>.</li>
+
+            <li>'<strong>-s</strong>' (is regular file, with
+            <strong>s</strong>ize)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and is a regular file with size greater
+            than zero.</li>
+
             <li>'<strong>-U</strong>' (is existing URL, via
             subrequest)<br />
             Checks whether or not <em>TestString</em> is a valid URL,
@@ -639,6 +657,14 @@ RewriteRule ^index\.html$  newsite.html
             access controls for that path. This uses an internal
             subrequest to do the check, so use it with care -
             it can impact your server's performance!</li>
+
+            <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable
+            permissions)<br />
+            Treats the <em>TestString</em> as a pathname and tests
+            whether or not it exists, and has executable permissions.
+            These permissions are determined according to
+            the underlying OS.</li>
+
           </ul>
 
 <note><title>Note:</title>