aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-05-27 16:55:33 +0200
committerIngela Anderton Andin <[email protected]>2014-05-27 16:55:33 +0200
commit95ffa9b741631752633b3c97dfcd1ce620574e94 (patch)
tree922e18f279ded1d25995e05e94a52c9b73f62799 /lib/ssh/doc/src
parent339b6416664c7dc64d72c21653138137e8d1018f (diff)
parentdeacab96d83ad6432afbcba54cf2e372395008e5 (diff)
downloadotp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.gz
otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.bz2
otp-95ffa9b741631752633b3c97dfcd1ce620574e94.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION lib/ssh/test/ssh_basic_SUITE.erl lib/ssh/vsn.mk
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/notes.xml32
1 files changed, 31 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index bce02966ae..84d5e5c86e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2004</year><year>2013</year>
+ <year>2004</year><year>2014</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -29,6 +29,36 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 3.0.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed timeout bug in ssh:connect.</p>
+ <p>
+ Own Id: OTP-11908</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Option <c>max_sessions</c> added to
+ <c>ssh:daemon/{2,3}</c>. This option, if set, limits the
+ number of simultaneous connections accepted by the
+ daemon.</p>
+ <p>
+ Own Id: OTP-11885</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 3.0.1</title>
<section><title>Fixed Bugs and Malfunctions</title>