From c04cad3ba921deb086d19e2de2526af4854add75 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Thu, 2 Jun 2016 11:39:07 +0200
Subject: Revert "Prepare release"

This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da.
---
 lib/asn1/doc/src/notes.xml            |  15 --
 lib/asn1/vsn.mk                       |   2 +-
 lib/common_test/doc/src/notes.xml     |  18 ---
 lib/common_test/vsn.mk                |   2 +-
 lib/compiler/doc/src/notes.xml        |  89 -----------
 lib/compiler/vsn.mk                   |   2 +-
 lib/cosEvent/doc/src/notes.xml        |  17 +-
 lib/cosEvent/vsn.mk                   |   2 +-
 lib/cosEventDomain/doc/src/notes.xml  |  17 +-
 lib/cosEventDomain/vsn.mk             |   2 +-
 lib/cosFileTransfer/doc/src/notes.xml |  17 +-
 lib/cosFileTransfer/vsn.mk            |   2 +-
 lib/cosNotification/doc/src/notes.xml |  17 +-
 lib/cosNotification/vsn.mk            |   2 +-
 lib/cosProperty/doc/src/notes.xml     |  17 +-
 lib/cosProperty/vsn.mk                |   2 +-
 lib/cosTime/doc/src/notes.xml         |  17 +-
 lib/cosTime/vsn.mk                    |   2 +-
 lib/cosTransactions/doc/src/notes.xml |  17 +-
 lib/cosTransactions/vsn.mk            |   2 +-
 lib/crypto/doc/src/notes.xml          |  46 ------
 lib/crypto/vsn.mk                     |   2 +-
 lib/debugger/doc/src/notes.xml        |  16 --
 lib/debugger/vsn.mk                   |   2 +-
 lib/dialyzer/doc/src/notes.xml        |  66 --------
 lib/diameter/doc/src/notes.xml        |  19 ---
 lib/edoc/doc/src/notes.xml            |  14 --
 lib/edoc/vsn.mk                       |   2 +-
 lib/eldap/doc/src/notes.xml           |  33 ----
 lib/erl_docgen/doc/src/notes.xml      |  54 +------
 lib/erl_docgen/vsn.mk                 |   2 +-
 lib/erl_interface/doc/src/notes.xml   |  20 ---
 lib/erl_interface/vsn.mk              |   2 +-
 lib/et/doc/src/notes.xml              |  16 --
 lib/et/vsn.mk                         |   2 +-
 lib/eunit/doc/src/notes.xml           |  15 --
 lib/eunit/vsn.mk                      |   2 +-
 lib/gs/doc/src/notes.xml              |  17 +-
 lib/gs/vsn.mk                         |   2 +-
 lib/hipe/doc/src/notes.xml            |  40 -----
 lib/hipe/vsn.mk                       |   2 +-
 lib/ic/doc/src/notes.xml              |  17 +-
 lib/ic/vsn.mk                         |   2 +-
 lib/inets/doc/src/notes.xml           |  34 +---
 lib/jinterface/doc/src/notes.xml      |  20 ---
 lib/jinterface/vsn.mk                 |   2 +-
 lib/kernel/doc/src/notes.xml          | 181 ---------------------
 lib/megaco/doc/src/notes.xml          |  17 +-
 lib/megaco/vsn.mk                     |   2 +-
 lib/mnesia/doc/src/notes.xml          |  23 +--
 lib/mnesia/vsn.mk                     |   2 +-
 lib/observer/doc/src/notes.xml        |  30 ----
 lib/observer/vsn.mk                   |   2 +-
 lib/odbc/doc/src/notes.xml            |  18 +--
 lib/odbc/vsn.mk                       |   2 +-
 lib/orber/doc/src/notes.xml           |  17 +-
 lib/orber/vsn.mk                      |   2 +-
 lib/os_mon/doc/src/notes.xml          |  28 ----
 lib/os_mon/vsn.mk                     |   2 +-
 lib/otp_mibs/doc/src/notes.xml        |  15 --
 lib/otp_mibs/vsn.mk                   |   2 +-
 lib/parsetools/doc/src/notes.xml      |  15 --
 lib/parsetools/vsn.mk                 |   2 +-
 lib/percept/doc/src/notes.xml         |  15 --
 lib/percept/vsn.mk                    |   2 +-
 lib/public_key/doc/src/notes.xml      |  15 --
 lib/public_key/vsn.mk                 |   2 +-
 lib/reltool/doc/src/notes.xml         |  19 +--
 lib/reltool/vsn.mk                    |   2 +-
 lib/runtime_tools/doc/src/notes.xml   |  94 -----------
 lib/runtime_tools/vsn.mk              |   2 +-
 lib/sasl/doc/src/notes.xml            |  17 --
 lib/snmp/doc/src/notes.xml            |  17 +-
 lib/snmp/vsn.mk                       |   2 +-
 lib/ssh/doc/src/notes.xml             |  64 --------
 lib/ssl/doc/src/notes.xml             | 109 -------------
 lib/stdlib/doc/src/notes.xml          | 293 ----------------------------------
 lib/syntax_tools/doc/src/notes.xml    |  26 ---
 lib/tools/doc/src/notes.xml           |  29 ----
 lib/tools/vsn.mk                      |   2 +-
 lib/typer/doc/src/notes.xml           |  15 --
 lib/typer/vsn.mk                      |   2 +-
 lib/wx/doc/src/notes.xml              |  37 -----
 lib/wx/vsn.mk                         |   2 +-
 lib/xmerl/doc/src/notes.xml           |  15 --
 lib/xmerl/vsn.mk                      |   2 +-
 86 files changed, 55 insertions(+), 1798 deletions(-)

(limited to 'lib')

diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 68d335f451..7af6ad72d2 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
-<section><title>Asn1 4.0.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Asn1 4.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 527af05da1..ab2c127ca2 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 4.0.3
+ASN1_VSN = 4.0.2
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 0a8433c8c4..ebba864606 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,24 +33,6 @@
     <file>notes.xml</file>
     </header>
 
