svn commit: r1507032 - /activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

[ce...@apache.org]

Author: ceposta
Date: Thu Jul 25 15:55:38 2013
New Revision: 1507032

URL: http://svn.apache.org/r1507032
Log:
add documentation for APLO-325

Modified:
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1507032&r1=1507031&r2=1507032&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Thu Jul 25 15:55:38 2013
@@ -273,7 +273,12 @@ the settings used on the socket:
 
 * `binary_transfers` : Should data be sent to the client as binary blobs. Currently
   not all browsers support binary WebSocket data.  Defaults to false.
-  
+* `cors_origin` : Specify cross-origin resource sharing limmitations, including `*` all or individual server
+  names
+* `max_text_message_size` : Specify the size of text messages that the websocket connector can handle
+* `max_binary_message_size` : Specify the size of binary messages that the websocket connector can handle
+* `max_idle_time` : timeout limitations of the underlying websocket socket
+
 Example configuraiton:
 
 {pygmentize:: xml}