diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-21 09:27:08 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-21 09:27:08 +0200 |
| commit | 252eae09079533022061f6ec6f2dc1310383d4c4 (patch) | |
| tree | 8cc0f9eeb677b9942b6f6ef6a3480e38b6f9dded /lib/ssh | |
| parent | cd7846186bd1d5f2649e9e0d7d9f61ec35175f39 (diff) | |
| parent | c5ebeab7e56b48f47760f46247070821b9425c70 (diff) | |
| download | otp-252eae09079533022061f6ec6f2dc1310383d4c4.tar.gz otp-252eae09079533022061f6ec6f2dc1310383d4c4.tar.bz2 otp-252eae09079533022061f6ec6f2dc1310383d4c4.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index e3850f4059..eb997a8eb5 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -88,6 +88,7 @@ number for SSH.</d> <v>Options = [{Option, Value}]</v> <v>Timeout = infinity | integer(milliseconds)</v> + <d>Negotiation timeout, for connection timeout use the option <c>{connect_timeout, timeout()}</c>.</d> </type> <desc> <p>Connects to an SSH server. No channel is started. This is done |