From: Eric Covener <covener@apache.org>
Date: Fri, 5 Nov 2010 04:23:14 +0000 (+0000)
Subject: Merge r1031428 from trunk:
X-Git-Tag: 2.2.18~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=502b6e5d32f312379d9c613235c00c17979254b1;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1031428 from trunk:

PR#47348: missing "response" the ProxyBadHeader description,
and drive home with  ...from the origin server.



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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 22d4755414e..381d312e5a7 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -663,8 +663,8 @@ response</td></tr>
 </table>
     <p>The <code class="directive">ProxyBadHeader</code> directive determines the
     behaviour of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> if it receives syntactically invalid
-    header lines (<em>i.e.</em> containing no colon). The following arguments
-    are possible:</p>
+    response header lines (<em>i.e.</em> containing no colon) from the origin 
+    server. The following arguments are possible:</p>
 
     <dl>
     <dt><code>IsError</code></dt>
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 50e0f9dbbeb..b520f12da27 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -460,8 +460,8 @@ response</description>
 <usage>
     <p>The <directive>ProxyBadHeader</directive> directive determines the
     behaviour of <module>mod_proxy</module> if it receives syntactically invalid
-    header lines (<em>i.e.</em> containing no colon). The following arguments
-    are possible:</p>
+    response header lines (<em>i.e.</em> containing no colon) from the origin 
+    server. The following arguments are possible:</p>
 
     <dl>
     <dt><code>IsError</code></dt>