-<section><title>Common_Test 1.12.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    The following modules were missing in
-	    common_test.app.src: ct_groups, ct_property_test,
-	    ct_release_test, ct_webtool, ct_webtool_sup,
-	    test_server_gl. They have now been added.</p>
-          <p>
-	    Own Id: OTP-13475</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Common_Test 1.12.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index c68750886a..2fab4d3883 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.12.2
+COMMON_TEST_VSN = 1.13
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 5d7f48857e..ae375c5f58 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,95 +32,6 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
-<section><title>Compiler 7.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p><c>compile:forms/1,2</c> would crash when used in a
-	    working directory thad had been deleted by another
-	    process. (Thanks to Adam Lindberg for reporting this
-	    bug.)</p>
-          <p>
-	    Own Id: OTP-13430 Aux Id: ERL-113 </p>
-        </item>
-        <item>
-	    <p>Dialyzer no longer crashes when there is an invalid
-	    function call such as <c>42(7)</c> in a module being
-	    analyzed. The compiler will now warn for invalid function
-	    calls such as <c>X = 42, x(7)</c>. (ERL-138. Thanks to
-	    Daniel Feltey for reporting this bug.)</p>
-          <p>
-	    Own Id: OTP-13552</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Optimization of tuple matching has been slightly
-	    improved.</p>
-          <p>
-	    Own Id: OTP-12951</p>
-        </item>
-        <item>
-	    <p>Five deprecated and undocumented functions in the
-	    module <c>core_lib</c> have been removed. The functions
-	    are: <c>get_anno/{1,2}</c>, <c>is_literal/1</c>,
-	    <c>is_literal_list/1</c>, and <c>literal_value</c>. Use
-	    the appropriate functions in the <c>cerl</c> module
-	    instead.</p>
-          <p>
-	    Own Id: OTP-12979</p>
-        </item>
-        <item>
-	    <p>The pre-processor can now expand the ?FUNCTION_NAME
-	    and ?FUNCTION_ARITY macros.</p>
-          <p>
-	    Own Id: OTP-13059</p>
-        </item>
-        <item>
-	    <p>The function mapfold/4 has been added to the
-	    <c>cerl_trees</c> module.</p>
-          <p>
-	    Own Id: OTP-13280</p>
-        </item>
-        <item>
-	    <p>Bitstring comprehensions have been generalized to
-	    allow arbitrary expressions in the construction part.</p>
-          <p>
-	    Own Id: OTP-13289</p>
-        </item>
-        <item>
-	    <p>The compiler will now produce warnings for binary
-	    patterns that will never match (example:
-	    <c>&lt;&lt;-1/unsigned&gt;&gt; = Bin</c>). </p>
-          <p>
-	    Own Id: OTP-13374 Aux Id: ERL-44 </p>
-        </item>
-        <item>
-	    <p>The compiler will no longer put the compilation date
-	    and time into BEAM files. That means that two BEAM files
-	    compiled on the same computer from the same source code
-	    and compilation options will be identical.</p>
-	    <p>Note: If you want to find out whether a BEAM file on
-	    disk is different from the loaded code, compared the MD5
-	    value obtained from <c>Mod:module_info(md5)</c> with the
-	    MD5 value obtained from
-	    <c>beam_lib:md5(BeamFileForMod)</c></p>.
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13504</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Compiler 6.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 23dd4bd4b1..c83455240d 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.0
+COMPILER_VSN = 6.0.3
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index fe94cb64d3..83fa5fa4b7 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -33,22 +33,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosEvent 2.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEvent 2.2</title>
+  <section><title>cosEvent 2.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosEvent/vsn.mk b/lib/cosEvent/vsn.mk
index c39bed9fe4..3149020d7c 100644
--- a/lib/cosEvent/vsn.mk
+++ b/lib/cosEvent/vsn.mk
@@ -1,2 +1,2 @@
-COSEVENT_VSN = 2.2.1
+COSEVENT_VSN = 2.2
 
diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index 5e5bb2c33e..5617efe697 100644
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ b/lib/cosEventDomain/doc/src/notes.xml
@@ -32,22 +32,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosEventDomain 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosEventDomain 1.2</title>
+  <section><title>cosEventDomain 1.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
index 4e10d6ac60..bdde1f6ab2 100644
--- a/lib/cosEventDomain/vsn.mk
+++ b/lib/cosEventDomain/vsn.mk
@@ -1,2 +1,2 @@
-COSEVENTDOMAIN_VSN = 1.2.1
+COSEVENTDOMAIN_VSN = 1.2
 
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
index 58ab087014..eacc75062b 100644
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ b/lib/cosFileTransfer/doc/src/notes.xml
@@ -31,22 +31,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosFileTransfer 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosFileTransfer 1.2</title>
+  <section><title>cosFileTransfer 1.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosFileTransfer/vsn.mk b/lib/cosFileTransfer/vsn.mk
index e271c05242..00bfdb3087 100644
--- a/lib/cosFileTransfer/vsn.mk
+++ b/lib/cosFileTransfer/vsn.mk
@@ -1 +1 @@
-COSFILETRANSFER_VSN = 1.2.1
+COSFILETRANSFER_VSN = 1.2
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index 1237000153..3f3f0be3e7 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -32,22 +32,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosNotification 1.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosNotification 1.2.1</title>
+  <section><title>cosNotification 1.2.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosNotification/vsn.mk b/lib/cosNotification/vsn.mk
index 0d95ab4853..07b9bf474b 100644
--- a/lib/cosNotification/vsn.mk
+++ b/lib/cosNotification/vsn.mk
@@ -1,2 +1,2 @@
-COSNOTIFICATION_VSN = 1.2.2
+COSNOTIFICATION_VSN = 1.2.1
 
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index d5219fc110..4ec7eca94a 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -32,22 +32,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosProperty 1.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosProperty 1.2</title>
+  <section><title>cosProperty 1.2</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
index 1a8e42ffdb..d96508c2d2 100644
--- a/lib/cosProperty/vsn.mk
+++ b/lib/cosProperty/vsn.mk
@@ -1,2 +1,2 @@
-COSPROPERTY_VSN = 1.2.1
+COSPROPERTY_VSN = 1.2
 
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index 686d9e6add..62c1aa3c26 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -33,22 +33,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTime 1.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTime 1.2.1</title>
+  <section><title>cosTime 1.2.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTime/vsn.mk b/lib/cosTime/vsn.mk
index 7c9cae2d2f..39b457b53b 100644
--- a/lib/cosTime/vsn.mk
+++ b/lib/cosTime/vsn.mk
@@ -1,2 +1,2 @@
-COSTIME_VSN = 1.2.2
+COSTIME_VSN = 1.2.1
 
diff --git a/lib/cosTransactions/doc/src/notes.xml b/lib/cosTransactions/doc/src/notes.xml
index 85ace1208b..b681330391 100644
--- a/lib/cosTransactions/doc/src/notes.xml
+++ b/lib/cosTransactions/doc/src/notes.xml
@@ -33,22 +33,7 @@
     <file>notes.xml</file>
   </header>
 
