aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/ssh.xml
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-07 12:19:32 +0200
committerHans Nilsson <[email protected]>2015-10-07 12:19:32 +0200
commit2c38c2d697131d68df79f42b1d53e01826812303 (patch)
tree46831739a9f6c787dc33370213d05229e7066db8 /lib/ssh/doc/src/ssh.xml
parentf4453711e984090b8968f5689ae3811efef5919c (diff)
parentf8f1bf3326e98bff7dbfed6f284b136b799c0be4 (diff)
downloadotp-2c38c2d697131d68df79f42b1d53e01826812303.tar.gz
otp-2c38c2d697131d68df79f42b1d53e01826812303.tar.bz2
otp-2c38c2d697131d68df79f42b1d53e01826812303.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r--lib/ssh/doc/src/ssh.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index dd85baf219..93bea09e4e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -45,7 +45,7 @@
<item>Supported MAC algorithms: hmac-sha2-256 and hmac-sha1.</item>
<item>Supported encryption algorithms: aes256-ctr, aes192-ctr, aes128-ctr, aes128-cb and 3des-cbc.</item>
<item>Supported key exchange algorithms: ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1 and diffie-hellman-group-exchange-sha256.</item>
- <item>Supported compression algorithms: none, zlib</item>
+ <item>Supported compression algorithms: none, [email protected], zlib</item>
<item>Supports unicode filenames if the emulator and the underlaying OS support it.
See section DESCRIPTION in the
<seealso marker="kernel:file">file</seealso> manual page in <c>kernel</c>