Merge branch 'maint'

4 files changed, 16 insertions, 9 deletions

diff --git a/lib/common_test/doc/src/ct_netconfc.xml b/lib/common_test/doc/src/ct_netconfc.xml
index 32a1175d81..8fbe5f3df6 100644
--- a/lib/common_test/doc/src/ct_netconfc.xml
+++ b/lib/common_test/doc/src/ct_netconfc.xml
@@ -412,11 +412,11 @@
     </func>
 
     <func>
-      <name since="OTP 18.3">create_subscription(Client) -> Result</name>
-      <name since="OTP 18.3">create_subscription(Client, Stream) -> Result</name>
-      <name since="OTP 18.3">create_subscription(Client, Stream, Filter) -> Result</name>
-      <name since="OTP 18.3">create_subscription(Client, Stream, Filter, Timeout) -> Result</name>
-      <name name="create_subscription" arity="5" clause_i="2" since="OTP 18.3"/>
+      <name since="OTP R15B02">create_subscription(Client) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream, Filter) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream, Filter, Timeout) -> Result</name>
+      <name name="create_subscription" arity="5" clause_i="2" since="OTP R15B02"/>
       <name name="create_subscription" arity="6" since="OTP R15B02"/>
       <fsummary>Creates a subscription for event notifications.</fsummary>
       <desc>
@@ -515,7 +515,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
 
     <func>
       <name name="edit_config" arity="3" since="OTP R15B02"/>
-      <name name="edit_config" arity="4" clause_i="1" since="OTP R15B02"/>
+      <name name="edit_config" arity="4" clause_i="1" since="OTP 18.0"/>
       <name name="edit_config" arity="4" clause_i="2" since="OTP R15B02"/>
       <name name="edit_config" arity="5" since="OTP 18.0"/>
       <fsummary>Edits configuration data.</fsummary>
@@ -599,7 +599,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     <func>
       <name name="get_event_streams" arity="1" since="OTP 20.0"/>
       <name name="get_event_streams" arity="2" clause_i="1" since="OTP R15B02"/>
-      <name name="get_event_streams" arity="2" clause_i="2" since="OTP R15B02"/>
+      <name name="get_event_streams" arity="2" clause_i="2" since="OTP 20.0"/>
       <name name="get_event_streams" arity="3" since="OTP R15B02"/>
       <fsummary>Sends a request to get the specified event streams.</fsummary>
       <desc>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 1e7009b3a8..f70d6c24db 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -284,7 +284,7 @@ connect(Socket, Ip, Port>,
 
     <func>
       <name name="listen" arity="2" clause_i="1" since=""/>
-      <name name="listen" arity="2" clause_i="2" since=""/>
+      <name name="listen" arity="2" clause_i="2" since="OTP R15B"/>
       <fsummary>Set up a socket to listen.</fsummary>
       <desc>
         <p>Sets up a socket to listen on the IP address and port number
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 94f1af34bf..11b0b8e987 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -2077,6 +2077,13 @@ mnesia:create_table(employee,
       <fsummary>Starts a local Mnesia system.</fsummary>
       <desc>
       <marker id="start"></marker>
+        <p>Mnesia startup is asynchronous. The function call
+	        <c>mnesia:start()</c> returns the atom <c>ok</c> and then
+          starts to initialize the different tables. Depending on the
+          size of the database, this can take some time, and the
+          application programmer must wait for the tables that the
+          application needs before they can be used. This is achieved
+          by using the function <c>mnesia:wait_for_tables/2</c>.</p>
         <p>The startup procedure for a set of Mnesia nodes is a
           fairly complicated operation. A Mnesia system consists
           of a set of nodes, with Mnesia started locally on all
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index cd4ca0a3a7..4d527f8ed3 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -385,7 +385,7 @@
     <func>
       <name name="write" arity="1" since=""/>
       <name name="write" arity="2" clause_i="1" since=""/>
-      <name name="write" arity="2" clause_i="2" since=""/>
+      <name name="write" arity="2" clause_i="2" since="OTP 20.0"/>
       <fsummary>Write a term.</fsummary>
       <desc>
         <p>Returns a character list that represents <c><anno>Term</anno></c>.