Merge branch 'sverker/revert-big-creation'

* sverker/revert-big-creation:
  Revert "erts: Make DFLAG_BIG_CREATION mandatory"
  Revert "erts: Remove old encoding of pids, ports and refs"
  Revert "erl_interface: Remove old encoding of pid,port,refs"
  Revert "epmd: Support 32-bit creation values in local node"
  Revert "jinterface: Remove old encoding of pid,port,refs"
  Revert "erl_interface: Support 32-bit creation local cnode"
  Revert "erts: Document new EPMD response ALIVE2_X_RESP"

2 files changed, 5 insertions, 23 deletions

diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index 1951d498cd..185c75fe84 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -109,8 +109,7 @@
       <title>Register a Node in EPMD</title>
       <p>When a distributed node is started it registers itself in the EPMD.
         The message <c>ALIVE2_REQ</c> described below is sent from the node to
-        the EPMD. The response from the EPMD is <c>ALIVE2_X_RESP</c> (or
-        <c>ALIVE2_RESP</c>).</p>
+        the EPMD. The response from the EPMD is <c>ALIVE2_RESP</c>.</p>
 
       <table align="left">
         <row>
@@ -156,12 +155,12 @@
         <tag><c>HighestVersion</c></tag>
         <item>
           <p>The highest distribution version that this node can handle.
-            The value in OTP 22 and later is 6.</p>
+            The value in Erlang/OTP R6B and later is 5.</p>
         </item>
         <tag><c>LowestVersion</c></tag>
         <item>
           <p>The lowest distribution version that this node can handle.
-            The value in OTP 22 and later is 5.</p>
+            The value in Erlang/OTP R6B and later is 5.</p>
         </item>
         <tag><c>Nlen</c></tag>
         <item>
@@ -185,24 +184,7 @@
         node is a distributed node. When the connection is closed,
         the node is automatically unregistered from the EPMD.</p>
 
-      <p>The response message is either <c>ALIVE2_X_RESP</c> or
-        <c>ALIVE2_RESP</c> depending on distribution version. If both the node
-        and EPMD support distribution version 6 then response is
-        <c>ALIVE2_X_RESP</c> otherwise it is the older <c>ALIVE2_RESP</c>:</p>
-
-      <table align="left">
-        <row>
-          <cell align="center">1</cell>
-          <cell align="center">1</cell>
-          <cell align="center">4</cell>
-        </row>
-        <row>
-          <cell align="center"><c>118</c></cell>
-          <cell align="center"><c>Result</c></cell>
-          <cell align="center"><c>Creation</c></cell>
-        </row>
-        <tcaption>ALIVE2_X_RESP (118) with 32 bit creation</tcaption>
-      </table>
+      <p>The response message <c>ALIVE2_RESP</c> is as follows:</p>
 
       <table align="left">
         <row>
@@ -215,7 +197,7 @@
           <cell align="center"><c>Result</c></cell>
           <cell align="center"><c>Creation</c></cell>
         </row>
-        <tcaption>ALIVE2_RESP (121) with 16-bit creation</tcaption>
+        <tcaption>ALIVE2_RESP (121)</tcaption>
       </table>
 
       <p>Result = 0 -> ok, result &gt; 0 -> error.</p>
diff --git a/erts/doc/src/erl_ext_fig.gif b/erts/doc/src/erl_ext_fig.gif
index 40dd17bd5e..14d6bbc871 100644
--- a/erts/doc/src/erl_ext_fig.gif
+++ b/erts/doc/src/erl_ext_fig.gif