Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address

3 files changed, 11 insertions, 9 deletions

diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index 7d1585f483..dfddbb18ea 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -36,7 +36,7 @@
   <description>
     <p>As of erts version 5.5.3 the driver interface has been extended
       (see <seealso marker="driver_entry#extended_marker">extended marker</seealso>).
-      The extended interface introduce
+      The extended interface introduces
       <seealso marker="erl_driver#version_management">version management</seealso>,
       the possibility to pass capability flags
       (see <seealso marker="driver_entry#driver_flags">driver flags</seealso>)
@@ -45,21 +45,21 @@
     <note>
       <p>Old drivers (compiled with an <c>erl_driver.h</c> from an
         earlier erts version than 5.5.3) have to be recompiled
-        (but does not have to use the extended interface).</p>
+        (but do not have to use the extended interface).</p>
     </note>
     <p>The <c>driver_entry</c> structure is a C struct that all erlang
-      drivers defines. It contains entry points for the erlang driver
+      drivers define. It contains entry points for the erlang driver
       that are called by the erlang emulator when erlang code accesses
       the driver.</p>
     <p>      
       <marker id="emulator"></marker>
       The <seealso marker="driver_entry">erl_driver</seealso> driver
-      API functions needs a port handle
+      API functions need a port handle
       that identifies the driver instance (and the port in the
       emulator). This is only passed to the <c>start</c> function, but
       not to the other functions. The <c>start</c> function returns a
       driver-defined handle that is passed to the other functions. A
-      common practice is to have the <c>start</c> function allocating
+      common practice is to have the <c>start</c> function allocate
       some application-defined structure and stash the <c>port</c>
       handle in it, to use it later with the driver API functions.</p>
     <p>The driver call-back functions are called synchronously from the
@@ -239,7 +239,7 @@ typedef struct erl_drv_entry {
       </item>
       <tag>void *handle</tag>
       <item>
-        <p>This field is reserved for the emulators internal use. The
+        <p>This field is reserved for the emulator's internal use. The
           emulator will modify this field; therefore, it is important
           that the <c>driver_entry</c> isn't declared <c>const</c>.</p> 
       </item>
@@ -403,7 +403,7 @@ typedef struct erl_drv_entry {
       <tag>void *handle2</tag>
       <item>
         <p>
-          This field is reserved for the emulators internal use. The
+          This field is reserved for the emulator's internal use. The
           emulator will modify this field; therefore, it is important
           that the <c>driver_entry</c> isn't declared <c>const</c>.
         </p>
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 77bd952d41..1e6e290f6b 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -231,7 +231,8 @@
       <tag><c><![CDATA[-detached]]></c></tag>
       <item>
         <p>Starts the Erlang runtime system detached from the system
-          console. Useful for running daemons and backgrounds processes.</p>
+          console. Useful for running daemons and backgrounds processes. Implies
+          <c><![CDATA[-noinput]]></c>.</p>
       </item>
       <tag><c><![CDATA[-emu_args]]></c></tag>
       <item>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 78d58a1e56..c3f06982f5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3980,7 +3980,8 @@ os_prompt%</pre>
           <tag><c>{status, Status}</c></tag>
           <item>
             <p><c>Status</c> is the status of the process. <c>Status</c>
-              is <c>waiting</c> (waiting for a message), <c>running</c>,
+              is <c>exiting</c>, <c>garbage_collecting</c>,
+              <c>waiting</c> (for a message), <c>running</c>,
               <c>runnable</c> (ready to run, but another process is
               running), or <c>suspended</c> (suspended on a "busy" port
               or by the <c>erlang:suspend_process/[1,2]</c> BIF).</p>