aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-05-03 11:00:25 +0200
committerIngela Anderton Andin <[email protected]>2017-05-03 11:00:25 +0200
commit97b0d768edd96f527238403b1b4d2658b3506eed (patch)
treea8b52a868be4f46b92a3bc017e7e2fa1c6dbcff0 /lib/ssl
parentefcb91bce9c95f53268ad6cbb43677ba12948bce (diff)
parentf372208224436f3f6e346a429ebd6ed61b5ee6b0 (diff)
downloadotp-97b0d768edd96f527238403b1b4d2658b3506eed.tar.gz
otp-97b0d768edd96f527238403b1b4d2658b3506eed.tar.bz2
otp-97b0d768edd96f527238403b1b4d2658b3506eed.zip
Merge branch 'ingela/ssl/releasenote-fix'
* ingela/ssl/releasenote-fix: ssl: Move missing release note fix to correct place
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/doc/src/notes.xml15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index f5a82b54a7..d321ae11d0 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -182,7 +182,14 @@
message.</p>
<p>
Own Id: OTP-13853</p>
+ </item>
+
+ <item>
+ <p>Correct handling of signature algorithm selection</p>
+ <p>
+ Own Id: OTP-13711</p>
</item>
+
</list>
</section>
@@ -241,14 +248,6 @@
<p>
Own Id: OTP-13651</p>
</item>
-
- <item>
- <p>Correct handling of signature algorithm selection with
- regard to TLS version.</p>
- <p>
- Own Id: OTP-13711</p>
- </item>
-
</list>
</section>