I have finally been asked one too many times whether the 'foobar' in

these documents represents the literal string 'foobar'. I think that
this might prove a little clearer, and require just that one little bit
less explanation.

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

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 56d2e74bf677e080593033155d55a1b3cd3bb6bc..14b10ecdcfd9f3def48066cd20edcac73e91152e 100644 (file)
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -294,12 +294,12 @@ headers</td></tr>
         <td>The time from when the request was received to the time the
         headers are sent on the wire. This is a measure of the duration
         of the request. The value is preceded by <code>D=</code>.</td></tr>
-<tr class="odd"><td><code>%{FOOBAR}e</code></td>
+<tr class="odd"><td><code>%{VARNAME}e</code></td>
         <td>The contents of the <a href="../env.html">environment
-        variable</a> <code>FOOBAR</code>.</td></tr>
-<tr><td><code>%{FOOBAR}s</code></td>
+        variable</a> <code>VARNAME</code>.</td></tr>
+<tr><td><code>%{VARNAME}s</code></td>
         <td>The contents of the <a href="mod_ssl.html#envvars">SSL environment
-        variable</a> <code>FOOBAR</code>, if <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is enabled.</td></tr>
+        variable</a> <code>VARNAME</code>, if <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> is enabled.</td></tr>
 </table>
 
     <div class="note"><h3>Note</h3>

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 4f56a66cc01bf054529a97e45037cb52064084ea..b5d9fcb2c320148772065b14eb6e8657dbb5aa0e 100644 (file)
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -379,13 +379,13 @@ headers</description>
         headers are sent on the wire. This is a measure of the duration
         of the request. The value is preceded by <code>D=</code>.</td></tr>
 
-    <tr><td><code>%{FOOBAR}e</code></td>
+    <tr><td><code>%{VARNAME}e</code></td>
         <td>The contents of the <a href="../env.html">environment
-        variable</a> <code>FOOBAR</code>.</td></tr>
+        variable</a> <code>VARNAME</code>.</td></tr>
 
-    <tr><td><code>%{FOOBAR}s</code></td>
+    <tr><td><code>%{VARNAME}s</code></td>
         <td>The contents of the <a href="mod_ssl.html#envvars">SSL environment
-        variable</a> <code>FOOBAR</code>, if <module>mod_ssl</module> is enabled.</td></tr>
+        variable</a> <code>VARNAME</code>, if <module>mod_ssl</module> is enabled.</td></tr>
 
     </table>
 

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index afa49fa012b0a0f7f94e0c93c98b7cfb74e3cb83..6f28ef58a3203894157c17de2cd864c1bb335cb2 100644 (file)
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -90,22 +90,22 @@
 <tr><td><code>%b</code></td>
         <td>Size of response in bytes, excluding HTTP headers. In CLF format, <em>i.e.</em>
         a '<code>-</code>' rather than a 0 when no bytes are sent.</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}C</code></td>
-        <td>The contents of cookie <var>Foobar</var> in the request sent
+<tr class="odd"><td><code>%{<var>VARNAME</var>}C</code></td>
+        <td>The contents of cookie <var>VARNAME</var> in the request sent
         to the server.</td></tr>
 <tr><td><code>%D</code></td>
         <td>The time taken to serve the request, in microseconds.</td></tr>
-<tr class="odd"><td><code>%{<var>FOOBAR</var>}e</code></td>
+<tr class="odd"><td><code>%{<var>VARNAME</var>}e</code></td>
         <td>The contents of the environment variable
-        <var>FOOBAR</var></td></tr>
+        <var>VARNAME</var></td></tr>
 <tr><td><code>%f</code></td>
         <td>Filename</td></tr>
 <tr class="odd"><td><code>%h</code></td>
         <td>Remote host</td></tr>
 <tr><td><code>%H</code></td>
         <td>The request protocol</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}i</code></td>
-        <td>The contents of <code><var>Foobar</var>:</code> header line(s)
+<tr class="odd"><td><code>%{<var>VARNAME</var>}i</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code> header line(s)
         in the request sent to the server. Changes made by other
         modules (e.g. <code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code>) affect this.
         </td></tr>
@@ -121,11 +121,11 @@
         <code>On</code>.</td></tr>
 <tr><td><code>%m</code></td>
         <td>The request method</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}n</code></td>
-        <td>The contents of note <var>Foobar</var> from another
+<tr class="odd"><td><code>%{<var>VARNAME</var>}n</code></td>
+        <td>The contents of note <var>VARNAME</var> from another
         module.</td></tr>
-<tr><td><code>%{<var>Foobar</var>}o</code></td>
-        <td>The contents of <code><var>Foobar</var>:</code> header line(s)
+<tr><td><code>%{<var>VARNAME</var>}o</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code> header line(s)
         in the reply.</td></tr>
 <tr class="odd"><td><code>%p</code></td>
         <td>The canonical port of the server serving the request</td></tr>

diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml
index 9d5b920f4944ea81a735e39097a81a1a23f2348a..715b863269301cf6a0ec3f2ce6c16eea0fea857f 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml
+++ b/docs/manual/mod/mod_log_config.xml
@@ -83,16 +83,16 @@
         <td>Size of response in bytes, excluding HTTP headers. In CLF format, <em>i.e.</em>
         a '<code>-</code>' rather than a 0 when no bytes are sent.</td></tr>
 
-    <tr><td><code>%{<var>Foobar</var>}C</code></td>
-        <td>The contents of cookie <var>Foobar</var> in the request sent
+    <tr><td><code>%{<var>VARNAME</var>}C</code></td>
+        <td>The contents of cookie <var>VARNAME</var> in the request sent
         to the server.</td></tr>
 
     <tr><td><code>%D</code></td>
         <td>The time taken to serve the request, in microseconds.</td></tr>
 
-    <tr><td><code>%{<var>FOOBAR</var>}e</code></td>
+    <tr><td><code>%{<var>VARNAME</var>}e</code></td>
         <td>The contents of the environment variable
-        <var>FOOBAR</var></td></tr>
+        <var>VARNAME</var></td></tr>
 
     <tr><td><code>%f</code></td>
         <td>Filename</td></tr>
@@ -103,8 +103,8 @@
     <tr><td><code>%H</code></td>
         <td>The request protocol</td></tr>
 
-    <tr><td><code>%{<var>Foobar</var>}i</code></td>
-        <td>The contents of <code><var>Foobar</var>:</code> header line(s)
+    <tr><td><code>%{<var>VARNAME</var>}i</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code> header line(s)
         in the request sent to the server. Changes made by other
         modules (e.g. <module>mod_headers</module>) affect this.
         </td></tr>
@@ -125,12 +125,12 @@
     <tr><td><code>%m</code></td>
         <td>The request method</td></tr>
 
-    <tr><td><code>%{<var>Foobar</var>}n</code></td>
-        <td>The contents of note <var>Foobar</var> from another
+    <tr><td><code>%{<var>VARNAME</var>}n</code></td>
+        <td>The contents of note <var>VARNAME</var> from another
         module.</td></tr>
 
-    <tr><td><code>%{<var>Foobar</var>}o</code></td>
-        <td>The contents of <code><var>Foobar</var>:</code> header line(s)
+    <tr><td><code>%{<var>VARNAME</var>}o</code></td>
+        <td>The contents of <code><var>VARNAME</var>:</code> header line(s)
         in the reply.</td></tr>
 
     <tr><td><code>%p</code></td>