From: Takashi Sato <takashi@apache.org>
Date: Thu, 29 May 2014 12:55:59 +0000 (+0000)
Subject: Merge r1560683 and r1581011 from trunk:
X-Git-Tag: 2.4.10~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f5ceb6f541a516c6d705dbdae5d917881db29be;p=apache

Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

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

diff --git a/docs/manual/mod/mod_proxy_connect.xml b/docs/manual/mod/mod_proxy_connect.xml
index a6837a794c..01761f2cef 100644
--- a/docs/manual/mod/mod_proxy_connect.xml
+++ b/docs/manual/mod/mod_proxy_connect.xml
@@ -39,7 +39,7 @@
     requests, <module>mod_proxy</module> and
     <module>mod_proxy_connect</module> have to be present in the server.</p>
 
-    <p>CONNECT is also used, when the server needs to send an HTTPS request
+    <p>CONNECT is also used when the server needs to send an HTTPS request
     through a forward proxy. In this case the server acts as a CONNECT client.
     This functionality is part of <module>mod_proxy</module> and
     <module>mod_proxy_connect</module> is not needed in this case.</p>
diff --git a/docs/manual/mod/mod_proxy_express.xml b/docs/manual/mod/mod_proxy_express.xml
index 0119a2eca3..2d8d44086d 100644
--- a/docs/manual/mod/mod_proxy_express.xml
+++ b/docs/manual/mod/mod_proxy_express.xml
@@ -61,10 +61,13 @@
     <li>It does not support regex or pattern matching at all.
     </li>
     <li>It emulates:
-      <example>
-        ProxyPass / backend.server:port<br />
-        ProxyPassReverse / backend.server:port<br />
-      </example>
+      <highlight language="config">
+&lt;VirtualHost *:80&gt;
+   ServerName front.end.server
+   ProxyPass / back.end.server:port
+   ProxyPassReverse / back.end.server:port
+&lt;/VirtualHost&gt;
+      </highlight>
       That is, the entire URL is appended to the mapped backend
       URL. This is in keeping with the intent of being a simple
       but fast reverse proxy switch.