3 files changed, 52 insertions, 31 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 533bb9097c..7b389929cf 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -35,18 +35,35 @@
   <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>
+      version 4.20.1, 4.20 and 4.19. </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 transport domain, <c>tdomain</c>, 
+	  is now a (new) valid option when 
+	  <seealso marker="snmpm#register_agent">registering</seealso>
+	  a new agent (and 
+	  <seealso marker="snmpm#update_agent_info">updating</seealso> 
+	  agent info). </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>
+
+        <item>
           <p>[compiler] Added the option 
 	  <seealso marker="snmpc#compile">warnings_as_errors</seealso> 
+	  (for the SNMP MIB compiler (escript) frontend, the option 
+	  <seealso marker="snmpc(command)">--wae</seealso> is used) 
 	  which specifies whether warnings should be treated as errors. </p>
           <p>Tuncer Ayaz</p>
           <p>Own Id: OTP-9437</p>
@@ -56,25 +73,18 @@
 
     <section>
       <title>Fixed Bugs and Malfunctions</title>
-<!--
       <p>-</p> 
--->
 
+<!--
       <list type="bulleted">
         <item>
-          <p>[agent] Did not handle transport domains properly in some cases, 
-	  for instance trap sending. </p>
-	  <p>Own Id: OTP-9400</p>
-	</item>
-
-        <item>
-          <p>[agent] Wrong default transport domain, snmpUDPDomain, instead
-	  of transportDomainUdpIpv4. </p>
-	  <p>Own Id: OTP-9425</p>
-          <p>Aux Id: Seq 11874</p>
-	</item>
+          <p>[agent] Did not handle transport domains properly in some 
+	  cases. </p>
+          <p>Own Id: OTP-9400</p>
+        </item>
 
       </list>
+-->
     </section>
 
 
@@ -110,7 +120,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..c36a1b2a24 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -283,27 +283,27 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
         <v>TargetName = target_name()</v>
         <v>Config = [agent_config()]</v>
         <v>agent_config() = {Item, Val}</v>
-        <v>Item = engine_id | address | port | community | timeout | max_message_size | version | sec_model | sec_name | sec_level</v>
+        <v>Item = engine_id | address | port | community | timeout | max_message_size | version | sec_model | sec_name | sec_level | tdomain</v>
         <v>Val = term()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
         <p>Explicitly instruct the manager to handle this agent, with
-          <c>UserId</c> as the responsible user. </p>
-        <p>Called to instruct the manager that this agent 
-          shall be handled. This function is used when
-          the user knows in advance which agents the
-          manager shall handle.
-          Note that there is an alternate way to do the same thing:
-          Add the agent to the manager config files (see 
-          <seealso marker="snmp_manager_config_files#agents">agents.conf</seealso>).</p>
+	<c>UserId</c> as the responsible user. </p>
+        <p>Called to instruct the manager that this agent shall be handled. 
+	This function is used when the user knows in advance which agents 
+	the manager shall handle.
+	Note that there is an alternate way to do the same thing:
+	Add the agent to the manager config files (see 
+	<seealso marker="snmp_manager_config_files#agents">agents.conf</seealso>).</p>
         <p><c>TargetName</c> is a non-empty string, 
-          uniquely identifying the agent. </p>
-        <p>The type of <c>Val</c> depends on <c>Item</c>: </p>
+	uniquely identifying the agent. </p>
+	<p>The type of <c>Val</c> depends on <c>Item</c>: </p>
 <code type="none"><![CDATA[
 [mandatory] engine_id = string()
 [mandatory] address = ip_address()
 [optional]  port = integer()
+[optional]  tdomain = transportDomainUdpIpv4 | transportDomainUdpIpv6
 [optional]  community = string()
 [optional]  timeout = integer() | snmp_timer()
 [optional]  max_message_size = integer()
@@ -312,7 +312,9 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
 [optional]  sec_name = string() 
 [optional]  sec_level = noAuthNoPriv | authNoPriv | authPriv
 ]]></code>
-        <p>Note that if no <c>Port</c> is given, the default value is used.</p>
+        <p>Note that if no <c>tdomain</c> is given, the default value,
+	<c>transportDomainUdpIpv4</c>, is used.</p>
+        <p>Note that if no <c>port</c> is given, the default value is used.</p>
 
         <marker id="unregister_agent"></marker>
       </desc>
@@ -348,17 +350,25 @@ 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>
+	<p>See function 
+	<seealso marker="#register_agent">register_agent</seealso>) 
+	for more info about what kind of items are allowed. </p>
 
         <marker id="which_agents"></marker>
       </desc>