docs: Normalize "server-variables" to "server variables" in mod_rewrite

Remove hyphenation from "Server-Variables"/"server-variables" in
mod/mod_rewrite.xml and rewrite/flags.xml — no RFC precedent exists
for the hyphenated form (RFC 3875 uses "meta-variables"). Rework the
module summary to clarify that HTTP headers and timestamps are a
subset of server variables, not separate categories. Link the term
to its definition in RewriteCond.

Addresses: https://bz.apache.org/bugzilla/show_bug.cgi?id=70059

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

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 55c2880bf65ed52c7fe4bc556363b00f9bae1d49..4a35efc2cafeb8c7bd8d916386e88ce67ce3b8b4 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -41,8 +41,9 @@ URLs on the fly</description>
       <p><module>mod_rewrite</module> provides a flexible and powerful way to
       manipulate URLs using an unlimited number of rules. Each rule can have an
       unlimited number of attached rule conditions, to allow you to rewrite URLs
-      based on server variables, environment variables, cookies, HTTP headers, or time
-      stamps.</p>
+      based on <a href="#rewritecond">server variables</a> (including HTTP
+      headers, connection details, and timestamps), environment variables,
+      or other request properties.</p>
 
       <p><module>mod_rewrite</module> can operate on the full URL-path, or any
       portion of it, including the PATH_INFO or QUERY_STRING.</p>
@@ -498,7 +499,7 @@ RewriteRule "^/ex/(.*)" "${examplemap:$1}"
           RewriteMap</a> for more details.
         </li>
         <li>
-          <strong>Server-Variables</strong>: These are variables of
+          <strong>Server variables</strong>: These are variables of
           the form
             <strong><code>%{</code> <em>NAME_OF_VARIABLE</em>
             <code>}</code></strong>
@@ -1303,7 +1304,7 @@ sections and consider both set of statements, rather than only the last one.</li
         <li>back-references (<code>%N</code>) to the last matched
         RewriteCond pattern</li>
 
-        <li>server-variables as in rule condition test-strings
+        <li>server variables as in rule condition test-strings
         (<code>%{VARNAME}</code>)</li>
 
         <li><a href="#mapfunc">mapping-function</a> calls
@@ -1321,7 +1322,7 @@ sections and consider both set of statements, rather than only the last one.</li
       matched
       <directive module="mod_rewrite">RewriteCond</directive>
       <em>CondPattern</em>: <code>%0</code> is the entire match and
-      <code>%1</code>..<code>%9</code> are the captured groups. The server-variables are the same
+      <code>%1</code>..<code>%9</code> are the captured groups. The server variables are the same
       as for the <em>TestString</em> of a
       <directive module="mod_rewrite">RewriteCond</directive>
       directive. The mapping-functions come from the
@@ -1368,7 +1369,7 @@ sections and consider both set of statements, rather than only the last one.</li
     <tr>
         <td>B</td>
         <td>Escape non-alphanumeric characters in backreferences <em>before</em>
-        applying the transformation. For similar escaping of server-variables, see
+        applying the transformation. For similar escaping of server variables, see
         the "escape" <a href="#mapfunc">mapping-function</a>.<em><a
         href="../rewrite/flags.html#flag_b">details ...</a></em></td>
     </tr>

diff --git a/docs/manual/rewrite/flags.xml b/docs/manual/rewrite/flags.xml
index f063f074d145d779af927b592d61be9a7a4868b6..c485ef634ba5cdbc97c08c6adbd702de0376787c 100644 (file)
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -73,7 +73,7 @@ so backreferences are unescaped at the time they are applied.
 Using the B flag, non-alphanumeric characters in backreferences
 will be escaped. For example, consider the rule:</p>
 
-<p>For similar escaping of server-variables, see
+<p>For similar escaping of server variables, see
     the "escape" <a href="#mapfunc">mapping-function</a></p>