-  <section><title>cosTransactions 1.3.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>cosTransactions 1.3.1</title>
+  <section><title>cosTransactions 1.3.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/cosTransactions/vsn.mk b/lib/cosTransactions/vsn.mk
index ab163d83c2..3a18cae384 100644
--- a/lib/cosTransactions/vsn.mk
+++ b/lib/cosTransactions/vsn.mk
@@ -1 +1 @@
-COSTRANSACTIONS_VSN = 1.3.2
+COSTRANSACTIONS_VSN = 1.3.1
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index cbca2a8030..6c76a0d7b0 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,52 +31,6 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
-<section><title>Crypto 3.7</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Refactor <c>crypto</c> to use the EVP interface of
-	    OpenSSL, which is the recommended interface that also
-	    enables access to hardware acceleration for some
-	    operations.</p>
-          <p>
-	    Own Id: OTP-12217</p>
-        </item>
-        <item>
-          <p>
-	    Add support for 192-bit keys for the <c>aes_cbc</c>
-	    cipher.</p>
-          <p>
-	    Own Id: OTP-13206 Aux Id: pr 832 </p>
-        </item>
-        <item>
-          <p>
-	    Add support for 192-bit keys for <c>aes_ecb</c>.</p>
-          <p>
-	    Own Id: OTP-13207 Aux Id: pr829 </p>
-        </item>
-        <item>
-          <p>
-	    Deprecate the function crypto:rand_bytes and make sure
-	    that crypto:strong_rand_bytes is used in all places that
-	    are cryptographically significant.</p>
-          <p>
-	    Own Id: OTP-13214</p>
-        </item>
-        <item>
-          <p>
-	    Enable AES-GCM encryption/decryption to change the tag
-	    length between 1 to 16 bytes.</p>
-          <p>
-	    Own Id: OTP-13483 Aux Id: PR-998 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Crypto 3.6.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 96466869d1..6dcb28ec8a 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 3.7
+CRYPTO_VSN = 3.6.3
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 2e0d834269..3028d8dd41 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,22 +33,6 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
-<section><title>Debugger 4.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>When the debugger searches for source files, it will
-	    also use the location of the source in the compilation
-	    information part of the BEAM file.</p>
-          <p>
-	    Own Id: OTP-13375</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Debugger 4.1.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index dd496013cd..cf8ffd3272 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2
+DEBUGGER_VSN = 4.1.2
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 6e335ac3c1..d9af2cb4cd 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,72 +32,6 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
-<section><title>Dialyzer 3.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Fix a bug in the translation of forms to types. </p>
-          <p>
-	    Own Id: OTP-13520</p>
-        </item>
-        <item>
-	    <p>Correct mispelling in Dialyzer's acronym definition.
-	    </p>
-          <p>
-	    Own Id: OTP-13544 Aux Id: PR-1007 </p>
-        </item>
-        <item>
-	    <p>Dialyzer no longer crashes when there is an invalid
-	    function call such as <c>42(7)</c> in a module being
-	    analyzed. The compiler will now warn for invalid function
-	    calls such as <c>X = 42, x(7)</c>. (ERL-138. Thanks to
-	    Daniel Feltey for reporting this bug.)</p>
-          <p>
-	    Own Id: OTP-13552</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> The evaluation of SCCs in <c>dialyzer_typesig</c> is
-	    optimized. </p> <p> Maps are used instead of Dicts to
-	    further optimize the evalutation. </p>
-          <p>
-	    Own Id: OTP-10349</p>
-        </item>
-        <item>
-	    <p> Since Erlang/OTP R14A, when support for parameterized
-	    modules was added, <c>module()</c> has included
-	    <c>tuple()</c>, but that part is removed; the type
-	    <c>module()</c> is now the same as <c>atom()</c>, as
-	    documented in the Reference Manual. </p>
-          <p>
-	    Own Id: OTP-13244</p>
-        </item>
-        <item>
-	    <p> The type specification syntax for Maps is improved:
-	    </p> <list> <item> <p> The association type <c>KeyType :=
-	    ValueType</c> denotes an association that must be
-	    present. </p> </item> <item> <p> The shorthand <c>...</c>
-	    stands for the association type <c>any() => any()</c>.
-	    </p> </item> </list> <p> An incompatible change is that
-	    <c>#{}</c> stands for the empty map. The type
-	    <c>map()</c> (a map of any size) can be written as
-	    <c>#{...}</c>. </p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13542 Aux Id: PR-1014 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Dialyzer 2.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 5ae43661fc..82448e7f51 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,25 +43,6 @@ first.</p>
 
 <!-- ===================================================================== -->
 
-<section><title>diameter 1.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Add diameter:peer_info/1.</p>
-          <p>
-	    That retrieves information in the style of
-	    diameter:service_info/2, but for a single peer
-	    connection.</p>
-          <p>
-	    Own Id: OTP-13508</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>diameter 1.11.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index ae8147c564..130a5a850e 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -32,20 +32,6 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
-<section><title>Edoc 0.7.19</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Handle typed record fields. </p>
-          <p>
-	    Own Id: OTP-13558</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Edoc 0.7.18</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index f38800b3e0..83514ac94f 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.19
+EDOC_VSN = 0.7.18
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index eff2ac0fa6..aa3e3137ae 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,39 +31,6 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
-<section><title>Eldap 1.2.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    If the underlying tcp connection is closed and an LDAP
-	    operation returned tcp_error, the client applications
-	    tend to close the ldap handle with eldap:close. This will
-	    cause a <c>{nocatch, {gen_tcp_error, ...}}</c> exception.</p>
-          <p>
-	    Such errors are now ignored during close, because the
-	    socket will be closed anyway.</p>
-          <p>
-	    Own Id: OTP-13590 Aux Id: PR-1048 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Eldap 1.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 3425a8a712..be94c0a7a0 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,59 +31,7 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.4.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Generate HTML anchors for datatypes without
-	    <c>name</c> attribute. </p>
-          <p>
-	    Own Id: OTP-13600 Aux Id: Jira: ERL-141 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Known Bugs and Problems</title>
-      <list>
-        <item>
-	    <p> Updated make rules so it's possible to use the
-	    xmllint target for checking the system
-	    documentation.<br/> Removed usage of non defined DTD tag
-	    (output) from the system documentation and corrected a
-	    number of xml faults. </p> <p> Added support for quote
-	    tag and a new level of header formatting in erl_docgen.
-	    </p> <p> A fault when generating html for manual set
-	    markers for section headings is corrected so now is the
-	    title visible after hyperlink jump. </p>
-          <p>
-	    Own Id: OTP-13638</p>
-        </item>
-        <item>
-	    <p> Corrected the space handling for the seealso tag.
-	    </p>
-          <p>
-	    Own Id: OTP-13639</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Erl_Docgen 0.4.2</title>
+  <section><title>Erl_Docgen 0.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 62e6d034ad..3188b926ff 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.4.3
+ERL_DOCGEN_VSN = 0.4.2
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index fb7474435c..9420beaf43 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,26 +31,6 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
-<section><title>Erl_Interface 3.9</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Handle terms (pids,ports and refs) from nodes with a
-	    'creation' value larger than 3. This is a preparation of
-	    the distribution protocol to allow OTP 19 nodes to
-	    correctly communicate with future nodes (20 or higher).
-	    The 'creation' value differentiates different
-	    incarnations of the same node (name).</p>
-          <p>
-	    Own Id: OTP-13488</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Erl_Interface 3.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 33705d1e8b..56dbdbac9f 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.9
+EI_VSN = 3.8.2
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index 5300d2e4ef..ee9e34d14d 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -37,22 +37,6 @@
   one section in this document. The title of each section is the
   version number of <c>Event Tracer (ET)</c>.</p>
 
-<section><title>ET 1.6</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Update selector to utilize new garbage collection trace
-	    tags.</p>
-          <p>
-	    Own Id: OTP-13545</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>ET 1.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index a37fec083b..0af7bf75e1 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.6
+ET_VSN  = 1.5.1
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index 88602e8222..b513caf95b 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,21 +33,6 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
-<section><title>Eunit 2.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>There is a new <c>debugVal/2</c> that gives control
-	    over the truncation depth.</p>
-          <p>
-	    Own Id: OTP-13612</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Eunit 2.2.13</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index b551ee6eb6..dcb7fad699 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.3
+EUNIT_VSN = 2.2.13
diff --git a/lib/gs/doc/src/notes.xml b/lib/gs/doc/src/notes.xml
index 20188c75e2..3ceae98bc5 100644
--- a/lib/gs/doc/src/notes.xml
+++ b/lib/gs/doc/src/notes.xml
@@ -31,22 +31,7 @@
   </header>
   <p>This document describes the changes made to the GS application.</p>
 
