aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-11-01 13:58:26 +0100
committerErlang/OTP <[email protected]>2010-11-01 13:58:26 +0100
commitb93c12e8e0113862be038565fc04e170cfe3c12a (patch)
tree9e0e6cb19f759239cb415050616237a7c2ba5c50 /lib/ssh/doc
parent7fce62fb8dfcf964111ce8c3254a41ce450ad0b6 (diff)
parent637dff7790e3f195dff81a7cfb8af468dece8946 (diff)
downloadotp-b93c12e8e0113862be038565fc04e170cfe3c12a.tar.gz
otp-b93c12e8e0113862be038565fc04e170cfe3c12a.tar.bz2
otp-b93c12e8e0113862be038565fc04e170cfe3c12a.zip
Merge branch 'nick/ssh/replaced-deprecated/OTP-8849' into maint-r14
* nick/ssh/replaced-deprecated/OTP-8849: The fix regarding OTP-8849 was not included in the previous version as stated. Move away from using deprecated public_key function pem_to_der.
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/notes.xml17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 01478f870e..9bedd446f4 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,7 +29,21 @@
<file>notes.xml</file>
</header>
- <section><title>Ssh 2.0.2</title>
+<section><title>Ssh 2.0.3</title>
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The fix regarding OTP-8849 was not included in the
+ previous version as stated.</p>
+ <p>
+ Own Id: OTP-8918</p>
+ </item>
+ </list>
+ </section>
+</section>
+
+<section><title>Ssh 2.0.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
@@ -60,7 +74,6 @@
</list>
</section>
</section>
-
<section><title>Ssh 2.0.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>