Commit 24de2a9a authored by Luca Toscano's avatar Luca Toscano
Browse files

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).



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

docs/manual/mod/mod_proxy.xml

+3 −6
Original line number Diff line number Diff line
@@ -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>