aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-10-13 14:47:28 +0200
committerErlang/OTP <[email protected]>2015-10-13 14:47:28 +0200
commitd7f76c4800b279f69c1f0a6f885f5f659e627127 (patch)
tree52e4a191baa38b629867c019b0281490c4e52353 /lib/ssh/doc
parenta2c538dee3013bb6285027d9ae45b7f055e8e8eb (diff)
parente5d5c462c09b631af417347154a04378f6186778 (diff)
downloadotp-d7f76c4800b279f69c1f0a6f885f5f659e627127.tar.gz
otp-d7f76c4800b279f69c1f0a6f885f5f659e627127.tar.bz2
otp-d7f76c4800b279f69c1f0a6f885f5f659e627127.zip
Merge branch 'hans/ssh/option_max_channels/OTP-13036' into maint-18
* hans/ssh/option_max_channels/OTP-13036: ssh: update vsn.mk ssh: Option max_channels added.
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/ssh.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index cf5e8f1aff..37ed016099 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -501,6 +501,15 @@ kex is implicit but public_key is set explicitly.</p>
</p>
</item>
+ <tag><c><![CDATA[{max_channels, pos_integer()}]]></c></tag>
+ <item>
+ <p>The maximum number of channels with active remote subsystem that are accepted for
+ each connection to this daemon</p>
+ <p>By default, this option is not set. This means that the number is not limited.
+ </p>
+ </item>
+
+
<tag><c><![CDATA[{parallel_login, boolean()}]]></c></tag>
<item>
<p>If set to false (the default value), only one login is handled at a time.