diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
| commit | c8ebe623376bc025bf166ec333ac874c215de816 (patch) | |
| tree | 2e1c6f6a149bce3844ed21da08e5f0695de3fecc /doc/rsconf1_markmessageperiod.html | |
| parent | 497bfeb287a75d1fb0f37502d3805307311a574d (diff) | |
| parent | 76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff) | |
| download | rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
template.c
tests/Makefile.am
tests/parsertest.sh
Diffstat (limited to 'doc/rsconf1_markmessageperiod.html')
| -rw-r--r-- | doc/rsconf1_markmessageperiod.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsconf1_markmessageperiod.html b/doc/rsconf1_markmessageperiod.html index 2c833339..a6486ba1 100644 --- a/doc/rsconf1_markmessageperiod.html +++ b/doc/rsconf1_markmessageperiod.html @@ -7,7 +7,7 @@ <h2>$MarkMessagePeriod</h2> <p><b>Type:</b> specific to immark input module</p> -<p><b>Default:</b> 1800 (20 minutes)</p> +<p><b>Default:</b> 1200 (20 minutes)</p> <p><b>Description:</b></p> <p>This specifies when mark messages are to be written to output modules. The time specified is in seconds. Specifying 0 is possible and disables mark |