Return-Path: 
 <cvs-return-56408-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 72049183EE
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sun, 21 Feb 2016 14:00:01 +0000 (UTC)
Received: (qmail 26827 invoked by uid 500); 21 Feb 2016 14:00:01 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 26764 invoked by uid 500); 21 Feb 2016 14:00:01 -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 26755 invoked by uid 99); 21 Feb 2016 14:00:01 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO
 spamd4-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Feb 2016 14:00:01 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org)
 with ESMTP id D157CC0474
	for <cvs@httpd.apache.org>; Sun, 21 Feb 2016 14:00:00 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 1.471
X-Spam-Level: *
X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31
	tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1,
	RP_MATCHES_RCVD=-0.329] autolearn=disabled
Received: from mx1-lw-eu.apache.org ([10.40.0.8])
	by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new,
 port 10024)
	with ESMTP id cpOhk3kcOCF9 for <cvs@httpd.apache.org>;
	Sun, 21 Feb 2016 13:59:59 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org
 [209.188.14.139])
	by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP
 id 8BF105F60D
	for <cvs@httpd.apache.org>; Sun, 21 Feb 2016 13:59:58 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at
 mailrelay1-us-west.apache.org) with ESMTP id 7B545E019D
	for <cvs@httpd.apache.org>; Sun, 21 Feb 2016 13:59:57 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org)
 with ESMTP id 51D033A024F
	for <cvs@httpd.apache.org>; Sun, 21 Feb 2016 13:59:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1731532 - in /httpd/httpd/trunk/docs/manual/mod:
 mod_proxy_balancer.xml mod_proxy_wstunnel.xml
Date: Sun, 21 Feb 2016 13:59:57 -0000
To: cvs@httpd.apache.org
From: elukey@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160221135957.51D033A024F@svn01-us-west.apache.org>

Author: elukey
Date: Sun Feb 21 13:59:56 2016
New Revision: 1731532

URL: http://svn.apache.org/viewvc?rev=1731532&view=rev
Log:
Updated mod_proxy's websocket documentation to address some user comments.


Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml?rev=1731532&r1=1731531&r2=1731532&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_balancer.xml Sun Feb 21 13:59:56 2016
@@ -30,17 +30,23 @@
 
 <summary>
     <p>This module <em>requires</em> the service of <module
-    >mod_proxy</module>. It provides load balancing support for
-    <code>HTTP</code>, <code>FTP</code> and <code>AJP13</code> protocols
-    </p>
-
-    <p>Load balancing scheduler algorithm is provided by not this
-    module but other modules such as:
-    <module>mod_lbmethod_byrequests</module>,
-    <module>mod_lbmethod_bytraffic</module>,
-    <module>mod_lbmethod_bybusyness</module> and
-    <module>mod_lbmethod_heartbeat</module>.
-    </p>
+    >mod_proxy</module> and it provides load balancing for
+    all the supported protocols. The most important ones are:</p>
+    <ul>
+        <li>HTTP, using <module>mod_proxy_http</module></li>
+        <li>FTP, using <module>mod_proxy_ftp</module></li>
+        <li>AJP13, using <module>mod_proxy_ajp</module></li>
+        <li>WebSocket, using <module>mod_proxy_wstunnel</module></li>
+    </ul>
+    
+    <p>The Load balancing scheduler algorithm is not provided by this
+    module but from other ones such as:</p>
+    <ul>
+        <li><module>mod_lbmethod_byrequests</module></li>
+        <li><module>mod_lbmethod_bytraffic</module></li>
+        <li><module>mod_lbmethod_bybusyness</module></li>
+        <li><module>mod_lbmethod_heartbeat</module></li>
+    </ul>
 
     <p>Thus, in order to get the ability of load balancing,
     <module>mod_proxy</module>, <module>mod_proxy_balancer</module>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml?rev=1731532&r1=1731531&r2=1731532&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml Sun Feb 21 13:59:56 2016
@@ -34,21 +34,23 @@
     <p>This module <em>requires</em> the service of <module
     >mod_proxy</module>. It provides support for the tunnelling of web
     socket connections to a backend websockets server. The connection
-    is automagically upgraded to a websocket connection:</p>
+    is automatically upgraded to a websocket connection:</p>
 
-    <highlight language="config">
+    <example><title>HTTP Response</title>
+        <highlight language="config">
 Upgrade: WebSocket
 Connection: Upgrade
-    </highlight>
-
+        </highlight>
+    </example>
 
-    <example><title>Proxying requests to websockets server</title>
+<p>Proxying requests to a websockets server like <code>echo.websocket.org</code> can be done using the
+<directive type="ProxyPass" module="mod_proxy">ProxyPass</directive> directive:</p>
     <highlight language="config">
 ProxyPass "/ws2/"  "ws://echo.websocket.org/"
 ProxyPass "/wss2/" "wss://echo.websocket.org/"
     </highlight>
-    </example>
 
+<p>Load balancing for multiple backends can be achieved using <module>mod_proxy_balancer</module>.</p>
 </summary>
 
 <seealso><module>mod_proxy</module></seealso>