aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/notes.xml
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-10-14 12:42:50 +0200
committerHenrik Nord <[email protected]>2015-10-14 12:42:50 +0200
commitf92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2 (patch)
tree0eaaf1c3424cb924d7eb30558089ede1e3730872 /lib/ssh/doc/src/notes.xml
parent11229947bed829ee0691d9669a4858fd8cf6cbb7 (diff)
parent930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (diff)
downloadotp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.gz
otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.tar.bz2
otp-f92473f8b3e9379f6c96bb8e5ff40143ec3d9dc2.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssh/doc/src/notes.xml')
-rw-r--r--lib/ssh/doc/src/notes.xml17
1 files changed, 17 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>