Revert "Prepare release"

This reverts commit df130102cdeca8d35fec95a0c926fd1cfec54eab.
author: Rickard Green <[email protected]> 2019-02-27 13:19:37 +0100
committer: Rickard Green <[email protected]> 2019-02-27 13:19:37 +0100
commit: 196b7abdb0aad42c3b7e10e9aedb9fb720525676 (patch)
tree: 0be24d33f34d249ac404c28d316cdbb2c3680312 /lib
parent: 91637325d535b0881f6cc279927785d8ae0350e2 (diff)
download: otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.gz
otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.bz2
otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.zip
65 files changed, 98 insertions, 865 deletions
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 4228b12031..22ca7840de 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,23 +32,6 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
-<section><title>Asn1 5.0.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Asn1 5.0.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 018beda307..69f1af28e8 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.9
+ASN1_VSN = 5.0.8
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 73d1b83267..2f53f1c29e 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,34 +33,6 @@
     <file>notes.xml</file>
     </header>
 
-<section><title>Common_Test 1.16.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Use <c>ssh</c> as the default remote shell. </p>
-          <p>
-	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Common_Test 1.16.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index d5271a6593..fd5d4a57aa 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.16.2
+COMMON_TEST_VSN = 1.16.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 12429cf561..02e6203137 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,53 +32,6 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
-<section><title>Compiler 7.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The compiler has been rewritten to internally use an
-	    intermediate representation based on Static Single
-	    Assignment (SSA). The new intermediate representation
-	    makes more optimizations possible.</p>
-          <p>
-	    Most noticeable is that the binary matching optimizations
-	    are now applicable in many more circumstances than
-	    before.</p>
-          <p>
-	    Another noticeable change is that type optimizations are
-	    now applied across local function calls, and will remove
-	    a lot more redundant type tests than before.</p>
-          <p>
-	    Own Id: OTP-14894 Aux Id: ERL-714 </p>
-        </item>
-        <item>
-	    <p>Funs are no longer created when they are only used
-	    locally, greatly improving the performance of named funs
-	    and "fun-wrapped" macros.</p>
-          <p>
-	    Own Id: OTP-15273 Aux Id: ERL-639 </p>
-        </item>
-        <item>
-	    <p>All compiler options that can be given in the source
-	    file can now also be given in the option list or from the
-	    command line for <c>erlc</c>.</p>
-	    <p>Specifically, the option
-	    <c>{nowarn_deprecated_function,MFAs}</c> was only
-	    recognized when given in the file with the attribute
-	    <c>-compile()</c>. The option
-	    <c>{nowarn_unused_function,FAs}</c> was incorrectly
-	    documented to only work in a file, but it also worked
-	    when given in the option list.</p>
-          <p>
-	    Own Id: OTP-15456</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Compiler 7.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 494de072ff..efedb414ad 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.4
+COMPILER_VSN = 7.3.1
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index eb958cbc14..0a3f68ade2 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,65 +31,6 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
-<section><title>Crypto 4.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> A new <c>rand</c> module algorithm, <c>exro928ss</c>
-	    (Xoroshiro928**), has been implemented. It has got a
-	    really long period and good statistical quality for all
-	    output bits, while still being only about 50% slower than
-	    the default algorithm. </p><p> The same generator is also
-	    used as a long period counter in a new <c>crypto</c>
-	    plugin for the <c>rand</c> module, algorithm
-	    <c>crypto_aes</c>. This plugin uses AES-256 to scramble
-	    the counter which buries any detectable statistical
-	    artifacts. Scrambling is done in chunks which are cached
-	    to get good amortized speed (about half of the default
-	    algorithm). </p>
-          <p>
-	    Own Id: OTP-14461 Aux Id: PR-1857 </p>
-        </item>
-        <item>
-          <p>
-	    Crypto's single C-file are splitted into multiple files.
-	    The different coding styles in the different parts are
-	    unified into a single one.</p>
-          <p>
-	    Own Id: OTP-14732 Aux Id: PR-2068, PR-2095 </p>
-        </item>
-        <item>
-          <p>
-	    Build configuration of the <c>crypto</c> application has
-	    been moved from the <c>erts</c> application into the
-	    <c>crypto</c> application.</p>
-          <p>
-	    Own Id: OTP-15129</p>
-        </item>
-        <item>
-          <p>
-	    Crypto internals is partly re-written to facilitate a
-	    planned new and possibly faster api for block and stream
-	    ciphers.</p>
-          <p>
-	    Own Id: OTP-15451</p>
-        </item>
-        <item>
-          <p>
-	    Adds two hash functions blake2b and blake2s (64 bit hash
-	    and 32 bit hash respectively). These are modern and
-	    standard hash functions used in blockchains and encrypted
-	    communication protocols. The hash functions are available
-	    in OpenSSL since version 1.1.1.</p>
-          <p>
-	    Own Id: OTP-15564 Aux Id: PR-2129 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Crypto 4.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 72a51bfec9..6a91244715 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.5
+CRYPTO_VSN = 4.4
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 795b46d467..395b69973d 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,23 +33,6 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
-<section><title>Debugger 4.2.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Debugger 4.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index daecc7594c..a3cbb497f8 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2.7
+DEBUGGER_VSN = 4.2.6
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 35d684330f..3cf776e566 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,23 +32,6 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
-<section><title>Dialyzer 3.3.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Dialyzer 3.3.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 7221993963..98ab533a58 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 3.3.2
+DIALYZER_VSN = 3.3.1
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 78c9c465cb..bf9358c4d1 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,21 +31,6 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
-<section><title>Eldap 1.2.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Ticket!</p>
-          <p>
-	    Own Id: OTP-15632</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Eldap 1.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 7f03fbd1b2..6d541e4689 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.7
+ELDAP_VSN = 1.2.6
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 62da860283..97c842a324 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,24 +31,7 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.8.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Erl_Docgen 0.8.1</title>
+  <section><title>Erl_Docgen 0.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 68b344aa40..3b2f6db6a1 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.8.2
+ERL_DOCGEN_VSN = 0.8.1
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index bffc293994..2bdb390644 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -736,7 +736,7 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_init(void)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_init(void)</nametext></name>
       <fsummary>Initialize the ei library.</fsummary>
       <desc>
         <p>Initialize the <c>ei</c> library. This function should be called once
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index dec9de5115..df40973270 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -412,7 +412,7 @@ typedef struct {
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_close_connection(int fd)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_close_connection(int fd)</nametext></name>
       <fsummary>Close a connection.</fsummary>
       <desc>
         <p>Closes a previously opened connection or listen socket.</p>
@@ -472,9 +472,9 @@ fd = ei_xconnect(&ec, &addr, ALIVE);
 
     <func>
       <name since=""><ret>int</ret><nametext>ei_connect_init(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
       <name since=""><ret>int</ret><nametext>ei_connect_xinit(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
       <fsummary>Initialize for a connection.</fsummary>
       <desc>
         <p>Initializes the <c>ec</c> structure, to
@@ -595,8 +595,8 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_listen(ei_cnode *ec, int *port, int backlog)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_listen(ei_cnode *ec, int *port, int backlog)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog)</nametext></name>
       <fsummary>Create a listen socket.</fsummary>
       <desc>
         <p>Used by a server process to setup a listen socket which
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 43064f71b9..07ddd82718 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,49 +31,6 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
-<section><title>Erl_Interface 3.10.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor adjustments made to build system for parallel
-	    configure.</p>
-          <p>
-	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
-        </item>
-        <item>
-          <p>
-	    The limited support for VxWorks is deprecated as of OTP
-	    22, and will be removed in OTP 23.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15621</p>
-        </item>
-        <item>
-	    <p>The old legacy <c>erl_interface</c> library (functions
-	    with prefix <c>erl_</c>) is deprecated as of OTP 22, and
-	    will be removed in OTP 23. This does not apply to the
-	    <c>ei</c> library. Reasonably new <c>gcc</c> compilers
-	    will issue deprecation warnings. In order to disable
-	    these warnings, define the macro
-	    <c>EI_NO_DEPR_WARN</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15622</p>
-        </item>
-        <item>
-	    <p> Use <c>ssh</c> as the default remote shell. </p>
-          <p>
-	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Erl_Interface 3.10.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index b7e09d6d00..06ef907d6c 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10.5
+EI_VSN = 3.10.4
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index 9b2c100a29..e9cdf42018 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,31 +31,6 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
-<section><title>Hipe 3.18.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Add function <c>hipe:erllvm_is_supported</c> to check
-	    presence of suitable version of the LLVM tool chain as
-	    well as supported hardware architecture. The old
-	    <c>hipe:llvm_support_available</c> has been removed.</p>
-          <p>
-	    Own Id: OTP-15385 Aux Id: PR-1986 </p>
-        </item>
-        <item>
-          <p>
-	    Fix hipe LLVM for FreeBSD and other non-linux unix to use
-	    /tmp/ instead of /dev/shm/.</p>
-          <p>
-	    Own Id: OTP-15386 Aux Id: PR-1963 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Hipe 3.18.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 39565d721f..12d621bf01 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.18.3
+HIPE_VSN = 3.18.2
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 7b57cf5c09..31dae6317e 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,35 +33,7 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 7.0.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> Use <c>ssh</c> as the default remote shell. </p>
-          <p>
-	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Inets 7.0.5</title>
+  <section><title>Inets 7.0.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index b7ddf39ebd..921161dce1 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 7.0.6
+INETS_VSN   = 7.0.5
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index f070dd8859..e4bfddcd17 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,23 +31,6 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
-<section><title>Jinterface 1.9.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Jinterface 1.9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index d66074b9f0..a8dc815145 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.9.2
+JINTERFACE_VSN = 1.9.1
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 524891afb8..021ecfa40d 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,43 +31,6 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
-<section><title>Kernel 6.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A simple socket API has been provided through the socket
-	    module. Known issues are; No support for the Windows OS
-	    (currently), a small term leakage.</p>
-          <p>
-	    Own Id: OTP-14831</p>
-        </item>
-        <item>
-          <p>
-	    Improved the documentation for the linger option.</p>
-          <p>
-	    Own Id: OTP-15491 Aux Id:
-	    https://github.com/erlang/otp/pull/2019 </p>
-        </item>
-        <item>
-          <p>
-	    The dist messages EXIT, EXIT2 and MONITOR_DOWN have been
-	    updated with new versions that send the reason term as
-	    part of the payload of the message instead of as part of
-	    the control message.</p>
-          <p>
-	    The old versions are still present and can be used when
-	    communicating with nodes that don't support the new
-	    versions.</p>
-          <p>
-	    Own Id: OTP-15611</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Kernel 6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 7c125b5816..ccf0a82ced 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -19,27 +19,39 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
+%% - OTP 20
 %% - OTP 21
-%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^6\\.0$">>,[restart_new_emulator]},
+ [{<<"^5\\.3$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
   {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
- [{<<"^6\\.0$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^5\\.3$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
   {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.2$">>,[restart_new_emulator]},
-  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 7bebe1ba70..4b43c6ae9d 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 6.3
+KERNEL_VSN = 6.2
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 6f33ae390c..b697c3f631 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,30 +37,7 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.18.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor updates to build system necessary due to move of
-	    configuration of <c>crypto</c> application.</p>
-          <p>
-	    Own Id: OTP-15262 Aux Id: OTP-15129 </p>
-        </item>
-        <item>
-          <p>
-	    Minor adjustments made to build system for parallel
-	    configure.</p>
-          <p>
-	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Megaco 3.18.4</title>
+  <section><title>Megaco 3.18.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 843a3dccc5..f4c82c537a 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.18.5
+MEGACO_VSN  = 3.18.4
 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 427024f6b1..8fc3610bb6 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,35 +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.16</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Optimize mnesia:read/1 if data have been written in the
-	    same transaction.</p>
-          <p>
-	    Own Id: OTP-15550 Aux Id: PR-12029 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Optimized dumping of tables with plugin backends.</p>
-          <p>
-	    Own Id: OTP-15588 Aux Id: PR-2102 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Mnesia 4.15.5</title>
+  <section><title>Mnesia 4.15.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index aa5d9adb6d..1cfb35c774 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.16
+MNESIA_VSN = 4.15.5
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 10eb9972ee..22035af982 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,23 +32,6 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
-<section><title>Observer 2.8.3</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Observer 2.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 98ffb0a7d6..5ce0aca589 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.8.3
+OBSERVER_VSN = 2.8.2
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index 3b060a8916..dba7663bb9 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.12.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor adjustments made to build system for parallel
-	    configure.</p>
-          <p>
-	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>ODBC 2.12.2</title>
+  <section><title>ODBC 2.12.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index ff023e666b..bb21016fad 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.12.3
+ODBC_VSN = 2.12.2
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 6cff743ec2..64e9f281e3 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,23 +31,6 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
-<section><title>Os_Mon 2.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The application otp_mibs has been removed from OTP. Some
-	    of its components (mibs) has been moved to other apps
-	    (snmp), or removed completely (os_mon).</p>
-          <p>
-	    Own Id: OTP-14984 Aux Id: OTP-15329 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Os_Mon 2.4.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 845443d329..9713f6bc6b 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.5
+OS_MON_VSN = 2.4.7
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 630f4e295c..b3e6023c41 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.6.5</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Ticket!</p>
-          <p>
-	    Own Id: OTP-15632</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Public_Key 1.6.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 11c06fb158..5e2643f0ea 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.6.5
+PUBLIC_KEY_VSN = 1.6.4
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 2d043017af..165ae6db6a 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -38,40 +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.8</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    A new element, <c>Opts</c>, can now be included in a
-	    <c>rel</c> tuple in the reltool release specific
-	    configuration format: {rel, Name, Vsn, RelApps, Opts}.</p>
-          <p>
-	    This supports the use of <c>{rel, Name, Vsn, RelApps,
-	    [{load_dot_erlang, false}]}</c> to prevent the boot
-	    script from running the <c>.erlang</c> file.</p>
-          <p>
-	    The incompatibilities are as follows:</p>
-          <p>
-	    * The return from <c>reltool:get_config/1</c> and
-	    <c>reltool:get_config/3</c> includes the new <c>rel</c>
-	    tuple for all rels where the <c>load_dot_erlang</c>
-	    option is set to <c>false</c>.<br/> * The return from
-	    <c>reltool:get_config/3</c> includes the new <c>rel</c>
-	    tuple for ALL rels if the <c>InclDefs</c> parameter is
-	    set to <c>true</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15571</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Reltool 0.7.8</title>
+  <section><title>Reltool 0.7.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index c5aacfba38..a649a3e0c0 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.8
+RELTOOL_VSN = 0.7.8
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 31c5e71360..810bb8207c 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,22 +32,6 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
-<section><title>Runtime_Tools 1.13.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor updates to build system necessary due to move of
-	    configuration of <c>crypto</c> application.</p>
-          <p>
-	    Own Id: OTP-15262 Aux Id: OTP-15129 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Runtime_Tools 1.13.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index fa2f338ec2..aa3d702997 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.13.2
+RUNTIME_TOOLS_VSN = 1.13.1
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 13546a6a62..982c874117 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.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Change the first module called by erts to be names
-	    erl_init instead of otp_ring0. systools in sasl have been
-	    updated to reflect this change.</p>
-          <p>
-	    Own Id: OTP-15336 Aux Id: PR-1825 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SASL 3.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 22a9027b7c..26127eae84 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,21 +19,27 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
+%% - OTP 20
 %% - OTP 21
-%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.2$">>,[restart_new_emulator]},
+ [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.2$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.3$">>,[restart_new_emulator]},
-  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
- [{<<"^3\\.2$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.2$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.3$">>,[restart_new_emulator]},
-  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 8838b514da..c1f80752a7 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.4
+SASL_VSN = 3.3
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index ffb9bf486d..423d90fef6 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,24 +34,7 @@
   </header>
 
 
-  <section><title>SNMP 5.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The application otp_mibs has been removed from OTP. Some
-	    of its components (mibs) has been moved to other apps
-	    (snmp), or removed completely (os_mon).</p>
-          <p>
-	    Own Id: OTP-14984 Aux Id: OTP-15329 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>SNMP 5.2.12</title>
+  <section><title>SNMP 5.2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index e95676bb4f..0bc4baf5eb 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,21 +30,6 @@
     <file>notes.xml</file>
   </header>
 
-<section><title>Ssh 4.7.4</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Ticket!</p>
-          <p>
-	    Own Id: OTP-15632</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Ssh 4.7.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 0f9eee887c..2890d7fe5b 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.7.4
+SSH_VSN = 4.7.3
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 995c52f78e..82eb8ff700 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,22 +27,6 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
-<section><title>SSL 9.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Use new logger API in ssl. Introduce log levels and
-	    verbose debug logging for SSL.</p>
-          <p>
-	    Own Id: OTP-15055</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>SSL 9.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 0d9f907d5c..3527062a8a 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.2
+SSL_VSN = 9.1.2
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 7efa69cf4f..dee7136eb1 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,121 +31,6 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
-<section><title>STDLIB 3.8</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p> A new <c>rand</c> module algorithm, <c>exro928ss</c>
-	    (Xoroshiro928**), has been implemented. It has got a
-	    really long period and good statistical quality for all
-	    output bits, while still being only about 50% slower than
-	    the default algorithm. </p><p> The same generator is also
-	    used as a long period counter in a new <c>crypto</c>
-	    plugin for the <c>rand</c> module, algorithm
-	    <c>crypto_aes</c>. This plugin uses AES-256 to scramble
-	    the counter which buries any detectable statistical
-	    artifacts. Scrambling is done in chunks which are cached
-	    to get good amortized speed (about half of the default
-	    algorithm). </p>
-          <p>
-	    Own Id: OTP-14461 Aux Id: PR-1857 </p>
-        </item>
-        <item>
-          <p>
-	    Types related to server naming and starting have been
-	    exported from <c>gen_statem</c>. These are:
-	    <c>server_name/0</c>, <c>server_ref/0</c>,
-	    <c>start_opt/0</c>, <c>start_ret/0</c> and
-	    <c>enter_loop_opt/0</c>.</p>
-          <p>
-	    Own Id: OTP-14724 Aux Id: PR-2056 </p>
-        </item>
-        <item>
-          <p>
-	    The default algorithm for the <c>rand</c> module has been
-	    changed to <c>exsss</c> (Xorshift116**) which is a
-	    combination of the Xorshift116 (<c>exsp</c>) state update
-	    and a new scrambler "StarStar" from the 2018 paper
-	    "Scrambled Linear Pseudorandom Number Generators" by
-	    David Blackman and Sebastiano Vigna. This combination
-	    should not have the caveat of weak low bits that the
-	    previous default algorithm(s) have had, with the cost of
-	    about 10% lower speed. See GitHub pull request #1969.</p>
-          <p>
-	    Own Id: OTP-14731 Aux Id: PR-1969 </p>
-        </item>
-        <item>
-          <p>
-	    The generic state machine behaviour <c>gen_statem</c> has
-	    gotten code cleanup and documentation improvements from
-	    GitHub Pull Request #1855, even though the PR itself was
-	    rejected.</p>
-          <p>
-	    Own Id: OTP-14737 Aux Id: PR-1855 </p>
-        </item>
-        <item>
-          <p>
-	    Update Unicode specification to version 11.0.</p>
-          <p>
-	    Own Id: OTP-15111</p>
-        </item>
-        <item>
-          <p>
-	    ETS option <c>write_concurrency</c> now also affects and
-	    improves the scalability of <c>ordered_set</c> tables.
-	    The implementation is based on a data structure called
-	    contention adapting search tree, where the lock
-	    granularity adapts to the actual amount of concurrency
-	    exploited by the applications in runtime.</p>
-          <p>
-	    Own Id: OTP-15128</p>
-        </item>
-        <item>
-          <p>
-	    Optimized <c>maps:new/0</c> with trivial Erlang
-	    implementation, making use of literal terms (the empty
-	    map) not needing dynamic heap allocation.</p>
-          <p>
-	    Own Id: OTP-15200 Aux Id: PR-1878 </p>
-        </item>
-        <item>
-	    <p>The <c>gen_*</c> behaviours have been changed so that
-	    if logging of the last N messages through
-	    <c>sys:log/2,3</c> is active for the server, this log is
-	    included in the terminate report.</p> <p>To accomplish
-	    this the format of "System Events" as defined in the man
-	    page for <c>sys</c> has been clarified and cleaned up, a
-	    new function <c>sys:get_log/1</c> has been added, and
-	    <c>sys:get_debug/3</c> has been deprecated. Due to these
-	    changes, code that relies on the internal badly
-	    documented format of "System Events", need to be
-	    corrected.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15381</p>
-        </item>
-        <item>
-          <p>
-	    The <c>gen_statem</c> behaviour engine loop has been
-	    optimized for better performance in particular when the
-	    callback module returns some actions, that is better
-	    performance for more realistic applications than the Echo
-	    Benchmark.</p>
-          <p>
-	    Own Id: OTP-15452</p>
-        </item>
-        <item>
-	    <p> Use <c>ssh</c> as the default remote shell. </p>
-          <p>
-	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>STDLIB 3.7.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 57551c3c0e..9cd425db9a 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -108,7 +108,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-11.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-@OTP-15128@","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index f24db79bdd..9e5d6a3bd8 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,27 +19,39 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
+%% - OTP 20
 %% - OTP 21
-%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.5$">>,[restart_new_emulator]},
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
   {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.7$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^3\\.5$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
   {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.7$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index cbefd6590a..d46173497b 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.8
+STDLIB_VSN = 3.7.1
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 0ee3de24af..dc13fe474b 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,23 +32,6 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
-<section><title>Syntax_Tools 2.1.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Syntax_Tools 2.1.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 538c71dc24..8959ebbd04 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.1.7
+SYNTAX_TOOLS_VSN = 2.1.6
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 29bc16095f..a6781dfdb3 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,42 +31,6 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
-<section><title>Tools 3.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Add <c>cprof</c> and <c>tags</c> modules to .app file so
-	    that they are included in releases.</p>
-          <p>
-	    Own Id: OTP-15534 Aux Id: PR-2078 </p>
-        </item>
-      </list>
-    </section>
-
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The <c>cover</c> tool now uses the <c>counters</c>
-	    module instead of <c>ets</c> for updating the counters
-	    for how many times a line has been executed. By default,
-	    Cover will work with distributed nodes, but a new
-	    function <c>cover:local_only/0</c> allows running the
-	    Cover in a restricted but faster local-only mode.</p>
-	    <p>The increase in speed will vary depending on the type
-	    of code being cover-compiled, but as an example, the
-	    compiler test suite runs more than twice as fast with the
-	    new Cover.</p>
-          <p>
-	    Own Id: OTP-15575</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Tools 3.0.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index 5700885549..bb8305e9f1 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.1
+TOOLS_VSN = 3.0.2
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 95e61f0ad2..1061e73138 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,23 +32,6 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
-<section><title>Wx 1.8.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    All incorrect (that is, all) uses of "can not" has been
-	    corrected to "cannot" in source code comments,
-	    documentation, examples, and so on.</p>
-          <p>
-	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Wx 1.8.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index dac219fa98..d241a7a1b4 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.7
+WX_VSN = 1.8.6
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 07b8cf159d..7f6874e36b 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.20</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    A typo in an error printout has been fixed.</p>
-          <p>
-	    Own Id: OTP-14703 Aux Id: PR-1964 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Xmerl 1.3.19</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 31ffa6e749..b6486681c2 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.20
+XMERL_VSN = 1.3.19
author	Rickard Green <[email protected]>	2019-02-27 13:19:37 +0100
committer	Rickard Green <[email protected]>	2019-02-27 13:19:37 +0100
commit	196b7abdb0aad42c3b7e10e9aedb9fb720525676 (patch)
tree	0be24d33f34d249ac404c28d316cdbb2c3680312 /lib
parent	91637325d535b0881f6cc279927785d8ae0350e2 (diff)
download	otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.gz otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.tar.bz2 otp-196b7abdb0aad42c3b7e10e9aedb9fb720525676.zip