Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  ...

1 files changed, 118 insertions, 80 deletions

diff --git a/lib/snmp/doc/src/snmp_agent_netif.xml b/lib/snmp/doc/src/snmp_agent_netif.xml
index 1f2dbe80db..d751740a82 100644
--- a/lib/snmp/doc/src/snmp_agent_netif.xml
+++ b/lib/snmp/doc/src/snmp_agent_netif.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -65,16 +65,19 @@
   </section>
 
   <section>
+    <marker id="messages"></marker>
     <title>Messages</title>
     <p>The section <em>Messages</em> describes mandatory messages, which
       Net if must send and be able to receive.     
       </p>
 
     <section>
+      <marker id="outgoing_messages"></marker>
       <title>Outgoing Messages</title>
       <p>Net if must send the following message when it receives an
-        SNMP PDU from the network that is aimed for the MasterAgent:
-        </p>
+      SNMP PDU from the network that is aimed for the MasterAgent:
+      </p>
+      <marker id="om_snmp_pdu"></marker>
       <pre>
 MasterAgent ! {snmp_pdu, Vsn, Pdu, PduMS, ACMData, From, Extra}
       </pre>
@@ -106,9 +109,10 @@ MasterAgent ! {snmp_pdu, Vsn, Pdu, PduMS, ACMData, From, Extra}
          the request.</item>
       </list>
       <p>The following message is used to report that a response to a
-        request has been received.  The only request an agent can send
-        is an Inform-Request.
-        </p>
+      request has been received.  The only request an agent can send
+      is an Inform-Request.
+      </p>
+      <marker id="om_snmp_response_received"></marker>
       <pre>
 Pid ! {snmp_response_received, Vsn, Pdu, From}
       </pre>
@@ -131,119 +135,153 @@ Pid ! {snmp_response_received, Vsn, Pdu, From}
     </section>
 
     <section>
+      <marker id="incoming_messages"></marker>
       <title>Incoming Messages</title>
       <p>This section describes the incoming messages which a Net if
-        process must be able to receive.
-        </p>
+      process must be able to receive.
+      </p>
       <list type="bulleted">
         <item>
+	  <marker id="im_snmp_response"></marker>
           <p><c>{snmp_response, Vsn, Pdu, Type, ACMData, To, Extra}</c></p>
           <p>This message is sent to the Net if process from a master
             agent as a response to a previously received request.
             </p>
           <list type="bulleted">
-            <item><c>Vsn</c> is either <c>'version-1'</c>,
-            <c>'version-2'</c>, or <c>'version-3'</c>.
+            <item>
+	      <p><c>Vsn</c> is either <c>'version-1'</c>,
+	      <c>'version-2'</c>, or <c>'version-3'</c>. </p>
             </item>
-            <item><c>Pdu</c> is an SNMP PDU record (as defined in
-             snmp_types.hrl) with the SNMP response.
+            <item>
+	      <p><c>Pdu</c> is an SNMP PDU record (as defined in
+	      snmp_types.hrl) with the SNMP response. </p>
             </item>
-            <item><c>Type</c> is the <c>#pdu.type</c> of the original
-             request.
+            <item>
+	      <p><c>Type</c> is the <c>#pdu.type</c> 
+	      of the original request. </p>
             </item>
-            <item><c>ACMData</c> is data used by the Access Control
-             Module in use.  Normally this is just sent to
-            <c>snmpa_mpd:generate_response_message</c> (see Reference Manual).
+            <item>
+	      <p><c>ACMData</c> is data used by the Access Control
+	      Module in use.  Normally this is just sent to
+	      <c>snmpa_mpd:generate_response_message</c> 
+	      (see Reference Manual). </p>
             </item>
-            <item><c>To</c> is the destination address. If UDP over IP
-             is used, this should be a 2-tuple <c>{IP, UDPport}</c>,
-             where <c>IP</c> is a 4-tuple with the IP address, and
-            <c>UDPport</c> is an integer.
+            <item>
+	      <p><c>To</c> is the destination address. If UDP over IP
+	      is used, this should be a 2-tuple <c>{IP, UDPport}</c>,
+	      where <c>IP</c> is a 4-tuple with the IP address, and
+	      <c>UDPport</c> is an integer. </p>
             </item>
