diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-12-21 10:21:56 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-12-21 10:21:56 +0100 |
| commit | 63b82a8d72b4a16bd98e7997e3782174afae8ed6 (patch) | |
| tree | 8afe83af1e407e0a67ccc55892cf787e2460360f /lib/ssh/doc/src | |
| parent | 5af4de28200f652ca23780c0e141a6c063275e93 (diff) | |
| parent | 19c560d98202b87e5b158f673fd48ba347e623ee (diff) | |
| download | otp-63b82a8d72b4a16bd98e7997e3782174afae8ed6.tar.gz otp-63b82a8d72b4a16bd98e7997e3782174afae8ed6.tar.bz2 otp-63b82a8d72b4a16bd98e7997e3782174afae8ed6.zip | |
Merge branch 'fredrik/ssh/sftp-file-is-dir/OTP-6406'
* fredrik/ssh/sftp-file-is-dir/OTP-6406:
Removed unused code ssh.erl and changed tests
Added eexist to return proper sftp parameter
Changed erlclient testcases for sftp
sftp ver6 mods, SSH_FX_CANNOT_DELETE added as parameter
Updated doc for sftpd_vsn
Changed testcases to proper sftpd listening
changed option to sftpd_vsn
corrected is_dir call in sftpd
Changes to sftpd test suite
Added a file_is_a_directory to a proper status return
Basic functionality for sftp ver6 and testcase
Conflicts:
lib/ssh/doc/src/ssh_sftpd.xml
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/ssh_sftpd.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml index a4273195b5..3666bc7692 100644 --- a/lib/ssh/doc/src/ssh_sftpd.xml +++ b/lib/ssh/doc/src/ssh_sftpd.xml @@ -80,7 +80,12 @@ the user will end up in <c>/tmp/etc</c>. </p> </item> - </taglist> + <tag><c><![CDATA[{sftpd_vsn, integer()}]]></c></tag> + <item> + <p>Sets the sftp version to use, defaults to 5. Version 6 is under + development and limited.</p> + </item> + </taglist> </desc> </func> </funcs> |