aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-14 12:42:02 +0200
committerHenrik Nord <[email protected]>2015-10-14 12:42:02 +0200
commit930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (patch)
tree0917e3e56e3e24a5a45bd1afb61c6ea69ec0be2d /lib/ssh/doc/src
parent3c787f47ffc660d77eba3528b10eba570529fb9e (diff)
parent3c799a7ee5ee26f643c7ffad79c81d6156f3dac6 (diff)
downloadotp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.tar.gz
otp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.tar.bz2
otp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.zip
Merge branch 'maint-18' into maint
Conflicts: lib/ssh/vsn.mk
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/notes.xml17
-rw-r--r--lib/ssh/doc/src/ssh.xml9
2 files changed, 26 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 368bb0f552..0c0c947f65 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,23 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.1.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ A new option <c>max_channels</c> limits the number of
+ channels with active server-side subsystems that are
+ accepted.</p>
+ <p>
+ Own Id: OTP-13036</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
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.