From b9faca269de1de51ae33577cc204befbea24243c Mon Sep 17 00:00:00 2001
From: Henrik <henrik@erlang.org>
Date: Tue, 29 May 2018 10:47:25 +0200
Subject: Revert "Prepare release"

This reverts commit fd8e49b5bddceaae803670121b603b5eee8c5c08.
---
 lib/sasl/doc/src/notes.xml | 75 ----------------------------------------------
 lib/sasl/vsn.mk            |  2 +-
 2 files changed, 1 insertion(+), 76 deletions(-)

(limited to 'lib/sasl')

diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index c2dc9a3fc2..791e9c063a 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,81 +31,6 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
-<section><title>SASL 3.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>A new logging API is added to Erlang/OTP, see the
-	    <seealso
-	    marker="kernel:logger"><c>logger(3)</c></seealso> manual
-	    page, and section <seealso
-	    marker="kernel:logger_chapter">Logging</seealso> in the
-	    Kernel User's Guide.</p>
-	    <p>Calls to <c>error_logger</c> are automatically
-	    redirected to the new API, and legacy error logger event
-	    handlers can still be used. It is, however, recommended
-	    to use the Logger API directly when writing new code.</p>
-	    <p>Notice the following potential incompatibilities:</p>
-	    <list> <item><p>Kernel configuration parameters
-	    <c>error_logger</c> still works, but is overruled if the
-	    default handler's output destination is configured with
-	    Kernel configuration parameter <c>logger</c>.</p> <p>In
-	    general, parameters for configuring error logger are
-	    overwritten by new parameters for configuring
-	    Logger.</p></item> <item><p>The concept of SASL error
-	    logging is deprecated, meaning that by default the SASL
-	    application does not affect which log events are
-	    logged.</p> <p>By default, supervisor reports and crash
-	    reports are logged by the default Logger handler started
-	    by Kernel, and end up at the same destination (terminal
-	    or file) as other standard log event from Erlang/OTP.</p>
-	    <p>Progress reports are not logged by default, but can be
-	    enabled with the Kernel configuration parameter
-	    <c>logger_progress_reports</c>.</p> <p>To obtain
-	    backwards compatibility with the SASL error logging
-	    functionality from earlier releases, set Kernel
-	    configuration parameter <c>logger_sasl_compatible</c> to
-	    <c>true</c>. This prevents the default Logger handler
-	    from logging any supervisor-, crash-, or progress
-	    reports. Instead, SASL adds a separate Logger handler
-	    during application start, which takes care of these log
-	    events. The SASL configuration parameters
-	    <c>sasl_error_logger</c> and <c>sasl_errlog_type</c>
-	    specify the destination (terminal or file) and severity
-	    level to log for these events.</p></item></list>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13295</p>
-        </item>
-        <item>
-          <p>
-	    The old and out-dated "Status Inspection" tool (modules
-	    <c>si</c> and <c>si_sasl_sup</c>) is removed.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-14469</p>
-        </item>
-        <item>
-          <p>
-	    When creating the release tar file, systools now includes
-	    sys.config.src if it exists in the
-	    $ROOT/releases/&lt;vsn&gt;/ directory. This is to allow
-	    adjustments, e.g. resolving environment variables, after
-	    unpacking the release, but before installing it. This
-	    functionality requires a custom tool which uses
-	    sys.config.src as input and creates a correct sys.config
-	    file.</p>
-          <p>
-	    Own Id: OTP-14950 Aux Id: PR-1560 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SASL 3.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 0972ae20ba..52b168598a 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.2
+SASL_VSN = 3.1.2
-- 
cgit v1.2.3