From 196b7abdb0aad42c3b7e10e9aedb9fb720525676 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Wed, 27 Feb 2019 13:19:37 +0100
Subject: Revert "Prepare release"

This reverts commit df130102cdeca8d35fec95a0c926fd1cfec54eab.
---
 lib/erl_interface/doc/src/ei.xml         |  2 +-
 lib/erl_interface/doc/src/ei_connect.xml | 10 ++++----
 lib/erl_interface/doc/src/notes.xml      | 43 --------------------------------
 lib/erl_interface/vsn.mk                 |  2 +-
 4 files changed, 7 insertions(+), 50 deletions(-)

(limited to 'lib/erl_interface')

diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index bffc293994..2bdb390644 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -736,7 +736,7 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_init(void)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_init(void)</nametext></name>
       <fsummary>Initialize the ei library.</fsummary>
       <desc>
         <p>Initialize the <c>ei</c> library. This function should be called once
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index dec9de5115..df40973270 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -412,7 +412,7 @@ typedef struct {
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_close_connection(int fd)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_close_connection(int fd)</nametext></name>
       <fsummary>Close a connection.</fsummary>
       <desc>
         <p>Closes a previously opened connection or listen socket.</p>
@@ -472,9 +472,9 @@ fd = ei_xconnect(&ec, &addr, ALIVE);
 
     <func>
       <name since=""><ret>int</ret><nametext>ei_connect_init(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
       <name since=""><ret>int</ret><nametext>ei_connect_xinit(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
       <fsummary>Initialize for a connection.</fsummary>
       <desc>
         <p>Initializes the <c>ec</c> structure, to
@@ -595,8 +595,8 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_listen(ei_cnode *ec, int *port, int backlog)</nametext></name>
-      <name since="OTP 22.0"><ret>int</ret><nametext>ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_listen(ei_cnode *ec, int *port, int backlog)</nametext></name>
+      <name since="OTP @OTP-15442@"><ret>int</ret><nametext>ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog)</nametext></name>
       <fsummary>Create a listen socket.</fsummary>
       <desc>
         <p>Used by a server process to setup a listen socket which
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 43064f71b9..07ddd82718 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,49 +31,6 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
-<section><title>Erl_Interface 3.10.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor adjustments made to build system for parallel
-	    configure.</p>
-          <p>
-	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
-        </item>
-        <item>
-          <p>
-	    The limited support for VxWorks is deprecated as of OTP
-	    22, and will be removed in OTP 23.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15621</p>
-        </item>
-        <item>
-	    <p>The old legacy <c>erl_interface</c> library (functions
-	    with prefix <c>erl_</c>) is deprecated as of OTP 22, and
-	    will be removed in OTP 23. This does not apply to the
-	    <c>ei</c> library. Reasonably new <c>gcc</c> compilers
-	    will issue deprecation warnings. In order to disable
-	    these warnings, define the macro
-	    <c>EI_NO_DEPR_WARN</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-15622</p>
-        </item>
-        <item>
-	    <p> Use <c>ssh</c> as the default remote shell. </p>
-          <p>
-	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Erl_Interface 3.10.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index b7e09d6d00..06ef907d6c 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10.5
+EI_VSN = 3.10.4
 ERL_INTERFACE_VSN = $(EI_VSN)
-- 
cgit v1.2.3