From 25237481ccccd3ddfa74582dc267632ad618ba30 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 9 Dec 2013 20:12:33 +0100
Subject: Prepare release

---
 lib/sasl/doc/src/notes.xml | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/sasl/vsn.mk            |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'lib/sasl')

diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index b114f1f492..48853b2372 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -30,6 +30,56 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 2.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Don't try to add the log_mf_h handler in sasl unless
+	    configured to do so. Thanks to Richard Carlsson.</p>
+          <p>
+	    Own Id: OTP-11464</p>
+        </item>
+        <item>
+          <p>
+	    Fix confusing documentation about error handlers in
+	    SASL.(Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-11507</p>
+        </item>
+        <item>
+          <p>
+	    A bug in the mechanism for upgrading core parts of
+	    Erlang/OTP (emulator, kernel, stdlib, sasl) caused a
+	    switch of paths between stdlib and sasl in the
+	    intermediate .script/.boot file. The bug was introduces
+	    along with this upgrade mechanism in R15B. It has now
+	    been corrected. (Thanks to Tobias Schlager)</p>
+          <p>
+	    Own Id: OTP-11529</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added a boot file which skips loading the "$HOME/.erlang"
+	    file on startup. Enable by starting erlang with "erl
+	    -boot no_dot_erlang".</p>
+          <p>
+	    *** INCOMPATIBILITY with false ***</p>
+          <p>
+	    Own Id: OTP-8479 Aux Id: seq11510 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 2.3.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index f90ab51a47..d4b8ae94a1 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.3.3
+SASL_VSN = 2.3.4
-- 
cgit v1.2.3