-  <section><title>GS 1.6.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>GS 1.6</title>
+  <section><title>GS 1.6</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/gs/vsn.mk b/lib/gs/vsn.mk
index c762507bab..345f0f37f2 100644
--- a/lib/gs/vsn.mk
+++ b/lib/gs/vsn.mk
@@ -1,2 +1,2 @@
-GS_VSN = 1.6.1
+GS_VSN = 1.6
 
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 8b39b66e1d..4ebd4b817c 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,46 +31,6 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
-<section><title>Hipe 3.15.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    HiPE compiler crashed, during compilation, in some cases
-	    that involved inlining of float operations on complicated
-	    control flow graphs.</p>
-          <p>
-	    Own Id: OTP-13407 Aux Id: PR-984 </p>
-        </item>
-        <item>
-          <p>
-	    Various fixes and improvements to the HiPE LLVM backend.
-	    <list> <item>Add support for LLVM 3.7 and 3.8 in the
-	    HiPE/LLVM x86_64 backend</item> <item>Reinstate support
-	    for the LLVM backend on x86 (works OK for LLVM 3.5 to 3.7
-	    -- LLVM 3.8 has a bug that prevents it from generating
-	    correct native code on x86)</item> </list></p>
-          <p>
-	    Own Id: OTP-13626</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Elimination of maps:is_key/2 calls to HiPE</p>
-          <p>
-	    Own Id: OTP-13625 Aux Id: PR-1069 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Hipe 3.15</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index e61c1a042c..2edfd790ed 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.15.1
+HIPE_VSN = 3.15
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index 08b02bc4a4..4b73aa5509 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -31,22 +31,7 @@
     <file>notes.xml</file>
   </header>
 
-   <section><title>IC 4.4.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>IC 4.4</title>
+   <section><title>IC 4.4</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index 7d00ae0170..272c306799 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.4.1
+IC_VSN = 4.4
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index bbfb7947fd..5cebce18a9 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,39 +33,7 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Add handling of DELETE Body to http client. </p>
-          <p>
-	    Own Id: OTP-13383 Aux Id: PR-972 </p>
-        </item>
-        <item>
-          <p>
-	    Removed references to mod_include and webtool from
-	    examples and tests.</p>
-          <p>
-	    Thanks to waisbrot</p>
-          <p>
-	    Own Id: OTP-13445 Aux Id: PR-988 </p>
-        </item>
-        <item>
-          <p>
-	    Remove module inets_regexp. Module re should be used
-	    instead.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13561</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inets 6.2.3</title>
+  <section><title>Inets 6.2.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 0cbb911327..c1b7c027ed 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,26 +31,6 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
-<section><title>Jinterface 1.7</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Handle terms (pids,ports and refs) from nodes with a
-	    'creation' value larger than 3. This is a preparation of
-	    the distribution protocol to allow OTP 19 nodes to
-	    correctly communicate with future nodes (20 or higher).
-	    The 'creation' value differentiates different
-	    incarnations of the same node (name).</p>
-          <p>
-	    Own Id: OTP-13488</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Jinterface 1.6.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 752b34e78c..41e670528a 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.7
+JINTERFACE_VSN = 1.6.1
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index b0e614d33c..d0540768de 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,187 +31,6 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
-<section><title>Kernel 5.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p>The handling of <c>on_load</c> functions has been
-	    improved. The major improvement is that if a code upgrade
-	    fails because the <c>on_load</c> function fails, the
-	    previous version of the module will now be retained.</p>
-          <p>
-	    Own Id: OTP-12593</p>
-        </item>
-        <item>
-	    <p><c>rpc:call()</c> and <c>rpc:block_call()</c> would
-	    sometimes cause an exception (which was not mentioned in
-	    the documentation). This has been corrected so that
-	    <c>{badrpc,Reason}</c> will be returned instead.</p>
-          <p>
-	    Own Id: OTP-13409</p>
-        </item>
-        <item>
-	    <p>On Windows, for modules that were loaded early (such
-	    as the <c>lists</c> module), <c>code:which/1</c> would
-	    return the path with mixed slashes and backslashes, for
-	    example: <c>"C:\\Program
-	    Files\\erl8.0/lib/stdlib-2.7/ebin/lists.beam"</c>. This
-	    has been corrected.</p>
-          <p>
-	    Own Id: OTP-13410</p>
-        </item>
-        <item>
-          <p>
-	    Use fsync instead of fdatasync on Mac OSX.</p>
-          <p>
-	    Own Id: OTP-13411</p>
-        </item>
-        <item>
-          <p>
-	    The default chunk size for the fallback sendfile
-	    implementation, used on platforms that do not have a
-	    native sendfile, has been decreased in order to reduce
-	    connectivity issues.</p>
-          <p>
-	    Own Id: OTP-13444</p>
-        </item>
-        <item>
-          <p>
-	    Huges writes (2Gb or more) could fail on some Unix
-	    platforms (for example, OS X and FreeBSD).</p>
-          <p>
-	    Own Id: OTP-13461</p>
-        </item>
-        <item>
-          <p>
-	    A bug has been fixed where the DNS resolver inet_res did
-	    not refresh its view of the contents of for example
-	    resolv.conf immediately after start and hence then failed
-	    name resolution. Reported and fix suggested by Michal
-	    Ptaszek in GitHUB pull req #949.</p>
-          <p>
-	    Own Id: OTP-13470 Aux Id: Pull #969 </p>
-        </item>
-        <item>
-          <p>
-	    Fix process leak from global_group. Thanks to Xuming who
-	    reported and fixed this!</p>
-          <p>
-	    Own Id: OTP-13516 Aux Id: PR-1008 </p>
-        </item>
-        <item>
-          <p>
-	    The function <c>inet:gethostbyname/1</c> now honors the
-	    resolver option <c>inet6</c> instead of always looking up
-	    IPv4 addresses.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13622 Aux Id: PR-1065 </p>
-        </item>
-        <item>
-          <p>
-	    The <c>Status</c> argument to <c>init:stop/1</c> is now
-	    sanity checked to make sure <c>erlang:halt</c> does not
-	    fail.</p>
-          <p>
-	    Own Id: OTP-13631 Aux Id: PR-911 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Added <seealso
-	    marker="kernel:os#perf_counter/1">os:perf_counter/1</seealso>.</p>
-          <p>
-	    The perf_counter is a very very cheap and high resolution
-	    timer that can be used to timestamp system events. It
-	    does not have monoticity guarantees, but should on most
-	    OS's expose a monotonous time.</p>
-          <p>
-	    Own Id: OTP-12908</p>
-        </item>
-        <item>
-          <p>
-	    The os:cmd call has been optimized on unix platforms to
-	    be more performant as the number of schedulers increase.</p>
-          <p>
-	    Own Id: OTP-13089</p>
-        </item>
-        <item>
-	    <p>New functions that can load multiple functions at once
-	    have been added to the '<c>code</c>' module. The
-	    functions are <c>code:atomic_load/1</c>,
-	    <c>code:prepare_loading/1</c>,
-	    <c>code:finish_loading/1</c>, and
-	    <c>code:ensure_modules_loaded/1</c>.</p>
-          <p>
-	    Own Id: OTP-13111</p>
-        </item>
-        <item>
-          <p>
-	    The code path cache feature turned out not to be very
-	    useful in practice and has been removed. If an attempt is
-	    made to enable the code path cache, there will be a
-	    warning report informing the user that the feature has
-	    been removed.</p>
-          <p>
-	    Own Id: OTP-13191</p>
-        </item>
-        <item>
-	    <p>When an attempt is made to start a distributed Erlang
-	    node with the same name as an existing node, the error
-	    message will be much shorter and easier to read than
-	    before. Example:</p>
-	    <p><c>Protocol 'inet_tcp': the name somename@somehost
-	    seems to be in use by another Erlang node</c></p>
-          <p>
-	    Own Id: OTP-13294</p>
-        </item>
-        <item>
-          <p>
-	    The output of the default error logger is somewhat
-	    prettier and easier to read. The default error logger is
-	    used during startup of the OTP system. If the start-up
-	    fails, the output will be easier to read.</p>
-          <p>
-	    Own Id: OTP-13325</p>
-        </item>
-        <item>
-	    <p>The functions <c>rpc:safe_multi_server_call/2,3</c>
-	    that were deprecated in R12B have been removed.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13449</p>
-        </item>
-        <item>
-          <p>
-	    Update the error reasons in dist_util, and show them in
-	    the logs if net_kernel:verbose(1) has been called.</p>
-          <p>
-	    Own Id: OTP-13458</p>
-        </item>
-        <item>
-          <p>
-	    Experimental support for Unix Domain Sockets has been
-	    implemented. Read the sources if you want to try it out.
-	    Example: <c>gen_udp:open(0,
-	    [{ifaddr,{local,"/tmp/socket"}}])</c>. Documentation will
-	    be written after user feedback on the experimental API.</p>
-          <p>
-	    Own Id: OTP-13572 Aux Id: PR-612 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Kernel 4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index a05a339003..7deafc79e9 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,22 +37,7 @@
   section is the version number of Megaco.</p>
   
   
