1 files changed, 13 insertions, 9 deletions
diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index 30772c68fe..ae7f264d0c 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2013</year>
+      <year>2001</year><year>2015</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -126,7 +126,7 @@
   <section>
     <title>DATA TYPES</title>
     <taglist>
-    <tag><b>ErlDrvEntry</b></tag>
+    <tag><em>ErlDrvEntry</em></tag>
     <item>
     <p/>
     <code type="none">
@@ -235,6 +235,7 @@ typedef struct erl_drv_entry {
       </item>
 
       <tag><marker id="ready_input"/>void (*ready_input)(ErlDrvData drv_data, ErlDrvEvent event)</tag>
+      <item/>
       <tag><marker id="ready_output"/>void (*ready_output)(ErlDrvData drv_data, ErlDrvEvent event)</tag>
       <item>
         <p>This is called when a driver event (given in the
@@ -246,14 +247,10 @@ typedef struct erl_drv_entry {
           something that the <c>WaitForMultipleObjects</c> API
           function understands). (Some trickery in the emulator allows
           more than the built-in limit of 64 <c>Events</c> to be used.)</p>
-	  <p>On Enea OSE the <c>event</c> is one or more signals that can
-	  be retrieved using <seealso marker="ose:ose_erl_driver#erl_drv_ose_get_signal">erl_drv_ose_get_signal</seealso>.</p>
         <p>To use this with threads and asynchronous routines, create a
-          pipe on unix, an Event on Windows or a unique signal number on
-	  Enea OSE. When the routine
+          pipe on unix and an Event on Windows. When the routine
           completes, write to the pipe (use <c>SetEvent</c> on
-          Windows or send a message to the emulator process on Enea OSE),
-	  this will make the emulator call
+          Windows), this will make the emulator call
           <c>ready_input</c> or <c>ready_output</c>.</p>
           <p>Spurious events may happen. That is, calls to <c>ready_input</c>
           or <c>ready_output</c> even though no real events are signaled. In
@@ -440,7 +437,14 @@ typedef struct erl_drv_entry {
 	  <seealso marker="erl_driver#erl_drv_busy_msgq_limits">erl_drv_busy_msgq_limits()</seealso>
 	  function.
           </item>
-        </taglist> 
+          <tag><c>ERL_DRV_FLAG_USE_INIT_ACK</c></tag>
+          <item>When this flag is given the linked-in driver has to manually
+          acknowledge that the port has been successfully started using 
+	  <seealso marker="erl_driver#erl_drv_init_ack">erl_drv_init_ack()</seealso>.
+          This allows the implementor to make the erlang:open_port exit with
+          badarg after some initial asynchronous initialization has been done.
+          </item>
+        </taglist>
       </item>
       <tag>void *handle2</tag>
       <item>