diff options
| author | Micael Karlberg <[email protected]> | 2013-11-19 12:45:38 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-11-19 12:45:38 +0100 |
| commit | b73c98771730a6db086d3697eaa6b6ac11be0361 (patch) | |
| tree | 8bfec5285866a3947bb8ff239e59de76c9ce0437 /lib/snmp/doc/src/snmpa.xml | |
| parent | 8bcd32dfceec3b4381747046b82eec42487c7518 (diff) | |
| parent | 1508a71c3ec41347e6e34c57671028f2e4640680 (diff) | |
| download | otp-b73c98771730a6db086d3697eaa6b6ac11be0361.tar.gz otp-b73c98771730a6db086d3697eaa6b6ac11be0361.tar.bz2 otp-b73c98771730a6db086d3697eaa6b6ac11be0361.zip | |
Merge branch 'bmk/snmp/blocking_log_during_conversion' into bmk/snmp/snmp425_integration
Conflicts:
lib/snmp/src/app/snmp.erl
Diffstat (limited to 'lib/snmp/doc/src/snmpa.xml')
| -rw-r--r-- | lib/snmp/doc/src/snmpa.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml index 29e8869401..cc8681e5c8 100644 --- a/lib/snmp/doc/src/snmpa.xml +++ b/lib/snmp/doc/src/snmpa.xml @@ -570,7 +570,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} <v>LogDir = string()</v> <v>Mibs = [MibName]</v> <v>MibName = string()</v> - <v>Block = block()</v> + <v>Block = boolean()</v> <v>OutFile = string()</v> <v>LogName = string()</v> <v>LogFile = string()</v> @@ -587,7 +587,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} <p>The <c>Block</c> option indicates if the log should be blocked during conversion. This could be usefull when converting large logs (when otherwise the log could wrap during conversion). - Defaults to <c>false</c>. </p> + Defaults to <c>true</c>. </p> <p>See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> for more info.</p> @@ -609,7 +609,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} <v>LogDir = string()</v> <v>Mibs = [MibName]</v> <v>MibName = string()</v> - <v>Block = block()</v> + <v>Block = boolean()</v> <v>LogName = string()</v> <v>LogFile = string()</v> <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v> @@ -625,7 +625,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{} <p>The <c>Block</c> option indicates if the log should be blocked during conversion. This could be usefull when converting large logs (when otherwise the log could wrap during conversion). - Defaults to <c>false</c>. </p> + Defaults to <c>true</c>. </p> See <seealso marker="snmp#log_to_io">snmp:log_to_io</seealso> for more info.</p> |