From: Eric Covener <covener@apache.org>
Date: Wed, 8 Mar 2017 00:41:04 +0000 (+0000)
Subject: Merge r1785907 from trunk:
X-Git-Tag: 2.4.26~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c223ff567002406af83fef679617e34c642c1144;p=apache

Merge r1785907 from trunk:

compat inline for no-proxy




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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 66fb6fc645..b0e0b560f8 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -398,7 +398,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10
 &lt;/Location&gt;
         </highlight>
 
-      <p> The "no-proxy" environment variable can be set to disable 
+      <p> In 2.4.26 and later, the "no-proxy" environment variable can be set to disable 
       <module>mod_proxy</module> processing the current request.
       This variable should be set with <directive module="mod_setenvif"
       >SetEnvIf</directive>, as <directive module="mod_env">SetEnv</directive>
@@ -965,7 +965,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"
       specific location will take precedence.</p>
 
       <p>For the same reasons, exclusions must come <em>before</em> the
-      general <directive>ProxyPass</directive> directives. The "no-proxy"
+      general <directive>ProxyPass</directive> directives. In 2.4.26 and later, the "no-proxy"
       environment variable is an alternative to exclusions, and is the only
       way to configure an exclusion of a <directive>ProxyPass</directive>
       directive in <directive module="core">Location</directive> context.