diff options
| author | Micael Karlberg <[email protected]> | 2012-02-23 11:07:55 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-02-23 11:07:55 +0100 |
| commit | 60cd62388da64e3efc0143529be0a72436fc801e (patch) | |
| tree | ae55c0d0c22fff9740cf1829b4d784eea86e0b4a /lib/snmp/doc/src/snmp.xml | |
| parent | 045810f873df73a09b105d051eed244be2edf7ee (diff) | |
| parent | 14a757d5444719c33e9fbca8d97114d58229291f (diff) | |
| download | otp-60cd62388da64e3efc0143529be0a72436fc801e.tar.gz otp-60cd62388da64e3efc0143529be0a72436fc801e.tar.bz2 otp-60cd62388da64e3efc0143529be0a72436fc801e.zip | |
Merge branch 'bmk/snmp/manager/threaded_net_if/OTP-9876' into bmk/snmp/snmp422_integration/r15
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
lib/snmp/test/snmp_agent_test.erl
lib/snmp/vsn.mk
Diffstat (limited to 'lib/snmp/doc/src/snmp.xml')
| -rw-r--r-- | lib/snmp/doc/src/snmp.xml | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml index af0833f005..3e6610891f 100644 --- a/lib/snmp/doc/src/snmp.xml +++ b/lib/snmp/doc/src/snmp.xml @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="latin1" ?> +<?xml version="1.0" encoding="iso-8859-1" ?> <!DOCTYPE erlref SYSTEM "erlref.dtd"> <erlref> <header> <copyright> - <year>1996</year><year>2009</year> + <year>1996</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -391,6 +391,30 @@ version of the protocol data unit. There is a new line between <c>Vsn</c> and <c>PDU</c>.</p> + <marker id="log_to_io"></marker> + </desc> + </func> + + <func> + <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 = term()</v> + </type> + <desc> + <p>Converts an Audit Trail Log to a readable format and + prints it on stdio. See + <seealso marker="snmp#log_to_txt">log_to_txt</seealso> + above for more info.</p> + <marker id="change_log_size"></marker> </desc> </func> |