Final version of the (new) API.

2 files changed, 36 insertions, 36 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 11d2a513df..ae00c42a7c 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -54,17 +54,17 @@
 	</item>
 
         <item>
-          <p>[manager] The API for snmp requests has been changed to
+          <p>[manager] The API for snmp requests has been augmented to
 	  allow the caller to override some configuration. </p>
-	  <p>See 
-	  <seealso marker="snmpm#sync_get">sync_get/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get">async_get/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_next">sync_get_next/3,4</seealso>, 
-	  <seealso marker="snmpm#async_get_next">async_get_next/3,4</seealso>, 
-	  <seealso marker="snmpm#sync_get_bulk">sync_get_bulk/5,6</seealso>, 
-	  <seealso marker="snmpm#async_get_bulk">async_get_bulk/5,6</seealso>, 
-	  <seealso marker="snmpm#sync_set">sync_set/3,4</seealso> and 
-	  <seealso marker="snmpm#async_set">async_set/3,4</seealso>
+	  <p>This has been done by introducing a new set of API functions, see 
+	  <seealso marker="snmpm#sync_get2">sync_get2/3,4</seealso>, 
+	  <seealso marker="snmpm#async_get2">async_get2/3,4</seealso>, 
+	  <seealso marker="snmpm#sync_get_next2">sync_get_next2/3,4</seealso>, 
+	  <seealso marker="snmpm#async_get_next2">async_get_next2/3,4</seealso>, 
+	  <seealso marker="snmpm#sync_get_bulk2">sync_get_bulk2/5,6</seealso>, 
+	  <seealso marker="snmpm#async_get_bulk2">async_get_bulk2/5,6</seealso>, 
+	  <seealso marker="snmpm#sync_set2">sync_set2/3,4</seealso> and 
+	  <seealso marker="snmpm#async_set2">async_set2/3,4</seealso>
 	  for more info. </p>
           <p>Own Id: OTP-9162</p>
         </item>
@@ -304,7 +304,7 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
           <p>The config utility 
             (<seealso marker="snmp#config">snmp:config/0</seealso>)
             generated a default notify.conf 
-            with a bad name for the starndard trap entry (was "stadard trap", 
+            with a bad name for the standard trap entry (was "stadard trap", 
             but should have been "standard trap"). This has been corrected. </p>
           <p>Kenji Rikitake</p>
           <p>Own Id: OTP-8433</p>
@@ -508,7 +508,7 @@ snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
           <p>The config utility 
             (<seealso marker="snmp#config">snmp:config/0</seealso>)
             generated a default notify.conf 
-            with a bad name for the starndard trap entry (was "stadard trap", 
+            with a bad name for the standard trap entry (was "stadard trap", 
             but should have been "standard trap"). This has been corrected. </p>
           <p>Kenji Rikitake</p>
           <p>Own Id: OTP-8433</p>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index db7abd6867..ff072205bc 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -486,13 +486,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
         <p>Get a list of all registered usm users with engine-id 
           <c>EngineID</c>.</p>
 
-        <marker id="sync_get"></marker>
+        <marker id="sync_get2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>sync_get(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -538,13 +538,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<p>For <c>SnmpInfo</c>, see the user callback function 
 	<seealso marker="snmpm_user#handle_report">handle_report</seealso>.</p>
 
-        <marker id="async_get"></marker>
+        <marker id="async_get2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>async_get(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -578,13 +578,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	for <em>this</em> request, they override any configuration done 
 	when the agent was registered. </p>
 
-        <marker id="sync_get_next"></marker>
+        <marker id="sync_get_next2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>sync_get_next(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get_next2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -630,13 +630,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<p>For <c>SnmpInfo</c>, see the user callback function 
 	<seealso marker="snmpm_user#handle_report">handle_report</seealso>.</p>
 
-        <marker id="async_get_next"></marker>
+        <marker id="async_get_next2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>async_get_next(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get_next2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -667,13 +667,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	for <em>this</em> request, they override any configuration done 
 	when the agent was registered. </p>
 
-        <marker id="sync_set"></marker>
+        <marker id="sync_set2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>sync_set(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_set2(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -722,13 +722,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<p>For <c>SnmpInfo</c>, see the user callback function 
 	<seealso marker="snmpm_user#handle_report">handle_report</seealso>.</p>
 
-        <marker id="async_set"></marker>
+        <marker id="async_set2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>async_set(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_set2(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -764,13 +764,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	for <em>this</em> request, they override any configuration done 
 	when the agent was registered. </p>
 
-        <marker id="sync_get_bulk"></marker>
+        <marker id="sync_get_bulk2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name>sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -818,13 +818,13 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	<p>For <c>SnmpInfo</c>, see the user callback function 
 	<seealso marker="snmpm_user#handle_report">handle_report</seealso>.</p>
 
-        <marker id="async_get_bulk"></marker>
+        <marker id="async_get_bulk2"></marker>
       </desc>
     </func>
 
     <func>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name>async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>