From 1835902eb12c821e33348a7f9988d44b185043c9 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 4 May 2011 08:44:45 -0400
Subject: [PATCH] INT-1827 edited HTTP Proxy documentation

---
 docs/src/reference/docbook/http.xml | 41 ++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/docs/src/reference/docbook/http.xml b/docs/src/reference/docbook/http.xml
index 0f6b3b8478..c54842c534 100644
--- a/docs/src/reference/docbook/http.xml
+++ b/docs/src/reference/docbook/http.xml
@@ -180,12 +180,45 @@ In the case of the Outbound Gateway, the reply message produced by the gateway w
  	<title>HTTP Proxy configuration</title>
  
  	<para>
- 	If you are behind the proxy and need to configure proxy settings for HTTP outbound adapters/gateways you can do 
- 	so by providing custom instance of <classname>ClientHttpRequestFactory</classname>. 
-	You can provide your own implementation of <classname>ClientHttpRequestFactory</classname> strategy or you can use 
-	implementations already provided by Spring and Apache Commons.	
+ 	If you are behind the proxy and need to configure proxy settings for HTTP outbound adapters/
+	gateways you can apply several approaches.	
  	</para>
  	
+ 	<para>
+ 		<emphasis>Standard Java Proxy configuration</emphasis>
+    </para>
+    
+    <para>
+    There are 3 properties you can set to specify the proxy that will be used by the http protocol handler:
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>http.proxyHost</emphasis> - the host name of the proxy server. </para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>http.proxyPort</emphasis> - the port number, the default value being 80. </para>
+      </listitem>
+      
+      <listitem>
+        <para><emphasis>http.nonProxyHosts</emphasis> - a list of hosts that should be reached directly, 
+        bypassing the proxy. This is a list of patterns separated by '|'. The patterns may start or end with a '*' for wildcards. Any host matching one of these patterns will be reached through a direct connection instead of through a proxy. </para>
+      </listitem>
+    </itemizedlist>
+    
+    And for HTTPS:
+    
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>https.proxyHost</emphasis> - the host name of the proxy server. </para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>https.proxyPort</emphasis> - the port number, the default value being 80. </para>
+      </listitem> 
+    </itemizedlist>
+    For more information please refer to this document: http://download.oracle.com/javase/6/docs/technotes/guides/net/proxies.html
+    </para>
+ 	
  	<para>
  		<emphasis>Apache Commons</emphasis>
     </para>