Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src

5 files changed, 105 insertions, 14 deletions

diff --git a/erts/doc/src/driver_entry.xml b/erts/doc/src/driver_entry.xml
index dfddbb18ea..7860d83d83 100644
--- a/erts/doc/src/driver_entry.xml
+++ b/erts/doc/src/driver_entry.xml
@@ -121,7 +121,7 @@ typedef struct erl_drv_entry {
                                    the port */
     void (*ready_input)(ErlDrvData drv_data, ErlDrvEvent event); 
                                 /* called when we have input from one of 
-                                   the driver's handles) */
+                                   the driver's handles */
     void (*ready_output)(ErlDrvData drv_data, ErlDrvEvent event);  
                                 /* called when output is possible to one of 
                                    the driver's handles */
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml
index 474230cb38..8c3c1e5237 100644
--- a/erts/doc/src/epmd.xml
+++ b/erts/doc/src/epmd.xml
@@ -116,6 +116,16 @@
 
     <p>These options are available when starting the actual name server. The name server is normally started automatically by the <c>erl</c> command (if not already available), but it can also be started at i.e. system start-up.</p>
     <taglist>
+    <tag><c><![CDATA[-address List]]></c></tag>
+    <item>
+    <p>Let this instance of <c>epmd</c> listen only on the
+      comma-separated list of IP addresses and on the loopback address
+      (which is implicitely added to the list if it has not been
+      specified). This can also be set using the
+      <c><![CDATA[ERL_EPMD_ADDRESS]]></c> environment variable, see the
+      section <seealso marker="#environment_variables">Environment
+      variables</seealso> below.</p>
+    </item>
     <tag><c><![CDATA[-port No]]></c></tag>
     <item>
       <p>Let this instance of epmd listen to another TCP port than
@@ -228,6 +238,15 @@
     <marker id="environment_variables"></marker>
     <title>Environment variables</title>
     <taglist>
+      <tag><c><![CDATA[ERL_EPMD_ADDRESS]]></c></tag>
+      <item>
+        <p>This environment variable may be set to a comma-separated
+          list of IP addresses, in which case the <c>epmd</c> daemon
+          will listen only on the specified address(es) and on the
+          loopback address (which is implicitely added to the list if it
+          has not been specified). The default behaviour is to listen on
+          all available IP addresses.</p>
+      </item>
       <tag><c><![CDATA[ERL_EPMD_PORT]]></c></tag>
       <item>
         <p>This environment variable can contain the port number epmd will use.
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index a66d273438..514ee5ffaf 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1004,6 +1004,15 @@
 	  add to the code path.
   	  See <seealso marker="kernel:code">code(3)</seealso>.</p>
       </item>
+      <tag><c><![CDATA[ERL_EPMD_ADDRESS]]></c></tag>
+      <item>
+        <p>This environment variable may be set to a comma-separated
+          list of IP addresses, in which case the
+          <seealso marker="epmd">epmd</seealso> daemon
+          will listen only on the specified address(es) and on the
+          loopback address (which is implicitely added to the list if it
+          has not been specified).</p>
+      </item>
       <tag><c><![CDATA[ERL_EPMD_PORT]]></c></tag>
       <item>
         <p>This environment variable can contain the port number to use when
@@ -1016,6 +1025,49 @@
   </section>
 
   <section>
+    <marker id="configuration"></marker>
+    <title>Configuration</title>
+    <p>The standard Erlang/OTP system can be re-configured to change the default
+       behavior on start-up.</p>
+    <taglist>
+       <tag>The .erlang Start-up File</tag>
+       <item>
+         <p>When Erlang/OTP is started, the system searches for a file named .erlang
+            in the directory where Erlang/OTP is started. If not found, the user's home
+            directory is searched for an .erlang file.</p>
+         <p>If an .erlang file is found, it is assumed to contain valid Erlang expressions.
+            These expressions are evaluated as if they were input to the shell.</p>
+         <p>A typical .erlang file contains a set of search paths, for example:</p>
+    <code type="none"><![CDATA[
+        io:format("executing user profile in HOME/.erlang\n",[]).
+        code:add_path("/home/calvin/test/ebin").
+        code:add_path("/home/hobbes/bigappl-1.2/ebin").
+        io:format(".erlang rc finished\n",[]).
+    ]]></code>
+       </item>
+       <tag>user_default and shell_default</tag>
+       <item>
+         <p>Functions in the shell which are not prefixed by a module name are assumed
+           to be functional objects (Funs), built-in functions (BIFs), or belong to the
+           module user_default or shell_default.</p>
+         <p>To include private shell commands, define them in a module user_default and
+           add the following argument as the first line in the .erlang file.</p>
+    <code type="none"><![CDATA[
+         code:load_abs("..../user_default").
+    ]]></code>
+       </item>
+       <tag>erl</tag>
+       <item>
+         <p>If the contents of .erlang are changed and a private version of
+           user_default is defined, it is possible to customize the Erlang/OTP environment.
+           More powerful changes can be made by supplying command line arguments in the
+           start-up script erl. Refer to erl(1) and <seealso marker="init">init(3)</seealso>
+           for further information.</p>
+       </item>
+    </taglist>
+  </section>
+
+   <section>
     <title>SEE ALSO</title>
     <p><seealso marker="init">init(3)</seealso>,
       <seealso marker="erl_prim_loader">erl_prim_loader(3)</seealso>,
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index 33364c709a..0e828389f6 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -67,19 +67,6 @@
       </desc>
     </func>
     <func>
-      <name>get_args() -> [Arg]</name>
-      <fsummary>Get all non-flag command line arguments</fsummary>
-      <type>
-        <v>Arg = atom()</v>
-      </type>
-      <desc>
-        <p>Returns any plain command line arguments as a list of atoms
-          (possibly empty). It is recommended that
-          <c>get_plain_arguments/1</c> is used instead, because of
-          the limited length of atoms.</p>
-      </desc>
-    </func>
-    <func>
       <name>get_argument(Flag) -> {ok, Arg} | error</name>
       <fsummary>Get the values associated with a command line user flag</fsummary>
       <type>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 102fa43c1f..e91839572b 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,39 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Ets table type ordered_set could order large integer keys
+	    wrongly on pure 64bit platforms. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-9181</p>
+        </item>
+        <item>
+          <p>
+	    The status of a process was unnecessarily set to waiting
+	    before a process was enqueued in a run queue. This bug
+	    was harmless up until OTP-R14B01. In OTP-R14B02
+	    <c>erlang:hibernate/3</c> was fixed (OTP-9125). After the
+	    introduction of OTP-9125, the previously harmless process
+	    status bug sometimes caused erroneous badarg exceptions
+	    from <c>process_info()</c>.</p>
+          <p>
+	    OTP-9125 also introduced a thread unsafe access to the
+	    status field of a process which now also have been fixed.</p>
+          <p>
+	    *** INCOMPATIBILITY with noxs ***</p>
+          <p>
+	    Own Id: OTP-9197</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.8.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>