-            <item><c>Extra</c> is the term that the Net if process
-             sent to the agent when the request was sent to the agent.
+            <item>
+	      <p><c>Extra</c> is the term that the Net if process
+	      sent to the agent when the request was sent to the agent. </p>
             </item>
           </list>
         </item>
         <item>
+	  <marker id="im_discarded_pdu"></marker>
           <p><c>{discarded_pdu, Vsn, ReqId, ACMData, Variable, Extra}</c></p>
           <p>This message is sent from a master agent if it for some
-            reason decided to discard the pdu.
-            </p>
+	  reason decided to discard the pdu. </p>
           <list type="bulleted">
-            <item><c>Vsn</c> is either <c>'version-1'</c>,
-            <c>'version-2'</c>, or <c>'version-3'</c>.
+            <item>
+	      <p><c>Vsn</c> is either <c>'version-1'</c>,
+	      <c>'version-2'</c>, or <c>'version-3'</c>. </p>
             </item>
-            <item><c>ReqId</c> is the request id of the original
-             request.
+            <item>
+	      <p><c>ReqId</c> is the request id of the original request. </p>
             </item>
-            <item><c>ACMData</c> is data used by the Access Control
-             Module in use.  Normally this is just sent to
-            <c>snmpa_mpd:generate_response_message</c> (see Reference Manual).
+            <item>
+	      <p><c>ACMData</c> is data used by the Access Control
+	      Module in use. Normally this is just sent to
+	      <c>snmpa_mpd:generate_response_message</c> 
+	      (see Reference Manual). </p>
             </item>
-            <item><c>Variable</c> is the name of an snmp counter that
-             represents the error, e.g. <c>snmpInBadCommunityUses</c>.
+            <item>
+	      <p><c>Variable</c> is the name of an snmp counter that
+	      represents the error, e.g. <c>snmpInBadCommunityUses</c>. </p>
             </item>
-            <item><c>Extra</c> is the term that the Net if process
-             sent to the agent when the request was sent to the agent.
+            <item>
+	      <p><c>Extra</c> is the term that the Net if process
+	      sent to the agent when the request was sent to the agent. </p>
             </item>
           </list>
         </item>
         <item>
-          <p><c>{send_pdu, Vsn, Pdu, MsgData, To}</c></p>
+	  <marker id="im_send_pdu"></marker>
+          <p><c>{send_pdu, Vsn, Pdu, MsgData, To, Extra}</c></p>
           <p>This message is sent from a master agent when a trap is
-            to be sent.
-            </p>
+            to be sent. </p>
           <list type="bulleted">
-            <item><c>Vsn</c> is either <c>'version-1'</c>,
-            <c>'version-2'</c>, or <c>'version-3'</c>.
+            <item>
+	      <p><c>Vsn</c> is either <c>'version-1'</c>,
+	      <c>'version-2'</c>, or <c>'version-3'</c>.</p>
             </item>
-            <item><c>Pdu</c> is an SNMP PDU record (as defined in
-             snmp_types.hrl) with the SNMP response.
+	    <item>
+	      <p><c>Pdu</c> is an SNMP PDU record (as defined in
+	      snmp_types.hrl) with the SNMP response. </p>
+	    </item>
+            <item>
+	      <p><c>MsgData</c> is the message specific data used in
+	      the SNMP message.  This value is normally sent to
+	      <c>snmpa_mpd:generate_message/4</c>.  In SNMPv1 and
+	      SNMPv2c, this message data is the community string.  In
+	      SNMPv3, it is the context information. </p>
             </item>
