summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-01-05 16:05:06 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-01-05 16:05:06 +0000
commite296f662adfd35e9f9ff5e2ccd96b74898a94cf8 (patch)
tree94af8e15eff64e34e48171125fa09711129fc8b6 /docs
parent1420f5b7bb4209d5ad3d481fb397d4a0bab172dc (diff)
parentcbd64f3448f4df626874c1b0c3dac101e1b018c2 (diff)
downloadrabbitmq-server-git-e296f662adfd35e9f9ff5e2ccd96b74898a94cf8.tar.gz
Merge in default
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmqctl.1.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index 01ddd4c108..7ae2e00220 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -1000,6 +1000,26 @@
connection is secured with SSL.</para></listitem>
</varlistentry>
<varlistentry>
+ <term>ssl_protocol</term>
+ <listitem><para>SSL protocol
+ (e.g. tlsv1)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ssl_key_exchange</term>
+ <listitem><para>SSL key exchange algorithm
+ (e.g. rsa)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ssl_cipher</term>
+ <listitem><para>SSL cipher algorithm
+ (e.g. aes_256_cbc)</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>ssl_hash</term>
+ <listitem><para>SSL hash function
+ (e.g. sha)</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>peer_cert_subject</term>
<listitem><para>The subject of the peer's SSL
certificate, in RFC4514 form.</para></listitem>