From 96273e7f909b14163aa117174994362736590140 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 7 Apr 2011 12:20:56 +0200
Subject: Release notes and API cleanup.

---
 lib/snmp/doc/src/notes.xml | 30 +++++++++++++++---------------
 lib/snmp/doc/src/snmpa.xml |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'lib/snmp')

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index e9787c17da..6853eefad2 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -43,21 +43,6 @@
       <p>-</p>
 -->
       <list type="bulleted">
-        <item>
-          <p>[agent] Pass extra info through the agent to the net-if
-	  process when sending notifications. </p>
-	  <p>See 
-	  <seealso marker="snmpa#send_notification2">
-	  snmpa:send_notification2/3</seealso> for more info. 
-	  See also the incomming net-if messages when sending a 
-	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso> 
-	  and 
-	  <seealso marker="snmp_agent_netif#im_send_pdu_req">
-	  notification</seealso>. </p>
-          <p>Own Id: OTP-9183</p>
-          <p>Aux Id: Seq 11817</p>
-        </item>
-
         <item>
           <p>[agent] Added support for sending traps to IPv6 targets. </p>
 	  <p>See the 
@@ -75,6 +60,21 @@
           <p>Own Id: OTP-9174</p>
         </item>
 
+        <item>
+          <p>[agent] Pass extra info through the agent to the net-if
+	  process when sending notifications. </p>
+	  <p>See 
+	  <seealso marker="snmpa#send_notification2">
+	  snmpa:send_notification2/3</seealso> for more info. 
+	  See also the incomming net-if messages when sending a 
+	  <seealso marker="snmp_agent_netif#im_send_pdu">trap</seealso> 
+	  and 
+	  <seealso marker="snmp_agent_netif#im_send_pdu_req">
+	  notification</seealso>. </p>
+          <p>Own Id: OTP-9183</p>
+          <p>Aux Id: Seq 11817</p>
+        </item>
+
       </list>
     </section>
 
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index 1800bbc91a..27d89ea4e3 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -885,7 +885,6 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
         <v>Notification = atom()</v>
         <v>SendOpts = [send_option()]</v>
         <v>send_option() = {receiver, receiver()} | {name, notify_name()} | {context, context_name()} | {varbinds, varbinds()} | {local_engine_id, string()} | {extra, extra_info()}</v>
-        <v>override_option() = atom()</v>
         <v>receiver() = no_receiver | {tag(), tag_receiver()} | notification_delivery_info()</v>
         <v>tag() = term(()</v>
         <v>tag_receiver() = pid() | registered_name() | {Mod, Func, Args}</v>
-- 
cgit v1.2.3