-            <item><c>MsgData</c> is the message specific data used in
-             the SNMP message.  This value is normally sent to
-            <c>snmpa_mpd:generate_message/4</c>.  In SNMPv1 and
-             SNMPv2c, this message data is the community string.  In
-             SNMPv3, it is the context information.
+            <item>
+	      <p><c>To</c> is a list of the destination addresses and
+	      their corresponding security parameters.  This value is
+	      normally sent to <c>snmpa_mpd:generate_message/4</c>. </p>
             </item>
-            <item><c>To</c> is a list of the destination addresses and
-             their corresponding security parameters.  This value is
-             normally sent to <c>snmpa_mpd:generate_message/4</c>.  
+            <item>
+	      <p><c>Extra</c> is any term that the notification sender
+	      wishes to pass to the Net if process when sending a notification 
+	      (see 
+	      <seealso marker="snmpa#send_notification2">send notification
+	      </seealso> for more info). </p>
             </item>
           </list>
         </item>
         <item>
-          <p><c>{send_pdu_req, Vsn, Pdu, MsgData, To, Pid}</c></p>
-          <p>This            <marker id="message"></marker>
- message is sent from a master 
-            agent when a request is
-            to be sent.  The only request an agent can send is
-            Inform-Request.  The net if process needs to remember the
-            request id and the Pid, and when a response is received for
-            the request id, send it to Pid, using a
-            <c>snmp_response_received</c> message.
-            </p>
-          <list type="bulleted">
-            <item><c>Vsn</c> is either <c>'version-1'</c>,
-            <c>'version-2'</c>,  or <c>'version-3'</c>.
-            </item>
-            <item><c>Pdu</c> is an SNMP PDU record (as defined in
-             snmp_types.hrl) with the SNMP response.
-            </item>
-            <item><c>MsgData</c> is the message specific data used in
-             the SNMP message.  This value is normally sent to
-            <c>snmpa_mpd:generate_message/4</c>.  In SNMPv1 and
-             SNMPv2c, this message data is the community string.  In
-             SNMPv3, it is the context information.
+	  <marker id="im_send_pdu_req"></marker>
+          <p><c>{send_pdu_req, Vsn, Pdu, MsgData, To, Pid, Extra}</c></p>
+          <p>This message is sent from a master agent when a request is to 
+	  be sent.  The only request an agent can send is Inform-Request.  
+	  The net if process needs to remember the request id and the Pid, 
+	  and when a response is received for the request id, send it to Pid, 
+	  using a <c>snmp_response_received</c> message. </p>
+	  <list type="bulleted">
+	    <item>
+	      <p><c>Vsn</c> is either <c>'version-1'</c>,
+	      <c>'version-2'</c>,  or <c>'version-3'</c>.</p>
+	    </item>
+	    <item>
+	      <p><c>Pdu</c> is an SNMP PDU record (as defined in
+	      snmp_types.hrl) with the SNMP response. </p>
+	    </item>
+	    <item>
+	      <p><c>MsgData</c> is the message specific data used in
+	      the SNMP message.  This value is normally sent to
+	      <c>snmpa_mpd:generate_message/4</c>. In SNMPv1 and
+	      SNMPv2c, this message data is the community string. In
+	      SNMPv3, it is the context information. </p>
+	    </item>
+	    <item>
+	      <p><c>To</c> is a list of the destination addresses and
+	      their corresponding security parameters. This value is
+	      normally sent to <c>snmpa_mpd:generate_message/4</c>. </p>
+	    </item>
+	    <item>
+	      <p><c>Pid</c> is a process identifier. </p>
+	    </item>
+            <item>
+	      <p><c>Extra</c> is any term that the notification sender
+	      wishes to pass to the Net if process when sending a notification 
+	      (see 
+	      <seealso marker="snmpa#send_notification2">send notification
+	      </seealso> for more info). </p>
             </item>
-            <item><c>To</c> is a list of the destination addresses and
-             their corresponding security parameters.  This value is
-             normally sent to <c>snmpa_mpd:generate_message/4</c>.  
-            </item>
-            <item><c>Pid</c> is a process identifier.
-            </item>
-          </list>
+	  </list>
         </item>
       </list>
     </section>