From: Mike Rumph <mrumph@apache.org>
Date: Fri, 21 Aug 2015 00:56:23 +0000 (+0000)
Subject: Restructure ProxyPass directive documentation
X-Git-Tag: 2.2.32~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=899ef65c081126f4d08c054a7b0b63dcb0b64eac;p=thirdparty%2Fapache%2Fhttpd.git

Restructure ProxyPass directive documentation

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 2b554663cf7..f29ea2b7a15 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -756,6 +756,22 @@ expressions</description>
     </p>
     </note>
 
+    <p>When used inside a <directive type="section" module="core"
+    >Location</directive> section, the first argument is omitted and the local
+    directory is obtained from the <directive type="section" module="core"
+    >Location</directive>. The same will occur inside a
+    <directive type="section" module="core">LocationMatch</directive> section;
+    however, ProxyPass does not interpret the regexp as such, so it is necessary
+    to use <directive>ProxyPassMatch</directive> in this situation instead.</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>
+
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory, <em>e.g.</em></p>
 
@@ -783,6 +799,8 @@ expressions</description>
 
     </note> <!-- /ordering_proxypass -->
 
+    <p><strong>ProxyPass <code>key=value</code> Parameters</strong></p>
+
     <p>In Apache HTTP Server 2.1 and later, mod_proxy supports pooled
     connections to a backend server.  Connections created on demand
     can be retained in a pool for future use.  Limits on the pool size
@@ -1071,6 +1089,8 @@ expressions</description>
       &lt;/Proxy&gt;
     </example>
 
+    <p><strong>Additional ProxyPass Keywords</strong></p>
+
     <p>Normally, mod_proxy will canonicalise ProxyPassed URLs.
     But this may be incompatible with some backends, particularly those
     that make use of <var>PATH_INFO</var>.  The optional <var>nocanon</var>
@@ -1079,22 +1099,6 @@ expressions</description>
     as it removes the normal limited protection against URL-based attacks
     provided by the proxy.</p>
 
-    <p>When used inside a <directive type="section" module="core"
-    >Location</directive> section, the first argument is omitted and the local
-    directory is obtained from the <directive type="section" module="core"
-    >Location</directive>. The same will occur inside a
-    <directive type="section" module="core">LocationMatch</directive> section;
-    however, ProxyPass does not interpret the regexp as such, so it is necessary
-    to use <directive>ProxyPassMatch</directive> in this situation instead.</p>
-  
-    <p>This 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>
-
     <p>The optional <var>interpolate</var> keyword (available in
     httpd 2.2.9 and later), in combination with
     <directive>ProxyPassInterpolateEnv</directive>, causes the ProxyPass