-  <section><title>Megaco 3.18.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Megaco 3.18</title>
+  <section><title>Megaco 3.18</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index b95cd66a81..2e850f2917 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.18.1
+MEGACO_VSN  = 3.18
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 7d8e8d0c44..4a68e76d50 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,28 +39,7 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Added experimental external backend plugin api. This adds
-	    the possibility for the user to write other storage
-	    backends for data, for example by using shared memory or
-	    ram-cached disk storage.</p>
-          <p>
-	    The plugin api may change in future versions after being
-	    battle tested.</p>
-          <p>
-	    Own Id: OTP-13058</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Mnesia 4.13.4</title>
+  <section><title>Mnesia 4.13.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index fb4200f62d..194bc439a0 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.14
+MNESIA_VSN = 4.13.4
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 0c72052827..c3bd0d33b9 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,36 +32,6 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
-<section><title>Observer 2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Update dbg and ttb to work with a tracer module as tracer
-	    and tracing on ports.</p>
-          <p>
-	    Own Id: OTP-13500</p>
-        </item>
-        <item>
-          <p>
-	    Added possibility to change update frequency and length
-	    of the graph windows.</p>
-          <p>
-	    Own Id: OTP-13555</p>
-        </item>
-        <item>
-          <p>
-	    Improved background coloring to work with dark themes and
-	    other visual improvements.</p>
-          <p>
-	    Own Id: OTP-13556</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Observer 2.1.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index f214810199..aede0858d6 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.2
+OBSERVER_VSN = 2.1.2
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 55eb8e7ac0..ac3c99badc 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,23 +32,7 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.11.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Configure enhancment for better handling program paths
-	    used in the build process</p>
-          <p>
-	    Own Id: OTP-13559</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>ODBC 2.11.1</title>
+  <section><title>ODBC 2.11.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 957c6b42eb..c7c84560d1 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.11.2
+ODBC_VSN = 2.11.1
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 89f258e5e9..74d9d7a98c 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -34,22 +34,7 @@
   </header>
 
 
-  <section><title>Orber 3.8.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Orber 3.8.1</title>
+  <section><title>Orber 3.8.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index dcb2c985a3..4947315ad0 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1 +1 @@
-ORBER_VSN = 3.8.2
+ORBER_VSN = 3.8.1
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 961a92d9c0..c565df7f3b 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,34 +31,6 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
-<section><title>Os_Mon 2.4.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix type specification for cpu_sup:util/1</p>
-          <p>
-	    Own Id: OTP-13526 Aux Id: PR-1029 </p>
-        </item>
-        <item>
-          <p>
-	    Fix strict compilation on SUN/SPARC</p>
-          <p>
-	    Own Id: OTP-13548 Aux Id: PR-1046 </p>
-        </item>
-        <item>
-          <p>
-	    Fix memsup:get_os_wordsize() on 64-bit FreeBSD and 64-bit
-	    Linux PPC</p>
-          <p>
-	    Own Id: OTP-13601 Aux Id: PR-1039 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Os_Mon 2.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 1ac0fb1d27..7f2667e40a 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.4.1
+OS_MON_VSN = 2.4
diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml
index dbd2f47ffb..7beac5ffcb 100644
--- a/lib/otp_mibs/doc/src/notes.xml
+++ b/lib/otp_mibs/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the OTP_Mibs
     application.</p>
 
-<section><title>Otp_Mibs 1.1.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Otp_Mibs 1.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk
index 7a793007ee..38436d363e 100644
--- a/lib/otp_mibs/vsn.mk
+++ b/lib/otp_mibs/vsn.mk
@@ -1,4 +1,4 @@
-OTP_MIBS_VSN = 1.1.1
+OTP_MIBS_VSN = 1.1
 
 # Note: The branch 'otp_mibs' is defunct as of otp_mibs-1.0.4 and
 # should NOT be used again.
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index b826b4d03a..06d66e28c3 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -31,21 +31,6 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
-<section><title>Parsetools 2.1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Parsetools 2.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index befdd82d6e..de3da23c8a 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.1.2
+PARSETOOLS_VSN = 2.1.1
diff --git a/lib/percept/doc/src/notes.xml b/lib/percept/doc/src/notes.xml
index 06fd4c7b17..750dcb6cf5 100644
--- a/lib/percept/doc/src/notes.xml
+++ b/lib/percept/doc/src/notes.xml
@@ -33,21 +33,6 @@
   </header>
   <p>This document describes the changes made to the Percept application.</p>
 
-<section><title>Percept 0.8.12</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Remove deprecated <c>erlang:now/0</c> calls</p>
-          <p>
-	    Own Id: OTP-13422</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Percept 0.8.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/percept/vsn.mk b/lib/percept/vsn.mk
index c427ada91d..833ab35aa5 100644
--- a/lib/percept/vsn.mk
+++ b/lib/percept/vsn.mk
@@ -1 +1 @@
-PERCEPT_VSN = 0.8.12
+PERCEPT_VSN = 0.8.11
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index ee37d38a56..49b2ba0326 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,21 +35,6 @@
     <file>notes.xml</file>
   </header>
 
