diff options
author | Hans Nilsson <[email protected]> | 2017-03-20 10:06:39 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2017-03-20 10:06:39 +0100 |
commit | 748c2d938d309940b8365ed4f6af863b8129c5bf (patch) | |
tree | dd61988d4886499ac53bda6df1efa7bf5f1af079 /lib/ssh/doc/src | |
parent | 2cc47f22e4cb775422a6a7fb1b94836e7cf51143 (diff) | |
parent | 304e2939256d2d1d8e3ef7ccf66b3ce058b04d44 (diff) | |
download | otp-748c2d938d309940b8365ed4f6af863b8129c5bf.tar.gz otp-748c2d938d309940b8365ed4f6af863b8129c5bf.tar.bz2 otp-748c2d938d309940b8365ed4f6af863b8129c5bf.zip |
Merge branch 'hans/ssh/remove_option__public_key_alg/OTP-14263'
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 1f07e826ce..968983c862 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -243,21 +243,6 @@ <p><c>Peer</c> is in the format of <c>{Host,Port}</c>.</p> </item> - <tag><c><![CDATA[{public_key_alg, 'ssh-rsa' | 'ssh-dss'}]]></c></tag> - <item> - <note> - <p>This option will be removed in OTP 20, but is kept for compatibility. It is ignored if - the preferred <c>pref_public_key_algs</c> option is used.</p> - </note> - <p>Sets the preferred public key algorithm to use for user - authentication. If the preferred algorithm fails, - the other algorithm is tried. If <c>{public_key_alg, 'ssh-rsa'}</c> is set, it is translated - to <c>{pref_public_key_algs, ['ssh-rsa','ssh-dss']}</c>. If it is - <c>{public_key_alg, 'ssh-dss'}</c>, it is translated - to <c>{pref_public_key_algs, ['ssh-dss','ssh-rsa']}</c>. - </p> - </item> - <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag> <item> <p>List of user (client) public key algorithms to try to use.</p> |