summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2010-11-10 13:03:14 +0000
committerGordon Sim <gsim@apache.org>2010-11-10 13:03:14 +0000
commit8f69ed45d45212eb1486e9a25401dd4f03d41126 (patch)
tree6b646ce63c6cd0bda212caeaabd35fc2e9666462 /qpid
parentf1e85512a58830985d6364c032f398a61608dc62 (diff)
downloadqpid-python-8f69ed45d45212eb1486e9a25401dd4f03d41126.tar.gz
Corrected/clarified sasl mechanism option which is slightly different between c++ and python at present
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1033449 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/doc/book/src/Programming-In-Apache-Qpid.xml21
1 files changed, 16 insertions, 5 deletions
diff --git a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
index 419d875bb4..c0a99a50d5 100644
--- a/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
@@ -1711,11 +1711,22 @@ try:
string
</entry>
<entry>
- The specific SASL mechanism to use when
- authenticating to the broker. In c++ only a single
- value can be specified at present. In python the
- value can be a space separated list in order of
- preference.
+ 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
+ client when authenticating to the broker. The value
+ is a space separated list in order of preference. [Python only].
</entry>
</row>