-<section><title>Public_Key 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Handle PEM encoded EC public keys</p>
-          <p>
-	    Own Id: OTP-13408</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Public_Key 1.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 84f6a659b5..f801f55073 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.2
+PUBLIC_KEY_VSN = 1.1.1
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 6df4924d0a..0a83954865 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -38,24 +38,7 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.7.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Modify the code as motivated by a change of the
-	    Erlang Parser (<c>undefined</c> is no longer
-	    automatically inserted to the type of record fields
-	    without an initializer). </p>
-          <p>
-	    Own Id: OTP-13033 Aux Id: OTP-12719 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Reltool 0.7</title>
+  <section><title>Reltool 0.7</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 76f69fd294..733c41bc02 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.7.1
+RELTOOL_VSN = 0.7
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index dcc59c9648..57241edbdc 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,100 +32,6 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
-<section><title>Runtime_Tools 1.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fix bug in dbg:trace_port/2 that could cause the trace ip
-	    driver to produce faulty error reports "...(re)selected
-	    before stop_select was called for driver trace_ip_drv".</p>
-          <p>
-	    Own Id: OTP-13576 Aux Id: ERL-119 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Add microstate accounting</p>
-          <p>
-	    Microstate accounting is a way to track which state the
-	    different threads within ERTS are in. The main usage area
-	    is to pin point performance bottlenecks by checking which
-	    states the threads are in and then from there figuring
-	    out why and where to optimize.</p>
-          <p>
-	    Since checking whether microstate accounting is on or off
-	    is relatively expensive only a few of the states are
-	    enabled by default and more states can be enabled through
-	    configure.</p>
-          <p>
-	    There is a convinence module called msacc that has been
-	    added to runtime_tools that can assist in gathering and
-	    interpreting the data from Microstate accounting.</p>
-          <p>
-	    For more information see <seealso
-	    marker="erts:erlang#statistics_microstate_accounting">erlang:statistics(microstate_accounting,
-	    _)</seealso> and the <seealso
-	    marker="runtime_tools:msacc">msacc</seealso> module in
-	    runtime_tools.</p>
-          <p>
-	    Own Id: OTP-12345</p>
-        </item>
-        <item>
-          <p>
-	    Update observer GUI to support tracing on ports, and to
-	    set matchspecs for send/receive. This required some minor
-	    bugfixes in runtime_tools/dbg.</p>
-          <p>
-	    Own Id: OTP-13481</p>
-        </item>
-        <item>
-          <p>
-	    Update dbg and ttb to work with a tracer module as tracer
-	    and tracing on ports.</p>
-          <p>
-	    Own Id: OTP-13500</p>
-        </item>
-        <item>
-          <p>
-	    Updated dbg to accept the new trace options
-	    <c>monotonic_timestamp</c> and
-	    <c>strict_monotonic_timestamp</c>.</p>
-          <p>
-	    Own Id: OTP-13502</p>
-        </item>
-        <item>
-          <p>
-	    Introduce LTTng tracing via Erlang tracing.</p>
-          <p>
-	    For LTTng to be enabled OTP needs to be built with
-	    configure option <c>--with-dynamic-trace=lttng</c>.</p>
-	    <p>The dynamic trace module <c>dyntrace</c> is now
-	    capable to be used as a LTTng sink for Erlang tracing.
-	    For a list of all tracepoints, see <seealso
-	    marker="runtime_tools:LTTng">Runtime Tools User's
-	    Guide</seealso> .</p>
-	    <p>This feature also introduces an incompatible change in
-	    trace tags. The trace tags <c>gc_start</c> and
-	    <c>gc_end</c> has been split into <c>gc_minor_start</c>,
-	    <c>gc_minor_end</c> and <c>gc_major_start</c>,
-	    <c>gc_major_end</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13532</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Runtime_Tools 1.9.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index b33f6f4721..bfc8b84b91 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.10
+RUNTIME_TOOLS_VSN = 1.9.3
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index dae73f8b23..f07938220c 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,23 +31,6 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
-<section><title>SASL 3.0</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The module 'overload' is removed.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13184</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SASL 2.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 0f5c35b300..b9dc5e4117 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,22 +34,7 @@
   </header>
 
 
-  <section><title>SNMP 5.2.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SNMP 5.2.2</title>
+  <section><title>SNMP 5.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index f95b428290..f58f6b6162 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.3
+SNMP_VSN    = 5.2.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index bab0c39b99..96bc50c689 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,70 +30,6 @@
     <file>notes.xml</file>
   </header>
 
-<section><title>Ssh 4.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Some time optimization mainly in message encoding.</p>
-          <p>
-	    Own Id: OTP-13131</p>
-        </item>
-        <item>
-          <p>
-	    Optimized the sftp client time by setting new packet and
-	    window sizes.</p>
-          <p>
-	    Own Id: OTP-13175</p>
-        </item>
-        <item>
-          <p>
-	    The <c>ssh_connection_handler</c> module in SSH is
-	    changed and now uses the new behaviour <c>gen_statem</c>. </p>
-          <p>
-	    The module can be used as an example of a
-	    <c>gen_statem</c> callback module but with a warning:
-	    This commit of ssh is just a straightforward port from
-	    gen_fsm to gen_statem with some code cleaning. Since the
-	    state machine and the state callbacks are almost
-	    unchanged the ssh module does not demonstrate the full
-	    potential of the new behaviour.</p>
-          <p>
-	    The "new" state machine uses compund states. The ssh
-	    server and client state machines are quite similar but
-	    differences exist. With <c>gen_fsm</c> there were flags
-	    in the user data which in fact implemented "substates".
-	    Now with <c>gen_statem</c> those are made explicit in the
-	    state names, eg the state <c>userauth</c> and the binary
-	    <c>role</c>-flag becomes the two state names
-	    <c>{userauth, server}</c> and <c>{userauth, client}</c>.</p>
-          <p>
-	    Own Id: OTP-13267</p>
-        </item>
-        <item>
-          <p>
-	    The <c>{error, Reason}</c> tuples returned from
-	    <c>ssh_sftp</c> api functions are described.</p>
-          <p>
-	    Own Id: OTP-13347 Aux Id: ERL-86 </p>
-        </item>
-        <item>
-          <p>
-	    It is now possible to call <c>ssh:daemon/{1,2,3}</c> with
-	    <c>Port=0</c>. This makes the daemon select a free
-	    listening tcp port before opening it. To find this port
-	    number after the call, use the new function
-	    <c>ssh:daemon_info/1</c>. See the reference manual for
-	    details.</p>
-          <p>
-	    Own Id: OTP-13527</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Ssh 4.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 5fb76c1f62..e9b523d9e1 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -28,115 +28,6 @@
   <p>This document describes the changes made to the SSL application.</p>
 
 
