diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-21 09:26:57 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-21 09:26:57 +0200 |
| commit | c5ebeab7e56b48f47760f46247070821b9425c70 (patch) | |
| tree | cced240228b67b31dcbf95e6ff8e0830da8419a3 /lib/ssh | |
| parent | fc964917d6de7ac583b2971697afb3bb417892ad (diff) | |
| parent | 12d96ad4cbb41c361cb633615fd52f4b933e907f (diff) | |
| download | otp-c5ebeab7e56b48f47760f46247070821b9425c70.tar.gz otp-c5ebeab7e56b48f47760f46247070821b9425c70.tar.bz2 otp-c5ebeab7e56b48f47760f46247070821b9425c70.zip | |
Merge branch 'fredrik/ssh/correct_doc_timeout/OTP-11249' into maint
* fredrik/ssh/correct_doc_timeout/OTP-11249:
ssh: clarified timeout options
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 bd0d3d49dd..141d3df38e 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 |