diff options
| author | Hans Nilsson <[email protected]> | 2014-01-21 17:50:50 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-01-21 17:50:50 +0100 |
| commit | 1f7e86af8b3f489253c06b2043440c11168a4654 (patch) | |
| tree | bf4cc3e73b2cd29bd4270102634524351837d71c | |
| parent | f0aac62ab3d2bc91508cc35f239a8947b2194aea (diff) | |
| parent | 3b373f83f64f89464a648fe608e87e805ec32547 (diff) | |
| download | otp-1f7e86af8b3f489253c06b2043440c11168a4654.tar.gz otp-1f7e86af8b3f489253c06b2043440c11168a4654.tar.bz2 otp-1f7e86af8b3f489253c06b2043440c11168a4654.zip | |
Merge branch 'hans/ssh/unicode/OTP-10953'
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 2 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index ee41e17da4..89d8be850e 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -38,7 +38,7 @@ <item>Supported SSH version is 2.0 </item> <item>Supported MAC algorithms: hmac-sha1</item> <item>Supported encryption algorithms: aes128-cb and 3des-cbc</item> - <item>Supports unicode filenames if the emulator does so for the current os</item> + <item>Supports unicode filenames if the emulator and the underlaying OS supports it. See the DESCRIPTION section in <seealso marker="file">file</seealso> for information about this subject</item> <item>Supports unicode in shell and cli</item> </list> diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 8186f39888..9ffc59dbaf 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 3.0 +SSH_VSN = 3.0.1 APP_VSN = "ssh-$(SSH_VSN)" |