-<section><title>SSL 8.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Timeouts may have the value 0, gauards have been
-	    corrected to allow this</p>
-          <p>
-	    Own Id: OTP-13635</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Remove default support for DES cipher suites</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13195</p>
-        </item>
-        <item>
-          <p>
-	    Deprecate the function crypto:rand_bytes and make sure
-	    that crypto:strong_rand_bytes is used in all places that
-	    are cryptographically significant.</p>
-          <p>
-	    Own Id: OTP-13214</p>
-        </item>
-        <item>
-          <p>
-	    Better error handling of user error during TLS upgrade.
-	    ERL-69 is solved by gen_statem rewrite of ssl
-	    application.</p>
-          <p>
-	    Own Id: OTP-13255</p>
-        </item>
-        <item>
-          <p>
-	    Provide user friendly error message when crypto rejects a
-	    key</p>
-          <p>
-	    Own Id: OTP-13256</p>
-        </item>
-        <item>
-          <p>
-	    TLS distribution connections now allow specifying the
-	    options <c>verify_fun</c>, <c>crl_check</c> and
-	    <c>crl_cache</c>. See the documentation. GitHub pull req
-	    #956 contributed by Magnus Henoch.</p>
-          <p>
-	    Own Id: OTP-13429 Aux Id: Pull#956 </p>
-        </item>
-        <item>
-          <p>
-	    Remove confusing error message when closing a distributed
-	    erlang node running over TLS</p>
-          <p>
-	    Own Id: OTP-13431</p>
-        </item>
-        <item>
-          <p>
-	    ssl now uses gen_statem instead of gen_fsm to implement
-	    the ssl connection process, this solves some timing
-	    issues in addtion to making the code more intuitive as
-	    the behaviour can be used cleanly instead of having a lot
-	    of workaround for shortcomings of the behaviour.</p>
-          <p>
-	    Own Id: OTP-13464</p>
-        </item>
-        <item>
-          <p>
-	    Correct ssl:prf/5 to use the negotiated cipher suites prf
-	    function in ssl:prf/5 instead of the default prf.</p>
-          <p>
-	    Own Id: OTP-13546</p>
-        </item>
-        <item>
-          <p>
-	    Some legacy TLS 1.0 software does not tolerate the 1/n-1
-	    content split BEAST mitigation technique. Add a
-	    beast_mitigation SSL option (defaulting to
-	    one_n_minus_one) to select or disable the BEAST
-	    mitigation technique.</p>
-          <p>
-	    Own Id: OTP-13629</p>
-        </item>
-        <item>
-          <p>
-	    Enhance error log messages to facilitate for users to
-	    understand the error</p>
-          <p>
-	    Own Id: OTP-13632</p>
-        </item>
-        <item>
-          <p>
-	    Incresed default DH params to 2048-bit</p>
-          <p>
-	    Own Id: OTP-13636</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SSL 7.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 8e989042db..87f5335723 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,299 +31,6 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
-<section><title>STDLIB 3.0</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-	    <p> Fix a race bug affecting <c>dets:open_file/2</c>.
-	    </p>
-          <p>
-	    Own Id: OTP-13260 Aux Id: seq13002 </p>
-        </item>
-        <item>
-	    <p>Don't search for non-existing Map keys twice</p>
-	    <p>For <c>maps:get/2,3</c> and <c>maps:find/2</c>,
-	    searching for an immediate key, e.g. an atom, in a small
-	    map, the search was performed twice if the key did not
-	    exist.</p>
-          <p>
-	    Own Id: OTP-13459</p>
-        </item>
-        <item>
-          <p>
-	    Avoid stray corner-case math errors on Solaris, e.g. an
-	    error is thrown on undeflows in exp() and pow() when it
-	    shouldn't be.</p>
-          <p>
-	    Own Id: OTP-13531</p>
-        </item>
-        <item>
-	    <p>Fix linting of map key variables</p>
-	    <p>Map keys cannot be unbound and then used in parallel
-	    matching.</p>
-	    <p>Example: <c> #{ K := V } = #{ k := K } = M.</c> This
-	    is illegal if <c>'K'</c> is not bound.</p>
-          <p>
-	    Own Id: OTP-13534 Aux Id: ERL-135 </p>
-        </item>
-        <item>
-          <p>
-	    Fixed a bug in re on openbsd where sometimes re:run would
-	    return an incorrect result.</p>
-          <p>
-	    Own Id: OTP-13602</p>
-        </item>
-        <item>
-          <p>
-	    To avoid potential timer bottleneck on supervisor
-	    restart, timer server is no longer used when the
-	    supervisor is unable to restart a child.</p>
-          <p>
-	    Own Id: OTP-13618 Aux Id: PR-1001 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The types of The Abstract Format in the
-	    <c>erl_parse</c> module have been refined. </p>
-          <p>
-	    Own Id: OTP-10292</p>
-        </item>
-        <item>
-	    <p> Undocumented syntax for function specifications,
-	    <c>-spec F/A :: Domain -&gt; Range</c>, has been removed
-	    (without deprecation). </p> <p> Using the
-	    <c>is_subtype(V, T)</c> syntax for constraints (in
-	    function specifications) is no longer documented, and the
-	    newer syntax <c>V :: T</c> should be used instead. The
-	    Erlang Parser still recognizes the <c>is_subtype</c>
-	    syntax, and will continue to do so for some time. </p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-11879</p>
-        </item>
-        <item>
-	    <p>The '<c>random</c>' module has been deprecated. Use
-	    the '<c>rand</c>' module instead.</p>
-          <p>
-	    Own Id: OTP-12502 Aux Id: OTP-12501 </p>
-        </item>
-        <item>
-	    <p>Background: In record fields with a type declaration
-	    but without an initializer, the Erlang parser inserted
-	    automatically the singleton type <c>'undefined'</c> to
-	    the list of declared types, if that value was not present
-	    there. That is, the record declaration:</p>
-          <p>
-	    -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 ::
-	    some_mod:some_typ()}).</p>
-	    <p>was translated by the parser to:</p>
-          <p>
-	    -record(rec, {f1 :: float() | 'undefined', f2 = 42 ::
-	    integer(), f3 :: some_mod:some_typ() | 'undefined'}).</p>
-	    <p>The rationale for this was that creation of a "dummy"
-	    <c>#rec{}</c> record should not result in a warning from
-	    dialyzer that, for example, the implicit initialization
-	    of the <c>#rec.f1</c> field violates its type
-	    declaration.</p>
-	    <p>Problems: This seemingly innocent action has some
-	    unforeseen consequences.</p>
-	    <p>For starters, there is no way for programmers to
-	    declare that e.g. only floats make sense for the
-	    <c>f1</c> field of <c>#rec{}</c> records when there is no
-	    "obvious" default initializer for this field. (This also
-	    affects tools like PropEr that use these declarations
-	    produced by the Erlang parser to generate random
-	    instances of records for testing purposes.)</p>
-	    <p>It also means that dialyzer does not warn if e.g. an
-	    <c>is_atom/1</c> test or something more exotic like an
-	    <c>atom_to_list/1</c> call is performed on the value of
-	    the <c>f1</c> field.</p>
-	    <p>Similarly, there is no way to extend dialyzer to warn
-	    if it finds record constructions where <c>f1</c> is not
-	    initialized to some float.</p>
-	    <p>Last but not least, it is semantically problematic
-	    when the type of the field is an opaque type: creating a
-	    union of an opaque and a structured type is very
-	    problematic for analysis because it fundamentally breaks
-	    the opacity of the term at that point.</p>
-	    <p>Change: To solve these problems the parser will not
-	    automatically insert the <c>'undefined'</c> value
-	    anymore; instead the user has the option to choose the
-	    places where this value makes sense (for the field) and
-	    where it does not and insert the <c>| 'undefined'</c>
-	    there manually.</p>
-	    <p>Consequences of this change: This change means that
-	    dialyzer will issue a warning for all places where
-	    records with uninitialized fields are created and those
-	    fields have a declared type that is incompatible with
-	    <c>'undefined'</c> (e.g. <c>float()</c>). This warning
-	    can be suppressed easily by adding <c>| 'undefined'</c>
-	    to the type of this field. This also adds documentation
-	    that the user really intends to create records where this
-	    field is uninitialized.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-12719</p>
-        </item>
-        <item>
-	    <p> Remove deprecated functions in the modules
-	    <c>erl_scan</c> and <c>erl_parse</c>. </p>
-          <p>
-	    Own Id: OTP-12861</p>
-        </item>
-        <item>
-	    <p>The pre-processor can now expand the ?FUNCTION_NAME
-	    and ?FUNCTION_ARITY macros.</p>
-          <p>
-	    Own Id: OTP-13059</p>
-        </item>
-        <item>
-	    <p> A new behaviour <c>gen_statem</c> has been
-	    implemented. It has been thoroughly reviewed, is stable
-	    enough to be used by at least two heavy OTP applications,
-	    and is here to stay. But depending on user feedback, we
-	    do not expect but might find it necessary to make minor
-	    not backwards compatible changes into OTP-20.0, so its
-	    state can be designated as "not quite experimental"...
-	    </p> <p> The <c>gen_statem</c> behaviour is intended to
-	    replace <c>gen_fsm</c> for new code. It has the same
-	    features and add some really useful: </p> <list
-	    type="bulleted"> <item>State code is gathered</item>
-	    <item>The state can be any term</item> <item>Events can
-	    be postponed</item> <item>Events can be self
-	    generated</item> <item>A reply can be sent from a later
-	    state</item> <item>There can be multiple sys traceable
-	    replies</item> </list> <p> The callback model(s) for
-	    <c>gen_statem</c> differs from the one for
-	    <c>gen_fsm</c>, but it is still fairly easy to rewrite
-	    from <c>gen_fsm</c> to <c>gen_statem</c>. </p>
-          <p>
-	    Own Id: OTP-13065 Aux Id: PR-960 </p>
-        </item>
-        <item>
-          <p>
-	    Optimize binary:split/2 and binary:split/3 with native
-	    BIF implementation.</p>
-          <p>
-	    Own Id: OTP-13082</p>
-        </item>
-        <item>
-	    <p>Background: The types of record fields have since R12B
-	    been put in a separate form by <c>epp:parse_file()</c>,
-	    leaving the record declaration form untyped. The separate
-	    form, however, does not follow the syntax of type
-	    declarations, and parse transforms inspecting
-	    <c>-type()</c> attributes need to know about the special
-	    syntax. Since the compiler stores the return value of
-	    <c>epp:parse_file()</c> as debug information in the
-	    abstract code chunk (<c>"Abst"</c> or
-	    <c>abstract_code</c>), tools too need to know about the
-	    special syntax, if they inspect <c>-type()</c> attributes
-	    in abstract code.</p>
-	    <p>Change: No separate type form is created by
-	    <c>epp:parse_file()</c>, but the type information is kept
-	    in the record fields. This means that all parse
-	    transforms and all tools inspecting <c>-record()</c>
-	    declarations need to recognize <c>{typed_record_field,
-	    Field, Type}</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13148</p>
-        </item>
-        <item>
-          <p>
-	    Unsized fields of the type <c>bytes</c> in binary
-	    generators are now forbidden. (The other ways of writing
-	    unsized fields, such as <c>binary</c>, are already
-	    forbidden.)</p>
-          <p>
-	    Own Id: OTP-13152</p>
-        </item>
-        <item>
-	    <p> The type <c>map()</c> is built-in, and cannot be
-	    redefined. </p>
-          <p>
-	    Own Id: OTP-13153</p>
-        </item>
-        <item>
-	    <p> Let <c>dets:open_file()</c> exit with a <c>badarg</c>
-	    message if given a raw file name (a binary). </p>
-          <p>
-	    Own Id: OTP-13229 Aux Id: ERL-55 </p>
-        </item>
-        <item>
-	    <p> Add <c>filename:basedir/2,3</c></p> <p>basedir
-	    returns suitable path(s) for 'user_cache', 'user_config',
-	    'user_data', 'user_log', 'site_config' and 'site_data'.
-	    On linux and linux like systems the paths will respect
-	    the XDG environment variables.</p>
-          <p>
-	    Own Id: OTP-13392</p>
-        </item>
-        <item>
-	    <p>There are new preprocessor directives
-	    <c>-error(Term)</c> and <c>-warning(Term)</c> to cause a
-	    compilation error or a compilation warning,
-	    respectively.</p>
-          <p>
-	    Own Id: OTP-13476</p>
-        </item>
-        <item>
-          <p>
-	    Optimize <c>'++'</c> operator and <c>lists:append/2</c>
-	    by using a single pass to build a new list while checking
-	    for properness.</p>
-          <p>
-	    Own Id: OTP-13487</p>
-        </item>
-        <item>
-          <p>
-	    Add <c>maps:update_with/3,4</c> and <c>maps:take/2</c></p>
-          <p>
-	    Own Id: OTP-13522 Aux Id: PR-1025 </p>
-        </item>
-        <item>
-	    <p><c>lists:join/2</c> has been added. Similar to
-	    <c>string:join/2</c> but works with arbitrary lists.</p>
-          <p>
-	    Own Id: OTP-13523</p>
-        </item>
-        <item>
-	    <p>Obfuscate asserts to make Dialyzer shut up.</p>
-          <p>
-	    Own Id: OTP-13524 Aux Id: PR-1002 </p>
-        </item>
-        <item>
-          <p>
-	    Relax translation of initial calls in <c>proc_lib</c>,
-	    i.e. remove the restriction to only do the translation
-	    for <c>gen_server</c> and <c>gen_fsm</c>. This enables
-	    user defined <c>gen</c> based generic callback modules to
-	    be displayed nicely in <c>c:i()</c> and observer.</p>
-          <p>
-	    Own Id: OTP-13623</p>
-        </item>
-        <item>
-          <p>
-	    Lower ETS hash load factor to improve lookup performance
-	    at the cost of less than one word per object.</p>
-          <p>
-	    Own Id: OTP-13642</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>STDLIB 2.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index ef207f7c3d..78b2c7c7a4 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,32 +32,6 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
-<section><title>Syntax_Tools 2.0</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The abstract data type in <c>erl_syntax</c> is
-	    augmented with types and function specifications.</p>
-	    <p>The module <c>erl_prettypr</c> pretty prints types and
-	    function specification, and the output can be parsed.</p>
-	    <p>The types of record fields are no longer ignored. As a
-	    consequence <c>erl_syntax_lib:analyze_record_field/1</c>
-	    returns <c>{Default, Type}</c> instead of <c>Default</c>.
-	    The functions <c>analyze_record_attribute</c>,
-	    <c>analyze_attribute</c>, <c>analyze_form</c>, and
-	    <c>analyze_forms</c> in the <c>erl_syntax_lib</c> module
-	    are also affected by this incompatible change.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-12863</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Syntax_Tools 1.7</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index ae7b9ea482..3a6ac37eef 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,35 +31,6 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
-<section><title>Tools 2.8.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Update fprof to use the new 'spawned' trace event to
-	    determine when a process has been created.</p>
-          <p>
-	    Own Id: OTP-13499</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Various emacs mode improvements, such as better tags
-	    support.</p>
-          <p>
-	    Own Id: OTP-13610</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Tools 2.8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 8c889cbe4e..70564f05c6 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.4
+TOOLS_VSN = 2.8.3
diff --git a/lib/typer/doc/src/notes.xml b/lib/typer/doc/src/notes.xml
index 9ef5ca1c70..d6d545d0e4 100644
--- a/lib/typer/doc/src/notes.xml
+++ b/lib/typer/doc/src/notes.xml
@@ -31,21 +31,6 @@
   </header>
   <p>This document describes the changes made to TypEr.</p>
 
