From cc664a58fe3d901b2698f169df62511cf06ee745 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 25 Apr 2017 14:25:05 +0200
Subject: Fix release note for OTP-14290

---
 erts/doc/src/notes.xml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 5d21b8fda4..27a369660c 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -53,19 +53,6 @@
 <section><title>Erts 8.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Trying to open a directory with file:read_file/1 on Unix
-	    leaked a file descriptor. This bug has now been fixed.</p>
-          <p>
-	    Own Id: OTP-14308 Aux Id: ERL-383 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
       <list>
         <item>
           <p>
@@ -76,6 +63,13 @@
           <p>
 	    Own Id: OTP-14290</p>
         </item>
+        <item>
+          <p>
+	    Trying to open a directory with file:read_file/1 on Unix
+	    leaked a file descriptor. This bug has now been fixed.</p>
+          <p>
+	    Own Id: OTP-14308 Aux Id: ERL-383 </p>
+        </item>
       </list>
     </section>
 
-- 
cgit v1.2.3


From 304fef65a147b53234d8d8ad8889ffa79d7ef45b Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 28 Apr 2017 15:11:53 +0200
Subject: Prepare release

---
 erts/doc/src/notes.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 27a369660c..11206d43e7 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,31 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 8.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed memory segment cache used for multiblock carriers.
+	    Huge (> 2GB) memory segments could cause a VM crash.
+	    Creation of such huge memory segments used for multiblock
+	    carriers is however very uncommon.</p>
+          <p>
+	    Own Id: OTP-14360 Aux Id: ERL-401, PR-1417 </p>
+        </item>
+        <item>
+          <p>
+	    Fix release note for OTP-14290 in ERTS version 8.3.1. It
+	    was erroneously placed under "Known Bugs and Problems".</p>
+          <p>
+	    Own Id: OTP-14363 Aux Id: OTP-14290 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3