Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	erts/doc/src/socket.xml

4 files changed, 71 insertions, 3 deletions

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index c00f5e7ee2..252f74708d 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,72 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix type specification for uri_string:normalize/2 that
+	    may also return error().</p>
+          <p>
+	    Own Id: OTP-16322</p>
+        </item>
+        <item>
+          <p>
+	    Improve error handling in uri_string:normalize/2. This
+	    change fixes a crash when the input URI has faulty
+	    percent-encoding.</p>
+          <p>
+	    Own Id: OTP-16351</p>
+        </item>
+        <item>
+	    <p> Fix minor bugs in the Erlang pretty printer
+	    (<c>erl_pp</c>). </p>
+          <p>
+	    Own Id: OTP-16435</p>
+        </item>
+        <item>
+	    <p> Fix the Erlang parser regarding consecutive unary
+	    operators. </p>
+          <p>
+	    Own Id: OTP-16439</p>
+        </item>
+        <item>
+	    <p> Let <c>calendar:rfc3339_to_system_time()</c> crash
+	    when the time offset is missing. </p>
+          <p>
+	    Own Id: OTP-16514 Aux Id: ERL-1182 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Implement uri_string:resolve/{2,3} that can be used to
+	    resolve a URI reference against a base URI.</p>
+          <p>
+	    Own Id: OTP-16321</p>
+        </item>
+        <item>
+          <p>
+	    In <c>gen_statem</c> it is now possible to change the
+	    callback module for a running server. See
+	    <c>gen_statem</c>'s documentation for
+	    <c>change_callback_module</c>,
+	    <c>push_callback_module</c>, and
+	    <c>pop_callback_module</c>.</p>
+          <p>
+	    Own Id: OTP-16477 Aux Id: PR-2531 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.11.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/uri_string.xml b/lib/stdlib/doc/src/uri_string.xml
index 428558c789..c39664fa97 100644
--- a/lib/stdlib/doc/src/uri_string.xml
+++ b/lib/stdlib/doc/src/uri_string.xml
@@ -332,7 +332,7 @@
     </func>
 
     <func>
-      <name name="resolve" arity="2" since="OTP @OTP-16321@"/>
+      <name name="resolve" arity="2" since="OTP 22.3"/>
       <fsummary>Relative resolution.</fsummary>
       <desc>
         <p>Convert a <c><anno>RefURI</anno></c> reference that might be relative
@@ -353,7 +353,7 @@
     </func>
 
     <func>
-      <name name="resolve" arity="3" since="OTP @OTP-16321@"/>
+      <name name="resolve" arity="3" since="OTP 22.3"/>
       <fsummary>Relative resolution.</fsummary>
       <desc>
 	<p>Same as <c>resolve/2</c> but with an additional
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 56d18c439f..462a4c83d3 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -32,6 +32,7 @@
   {<<"^3\\.11$">>,[restart_new_emulator]},
   {<<"^3\\.11\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.11\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.11\\.2(?:\\.[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]},
@@ -53,6 +54,7 @@
   {<<"^3\\.11$">>,[restart_new_emulator]},
   {<<"^3\\.11\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.11\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.11\\.2(?:\\.[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]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index dae9e1fd64..8eb1abb32c 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.11.2
+STDLIB_VSN = 3.12