-<section><title>TypEr 0.9.11</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>TypEr 0.9.10</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/typer/vsn.mk b/lib/typer/vsn.mk
index ed12e067c1..507593ef56 100644
--- a/lib/typer/vsn.mk
+++ b/lib/typer/vsn.mk
@@ -1 +1 @@
-TYPER_VSN = 0.9.11
+TYPER_VSN = 0.9.10
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 4f0e166924..c7400206ab 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,43 +32,6 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
-<section><title>Wx 1.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Fixed bugs which could cause called functions to be
-	    invoked twice or not at all when callbacks where invoked
-	    at the same time.</p>
-          <p>
-	    Own Id: OTP-13491</p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Changed atom 'boolean' fields in #wxMouseState{} to
-	    'boolean()'.</p>
-          <p>
-	    Moved out arguments in wxListCtrl:hitTest to result.</p>
-          <p>
-	    Removed no-op functions in wxGauge that have been removed
-	    from wxWidgets-3.1.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-13553</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Wx 1.6.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index de4e5e1935..de723b2a2d 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.7
+WX_VSN = 1.6.1
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 0abcb87998..4f61d4b52c 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,21 +32,6 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
-<section><title>Xmerl 1.3.11</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.10</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index a78a035a1f..09d81e0533 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.11
+XMERL_VSN = 1.3.10
-- 
cgit v1.2.3