Return-Path: 
 <cvs-return-43754-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A3663DCD7
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Wed, 27 Jun 2012 11:26:11 +0000 (UTC)
Received: (qmail 91357 invoked by uid 500); 27 Jun 2012 11:26:11 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 91144 invoked by uid 500); 27 Jun 2012 11:26:11 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 91128 invoked by uid 99); 27 Jun 2012 11:26:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jun 2012 11:26:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jun 2012 11:26:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B68E52388865;
	Wed, 27 Jun 2012 11:25:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1354431 -
 /httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
Date: Wed, 27 Jun 2012 11:25:49 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120627112549.B68E52388865@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: covener
Date: Wed Jun 27 11:25:48 2012
New Revision: 1354431

URL: http://svn.apache.org/viewvc?rev=1354431&view=rev
Log:
Merge r1354427 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

re-emphasize this paragraph in ProxyRequests is for fwd proxy


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

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml?rev=1354431&r1=1354430&r2=1354431&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml Wed Jun 27 11:25:48 2012
@@ -555,7 +555,7 @@ request</description>
     need also <module>mod_proxy_http</module> or <module>mod_proxy_ftp</module>
     (or both) present in the server.</p>
 
-    <p>In order to get the functionality of proxying HTTPS sites, you
+    <p>In order to get the functionality of (forward) proxying HTTPS sites, you
     need <module>mod_proxy_connect</module> enabled in the server.</p>
 
     <note type="warning"><title>Warning</title>