3 files changed, 62 insertions, 4 deletions

diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index 35ed63e103..1bbd1bfafc 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -152,6 +152,7 @@ $(TOP_PDF_FILE): $(XML_FILES)
 pdf: $(TOP_PDF_FILE)
 
 html: gifs $(HTML_REF_MAN_FILE)
+html2: html $(INDEX_TARGET)
 
 clean clean_docs: clean_html clean_man clean_pdf
 	rm -f errs core *~
@@ -228,6 +229,7 @@ clean_man:
 clean_html:
 	@echo "cleaning html:"
 	rm -rf $(HTMLDIR)/*
+	rm -f $(INDEX_TARGET)
 
 $(MAN7DIR)/%.7: $(MIBSDIR)/%.mib
 	@echo "processing $*"
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index cf9d2b3834..facb9029f5 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -33,6 +33,58 @@
   </header>
 
   <section>
+    <title>SNMP Development Toolkit 4.21</title>
+    <p>Version 4.21 supports code replacement in runtime from/to
+      version 4.20.1, 4.20, 4.19 and 4.18.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+      <list type="bulleted">
+        <item>
+          <p>[manager] There was no way to specify transport domain. 
+	  The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
+	  This has now been changed so that it can also be IPv6 
+	  (transportDomainUdpIpv6). 
+	  To facilitate this, the <c>transportDomain</c> is now a (new) 
+	  valid option when 
+	  <seealso marker="snmpm#register_agent">registering</seealso>
+	  a new agent. </p>
+	  <p>This also mean that the transport behaviour has changed. </p>
+          <p>Own Id: OTP-9305</p>
+          <p>Aux Id: Seq 11847</p>
+        </item>
+      </list>
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p> 
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Did not handle transport domains properly in some 
+	  cases. </p>
+          <p>Own Id: OTP-9400</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.21 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.20.1</title>
     <p>Version 4.20.1 supports code replacement in runtime from/to
       version 4.20, 4.19 and 4.18.</p>
@@ -56,7 +108,6 @@
 <!--
       <p>-</p> 
 -->
-
       <list type="bulleted">
         <item>
           <p>[agent] Did not handle transport domains properly in some cases, 
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index b527d171b0..6162f0d592 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -348,17 +348,22 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
+      <name>update_agent_info(UserId, TargetName, Info) -> ok | {error, Reason}</name>
       <name>update_agent_info(UserId, TargetName, Item, Val) -> ok | {error, Reason}</name>
       <fsummary>Update agent config</fsummary>
       <type>
         <v>UserId = term()</v>
         <v>TargetName = target_name()</v>
-        <v>Item = atom()</v>
-        <v>Val = term()</v>
+        <v>Info = [{item(), item_value()}]</v>
+        <v>Item = item()</v>
+        <v>item() = atom()</v>
+        <v>Val = item_value()</v>
+        <v>item_value() = term()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Update agent config.</p>
+        <p>Update agent config. The function <c>update_agent_info/3</c> 
+	should be used when several values needs to be updated atomically. </p>
 
         <marker id="which_agents"></marker>
       </desc>