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/trunk@1934605 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index ac6573523eb0bc5d8b134624f04bb419ab018c5b..6f9b071c9552e888e4115d144d27e5792db12462 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>It 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 timestamps. Rules can operate on the
+      based on <a href="#rewritecond">server variables</a> (including HTTP
+      headers, connection details, and timestamps), environment variables,
+      or other request properties. Rules can operate on the
       <a href="directive-dict.html#Syntax">URL-path</a> (including any
       <a href="core.html#acceptpathinfo">trailing pathname information</a>)
       and can also alter the
@@ -507,7 +508,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>
@@ -1227,7 +1228,7 @@ guide for complete details.
         <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
@@ -1245,7 +1246,7 @@ guide for complete details.
       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
@@ -1292,7 +1293,7 @@ guide for complete details.
     <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 f2b54a1a17b0bda6b087e955f0fe94f418efb247..b5cf4a417a5e34651bacc6fc5505f475300ba84a 100644 (file)
--- a/docs/manual/rewrite/flags.xml
+++ b/docs/manual/rewrite/flags.xml
@@ -75,7 +75,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>