1 files changed, 46 insertions, 8 deletions

diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index 27d89ea4e3..86fde03205 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -198,12 +198,18 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       <type>
         <v>BackupDir = string()</v>
         <v>Agent = pid() | atom()</v>
+        <v>Reason = backup_in_progress | term()</v>
       </type>
       <desc>
         <p>Backup persistent/permanent data handled by the agent
           (such as local-db, mib-data and vacm). </p>
         <p>Data stored by mnesia is not handled. </p>
         <p>BackupDir cannot be identical to DbDir. </p>
+        <p>Simultaneous backup calls are <em>not</em> allowed. 
+	That is, two different processes cannot simultaneously 
+	successfully call this function. One of them will be first, 
+	and succeed. The second will fail with the error reason
+	<c>backup_in_progress</c>. </p>
 
         <marker id="info"></marker>
       </desc>
@@ -217,13 +223,13 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       </type>
       <desc>
         <p>Returns a list (a dictionary) containing information about
-          the agent. Information includes loaded MIBs, registered
-          sub-agents, some information about the memory allocation. </p>
-        <p>As of version 4.4 the format of the info has been changed. 
-          To convert the info to the old format, call the 
-          <seealso marker="#old_info_format">old_info_format</seealso> 
-          function. </p>
-
+	the agent. Information includes loaded MIBs, registered
+	sub-agents, some information about the memory allocation. </p>
+	<p>As of version 4.4 the format of the info has been changed. 
+	To convert the info to the old format, call the 
+	<seealso marker="#old_info_format">old_info_format</seealso> 
+	function. </p>
+	
         <marker id="old_info_format"></marker>
       </desc>
     </func>
@@ -495,6 +501,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
+      <name>log_to_txt(LogDir)</name>
       <name>log_to_txt(LogDir, Mibs)</name>
       <name>log_to_txt(LogDir, Mibs, OutFile) -> ok | {error, Reason}</name>
       <name>log_to_txt(LogDir, Mibs, OutFile, LogName) ->  ok | {error, Reason}</name>
@@ -522,6 +529,37 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
           See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> 
           for more info.</p>
 
+        <marker id="log_to_io"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>log_to_io(LogDir) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {error, Reason}</name>
+      <fsummary>Convert an Audit Trail Log to text format</fsummary>
+      <type>
+        <v>LogDir = string()</v>
+        <v>Mibs = [MibName]</v>
+        <v>MibName = string()</v>
+        <v>LogName = string()</v>
+        <v>LogFile = string()</v>
+        <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
+        <v>disk_log_open_error() = {LogName, term()}</v>
+        <v>file_open_error() = {OutFile, term()}</v>
+      </type>
+      <desc>
+        <p>Converts an Audit Trail Log to a readable format and 
+	prints it on stdio. 
+	<c>LogName</c> defaults to "snmpa_log". 
+	<c>LogFile</c> defaults to "snmpa.log". 
+	See <seealso marker="snmp#log_to_io">snmp:log_to_io</seealso> 
+	for more info.</p>
+
         <marker id="change_log_size"></marker>
       </desc>
     </func>