diff options
| author | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
| commit | c5d8b91af8011b82619f6ccca53a5a933ab91f7e (patch) | |
| tree | 6537af23600d4339d1670f5b7524a75322c56f31 /lib/ssh/doc/src | |
| parent | aebab2324285d3751c1ce73ad803be487ceb3a16 (diff) | |
| parent | 61f8ef381882eb0953b1e087d53894b88b356715 (diff) | |
| download | otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.gz otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.bz2 otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.zip | |
Merge branch 'ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227' into maint-17
* ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227:
ssh: Prepare for release
ssh: Add option sftp_vsn
ssh: Fix option user_interaction to work as expected
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh_sftp.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml index e55d092fe2..f1091e9eca 100644 --- a/lib/ssh/doc/src/ssh_sftp.xml +++ b/lib/ssh/doc/src/ssh_sftp.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2005</year><year>2013</year> + <year>2005</year><year>2014</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -81,6 +81,17 @@ <p>The timeout is passed to the ssh_channel start function, and defaults to infinity.</p> </item> + <tag> + <p><c><![CDATA[{sftp_vsn, integer()}]]></c></p> + </tag> + <item> + <p> + Desired SFTP protocol version. + The actual version will be the minimum of + the desired version and the maximum supported + versions by the SFTP server. + </p> + </item> </taglist> <p>All other options are directly passed to <seealso marker="ssh">ssh:connect/3</seealso> or ignored if a |