svn commit: r1769784 - /httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

[el...@apache.org]

Author: elukey
Date: Tue Nov 15 11:32:27 2016
New Revision: 1769784

URL: http://svn.apache.org/viewvc?rev=1769784&view=rev
Log:
Merge r1769637 from trunk:

Unified duplicate warning in mod_proxy ProxyPass documentation.

Also changed terminology to be in sync with:
https://httpd.apache.org/docs/current/mod/directive-dict.html#Context

It was confusing in my opinion to read that ProxyPass wasn't supported
for the <Directory> context (since "directory" semantic is already
overloaded).


Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1769784&r1=1769783&r2=1769784&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Tue Nov 15 11:32:27 2016
@@ -865,8 +865,9 @@ expressions</description>
     a local virtual path; <var>url</var> is a partial URL for the
     remote server and cannot include a query string.</p>
 
-    <note><strong>Note: </strong>This directive cannot be used within a 
-    <code>&lt;Directory&gt;</code> context.</note>
+    <note><strong>Note: </strong>This directive is not supported within
+    <directive type="section" module="core">Directory</directive> and
+    <directive type="section" module="core">Files</directive> containers.</note>
 
     <note type="warning">The <directive
     module="mod_proxy">ProxyRequests</directive> directive should
@@ -902,10 +903,6 @@ expressions</description>
     <code>http://example.com/mirror/foo/bar</code> to be internally converted
     into a proxy request to <code>http://backend.example.com/bar</code>.</p>
 
-    <p>The ProxyPass directive is not supported in <directive type="section" module="core"
-    >Directory</directive> or <directive type="section" module="core"
-    >Files</directive> sections.</p>
-
     <p>If you require a more flexible reverse-proxy configuration, see the
     <directive module="mod_rewrite">RewriteRule</directive> directive with the
     <code>[P]</code> flag.</p>