summaryrefslogtreecommitdiff
path: root/lib/ssh/doc/src/ssh.xml
diff options
context:
space:
mode:
authorHans Nilsson <hans@erlang.org>2021-10-14 09:44:04 +0200
committerHans Nilsson <hans@erlang.org>2021-10-14 17:01:26 +0200
commite6712b804184c0937b1e3a3c36fb477410ca9071 (patch)
tree28c37cd4582a6db8fe40880f4a780eae55da9f70 /lib/ssh/doc/src/ssh.xml
parent25dc9d9f2a896baee2f303c6d4154a8b7044be3c (diff)
downloaderlang-e6712b804184c0937b1e3a3c36fb477410ca9071.tar.gz
ssh: Use connect_timeout as default for negotiation timeout instead of infinity
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r--lib/ssh/doc/src/ssh.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 377643e69e..a9db9f418b 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -1274,7 +1274,9 @@
<p>No channel is started. This is done by calling <seemfa marker="ssh_connection#session_channel/2">
ssh_connection:session_channel/[2, 4]</seemfa>.
</p>
- <p>The <c>NegotiationTimeout</c> is in milli-seconds. The default value is <c>infinity</c>.
+ <p>The <c>NegotiationTimeout</c> is in milli-seconds. The default value is <c>infinity</c> or
+ the value of the <seetype marker="#connect_timeout_client_option"><c>connect_timeout</c></seetype>
+ option, if present.
For connection timeout, use the option
<seetype marker="#connect_timeout_client_option"><c>connect_timeout</c></seetype>.
</p>