From 2a88df01986962da5ea6c9cc2cdf60fe66b0d5c6 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Wed, 15 Sep 2010 15:32:08 +0000
Subject: Minor enhancements to docs (extra connection options, cross reference
 node properties, point out tcp-nodelay in perf tips)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@997367 13f79535-47bb-0310-9956-ffa450edef68
---
 doc/book/src/Programming-In-Apache-Qpid.xml | 43 ++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/doc/book/src/Programming-In-Apache-Qpid.xml b/doc/book/src/Programming-In-Apache-Qpid.xml
index 0aa32c194c..e4c49c9e7e 100644
--- a/doc/book/src/Programming-In-Apache-Qpid.xml
+++ b/doc/book/src/Programming-In-Apache-Qpid.xml
@@ -876,7 +876,7 @@ Queue my-topic does not exist
 
 	<screen>Message(properties={spout-id:1a1a3842-1a8b-4f88-8940-b4096e615a7d:0}, content='')</screen>
       </example>
-
+        <para>The details of the node thus created can be controlled by further options within the node. See <xref linkend="table-node-properties"/> for details.</para>
       </section>
 
       <section>
@@ -1786,6 +1786,42 @@ try:
 		  Sets both <literal>reconnection_interval_min</literal> and <literal>reconnection_interval_max</literal> to the same value.
 		</entry>
 	      </row>
+
+	      <row>
+	        <entry>
+	          heartbeat
+	        </entry>
+	        <entry>
+	          integer representing time in seconds
+	        </entry>
+	        <entry>
+	          Requests that heartbeats be sent every N seconds. If two
+	          successive heartbeats are missed the connection is
+	          considered to be lost.
+	        </entry>
+	      </row>
+	      <row>
+	        <entry>
+	          protocol
+	        </entry>
+	        <entry>
+	          string
+	        </entry>
+	        <entry>
+	          Sets the underlying protocol used. The default option is 'tcp'. To enable ssl, set to 'ssl'. The C++ client additionally supports 'rdma'.
+	        </entry>
+	      </row>
+	      <row>
+	        <entry>
+	          tcp-nodelay
+	        </entry>
+	        <entry>
+	          boolean
+	        </entry>
+	        <entry>
+	          Set tcp no-delay, i.e. disable Nagle algorithm. [C++ only]
+	        </entry>
+	      </row>
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -2211,6 +2247,11 @@ std::cout << request.getContent() << " -> " << response.getContent() << std::end
           refered to, which is required when hanling reply-to in AMQP
           0-10. </para>
           </listitem>
+          <listitem>
+	    <para>For latency sensitive applications, setting tcp-nodelay
+	      on qpidd and on client connections can help reduce the
+	      latency.</para>
+          </listitem>
       </itemizedlist>
     </section>
 
-- 
cgit v1.2.1