From 8f9bf8a8c35e03fecfa8a035076772983ad0dc71 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 17 Jun 2019 16:50:25 +0200
Subject: Prepare release

---
 lib/kernel/doc/src/gen_udp.xml |  8 ++++----
 lib/kernel/doc/src/inet.xml    |  6 +++---
 lib/kernel/doc/src/notes.xml   | 16 ++++++++++++++++
 lib/kernel/vsn.mk              |  2 +-
 4 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 6c0d072fed..6ffcfd9af3 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -213,7 +213,7 @@
     </func>
 
     <func>
-      <name name="send" arity="3" since="OTP @OTP-15747@"/>
+      <name name="send" arity="3" since="OTP 21.3.8.4"/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>
@@ -242,7 +242,7 @@
     </func>
 
     <func>
-      <name name="send" arity="4" clause_i="2" anchor="send-4-AncData" since="OTP @OTP-15747@"/>
+      <name name="send" arity="4" clause_i="2" anchor="send-4-AncData" since="OTP 21.3.8.4"/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>
@@ -265,7 +265,7 @@
     </func>
 
     <func>
-      <name name="send" arity="4" clause_i="3" since="OTP @OTP-15747@"/>
+      <name name="send" arity="4" clause_i="3" since="OTP 21.3.8.4"/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>
@@ -284,7 +284,7 @@
     </func>
 
     <func>
-      <name name="send" arity="5" since="OTP @OTP-15747@"/>
+      <name name="send" arity="5" since="OTP 21.3.8.4"/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index adaa2684d8..86f76fc07f 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -118,7 +118,7 @@ fe80::204:acff:fe17:bf38
       <name name="port_number"/>
     </datatype>
     <datatype>
-      <name name="family_address" since="OTP @OTP-15747@"/>
+      <name name="family_address" since="OTP 21.3.8.4"/>
       <desc>
 	<p>
 	  A general address format on the form <c>{Family, Destination}</c>
@@ -130,7 +130,7 @@ fe80::204:acff:fe17:bf38
       </desc>
     </datatype>
     <datatype>
-      <name name="inet_address" since="OTP @OTP-15747@"/>
+      <name name="inet_address" since="OTP 21.3.8.4"/>
       <desc>
 	<warning>
 	  <p>
@@ -142,7 +142,7 @@ fe80::204:acff:fe17:bf38
       </desc>
     </datatype>
     <datatype>
-      <name name="inet6_address" since="OTP @OTP-15747@"/>
+      <name name="inet6_address" since="OTP 21.3.8.4"/>
       <desc>
 	<warning>
 	  <p>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 906e86e8ac..fffac91308 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 6.3.1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The possibility to send ancillary data, in particular the
+	    TOS field, has been added to <c>gen_udp:send/4,5</c>.</p>
+          <p>
+	    Own Id: OTP-15747 Aux Id: ERIERL-294 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 6.3.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 10562a563b..72c2e95713 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 6.3.1.1
+KERNEL_VSN = 6.3.1.2
-- 
cgit v1.2.3