From 48f627f2a8485aa4e213df318853746fb54f416e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 15 Mar 2018 11:31:51 +0100
Subject: ssl: Remove duplicate release note

---
 lib/ssl/doc/src/notes.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 14ba12167a..810d55e25a 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -62,13 +62,6 @@
           <p>
 	    Own Id: OTP-14919</p>
         </item>
-        <item>
-          <p>
-	    Fix alert handling so that unexpected messages are logged
-	    and alerted correctly</p>
-          <p>
-	    Own Id: OTP-14929</p>
-        </item>
         <item>
           <p>
 	    Correct handling of anonymous cipher suites</p>
-- 
cgit v1.2.3


From bd2a492ed0343abe98cf5e0a009bec9563279821 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 15 Mar 2018 11:42:56 +0100
Subject: Update release notes

---
 lib/ssl/doc/src/notes.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 810d55e25a..4ad7da9486 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,22 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 8.2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix filter function to not incorrectly exclude AEAD
+	    cipher suites</p>
+          <p>
+	    Own Id: OTP-14981</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 8.2.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3