From 8fceb07c652025c3742b6ba604460c853f7a2ad5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 12 Jul 2011 09:58:56 +0200
Subject: [manager] No way to specify transport domain. Transport domains was
 assumed to be IPv4. This has now been changed so that it can also be IPv6. To
 facilitate this, the transportDomain is now a (new) valid option. This also
 mean that the transport behaviour has changed. OTP-9305

[agent] A temporary fix for transport domain, specifically regarding
trap sending. This is done in order to make testing possible,
pending merge from topic branch.
OTP-9400
---
 lib/snmp/doc/src/Makefile  |  2 ++
 lib/snmp/doc/src/snmpm.xml | 11 ++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib/snmp/doc')

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/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>
-- 
cgit v1.2.3