diff options
| author | Hans Nilsson <[email protected]> | 2015-10-07 12:19:06 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-07 12:19:06 +0200 |
| commit | f8f1bf3326e98bff7dbfed6f284b136b799c0be4 (patch) | |
| tree | b455c183b4924dd7f1cd79d454a4c63a32cffeb6 /lib/ssh/doc | |
| parent | 5fccd24ca22d19e65bb539cc0a71b2748d3b8dcd (diff) | |
| parent | f6996a8b1f9ecec034700c7ec5e914c7084fa5b5 (diff) | |
| download | otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.tar.gz otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.tar.bz2 otp-f8f1bf3326e98bff7dbfed6f284b136b799c0be4.zip | |
Merge branch 'hans/ssh/zlib_openssh/OTP-12759' into maint
Diffstat (limited to 'lib/ssh/doc')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 2 |
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> |