You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/13 15:16:35 UTC
qpid-jms-amqp-0-x git commit: QPID-7779: [QPID JMS AMQP 0-x] Correct
documentation for restriction on the SASL mechanismssetting
Repository: qpid-jms-amqp-0-x
Updated Branches:
refs/heads/master 95203e5d1 -> 1c0f9fd63
QPID-7779: [QPID JMS AMQP 0-x] Correct documentation for restriction on the SASL mechanismssetting
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/1c0f9fd6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/1c0f9fd6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/1c0f9fd6
Branch: refs/heads/master
Commit: 1c0f9fd630a7869bd64d84107b156798688e8074
Parents: 95203e5
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Nov 13 15:15:29 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Nov 13 15:16:08 2017 +0000
----------------------------------------------------------------------
doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml | 2 +-
doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/1c0f9fd6/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
index 7bc179f..dc29a13 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
@@ -246,7 +246,7 @@
<row>
<entry> sasl_mechs </entry>
<entry> - </entry>
- <entry> A comma separated list of SASL mechanisms which may be used. If not present then
+ <entry> A space separated list of SASL mechanisms which may be used. If not present then
any method offered by the broker may be used.
For secure applications, we suggest SCRAM-SHA-256. The
ANONYMOUS mechanism is not secure. The PLAIN mechanism is secure only when used
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/1c0f9fd6/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
----------------------------------------------------------------------
diff --git a/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml b/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
index a0227fd..9616ea9 100644
--- a/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
+++ b/doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
@@ -456,9 +456,9 @@
<entry></entry>
<entry><para>Restriction on the SASL mechanisms which can be used.
More than one could be specified as
- a comma separated list.</para><para>We currently support the following
- mechanisms {PLAIN | GSSAPI | EXTERNAL}.</para><para>This can also be set
- per connection using the
+ a space separated list.</para><para>We currently support the following
+ mechanisms: PLAIN GSSAPI EXTERNAL SCRAM-SHA-256 SCRAM-SHA-1 XOAUTH2 CRAM-MD5 XOAUTH2 ANONYMOUS.</para>
+ <para>This can also be set per connection using the
<link linkend="JMS-Client-0-8-Connection-URL">Connection URL</link> options.</para>
</entry>
</row>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org