Synch (a bit) with trunk

Backport r1643118 + some manual tweaks regarding left-over in previous backports

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

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index f3b863db8f70da6c85629b275a28e4367ede4f4c..04f07e224144d6bb3fa10156053dd10496cd631b 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -230,7 +230,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     <tr><td><code>REMOTE_HOST</code></td>
         <td>The host name of the remote host</td></tr>
     <tr><td><code>REMOTE_USER</code></td>
-        <td>The name of the authenticated user, if any (not available during <directive>&lt;If &gt;</directive>)</td></tr>
+        <td>The name of the authenticated user, if any (not available during <directive>&lt;If&gt;</directive>)</td></tr>
     <tr><td><code>REMOTE_IDENT</code></td>
         <td>The user name set by <module>mod_ident</module></td></tr>
     <tr><td><code>SERVER_NAME</code></td>
@@ -252,7 +252,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         module="mod_authn_core">AuthType</directive> (e.g.
         "<code>basic</code>")</td></tr>
     <tr><td><code>CONTENT_TYPE</code></td>
-        <td>The content type of the response (not available during <directive>&lt;If &gt;</directive>)</td></tr>
+        <td>The content type of the response (not available during <directive>&lt;If&gt;</directive>)</td></tr>
     <tr><td><code>HANDLER</code></td>
         <td>The name of the <a href="handler.html">handler</a> creating
             the response</td></tr>
@@ -266,7 +266,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>"<code>on</code>" if the connection uses IPv6,
             "<code>off</code>" otherwise</td></tr>
     <tr><td><code>REQUEST_STATUS</code></td>
-        <td>The HTTP error status of the request (not available during <directive>&lt;If &gt;</directive>)</td></tr>
+        <td>The HTTP error status of the request (not available during <directive>&lt;If&gt;</directive>)</td></tr>
     <tr><td><code>REQUEST_LOG_ID</code></td>
         <td>The error log id of the request (see
             <directive module="core">ErrorLogFormat</directive>)</td></tr>
@@ -480,10 +480,12 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Same as <code>req</code>, but header names will not be added to the
             Vary header</td><td></td></tr>
     <tr><td><code>resp</code></td>
-        <td>Get HTTP response header</td><td></td></tr>
+        <td>Get HTTP response header (most response headers will not yet be set
+            during <directive>&lt;If&gt;</directive>)</td><td></td></tr>
     <tr><td><code>reqenv</code></td>
         <td>Lookup request environment variable (as a shortcut,
-        <code>v</code> can also be used to access variables).</td>
+        <code>v</code> can also be used to access variables). 
+        </td>
         <td>ordering</td></tr>
     <tr><td><code>osenv</code></td>
         <td>Lookup operating system environment variable</td><td></td></tr>