summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2023-02-15 10:09:32 +0100
committerHenrik Nord <henrik@erlang.org>2023-02-15 10:09:32 +0100
commit2b397d7e5580480dc32fa9751db95f4b89ff029e (patch)
tree673bcb7ecfe56d3e0900ae76306e31ab15c65956 /lib
parentdc132c20447a4780fc9dc7f449b00523876e0f97 (diff)
downloaderlang-2b397d7e5580480dc32fa9751db95f4b89ff029e.tar.gz
Revert "Prepare release"
This reverts commit 587341d994f91af5b30483ee9434e932e3d7b802.
Diffstat (limited to 'lib')
-rw-r--r--lib/asn1/doc/src/notes.xml26
-rw-r--r--lib/asn1/vsn.mk2
-rw-r--r--lib/common_test/doc/src/notes.xml37
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--lib/compiler/doc/src/notes.xml79
-rw-r--r--lib/compiler/src/compiler.app.src2
-rw-r--r--lib/compiler/vsn.mk2
-rw-r--r--lib/crypto/doc/src/notes.xml59
-rw-r--r--lib/crypto/vsn.mk2
-rw-r--r--lib/dialyzer/doc/src/notes.xml111
-rw-r--r--lib/dialyzer/vsn.mk2
-rw-r--r--lib/diameter/doc/src/notes.xml34
-rw-r--r--lib/diameter/vsn.mk2
-rw-r--r--lib/erl_docgen/doc/src/notes.xml19
-rw-r--r--lib/erl_docgen/vsn.mk2
-rw-r--r--lib/erl_interface/doc/src/notes.xml46
-rw-r--r--lib/erl_interface/vsn.mk2
-rw-r--r--lib/inets/doc/src/notes.xml23
-rw-r--r--lib/inets/src/inets_app/inets.app.src4
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/jinterface/doc/src/notes.xml31
-rw-r--r--lib/jinterface/vsn.mk2
-rw-r--r--lib/kernel/doc/src/inet.xml6
-rw-r--r--lib/kernel/doc/src/notes.xml325
-rw-r--r--lib/kernel/src/kernel.app.src2
-rw-r--r--lib/kernel/src/kernel.appup.src32
-rw-r--r--lib/kernel/vsn.mk2
-rw-r--r--lib/mnesia/doc/src/notes.xml17
-rw-r--r--lib/mnesia/vsn.mk2
-rw-r--r--lib/observer/doc/src/notes.xml21
-rw-r--r--lib/observer/src/observer.app.src4
-rw-r--r--lib/observer/vsn.mk2
-rw-r--r--lib/os_mon/doc/src/disksup.xml4
-rw-r--r--lib/os_mon/doc/src/notes.xml39
-rw-r--r--lib/os_mon/src/os_mon.app.src2
-rw-r--r--lib/os_mon/vsn.mk2
-rw-r--r--lib/public_key/doc/src/notes.xml21
-rw-r--r--lib/public_key/vsn.mk2
-rw-r--r--lib/reltool/doc/src/notes.xml24
-rw-r--r--lib/reltool/src/reltool.app.src4
-rw-r--r--lib/reltool/vsn.mk2
-rw-r--r--lib/runtime_tools/doc/src/notes.xml28
-rw-r--r--lib/runtime_tools/vsn.mk2
-rw-r--r--lib/sasl/doc/src/notes.xml17
-rw-r--r--lib/sasl/src/sasl.appup.src22
-rw-r--r--lib/sasl/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml28
-rw-r--r--lib/ssh/src/ssh.app.src6
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml129
-rw-r--r--lib/ssl/src/ssl.app.src4
-rw-r--r--lib/ssl/vsn.mk2
-rw-r--r--lib/stdlib/doc/src/base64.xml12
-rw-r--r--lib/stdlib/doc/src/binary.xml2
-rw-r--r--lib/stdlib/doc/src/edlin_expand.xml6
-rw-r--r--lib/stdlib/doc/src/ets.xml2
-rw-r--r--lib/stdlib/doc/src/lists.xml8
-rw-r--r--lib/stdlib/doc/src/math.xml2
-rw-r--r--lib/stdlib/doc/src/notes.xml304
-rw-r--r--lib/stdlib/doc/src/shell.xml10
-rw-r--r--lib/stdlib/doc/src/timer.xml8
-rw-r--r--lib/stdlib/doc/src/zip.xml2
-rw-r--r--lib/stdlib/src/stdlib.app.src2
-rw-r--r--lib/stdlib/src/stdlib.appup.src30
-rw-r--r--lib/stdlib/vsn.mk2
-rw-r--r--lib/syntax_tools/doc/src/notes.xml15
-rw-r--r--lib/syntax_tools/vsn.mk2
-rw-r--r--lib/tools/doc/src/notes.xml15
-rw-r--r--lib/tools/vsn.mk2
-rw-r--r--lib/wx/doc/src/notes.xml14
-rw-r--r--lib/wx/vsn.mk2
71 files changed, 133 insertions, 1553 deletions
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index b8af4a9df0..b39c5c50a9 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,32 +32,6 @@
<p>This document describes the changes made to the asn1 application.</p>
-<section><title>Asn1 5.1</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Minor code improvements.</p>
- <p>
- Own Id: OTP-18441</p>
- </item>
- <item>
- <p> Handling of <c>on_load</c> modules during boot has
- been improved by adding an extra step in the boot order
- for embedded mode that runs all <c>on_load</c> handlers,
- instead of relying on explicit invocation of them, later,
- when the kernel supervision tree starts. </p><p> This is
- mostly a code improvement and OTP internal simplification
- to avoid future bugs and to simplify code maintenance.
- </p>
- <p>
- Own Id: OTP-18447</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Asn1 5.0.21</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index a63de49f97..a3706fd209 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.1
+ASN1_VSN = 5.0.21
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index f9ec405e57..4d9d8204b7 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,43 +33,6 @@
<file>notes.xml</file>
</header>
-<section><title>Common_Test 1.24</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- This change improves Common Test docs (CT hook example
- code) and adds Emacs skeleton with hook code.</p>
- <p>
- Own Id: OTP-18377 Aux Id: PR-6437 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Updated common_test with a more robust way to fetch old
- releases, while ignoring the current release.</p>
- <p>
- Own Id: OTP-18259 Aux Id: PR-5924 </p>
- </item>
- <item>
- <p>
- - re-write the XML <c>ct</c> module documentation into
- erlang types to make Dialyzer able to catch more precise
- errors</p>
- <p>
- Own Id: OTP-18340</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Common_Test 1.23.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 472bde9027..4c6aab9f25 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.24
+COMMON_TEST_VSN = 1.23.3
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 1a7024b4ed..74823f895a 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,85 +32,6 @@
<p>This document describes the changes made to the Compiler
application.</p>
-<section><title>Compiler 8.3</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Optimized record updates.</p>
- <p>
- Own Id: OTP-18126 Aux Id: PR-6033 </p>
- </item>
- <item>
- <p>There are several new optimization for binary syntax
- in the JIT:</p> <list> <item>Creation and matching of
- binaries with segments of fixed sizes have been
- optimized.</item> <item>Creation and matching of UTF-8
- segments have been optimized.</item> <item>Appending to
- binaries has been optimized.</item> </list>
- <p>
- Own Id: OTP-18137 Aux Id: PR-6259, PR-6404, PR-6576,
- PR-6804 </p>
- </item>
- <item>
- <p>The compiler and JIT now generate better code for
- creation of small maps where all keys are literals known
- at compile time.</p>
- <p>
- Own Id: OTP-18185 Aux Id: GH-6139 </p>
- </item>
- <item>
- <p>A limitation in the binary syntax has been removed. It
- is now possible to match binary patterns in parallel.
- Example: <c>&lt;&lt;A:8&gt;&gt; = &lt;&lt;B:4,C:4&gt;&gt;
- = Bin</c></p>
- <p>
- Own Id: OTP-18297 Aux Id: GH-6348 </p>
- </item>
- <item>
- <p>It is documented that <c>$\^X</c> is the ASCII code
- for Control X, where X is an uppercase or lowercase
- letter. However, this notation would work for any
- character X, even then it didn't make sense.</p>
- <p>In Erlang/OTP 26, it is now documented that the
- following characters are also allowed to follow the
- <c>\^</c> characters: <c>@</c>, <c>[</c>, <c>\</c>,
- <c>]</c>, <c>^</c>, <c>_</c>, and <c>?</c>. Attempt to
- use other characters will be rejected with a compiler
- error.</p>
- <p>The value for <c>$\?</c> is now 127 (instead of 31 as
- in earlier releases).</p>
- <p>
- Own Id: OTP-18337 Aux Id: GH-6477, PR-6503 </p>
- </item>
- <item>
- <p>The BIFs <c>min/2</c> and <c>max/2</c> are now allowed
- to be used in guards and match specs.</p>
- <p>
- Own Id: OTP-18367 Aux Id: GH-6544 </p>
- </item>
- <item>
- <p>Map comprehensions as suggested in EEP 58 has now been
- implemented.</p>
- <p>
- Own Id: OTP-18413 Aux Id: EEP-58, PR-6727 </p>
- </item>
- <item>
- <p>Improved the selective receive optimization, which can
- now be enabled for references returned from other
- functions.</p>
- <p>This greatly improves the performance of
- <c>gen_server:send_request/3</c>,
- <c>gen_server:wait_response/2</c>, and similar
- functions.</p>
- <p>
- Own Id: OTP-18431 Aux Id: PR-6739 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Compiler 8.2.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index be1a6d7236..206053cab2 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -84,5 +84,5 @@
{registered, []},
{applications, [kernel, stdlib]},
{env, []},
- {runtime_dependencies, ["stdlib-5.0","kernel-8.4","erts-13.0",
+ {runtime_dependencies, ["stdlib-@OTP-18414@","kernel-8.4","erts-13.0",
"crypto-5.1"]}]}.
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index c9aed4742c..5b5306e4d3 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.3
+COMPILER_VSN = 8.2.3
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 1a98fe752b..cfe135808b 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 5.2</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Add support for SHAKE128 and SHAKE256.</p>
- <p>
- Own Id: OTP-18204 Aux Id: PR-6203 </p>
- </item>
- <item>
- <p>
- Make the <c>-DOPENSSL_API_COMPAT</c> flag work without
- warnings.</p>
- <p>
- Own Id: OTP-18206 Aux Id: PR-6167 </p>
- </item>
- <item>
- <p>
- Replace size/1 with either tuple_size/1 or byte_size/1</p>
- <p>
- The <c>size/1</c> BIF is not optimized by the JIT, and
- its use can result in worse types for Dialyzer.</p>
- <p>
- When one knows that the value being tested must be a
- tuple, <c>tuple_size/1</c> should always be preferred.</p>
- <p>
- When one knows that the value being tested must be a
- binary, <c>byte_size/1</c> should be preferred. However,
- <c>byte_size/1</c> also accepts a bitstring (rounding up
- size to a whole number of bytes), so one must make sure
- that the call to <c>byte_size/</c> is preceded by a call
- to <c>is_binary/1</c> to ensure that bitstrings are
- rejected. Note that the compiler removes redundant calls
- to <c>is_binary/1</c>, so if one is not sure whether
- previous code had made sure that the argument is a
- binary, it does not harm to add an <c>is_binary/1</c>
- test immediately before the call to <c>byte_size/1</c>.</p>
- <p>
- Own Id: OTP-18405 Aux Id:
- GH-6672,PR-6702,PR-6768,PR-6700,PR-6769,PR-6812,PR-6814 </p>
- </item>
- <item>
- <p> Handling of <c>on_load</c> modules during boot has
- been improved by adding an extra step in the boot order
- for embedded mode that runs all <c>on_load</c> handlers,
- instead of relying on explicit invocation of them, later,
- when the kernel supervision tree starts. </p><p> This is
- mostly a code improvement and OTP internal simplification
- to avoid future bugs and to simplify code maintenance.
- </p>
- <p>
- Own Id: OTP-18447</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Crypto 5.1.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 3fa6df6102..d9fae2abd7 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.2
+CRYPTO_VSN = 5.1.2
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 18a07891e3..50c5d28c2e 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,117 +32,6 @@
<p>This document describes the changes made to the Dialyzer
application.</p>
-<section><title>Dialyzer 5.1</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>When checking behaviors, Dialyzer could generate false
- warning that a callback function did not have the correct
- type according to the spec in the behavior
- definition.</p>
- <p>
- Own Id: OTP-18237 Aux Id: GH-6221, PR-6243 </p>
- </item>
- <item>
- <p>In a spec, <c>list(none())</c> used to mean
- <c>none()</c>. It has now been corrected to mean the
- empty list.</p>
- <p>
- Own Id: OTP-18276 Aux Id: GH-6333 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Dialyzer has a new incremental mode that be invoked by
- giving the <c>--incremental</c> option when running
- Dialyzer. This new incremental mode is likely to become
- the default in a future release.</p>
- <p>Incremental mode primarily differs from the previous,
- "classic", ways of running Dialyzer, in that its model is
- optimised around the common use case of regularly
- analysing a single codebase, tweaking the code, analysing
- it again, and so on, without explicit reference to the
- building and checking of a PLT.</p>
- <p>In this mode the PLT file acts much more like a true
- cache, where users provide a codebase and a set of files
- they care about, and Dialyzer does the legwork in terms
- of deciding how to most efficiently report all of the
- relevant warnings given the cached results it may already
- have in the PLT (and if a PLT doesn't exist, incremental
- mode will create one).</p>
- <p>
- Own Id: OTP-18188 Aux Id: PR-5997 </p>
- </item>
- <item>
- <p>Dialyzer now produces clearer error messages for
- contract violations.</p>
- <p>
- Own Id: OTP-18238 Aux Id: PR-6271 </p>
- </item>
- <item>
- <p>The name of a built-in type can now be reused as the
- name of type locally. That is useful when an OTP release
- introduces a new built-in type; having the possibility to
- redefine built-in types locally can make it easier to
- maintain code that works in multiple OTP releases.</p>
- <p>
- Own Id: OTP-18282 Aux Id: GH-6132, PR-6335 </p>
- </item>
- <item>
- <p>Dialyzer's overloaded domain warning becomes is
- disabled by default, and can be enabled with the flag
- <c>-Woverlapping_contract</c>.</p>
- <p>Dialyzer used to issue a warning for overloaded
- domains stating <c>"such contracts are currently
- unsupported and are simply ignored"</c>. </p>
- <p>These contracts are not "ignored" but rather, Dialyzer
- takes the union of the overloaded domains. This means
- that we lose the dependency from each corresponding input
- to output type. Because of this, the warning is really
- about not being able to establish a dependency between
- the input and output types of each respective overloaded
- function specification.</p>
- <p>
- Own Id: OTP-18342 Aux Id: GH-6117, PR-6654 </p>
- </item>
- <item>
- <p>
- Dialyzer has enabled (by default) warnings about unknown
- types and functions.</p>
- <p>
- Prior to this change, Dialyzer had warnings about unknown
- types and functions disabled (by default).</p>
- <p>
- This default value has been overwritten; Dialyzer now
- warns about unknown types and functions (as requested by
- the community in GH-5695). Thus, the following two
- examples are equivalent, i.e., passing the
- <c>-Wunknown</c> function is enabled by default:</p>
- <p>
- <c>dialyzer moduler.erl -Wunknown -Wmissing_return</c></p>
- <p>
- <c>dialyzer moduler.erl -Wmissing_return</c></p>
- <p>
- Dialyzer has a new flag, <c>-Wno_unknown</c>. Its purpose
- is to suppress warnings about unknown functions and
- types.</p>
- <p>
- Users who wish to suppress these warnings can invoke
- Dialyzer using this flag. Example: <c>dialyzer module.erl
- -Wno_unknown</c></p>
- <p>
- Own Id: OTP-18439 Aux Id: GH-5695,PR-6822 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Dialyzer 5.0.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index a4dcbc90c3..dc8f066894 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 5.1
+DIALYZER_VSN = 5.0.4
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 8c90116cdf..3619a118a1 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,40 +43,6 @@ first.</p>
<!-- ===================================================================== -->
-<section><title>diameter 2.3</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Replace size/1 with either tuple_size/1 or byte_size/1</p>
- <p>
- The <c>size/1</c> BIF is not optimized by the JIT, and
- its use can result in worse types for Dialyzer.</p>
- <p>
- When one knows that the value being tested must be a
- tuple, <c>tuple_size/1</c> should always be preferred.</p>
- <p>
- When one knows that the value being tested must be a
- binary, <c>byte_size/1</c> should be preferred. However,
- <c>byte_size/1</c> also accepts a bitstring (rounding up
- size to a whole number of bytes), so one must make sure
- that the call to <c>byte_size/</c> is preceded by a call
- to <c>is_binary/1</c> to ensure that bitstrings are
- rejected. Note that the compiler removes redundant calls
- to <c>is_binary/1</c>, so if one is not sure whether
- previous code had made sure that the argument is a
- binary, it does not harm to add an <c>is_binary/1</c>
- test immediately before the call to <c>byte_size/1</c>.</p>
- <p>
- Own Id: OTP-18405 Aux Id:
- GH-6672,PR-6702,PR-6768,PR-6700,PR-6769,PR-6812,PR-6814 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>diameter 2.2.7</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 173f962b9d..5eda96f384 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.3
+DIAMETER_VSN = 2.2.7
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 5d6e16b61b..92726daa8a 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 1.5</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>New XML tag &lt;change&gt;. Like a &lt;note&gt; box,
- but with a different (steel blue) color and label.
- Intended to contain talk about semantic differences
- between OTP releases.</p>
- <p>
- Own Id: OTP-18338 Aux Id: PR-6408 </p>
- </item>
- </list>
- </section>
-
-</section>
-
-<section><title>Erl_Docgen 1.4</title>
+ <section><title>Erl_Docgen 1.4</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 442223e03c..a887c5c839 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 1.5
+ERL_DOCGEN_VSN = 1.4
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 1a9642aed8..2f44a32707 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,52 +31,6 @@
</header>
<p>This document describes the changes made to the Erl_interface application.</p>
-<section><title>Erl_Interface 5.4</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>As announced since the release of OTP 24, support
- for:</p> <list> <item><p> version 4 node container types
- in the external term format are now mandatory. That is,
- references supporting up to 5 32-bit integer identifiers,
- and process and port identifiers with support for 64-bit
- data storage. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_V4_NC"><c>DFLAG_V4_NC</c></seeguide>
- is therefor now also mandatory. OTP has since OTP 24
- supported this. </p></item> <item><p> the <seeguide
- marker="erts:erl_dist_protocol#new_link_protocol">new
- link protocol</seeguide> introduced in OTP 23.3 is now
- mandatory. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_UNLINK_ID"><c>DFLAG_UNLINK_ID</c></seeguide>
- is therefor now also mandatory. </p></item> </list>
- <p>Due to the above, OTP 26 nodes will refuse to connect
- to OTP nodes from releases prior to OTP 24.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18140 Aux Id: PR-6072 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Known Bugs and Problems</title>
- <list>
- <item>
- <p>
- The <c>ei</c> API for decoding/encoding terms is not
- fully 64-bit compatible since terms that have a
- representation on the external term format larger than 2
- GB cannot be handled.</p>
- <p>
- Own Id: OTP-16607 Aux Id: OTP-16608 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Erl_Interface 5.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index b68159d947..f06a7e869b 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 5.4
+EI_VSN = 5.3
ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 9f1979e7c4..8627087e05 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,28 +33,7 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 8.3</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- By default ssl connections will use options from
- <c>ssl_default_options(true)</c></p>
- <p>
- Own Id: OTP-18167</p>
- </item>
- <item>
- <p>Runtime dependencies have been updated.</p>
- <p>
- Own Id: OTP-18350</p>
- </item>
- </list>
- </section>
-
-</section>
-
-<section><title>Inets 8.2.1</title>
+ <section><title>Inets 8.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 971c3be120..c79d3c4be4 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -97,5 +97,5 @@
%% If the "new" ssl is used then 'crypto' must be started before inets.
{applications,[kernel,stdlib]},
{mod,{inets_app,[]}},
- {runtime_dependencies, ["stdlib-5.0","ssl-9.0","runtime_tools-1.8.14",
- "mnesia-4.12","kernel-9.0","erts-14.0", "public_key-1.13"]}]}.
+ {runtime_dependencies, ["stdlib-@OTP-18350@","ssl-9.0","runtime_tools-1.8.14",
+ "mnesia-4.12","kernel-@OTP-18350@","erts-@OTP-18350@", "public_key-1.13"]}]}.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 99285501c5..ba50e95060 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 8.3
+INETS_VSN = 8.2.1
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 5719a9a5b5..544bcb0eb2 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,37 +31,6 @@
</header>
<p>This document describes the changes made to the Jinterface application.</p>
-<section><title>Jinterface 1.14</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>As announced since the release of OTP 24, support
- for:</p> <list> <item><p> version 4 node container types
- in the external term format are now mandatory. That is,
- references supporting up to 5 32-bit integer identifiers,
- and process and port identifiers with support for 64-bit
- data storage. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_V4_NC"><c>DFLAG_V4_NC</c></seeguide>
- is therefor now also mandatory. OTP has since OTP 24
- supported this. </p></item> <item><p> the <seeguide
- marker="erts:erl_dist_protocol#new_link_protocol">new
- link protocol</seeguide> introduced in OTP 23.3 is now
- mandatory. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_UNLINK_ID"><c>DFLAG_UNLINK_ID</c></seeguide>
- is therefor now also mandatory. </p></item> </list>
- <p>Due to the above, OTP 26 nodes will refuse to connect
- to OTP nodes from releases prior to OTP 24.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18140 Aux Id: PR-6072 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Jinterface 1.13.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 32db2ab3a7..dc71145e36 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.14
+JINTERFACE_VSN = 1.13.1
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 0cb03fdbe4..5524000f3d 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -1597,7 +1597,7 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
This since setting <c>SO_REUSEADDR</c> on Windows more or less
has the same behavior as setting both <c>SO_REUSEADDR</c> and
<c>SO_REUSEPORT</c> on BSD. This behavior was introduced as
- of OTP 26.0.
+ of OTP @OTP-18344@.
</p>
<change>
<p>
@@ -1614,7 +1614,7 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
if <c>{reuseaddr, true}</c> was set.
</item>
<item>
- Between OTP 25.2 and up to the predecessor of OTP 26.0,
+ Between OTP 25.2 and up to the predecessor of OTP @OTP-18344@,
the underlying <c>SO_REUSEADDR</c> socket option was only
set on UDP sockets if <c>{reuseaddr, true}</c> was set, and
silently ignored on other sockets.
@@ -1645,7 +1645,7 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
This since setting <c>SO_REUSEADDR</c> on Windows more or less
has the same behavior as setting both <c>SO_REUSEADDR</c> and
<c>SO_REUSEPORT</c> on BSD. The <c>reuseport</c> option was
- introduced as of OTP 26.0.
+ introduced as of OTP @OTP-18344@.
</p>
<p>
See also the
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 819ccf12fc..be3cf04dbd 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,331 +31,6 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
-<section><title>Kernel 9.0</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Fix bug where duplicate keys were allowed in the .app
- file of an application. Duplicate keys are now rejected
- and the application will not start if they exist.</p>
- <p>
- Own Id: OTP-18210 Aux Id: GH-5877 PR-5878 </p>
- </item>
- <item>
- <p>
- Fix inconsistent handling in logger_formatter of the
- branched values in conditional branches. For example
- using <c>msg</c> in a conditional branch would not be
- formatted as it should before this fix.</p>
- <p>
- Own Id: OTP-18225 Aux Id: PR-6036 </p>
- </item>
- <item>
- <p>
- Fix the logger_std_h handler to log to standard_error if
- logging to standard_io fails for any reason.</p>
- <p>
- Own Id: OTP-18226 Aux Id: PR-6253 </p>
- </item>
- <item>
- <p>
- Fix the TLS distribution to work when starting Erlang in
- embedded mode and a connection is done before kernel is
- fully started.</p>
- <p>
- Own Id: OTP-18248 Aux Id: PR-6227 GH-6085 </p>
- </item>
- <item>
- <p>
- erl <c>-remsh</c> has been improved to provide better
- error reasons and work when using a shell without
- terminal support (that is an "oldshell").</p>
- <p>
- Own Id: OTP-18271 Aux Id: PR-6279 </p>
- </item>
- <item>
- <p>
- Fix logging of log events generated before kernel is
- started to not fail if the code for formatting those log
- messaged have not yet been loaded.</p>
- <p>
- Own Id: OTP-18286 Aux Id: PR-5955 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>The Erlang shell has been improved to support the
- following features:</p> <list> <item>Auto-complete
- variables, record names, record field names, map keys,
- function parameter types and filenames.</item> <item>Open
- external editor in the shell (with C-o) to edit the
- current expression in an editor.</item> <item>Support
- defining records (with types), functions and function
- typespecs, and custom types in the shell.</item> <item>Do
- not save pager commands, and input to io:getline in
- history.</item> </list>
- <p>
- Own Id: OTP-14835 Aux Id: PR-5924 </p>
- </item>
- <item>
- <p>The TTY/terminal subsystem has been rewritten from by
- moving more code to Erlang from the old linked-in driver
- and implementing all the I/O primitives needed in a NIF
- instead. </p><p> On Unix platforms the user should not
- notice a lot of difference, besides better handling of
- unicode characters and fixing of some long standing bugs.
- </p><p> Windows users will notice that erl.exe has the
- same functionality as a normal Unix shell and that
- werl.exe has been removed and replaced with a symlink to
- erl.exe. This makes the Windows Erlang terminal
- experience identical to that of Unix. </p><p> The
- re-write brings with it a number of bug fixes and feature
- additions:</p> <list> <item>The TTY is now reset when
- Erlang exits, fixing zsh to not break when terminating an
- Erlang session.</item> <item><c>standard_error</c> now
- uses the same unicode mode as <c>standard_io</c>.</item>
- <item>Hitting backspace when searching the shell history
- with an empty search string no longer breaks the
- shell.</item> <item>Tab expansion now works on remote
- nodes started using the JCL interface.</item> <item>It is
- now possible to configure the shell slogan and the
- session slogans (that is the texts that appear when you
- start an Erlang shell). See the kernel documentation for
- more details.</item> <item>Added shell:start_interactive
- for starting the interactive shell from a non-interactive
- Erlang session (for example an escript).</item> <item>On
- Windows, when starting in detached mode the standard
- handler are now set to <c>nul</c> devices instead of
- being unset.</item> </list>
- <p>
- Own Id: OTP-17932 Aux Id: PR-6144 GH-3150 GH-3390 GH-4343
- GH-4225 </p>
- </item>
- <item>
- <p>
- Preparation for adding Windows support to 'socket'.</p>
- <p>
- Own Id: OTP-18029</p>
- </item>
- <item>
- <p>As announced since the release of OTP 24, support
- for:</p> <list> <item><p> version 4 node container types
- in the external term format are now mandatory. That is,
- references supporting up to 5 32-bit integer identifiers,
- and process and port identifiers with support for 64-bit
- data storage. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_V4_NC"><c>DFLAG_V4_NC</c></seeguide>
- is therefor now also mandatory. OTP has since OTP 24
- supported this. </p></item> <item><p> the <seeguide
- marker="erts:erl_dist_protocol#new_link_protocol">new
- link protocol</seeguide> introduced in OTP 23.3 is now
- mandatory. The distribution flag <seeguide
- marker="erts:erl_dist_protocol#DFLAG_UNLINK_ID"><c>DFLAG_UNLINK_ID</c></seeguide>
- is therefor now also mandatory. </p></item> </list>
- <p>Due to the above, OTP 26 nodes will refuse to connect
- to OTP nodes from releases prior to OTP 24.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18140 Aux Id: PR-6072 </p>
- </item>
- <item>
- <p> Support for Kernel TLS (kTLS), has been added to the
- SSL application, for TLS distribution (<c>-proto_dist
- inet_tls</c>), the SSL option <c>{ktls, true}</c>. Using
- this for general SSL sockets is uncomfortable,
- undocumented and not recommended since it requires very
- platform dependent raw options. </p><p> This, for now,
- only works for some not too old Linux distributions.
- Roughly, a kernel 5.2.0 or later with support for
- UserLand Protocols and the kernel module <c>tls</c> is
- required. </p>
- <p>
- Own Id: OTP-18235 Aux Id: PR-6104, PR-5840 </p>
- </item>
- <item>
- <p>
- Add code:get_doc/2 which adds support to fetch
- documentation skeletons of functions using debug_info
- chunks instead of eep48 doc chunks.</p>
- <p>
- Own Id: OTP-18261 Aux Id: PR-5924 </p>
- </item>
- <item>
- <p>
- The Erlang shell's auto-completion when typing <c>tab</c>
- has been changed to happen after the editing current line
- instead of before it.</p>
- <p>
- This behaviour can be configured using a the
- <c>shell_expand_location</c> STDLIB configuration
- parameter.</p>
- <p>
- Own Id: OTP-18278 Aux Id: PR-6260 </p>
- </item>
- <item>
- <p>
- Typing <c>Ctrl+L</c> in a shell now clears the screen and
- redraws the current line instead of only redrawing the
- current line. To only redraw the current line, you must
- now type <c>Alt+L</c>. This brings the behaviour of
- <c>Ctrl+L</c> closer to how bash and other shells work.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18285 Aux Id: PR-6262 </p>
- </item>
- <item>
- <p>
- gen_server optimized by caching callback functions</p>
- <p>
- Own Id: OTP-18305 Aux Id: PR-5831 </p>
- </item>
- <item>
- <p>
- Prepare the <c>pg</c> communication protocol for upgrade.
- The plan is for OTP-28 nodes to be able to use an
- upgraded <c>pg</c> protocol while still being able to
- talk with OTP 26 nodes.</p>
- <p>
- Own Id: OTP-18327 Aux Id: PR-6433 </p>
- </item>
- <item>
- <p>The following <seemfa
- marker="kernel:inet#setopts/2"><c>inet:setopts/2</c></seemfa>
- options have been introduced:</p> <taglist> <tag><seeerl
- marker="kernel:inet#option-reuseport"><c>reuseport</c></seeerl></tag>
- <item><p>Reuse of local port. Load balancing may or may
- not be provided depending on underlying OS.</p></item>
- <tag><seeerl
- marker="kernel:inet#option-reuseport_lb"><c>reuseport_lb</c></seeerl></tag>
- <item><p>Reuse of local port. Load balancing
- provided.</p></item> <tag><seeerl
- marker="kernel:inet#option-exclusiveaddruse"><c>exclusiveaddruse</c></seeerl></tag>
- <item><p>Exclusive address/port usage on Windows. This
- socket option is Windows specific and will silently be
- ignored on other systems.</p></item> </taglist> <p>The
- behavior of setting <seeerl
- marker="kernel:inet#option-reuseaddr"><c>reuseaddr</c></seeerl>
- on Windows have changed in a <em>backwards
- incompatible</em> way. The underlying <c>SO_REUSEADDR</c>
- socket option is now only set if both the <c>reusaddr</c>
- and the <c>reuseport</c> <c>inet</c> options have been
- set. This since the underlying <c>SO_REUSEADDR</c> socket
- option on Windows behaves similar to how BSD behaves if
- both the underlying socket options <c>SO_REUSEADDR</c>
- and <c>SO_REUSEPORT</c> have been set. See the
- documentation of the <c>reuseaddr</c> option for more
- information.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18344 Aux Id: PR-6522, OTP-18324, PR-6481,
- GH-6461 </p>
- </item>
- <item>
- <p>
- Replace size/1 with either tuple_size/1 or byte_size/1</p>
- <p>
- The <c>size/1</c> BIF is not optimized by the JIT, and
- its use can result in worse types for Dialyzer.</p>
- <p>
- When one knows that the value being tested must be a
- tuple, <c>tuple_size/1</c> should always be preferred.</p>
- <p>
- When one knows that the value being tested must be a
- binary, <c>byte_size/1</c> should be preferred. However,
- <c>byte_size/1</c> also accepts a bitstring (rounding up
- size to a whole number of bytes), so one must make sure
- that the call to <c>byte_size/</c> is preceded by a call
- to <c>is_binary/1</c> to ensure that bitstrings are
- rejected. Note that the compiler removes redundant calls
- to <c>is_binary/1</c>, so if one is not sure whether
- previous code had made sure that the argument is a
- binary, it does not harm to add an <c>is_binary/1</c>
- test immediately before the call to <c>byte_size/1</c>.</p>
- <p>
- Own Id: OTP-18405 Aux Id:
- GH-6672,PR-6702,PR-6768,PR-6700,PR-6769,PR-6812,PR-6814 </p>
- </item>
- <item>
- <p>The function <c>file:pid2name/1</c> is deprecated and
- will be removed in Erlang/OTP 27.</p>
- <p>
- Own Id: OTP-18419</p>
- </item>
- <item>
- <p>
- The modules Erlang DNS resolver <c>inet_res</c> and
- helper modules have been updated for RFC6891; to handle
- OPT RR with DNSSEC OK (DO) bit.</p>
- <p>
- Own Id: OTP-18442 Aux Id: PR-6786, GH-6606 </p>
- </item>
- <item>
- <p>
- Introduced <seemfa
- marker="kernel:application#get_supervisor/1"><c>application:get_supervisor/1</c></seemfa>.</p>
- <p>
- Own Id: OTP-18444 Aux Id: PR-6035 </p>
- </item>
- <item>
- <p> Handling of <c>on_load</c> modules during boot has
- been improved by adding an extra step in the boot order
- for embedded mode that runs all <c>on_load</c> handlers,
- instead of relying on explicit invocation of them, later,
- when the kernel supervision tree starts. </p><p> This is
- mostly a code improvement and OTP internal simplification
- to avoid future bugs and to simplify code maintenance.
- </p>
- <p>
- Own Id: OTP-18447</p>
- </item>
- <item>
- <p>
- Reduce contention on the code_server by doing the code
- preparation on the client.</p>
- <p>
- Own Id: OTP-18448 Aux Id: PR-6736 </p>
- </item>
- <item>
- <p>
- Added a mode to ensure_all_loaded, to start children
- application and their dependencies concurrently.</p>
- <p>
- Own Id: OTP-18451 Aux Id: PR-6737 </p>
- </item>
- <item>
- <p>
- Cache OTP boot code paths, to limit how many folders that
- are being accessed during a module lookup. Can be
- disabled with -cache_boot_path false. OTP boot code paths
- consists of ERL_LIB environment variables. The various
- otp/*/ebin folders. And the {path, ...} clauses in the
- init script.</p>
- <p>
- Own Id: OTP-18452 Aux Id: PR-6729 </p>
- </item>
- <item>
- <p>
- Erlang distribution code in Kernel and SSL has been
- refactored a bit to facilitate debugging and
- re-usability, which shouldn't have any noticeable effects
- on behaviour or performance.</p>
- <p>
- Own Id: OTP-18456</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Kernel 8.5.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 10705d9d76..5e76e55911 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -160,7 +160,7 @@
{shell_docs_ansi,auto}
]},
{mod, {kernel, []}},
- {runtime_dependencies, ["erts-14.0", "stdlib-5.0",
+ {runtime_dependencies, ["erts-@OTP-18248:OTP-18344@", "stdlib-@OTP-17932@",
"sasl-3.0", "crypto-5.0"]}
]
}.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index f793dcd9eb..3a56077fb5 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -19,16 +19,26 @@
%%
%% We allow upgrade from, and downgrade to all previous
%% versions from the following OTP releases:
+%% - OTP 23
%% - OTP 24
%% - OTP 25
-%% - OTP 26
%%
%% We also allow upgrade from, and downgrade to all
%% versions that have branched off from the above
%% stated previous versions.
%%
{"%VSN%",
- [{<<"^8\\.0$">>,[restart_new_emulator]},
+ [{<<"^7\\.0$">>,[restart_new_emulator]},
+ {<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.1$">>,[restart_new_emulator]},
+ {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.2$">>,[restart_new_emulator]},
+ {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^7\\.3$">>,[restart_new_emulator]},
+ {<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.0$">>,[restart_new_emulator]},
{<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -50,9 +60,18 @@
{<<"^8\\.5$">>,[restart_new_emulator]},
{<<"^8\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.5\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.5\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^8\\.0$">>,[restart_new_emulator]},
+ {<<"^8\\.5\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^7\\.0$">>,[restart_new_emulator]},
+ {<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.1$">>,[restart_new_emulator]},
+ {<<"^7\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.2$">>,[restart_new_emulator]},
+ {<<"^7\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^7\\.3$">>,[restart_new_emulator]},
+ {<<"^7\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^7\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.0$">>,[restart_new_emulator]},
{<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -74,5 +93,4 @@
{<<"^8\\.5$">>,[restart_new_emulator]},
{<<"^8\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^8\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.5\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^8\\.5\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+ {<<"^8\\.5\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 78d04715a7..62ce99fb1c 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 9.0
+KERNEL_VSN = 8.5.3
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 77f8e892e0..aa5a04501b 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,22 +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.22</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Added debug statistics for active transactions.</p>
- <p>
- Own Id: OTP-18309 Aux Id: PR-6377 </p>
- </item>
- </list>
- </section>
-
-</section>
-
-<section><title>Mnesia 4.21.3</title>
+ <section><title>Mnesia 4.21.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 88974e5a03..3d7dc96e54 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.22
+MNESIA_VSN = 4.21.3
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index c2c5fd5e87..a32302ee95 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,27 +32,6 @@
<p>This document describes the changes made to the Observer
application.</p>
-<section><title>Observer 2.15</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Runtime dependencies have been updated.</p>
- <p>
- Own Id: OTP-18350</p>
- </item>
- <item>
- <p>
- Added <c>start/1</c>, <c>start_and_wait functions/1|2</c>
- functions.</p>
- <p>
- Own Id: OTP-18430 Aux Id: PR-6397 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Observer 2.14</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/src/observer.app.src b/lib/observer/src/observer.app.src
index 550d6322bb..e5b83df854 100644
--- a/lib/observer/src/observer.app.src
+++ b/lib/observer/src/observer.app.src
@@ -67,5 +67,5 @@
{registered, []},
{applications, [kernel, stdlib]},
{env, []},
- {runtime_dependencies, ["wx-2.3","stdlib-5.0","runtime_tools-1.19",
- "kernel-9.0","et-1.5","erts-14.0"]}]}.
+ {runtime_dependencies, ["wx-@OTP-18350@","stdlib-@OTP-18350@","runtime_tools-1.19",
+ "kernel-@OTP-18350@","et-1.5","erts-@OTP-18350@"]}]}.
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 7e52eea3f7..2a308d0c55 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.15
+OBSERVER_VSN = 2.14
diff --git a/lib/os_mon/doc/src/disksup.xml b/lib/os_mon/doc/src/disksup.xml
index 2916683fc4..8608e2c655 100644
--- a/lib/os_mon/doc/src/disksup.xml
+++ b/lib/os_mon/doc/src/disksup.xml
@@ -139,7 +139,7 @@
</desc>
</func>
<func>
- <name since="OTP 26.0">get_disk_info() -> [DiskData]</name>
+ <name since="OTP @OTP-18303@">get_disk_info() -> [DiskData]</name>
<fsummary>Immediately get information for the disks in the system</fsummary>
<type>
<v>DiskData = {Id, TotalKiB, AvailableKiB, Capacity}</v>
@@ -159,7 +159,7 @@
</desc>
</func>
<func>
- <name since="OTP 26.0">get_disk_info(Path) -> DiskData</name>
+ <name since="OTP @OTP-18303@">get_disk_info(Path) -> DiskData</name>
<fsummary>Immediately get information for a single path</fsummary>
<type>
<v>DiskData = [{Id, TotalKiB, AvailableKiB, Capacity}]</v>
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 556dadf46a..150dd5cbd7 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,45 +31,6 @@
</header>
<p>This document describes the changes made to the OS_Mon application.</p>
-<section><title>Os_Mon 2.9</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Fix internal os_mon_sysinfo:get_disk_info/1 function to
- not crash when run on Windows with multiple drives.</p>
- <p>
- Own Id: OTP-18246 Aux Id: PR-6284 GH-6156 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- The <seemfa
- marker="os_mon:disksup#get_disk_info/0"><c>disksup:get_disk_info/0</c></seemfa>
- and <seemfa
- marker="os_mon:disksup#get_disk_info/1"><c>disksup:get_disk_info/1</c></seemfa>
- functions have been introduced. These can be used in
- order to immediately fetch information about current disk
- usage.</p>
- <p>
- Own Id: OTP-18303 Aux Id: PR-6384 </p>
- </item>
- <item>
- <p>Runtime dependencies have been updated.</p>
- <p>
- Own Id: OTP-18350</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Os_Mon 2.8</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/os_mon/src/os_mon.app.src b/lib/os_mon/src/os_mon.app.src
index e78e8dae27..883be4f047 100644
--- a/lib/os_mon/src/os_mon.app.src
+++ b/lib/os_mon/src/os_mon.app.src
@@ -31,4 +31,4 @@
{start_memsup, true},
{start_os_sup, false}]},
{mod, {os_mon, []}},
- {runtime_dependencies, ["stdlib-5.0","sasl-4.2.1","kernel-9.0","erts-14.0"]}]}.
+ {runtime_dependencies, ["stdlib-@OTP-18350@","sasl-@OTP-18350@","kernel-@OTP-18350@","erts-@OTP-18350@"]}]}.
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index b109e7a0ab..e5043e204a 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.9
+OS_MON_VSN = 2.8
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 01d60bf119..78bf776419 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,27 +35,6 @@
<file>notes.xml</file>
</header>
-<section><title>Public_Key 1.14</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p> Handling of <c>on_load</c> modules during boot has
- been improved by adding an extra step in the boot order
- for embedded mode that runs all <c>on_load</c> handlers,
- instead of relying on explicit invocation of them, later,
- when the kernel supervision tree starts. </p><p> This is
- mostly a code improvement and OTP internal simplification
- to avoid future bugs and to simplify code maintenance.
- </p>
- <p>
- Own Id: OTP-18447</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Public_Key 1.13.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 332583742a..4a62528f7e 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.14
+PUBLIC_KEY_VSN = 1.13.2
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index d99f6d030f..40ea90d83d 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -38,29 +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.10</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Add possibility to strip specific chunks from beam files
- included in a release. Before this change it was only
- possible to strip all chunks from the beam files.</p>
- <p>
- Own Id: OTP-18230 Aux Id: PR-5936 </p>
- </item>
- <item>
- <p>Runtime dependencies have been updated.</p>
- <p>
- Own Id: OTP-18350</p>
- </item>
- </list>
- </section>
-
-</section>
-
-<section><title>Reltool 0.9</title>
+ <section><title>Reltool 0.9</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/reltool/src/reltool.app.src b/lib/reltool/src/reltool.app.src
index 031fd4b7be..fcefac3162 100644
--- a/lib/reltool/src/reltool.app.src
+++ b/lib/reltool/src/reltool.app.src
@@ -36,6 +36,6 @@
{registered, []},
{applications, [stdlib, kernel]},
{env, []},
- {runtime_dependencies, ["wx-2.3","tools-2.6.14","stdlib-5.0","sasl-4.2.1",
- "kernel-9.0","erts-14.0"]}
+ {runtime_dependencies, ["wx-@OTP-18350@","tools-2.6.14","stdlib-@OTP-18350@","sasl-@OTP-18350@",
+ "kernel-@OTP-18350@","erts-@OTP-18350@"]}
]}.
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index eb8a5dbb3b..1bee6b4581 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.10
+RELTOOL_VSN = 0.9
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index a3f901e544..56c77be0a4 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,34 +32,6 @@
<p>This document describes the changes made to the Runtime_Tools
application.</p>
-<section><title>Runtime_Tools 1.20</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Add <c>dbg:tracer(file, Filename)</c> as a convenient way
- to trace to a file in clean text.</p>
- <p>
- Own Id: OTP-18211 Aux Id: PR-6143 </p>
- </item>
- <item>
- <p> Handling of <c>on_load</c> modules during boot has
- been improved by adding an extra step in the boot order
- for embedded mode that runs all <c>on_load</c> handlers,
- instead of relying on explicit invocation of them, later,
- when the kernel supervision tree starts. </p><p> This is
- mostly a code improvement and OTP internal simplification
- to avoid future bugs and to simplify code maintenance.
- </p>
- <p>
- Own Id: OTP-18447</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Runtime_Tools 1.19</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 162095fe79..15ef680b67 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.20
+RUNTIME_TOOLS_VSN = 1.19
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 179f8df9dc..78de4f2f39 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 4.2.1</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Improve error message from systools:make_script, when
- .app parameters contain duplicates. The parameters that
- will be checked are modules, applications and registered.</p>
- <p>
- Own Id: OTP-18300 Aux Id: PR-6389 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>SASL 4.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 644de80438..3752c085e2 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,24 +19,28 @@
%%
%% We allow upgrade from, and downgrade to all previous
%% versions from the following OTP releases:
+%% - OTP 23
%% - OTP 24
%% - OTP 25
-%% - OTP 26
%%
%% We also allow upgrade from, and downgrade to all
%% versions that have branched off from the above
%% stated previous versions.
%%
{"%VSN%",
- [{<<"^4\\.1$">>,[restart_new_emulator]},
+ [{<<"^4\\.0$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^4\\.1$">>,[restart_new_emulator]},
{<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.2$">>,[restart_new_emulator]},
- {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
- [{<<"^4\\.1$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^4\\.0$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^4\\.1$">>,[restart_new_emulator]},
{<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.2$">>,[restart_new_emulator]},
- {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^4\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 569f493b68..0fbf91bf53 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 4.2.1
+SASL_VSN = 4.2
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 276c32ca83..1f0a018277 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,34 +30,6 @@
<file>notes.xml</file>
</header>
-<section><title>Ssh 5.0</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- The ssh_cli has been updated to work with the changes
- introduced in the new Erlang shell implementation.</p>
- <p>
- Own Id: OTP-18231 Aux Id: OTP-17932 PR-6144 </p>
- </item>
- <item>
- <p>
- Typing <c>Ctrl+L</c> in a shell now clears the screen and
- redraws the current line instead of only redrawing the
- current line. To only redraw the current line, you must
- now type <c>Alt+L</c>. This brings the behaviour of
- <c>Ctrl+L</c> closer to how bash and other shells work.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18285 Aux Id: PR-6262 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Ssh 4.15.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 1399f0b8c9..aded3fc06e 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -59,9 +59,9 @@
{mod, {ssh_app, []}},
{runtime_dependencies, [
"crypto-5.0",
- "erts-14.0",
- "kernel-9.0",
+ "erts-@OTP-17932@",
+ "kernel-@OTP-17932@",
"public_key-1.6.1",
- "stdlib-5.0",
+ "stdlib-@OTP-17932@",
"runtime_tools-1.15.1"
]}]}.
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index b5b7991fe1..a87b6ca4fb 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 5.0
+SSH_VSN = 4.15.1
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index ef34dcd050..568feeec32 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,135 +27,6 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
-<section><title>SSL 11.0</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- Improved error checking and handling of ssl options.</p>
- <p>
- Own Id: OTP-15903</p>
- </item>
- <item>
- <p>
- With this change, stateless tickets generated by server
- with anti_replay option enabled can be used for creating
- ClientHello throughout ticket lifetime. Without this
- change, usability was limited to WindowSize number of
- seconds configured for anti_replay option.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18168 Aux Id: PR-6019, GH-6014 </p>
- </item>
- <item>
- <p> Support for Kernel TLS (kTLS), has been added to the
- SSL application, for TLS distribution (<c>-proto_dist
- inet_tls</c>), the SSL option <c>{ktls, true}</c>. Using
- this for general SSL sockets is uncomfortable,
- undocumented and not recommended since it requires very
- platform dependent raw options. </p><p> This, for now,
- only works for some not too old Linux distributions.
- Roughly, a kernel 5.2.0 or later with support for
- UserLand Protocols and the kernel module <c>tls</c> is
- required. </p>
- <p>
- Own Id: OTP-18235 Aux Id: PR-6104, PR-5840 </p>
- </item>
- <item>
- <p>
- With this change, TLS 1.3 server can be configured to
- include client certificate in session ticket.</p>
- <p>
- Own Id: OTP-18253</p>
- </item>
- <item>
- <p>
- With this change, it is possible to configure encryption
- seed to be used with TLS1.3 stateless tickets. This
- enables using tickets on different server instances.</p>
- <p>
- Own Id: OTP-18254 Aux Id: PR-5982 </p>
- </item>
- <item>
- <p>
- Debugging enhancements.</p>
- <p>
- Own Id: OTP-18312</p>
- </item>
- <item>
- <p>
- With this change, maybe keyword atom is not used as
- function name in ssl code.</p>
- <p>
- Own Id: OTP-18335</p>
- </item>
- <item>
- <p>
- Replace size/1 with either tuple_size/1 or byte_size/1</p>
- <p>
- The <c>size/1</c> BIF is not optimized by the JIT, and
- its use can result in worse types for Dialyzer.</p>
- <p>
- When one knows that the value being tested must be a
- tuple, <c>tuple_size/1</c> should always be preferred.</p>
- <p>
- When one knows that the value being tested must be a
- binary, <c>byte_size/1</c> should be preferred. However,
- <c>byte_size/1</c> also accepts a bitstring (rounding up
- size to a whole number of bytes), so one must make sure
- that the call to <c>byte_size/</c> is preceded by a call
- to <c>is_binary/1</c> to ensure that bitstrings are
- rejected. Note that the compiler removes redundant calls
- to <c>is_binary/1</c>, so if one is not sure whether
- previous code had made sure that the argument is a
- binary, it does not harm to add an <c>is_binary/1</c>
- test immediately before the call to <c>byte_size/1</c>.</p>
- <p>
- Own Id: OTP-18405 Aux Id:
- GH-6672,PR-6702,PR-6768,PR-6700,PR-6769,PR-6812,PR-6814 </p>
- </item>
- <item>
- <p>
- For security reasons remove support for SHA1 and DSA
- algorithms from default values.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18438 Aux Id: GH-6679 </p>
- </item>
- <item>
- <p>
- Mitigate memory usage from large certificate chains by
- lowering the maximum handshake size. This should not
- effect the common cases, if needed it can be configured
- to a higher value.</p>
- <p>
- Own Id: OTP-18453</p>
- </item>
- <item>
- <p>
- Erlang distribution code in Kernel and SSL has been
- refactored a bit to facilitate debugging and
- re-usability, which shouldn't have any noticeable effects
- on behaviour or performance.</p>
- <p>
- Own Id: OTP-18456</p>
- </item>
- <item>
- <p>
- Add encoding and decoding of use_srtp hello extension to
- facilitate for DTLS users to implement SRTP
- functionality.</p>
- <p>
- Own Id: OTP-18459</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>SSL 10.8.6</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index b9f69af6a3..abc5d278a8 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -88,6 +88,6 @@
{applications, [crypto, public_key, kernel, stdlib]},
{env, []},
{mod, {ssl_app, []}},
- {runtime_dependencies, ["stdlib-4.1","public_key-1.11.3","kernel-9.0",
- "erts-14.0","crypto-5.0", "inets-5.10.7",
+ {runtime_dependencies, ["stdlib-4.1","public_key-1.11.3","kernel-@OTP-18235@",
+ "erts-@OTP-18248@","crypto-5.0", "inets-5.10.7",
"runtime_tools-1.15.1"]}]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index de283ec08a..088de889ae 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 11.0
+SSL_VSN = 10.8.6
diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml
index e3d217ca39..a4ab294336 100644
--- a/lib/stdlib/doc/src/base64.xml
+++ b/lib/stdlib/doc/src/base64.xml
@@ -103,10 +103,10 @@
</func>
<func>
- <name name="decode" arity="2" since="OTP 26.0"/>
- <name name="decode_to_string" arity="2" since="OTP 26.0"/>
- <name name="mime_decode" arity="2" since="OTP 26.0"/>
- <name name="mime_decode_to_string" arity="2" since="OTP 26.0"/>
+ <name name="decode" arity="2" since="OTP @OTP-18247@"/>
+ <name name="decode_to_string" arity="2" since="OTP @OTP-18247@"/>
+ <name name="mime_decode" arity="2" since="OTP @OTP-18247@"/>
+ <name name="mime_decode_to_string" arity="2" since="OTP @OTP-18247@"/>
<fsummary>Decode a base64 encoded string to data.</fsummary>
<type variable="Base64"/>
<type variable="Options" name_i="1"/>
@@ -163,8 +163,8 @@
</func>
<func>
- <name name="encode" arity="2" since="OTP 26.0"/>
- <name name="encode_to_string" arity="2" since="OTP 26.0"/>
+ <name name="encode" arity="2" since="OTP @OTP-18247@"/>
+ <name name="encode_to_string" arity="2" since="OTP @OTP-18247@"/>
<fsummary>Encode data into base64.</fsummary>
<type variable="Data"/>
<type variable="Options"/>
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 6f55d6d327..07f55ed30e 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -244,7 +244,7 @@
<func>
<name name="encode_hex" arity="1" since="OTP 24.0"/>
- <name name="encode_hex" arity="2" since="OTP 26.0"/>
+ <name name="encode_hex" arity="2" since="OTP @OTP-18354@"/>
<fsummary>Encodes a binary into a hex encoded binary with specified case</fsummary>
<desc>
<p>Encodes a binary into a hex encoded binary using the specified case for the hexadecimal digits "a" to "f".</p>
diff --git a/lib/stdlib/doc/src/edlin_expand.xml b/lib/stdlib/doc/src/edlin_expand.xml
index 46d2077896..0240f02f9f 100644
--- a/lib/stdlib/doc/src/edlin_expand.xml
+++ b/lib/stdlib/doc/src/edlin_expand.xml
@@ -28,7 +28,7 @@
<date></date>
<rev></rev>
</header>
- <module since="OTP 26.0">edlin_expand</module>
+ <module since="OTP @OTP-14835@">edlin_expand</module>
<modulesummary>Shell expansion and formatting of expansion suggestions.</modulesummary>
<description>
<p>This module provides an expand_fun for the erlang shell
@@ -38,8 +38,8 @@
</description>
<funcs>
<func>
- <name name="expand" arity="1" since="OTP 26.0"/>
- <name name="expand" arity="2" since="OTP 26.0"/>
+ <name name="expand" arity="1" since="OTP @OTP-14835@"/>
+ <name name="expand" arity="2" since="OTP @OTP-14835@"/>
<fsummary>Standard expanion function for the erl shell.</fsummary>
<desc>
<p>The standard expansion function is able to expand strings to
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 40a55d1524..ea0fb6dcf1 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -999,7 +999,7 @@ Error: fun containing local Erlang function calls
</func>
<func>
- <name name="lookup_element" arity="4" since="OTP 26.0"/>
+ <name name="lookup_element" arity="4" since="OTP @OTP-18279@"/>
<fsummary>Return the <c>Pos</c>:th element of all objects with a
specified key in an ETS table, or <c>Default</c> if there is no such object.</fsummary>
<desc>
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index f00b4d8398..00caf89d23 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -1069,7 +1069,7 @@ splitwith(Pred, List) ->
<func>
<name name="zip" arity="2" since=""/>
- <name name="zip" arity="3" since="OTP 26.0"/>
+ <name name="zip" arity="3" since="OTP @OTP-18318@"/>
<fsummary>Zip two lists into a list of two-tuples.</fsummary>
<desc>
<p>"Zips" two lists into one list of two-tuples,
@@ -1108,7 +1108,7 @@ splitwith(Pred, List) ->
<func>
<name name="zip3" arity="3" since=""/>
- <name name="zip3" arity="4" since="OTP 26.0"/>
+ <name name="zip3" arity="4" since="OTP @OTP-18318@"/>
<fsummary>Zip three lists into a list of three-tuples.</fsummary>
<desc>
<p>"Zips" three lists into one list of
@@ -1123,7 +1123,7 @@ splitwith(Pred, List) ->
<func>
<name name="zipwith" arity="3" since=""/>
- <name name="zipwith" arity="4" since="OTP 26.0"/>
+ <name name="zipwith" arity="4" since="OTP @OTP-18318@"/>
<fsummary>Zip two lists into one list according to a fun.</fsummary>
<desc>
<p>Combines the elements of two lists into one list.
@@ -1143,7 +1143,7 @@ splitwith(Pred, List) ->
<func>
<name name="zipwith3" arity="4" since=""/>
- <name name="zipwith3" arity="5" since="OTP 26.0"/>
+ <name name="zipwith3" arity="5" since="OTP @OTP-18318@"/>
<fsummary>Zip three lists into one list according to a fun.</fsummary>
<desc>
<p>Combines the elements of three lists into one
diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index c0b0d60f61..69df237496 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -110,7 +110,7 @@ erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt.</pre>
</func>
<func>
- <name name="tau" arity="0" since="OTP 26.0"/>
+ <name name="tau" arity="0" since="OTP @OTP-18361@"/>
<fsummary>Ratio of the circumference of a circle to its radius.</fsummary>
<desc>
<p>Ratio of the circumference of a circle to its radius.</p>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 73eac87489..e4cc6ee375 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,310 +31,6 @@
</header>
<p>This document describes the changes made to the STDLIB application.</p>
-<section><title>STDLIB 5.0</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- All process calls in <c>dets</c> have been updated to use
- the receive queue optimizations.</p>
- <p>
- Own Id: OTP-18275 Aux Id: PR-6045 </p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>The Erlang shell has been improved to support the
- following features:</p> <list> <item>Auto-complete
- variables, record names, record field names, map keys,
- function parameter types and filenames.</item> <item>Open
- external editor in the shell (with C-o) to edit the
- current expression in an editor.</item> <item>Support
- defining records (with types), functions and function
- typespecs, and custom types in the shell.</item> <item>Do
- not save pager commands, and input to io:getline in
- history.</item> </list>
- <p>
- Own Id: OTP-14835 Aux Id: PR-5924 </p>
- </item>
- <item>
- <p>
- Gen_server now caches external functions for use in
- handle_call, handle_cast and handle_info.</p>
- <p>
- Own Id: OTP-15597 Aux Id: PR-5831 </p>
- </item>
- <item>
- <p>The TTY/terminal subsystem has been rewritten from by
- moving more code to Erlang from the old linked-in driver
- and implementing all the I/O primitives needed in a NIF
- instead. </p><p> On Unix platforms the user should not
- notice a lot of difference, besides better handling of
- unicode characters and fixing of some long standing bugs.
- </p><p> Windows users will notice that erl.exe has the
- same functionality as a normal Unix shell and that
- werl.exe has been removed and replaced with a symlink to
- erl.exe. This makes the Windows Erlang terminal
- experience identical to that of Unix. </p><p> The
- re-write brings with it a number of bug fixes and feature
- additions:</p> <list> <item>The TTY is now reset when
- Erlang exits, fixing zsh to not break when terminating an
- Erlang session.</item> <item><c>standard_error</c> now
- uses the same unicode mode as <c>standard_io</c>.</item>
- <item>Hitting backspace when searching the shell history
- with an empty search string no longer breaks the
- shell.</item> <item>Tab expansion now works on remote
- nodes started using the JCL interface.</item> <item>It is
- now possible to configure the shell slogan and the
- session slogans (that is the texts that appear when you
- start an Erlang shell). See the kernel documentation for
- more details.</item> <item>Added shell:start_interactive
- for starting the interactive shell from a non-interactive
- Erlang session (for example an escript).</item> <item>On
- Windows, when starting in detached mode the standard
- handler are now set to <c>nul</c> devices instead of
- being unset.</item> </list>
- <p>
- Own Id: OTP-17932 Aux Id: PR-6144 GH-3150 GH-3390 GH-4343
- GH-4225 </p>
- </item>
- <item>
- <p>
- Added codepoint category to unicode_util</p>
- <p>
- Own Id: OTP-18150</p>
- </item>
- <item>
- <p>Added the <c>zip:zip_get_crc32/2</c> function to
- retrieve the CRC32 checksum from an opened ZIP
- archive.</p>
- <p>
- Own Id: OTP-18159 Aux Id: PR-6904 </p>
- </item>
- <item>
- <p>
- Add the new options <c>post_process_args</c> and
- <c>detached</c> to <c>peer:start</c> function.</p>
- <p>
- Own Id: OTP-18176 Aux Id: PR-6118 </p>
- </item>
- <item>
- <p>The <c>re:replace/3,4</c> functions now accept as the
- replacement argument.</p>
- <p>
- Own Id: OTP-18221 Aux Id: PR-6197 </p>
- </item>
- <item>
- <p>The performance of the <c>base64</c> module has been
- significantly improved. For example, on an x86_64 system
- with the JIT both encode and decode are almost three
- times faster than in Erlang/OTP 25.</p>
- <p>
- Own Id: OTP-18228 Aux Id: GH-5639 </p>
- </item>
- <item>
- <p>
- Improved implementation of <seemfa
- marker="stdlib:timer#apply_interval/4"><c>timer:apply_interval/4</c></seemfa>
- reducing load on the timer server, and introduction of
- the new function <seemfa
- marker="stdlib:timer#apply_repeatedly/4"><c>timer:apply_repeatedly/4</c></seemfa>.
- <c>timer:apply_repeatedly/4</c> is similar to
- <c>timer:apply_interval/4</c>, but
- <c>timer:apply_repeatedly/4</c> prevents parallel
- execution of triggered <c>apply</c> operations which
- <c>timer:apply_interval/4</c> does not.</p>
- <p>
- Own Id: OTP-18236 Aux Id: PR-6256 </p>
- </item>
- <item>
- <p>The <c>base64</c> module now supports encoding and
- decoding with an alternate URL safe alphabet, and an
- option for accepting or adding missing <c>=</c> padding
- characters.</p>
- <p>
- Own Id: OTP-18247 Aux Id: PR-6280, PR-6711 </p>
- </item>
- <item>
- <p>
- Add <c>shell:whereis/0</c> which can be used to locate
- the current shell process.</p>
- <p>
- Own Id: OTP-18272 Aux Id: PR-6279 </p>
- </item>
- <item>
- <p>
- The Erlang shell's auto-completion when typing <c>tab</c>
- has been changed to happen after the editing current line
- instead of before it.</p>
- <p>
- This behaviour can be configured using a the
- <c>shell_expand_location</c> STDLIB configuration
- parameter.</p>
- <p>
- Own Id: OTP-18278 Aux Id: PR-6260 </p>
- </item>
- <item>
- <p>
- New function <c>ets:lookup_element/4</c> with a
- <c>Default</c> argument returned if the key did not exist
- in the table. The old <c>ets:lookup_element/3</c> raises
- a <c>badarg</c> exception which can be both inconveniente
- and slower.</p>
- <p>
- Own Id: OTP-18279 Aux Id: PR-6234 </p>
- </item>
- <item>
- <p>
- Typing <c>Ctrl+L</c> in a shell now clears the screen and
- redraws the current line instead of only redrawing the
- current line. To only redraw the current line, you must
- now type <c>Alt+L</c>. This brings the behaviour of
- <c>Ctrl+L</c> closer to how bash and other shells work.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-18285 Aux Id: PR-6262 </p>
- </item>
- <item>
- <p>
- <c>peer</c> nodes using <c>standard_io</c> connections
- now include standard error from the node in the io stream
- from the started node.</p>
- <p>
- Own Id: OTP-18287 Aux Id: PR-5955 </p>
- </item>
- <item>
- <p>A limitation in the binary syntax has been removed. It
- is now possible to match binary patterns in parallel.
- Example: <c>&lt;&lt;A:8&gt;&gt; = &lt;&lt;B:4,C:4&gt;&gt;
- = Bin</c></p>
- <p>
- Own Id: OTP-18297 Aux Id: GH-6348 </p>
- </item>
- <item>
- <p>
- Improve type specification of
- <c>unicode:characters_to_list()</c>.</p>
- <p>
- Own Id: OTP-18301 Aux Id: PR-6350 </p>
- </item>
- <item>
- <p>In the <c>lists</c>, the <c>zip</c> family of
- functions now takes options to allow handling lists of
- different lengths.</p>
- <p>
- Own Id: OTP-18318 Aux Id: PR-6347 </p>
- </item>
- <item>
- <p>It is documented that <c>$\^X</c> is the ASCII code
- for Control X, where X is an uppercase or lowercase
- letter. However, this notation would work for any
- character X, even then it didn't make sense.</p>
- <p>In Erlang/OTP 26, it is now documented that the
- following characters are also allowed to follow the
- <c>\^</c> characters: <c>@</c>, <c>[</c>, <c>\</c>,
- <c>]</c>, <c>^</c>, <c>_</c>, and <c>?</c>. Attempt to
- use other characters will be rejected with a compiler
- error.</p>
- <p>The value for <c>$\?</c> is now 127 (instead of 31 as
- in earlier releases).</p>
- <p>
- Own Id: OTP-18337 Aux Id: GH-6477, PR-6503 </p>
- </item>
- <item>
- <p>The <c>binary:encode_hex/2</c> function has been added
- to allow the encoded hexadecimal digits to be in either
- lower or upper case.</p>
- <p>
- Own Id: OTP-18354 Aux Id: PR-6297 </p>
- </item>
- <item>
- <p>
- Variants of <c>timer:tc()</c> with user specified time
- unit have been introduced.</p>
- <p>
- Own Id: OTP-18355 Aux Id: PR-6507 </p>
- </item>
- <item>
- <p>
- New function <c>math:tau/0</c>. Returns
- <c>2*math:pi()</c>.</p>
- <p>
- Own Id: OTP-18361 Aux Id: PR-6536 </p>
- </item>
- <item>
- <p>The BIFs <c>min/2</c> and <c>max/2</c> are now allowed
- to be used in guards and match specs.</p>
- <p>
- Own Id: OTP-18367 Aux Id: GH-6544 </p>
- </item>
- <item>
- <p>
- Optimized <c>gen_server:multi_call()</c>.</p>
- <p>
- Own Id: OTP-18385 Aux Id: PR-6698 </p>
- </item>
- <item>
- <p>Map comprehensions as suggested in EEP 58 has now been
- implemented.</p>
- <p>
- Own Id: OTP-18413 Aux Id: EEP-58, PR-6727 </p>
- </item>
- <item>
- <p>Some map operations have been optimized by changing
- the internal sort order of atom keys. This changes the
- (undocumented) order of how atom keys in small maps are
- printed and returned by <c>maps:to_list/1</c> and
- <c>maps:next/1</c>. The new order is unpredictable and
- may change between different invocations of the Erlang
- VM.</p>
- <p>For applications where order is important, there is a
- new function <c>maps:iterator/2</c> for creating
- iterators that return the map elements in a deterministic
- order. There are also new modifiers <c>k</c> and <c>K</c>
- for the format string for <c>io:format()</c> to support
- printing map elements ordered.</p>
- <p>
- Own Id: OTP-18414 Aux Id: PR-6151 </p>
- </item>
- <item>
- <p>
- Make gen_server fail "silently" with a new return value
- for init/1.</p>
- <p>
- Own Id: OTP-18423 Aux Id:
- https://github.com/erlang/backlog/issues/142 </p>
- </item>
- <item>
- <p>Improved the selective receive optimization, which can
- now be enabled for references returned from other
- functions.</p>
- <p>This greatly improves the performance of
- <c>gen_server:send_request/3</c>,
- <c>gen_server:wait_response/2</c>, and similar
- functions.</p>
- <p>
- Own Id: OTP-18431 Aux Id: PR-6739 </p>
- </item>
- <item>
- <p>It is no longer necessary to enable a feature in the
- runtime system in order to load modules that are using
- it. It is sufficient to enable the feature in the
- compiler when compiling it.</p>
- <p>
- Own Id: OTP-18445</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>STDLIB 4.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index 261b52d531..e33db34b28 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -957,7 +957,7 @@ q - quit erlang
</func>
<func>
- <name name="start_interactive" arity="0" since="OTP 26.0"/>
+ <name name="start_interactive" arity="0" since="OTP @OTP-17932@"/>
<fsummary>Start the interactive shell</fsummary>
<desc>
<p>Starts the interactive shell if it has not already been started.
@@ -967,9 +967,9 @@ q - quit erlang
</func>
<func>
- <name name="start_interactive" arity="1" clause_i="1" since="OTP 26.0"/>
- <name name="start_interactive" arity="1" clause_i="2" since="OTP 26.0"/>
- <name name="start_interactive" arity="1" clause_i="3" since="OTP 26.0"/>
+ <name name="start_interactive" arity="1" clause_i="1" since="OTP @OTP-17932@"/>
+ <name name="start_interactive" arity="1" clause_i="2" since="OTP @OTP-17932@"/>
+ <name name="start_interactive" arity="1" clause_i="3" since="OTP @OTP-17932@"/>
<fsummary>Start the interactive shell</fsummary>
<desc>
<p>Starts the interactive shell if it has not already been started.
@@ -1075,7 +1075,7 @@ q - quit erlang
</func>
<func>
- <name name="whereis" arity="0" since="OTP 26.0"/>
+ <name name="whereis" arity="0" since="OTP @OTP-17932@"/>
<fsummary>Return the current shell process.</fsummary>
<desc>
<p>Returns the current shell process on the node where the
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 75706f7b2d..3fceddbec6 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -112,7 +112,7 @@
</func>
<func>
- <name name="apply_repeatedly" arity="4" since="OTP 26.0"/>
+ <name name="apply_repeatedly" arity="4" since="OTP @OTP-18236@"/>
<fsummary>Spawn a process evaluating <c>Module:Function(Arguments)</c>
repeatedly at intervals of <c>Time</c>.</fsummary>
<desc>
@@ -341,9 +341,9 @@
</func>
<func>
- <name name="tc" arity="2" clause_i="2" since="OTP 26.0"/>
- <name name="tc" arity="3" clause_i="2" since="OTP 26.0"/>
- <name name="tc" arity="4" since="OTP 26.0"/>
+ <name name="tc" arity="2" clause_i="2" since="OTP @OTP-18355@"/>
+ <name name="tc" arity="3" clause_i="2" since="OTP @OTP-18355@"/>
+ <name name="tc" arity="4" since="OTP @OTP-18355@"/>
<fsummary>Measure the real time it takes to evaluate <c>apply(Module,
Function, Arguments)</c> or <c>apply(Fun, Arguments)</c>.</fsummary>
<type_desc variable="Time">In the specified <c>TimeUnit</c></type_desc>
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 5d5d83d270..6ba9f4c212 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -507,7 +507,7 @@
</func>
<func>
- <name name="zip_get_crc32" arity="2" since="OTP 26.0"/>
+ <name name="zip_get_crc32" arity="2" since="OTP @OTP-18159@"/>
<fsummary>Extracts a crc32 checksum from an open archive.</fsummary>
<desc>
<p>Extracts one crc32 checksum from an open archive.</p>
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 884b432364..728f376be7 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -114,6 +114,6 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-3.0","kernel-9.0","erts-13.1","crypto-4.5",
+ {runtime_dependencies, ["sasl-3.0","kernel-@OTP-17932@","erts-13.1","crypto-4.5",
"compiler-5.0"]}
]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index be534a4aae..d211e8cad7 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,16 +19,24 @@
%%
%% We allow upgrade from, and downgrade to all previous
%% versions from the following OTP releases:
+%% - OTP 23
%% - OTP 24
%% - OTP 25
-%% - OTP 26
%%
%% We also allow upgrade from, and downgrade to all
%% versions that have branched off from the above
%% stated previous versions.
%%
{"%VSN%",
- [{<<"^3\\.15$">>,[restart_new_emulator]},
+ [{<<"^3\\.13$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.15$">>,[restart_new_emulator]},
{<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.15\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -44,10 +52,16 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
{<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.2$">>,[restart_new_emulator]},
- {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
- [{<<"^3\\.15$">>,[restart_new_emulator]},
+ {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^3\\.13$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.13\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.14\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^3\\.15$">>,[restart_new_emulator]},
{<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.15\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -63,6 +77,4 @@
{<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.1$">>,[restart_new_emulator]},
{<<"^4\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
- {<<"^4\\.2$">>,[restart_new_emulator]},
- {<<"^4\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^4\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index a114206c29..5793212911 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 5.0
+STDLIB_VSN = 4.2
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 1f806ebf6c..252b9f0f1e 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,21 +32,6 @@
<p>This document describes the changes made to the Syntax_Tools
application.</p>
-<section><title>Syntax_Tools 3.1</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Map comprehensions as suggested in EEP 58 has now been
- implemented.</p>
- <p>
- Own Id: OTP-18413 Aux Id: EEP-58, PR-6727 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Syntax_Tools 3.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index acc6cd01b7..1f94985baa 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 3.1
+SYNTAX_TOOLS_VSN = 3.0
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 0d992b9dc4..84a6019e57 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,21 +31,6 @@
</header>
<p>This document describes the changes made to the Tools application.</p>
-<section><title>Tools 3.6</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Map comprehensions as suggested in EEP 58 has now been
- implemented.</p>
- <p>
- Own Id: OTP-18413 Aux Id: EEP-58, PR-6727 </p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Tools 3.5.3</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index cfff79e80d..2d58c23e21 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.6
+TOOLS_VSN = 3.5.3
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 8fd35952db..f155b7a551 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,20 +32,6 @@
<p>This document describes the changes made to the wxErlang
application.</p>
-<section><title>Wx 2.3</title>
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>Runtime dependencies have been updated.</p>
- <p>
- Own Id: OTP-18350</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Wx 2.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index f6a9358c91..e7144bd6a2 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 2.3
+WX_VSN = 2.2.1