From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 26 Mar 2022 06:17:34 +0000 (+0000)
Subject: 'interpolate' is a keyword, not a user-defined string.
X-Git-Tag: 2.4.54-rc1-candidate~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f7b319bc4b8d0c9a612865480bc7e3a0fbb4e4;p=thirdparty%2Fapache%2Fhttpd.git

'interpolate' is a keyword, not a user-defined string.
So it should not be in <var></var> in <syntax>  and  <code> should be used instead of <var> in explanations.

While at it, fix some other style issues and missing links spotted here and there.

(t1899205 in trunk)

[skip ci]

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 5c616a8e5b3..47fa5d34a24 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -604,7 +604,7 @@ request</description>
 context in 2.3.3 and later.</compatibility>
 
 <usage>
-    <p>When enabled, this option will pass the Host: line from the incoming
+    <p>When enabled, this option will pass the <code>Host:</code> line from the incoming
     request to the proxied host, instead of the hostname specified in the
     <directive module="mod_proxy">ProxyPass</directive> line.</p>
 
@@ -1438,7 +1438,7 @@ ProxyPass "/" "balancer://hotcluster/"
     The optional <var>noquery</var> keyword (available in
     httpd 2.4.1 and later) prevents this.</p>
 
-    <p>The optional <var>interpolate</var> keyword, in combination with
+    <p>The optional <code>interpolate</code> keyword, in combination with
     <directive module="mod_proxy">ProxyPassInterpolateEnv</directive>, causes the ProxyPass
     to interpolate environment variables, using the syntax
     <var>${VARNAME}</var>.  Note that many of the standard CGI-derived
@@ -1545,7 +1545,7 @@ ProxyPassMatch "^/(.*\.gif)$" "http://backend.example.com:8000/$1"
 <description>Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</description>
 <syntax>ProxyPassReverse [<var>path</var>] <var>url</var>
-[<var>interpolate</var>]</syntax>
+[interpolate]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
@@ -1599,8 +1599,8 @@ ProxyPassReverseCookiePath  "/"  "/mirror/foo/"
     because it doesn't depend on a corresponding <directive module="mod_proxy"
     >ProxyPass</directive> directive.</p>
 
-    <p>The optional <var>interpolate</var> keyword, used together with
-    <directive>ProxyPassInterpolateEnv</directive>, enables interpolation
+    <p>The optional <code>interpolate</code> keyword, used together with
+    <directive module="mod_proxy">ProxyPassInterpolateEnv</directive>, enables interpolation
     of environment variables specified using the format <var>${VARNAME}</var>.
     Note that interpolation is not supported within the scheme portion of a
     URL.</p>
@@ -1626,7 +1626,7 @@ ProxyPassReverseCookiePath  "/"  "/mirror/foo/"
 <description>Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</description>
 <syntax>ProxyPassReverseCookieDomain <var>internal-domain</var>
-<var>public-domain</var> [<var>interpolate</var>]</syntax>
+<var>public-domain</var> [interpolate]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
@@ -1644,7 +1644,7 @@ string in <code>Set-Cookie</code> headers.</p>
 <description>Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</description>
 <syntax>ProxyPassReverseCookiePath <var>internal-path</var>
-<var>public-path</var> [<var>interpolate</var>]</syntax>
+<var>public-path</var> [interpolate]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
 </contextlist>
@@ -2053,7 +2053,7 @@ header for proxied requests</description>
 <compatibility>Available in httpd 2.2.9 and later</compatibility>
 
 <usage>
-    <p>This directive, together with the <var>interpolate</var> argument to
+    <p>This directive, together with the <code>interpolate</code> argument to
     <directive>ProxyPass</directive>, <directive>ProxyPassReverse</directive>,
     <directive>ProxyPassReverseCookieDomain</directive>, and
     <directive>ProxyPassReverseCookiePath</directive>,
@@ -2066,7 +2066,7 @@ header for proxied requests</description>
     <directive>ProxyPassReverseCookiePath</directive> directives
     and causes them to substitute the value of an environment
     variable <code>varname</code> for the string <code>${varname}</code>
-    in configuration directives if the <var>interpolate</var> option is set.</p>
+    in configuration directives if the <code>interpolate</code> option is set.</p>
     <p>The scheme/hostname/port portion of <directive>ProxyPass</directive> may
     contain variables, but only the ones available when the directive is parsed
     (for example, using <directive module="core">Define</directive>).