aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-11-05 15:51:57 +0100
committerFredrik Gustafsson <[email protected]>2012-11-05 15:51:57 +0100
commit441a7fc2f572c01b4b94a44a2309c59420476923 (patch)
treece964b8534e3cd6149337103b125388a32ae716a /lib/ssh/doc/src
parent7e83e75aae5f9eaa85e527db3fbbad01dffe0d4b (diff)
parentacdfec8baf27093b59cd25ffbc84e6165f9bb427 (diff)
downloadotp-441a7fc2f572c01b4b94a44a2309c59420476923.tar.gz
otp-441a7fc2f572c01b4b94a44a2309c59420476923.tar.bz2
otp-441a7fc2f572c01b4b94a44a2309c59420476923.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 0133250979..0b715cece9 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -142,6 +142,11 @@
some reason, the other algorithm is tried. The default is
to try <c><![CDATA[ssh_rsa]]></c> first.</p>
</item>
+ <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
+ <item>
+ <p>List of public key algorithms to try to use, ssh_rsa and ssh_dsa available.
+ Will override <c><![CDATA[{public_key_alg, ssh_rsa | ssh_dsa}]]></c></p>
+ </item>
<tag><c><![CDATA[{connect_timeout, timeout()}]]></c></tag>
<item>
<p>Sets a timeout on the transport layer connection. Defaults to infinity.</p>