diff options
| author | Henrik Nord <[email protected]> | 2015-10-14 12:42:50 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-14 12:42:50 +0200 |
| commit | f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2 (patch) | |
| tree | 0eaaf1c3424cb924d7eb30558089ede1e3730872 /lib/ssh/doc/src/ssh.xml | |
| parent | 11229947bed829ee0691d9669a4858fd8cf6cbb7 (diff) | |
| parent | 930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (diff) | |
| download | otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.gz otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.bz2 otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index b938da091c..2b190c98b6 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -507,6 +507,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. |