Author: gsim
Date: Mon Mar 7 11:06:58 2011
New Revision: 1078743
URL: http://svn.apache.org/viewvc?rev=1078743&view=rev
Log:
QPID-3115: update documentation of connection options (also changed to use
<literal></literal> consistently)
Modified:
qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
Modified: qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml?rev=1078743&r1=1078742&r2=1078743&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml Mon Mar 7
11:06:58 2011
@@ -1722,7 +1722,7 @@ try {
<row>
<entry>
- username
+ <literal>username</literal>
</entry>
<entry>
string
@@ -1733,7 +1733,7 @@ try {
</row>
<row>
<entry>
- password
+ <literal>password</literal>
</entry>
<entry>
string
@@ -1744,35 +1744,22 @@ try {
</row>
<row>
<entry>
- sasl-mechanism
+ <literal>sasl_mechanisms</literal>
</entry>
<entry>
string
</entry>
<entry>
- The specific SASL mechanism to use with the c++
- client when authenticating to the broker. Only a
- single value can be specified at present. [C++ only].
- </entry>
- </row>
- <row>
- <entry>
- sasl_mechanisms
- </entry>
- <entry>
- string
- </entry>
- <entry>
- The specific SASL mechanism to use with the python
+ The specific SASL mechanisms to use with the python
client when authenticating to the broker. The value
- is a space separated list in order of preference. [Python
only].
+ is a space separated list.
</entry>
</row>
<row>
<entry>
- reconnect
+ <literal>reconnect</literal>
</entry>
<entry>
boolean
@@ -1783,7 +1770,7 @@ try {
</row>
<row>
<entry>
- <literal>reconnect_timeout [Python]</literal>
<literal>reconnect-timeout [C++]</literal>
+ <literal>reconnect_timeout</literal>
</entry>
<entry>
integer
@@ -1794,7 +1781,7 @@ try {
</row>
<row>
<entry>
- <literal>reconnect_limit [Python]</literal>
<literal>reconnect-limit [C++]</literal>
+ <literal>reconnect_limit</literal>
</entry>
<entry>
integer
@@ -1805,7 +1792,7 @@ try {
</row>
<row>
<entry>
- <literal>reconnect_interval_min [Python]</literal>
<literal>reconnect-interval-min [C++]</literal>
+ <literal>reconnect_interval_min</literal>
</entry>
<entry>
integer representing time in seconds
@@ -1816,7 +1803,7 @@ try {
</row>
<row>
<entry>
- <literal>reconnect_interval_max [Python]</literal>
<literal>reconnect-interval-max [C++]</literal>
+ <literal>reconnect_interval_max</literal>
</entry>
<entry>
integer representing time in seconds
@@ -1827,7 +1814,7 @@ try {
</row>
<row>
<entry>
- <literal>reconnect_interval [Python]</literal>
<literal>reconnect-interval [C++]</literal>
+ <literal>reconnect_interval</literal>
</entry>
<entry>
integer representing time in seconds
@@ -1839,7 +1826,7 @@ try {
<row>
<entry>
- heartbeat
+ <literal>heartbeat</literal>
</entry>
<entry>
integer representing time in seconds
@@ -1852,7 +1839,7 @@ try {
</row>
<row>
<entry>
- protocol
+ <literal>protocol</literal>
</entry>
<entry>
string
@@ -1863,7 +1850,7 @@ try {
</row>
<row>
<entry>
- tcp-nodelay
+ <literal>tcp-nodelay</literal>
</entry>
<entry>
boolean
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
