summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-22 09:15:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-22 09:15:41 +0200
commitff9ad0de5507b49cbb557339599358fe46c765b2 (patch)
tree6862377a3f0ea3cfaad97c423edfbe18e9f5d2a3
parente9cf777ca422a964b4324111f4c93d84652ce2fc (diff)
parentbee73d2d93105b187171a1cc51ecf4125b39b65d (diff)
downloadrsyslog-ff9ad0de5507b49cbb557339599358fe46c765b2.tar.gz
rsyslog-ff9ad0de5507b49cbb557339599358fe46c765b2.tar.bz2
rsyslog-ff9ad0de5507b49cbb557339599358fe46c765b2.zip
Merge branch 'v6-stable' into beta
-rw-r--r--doc/v3compatibility.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html
index ad8776bb..1c153506 100644
--- a/doc/v3compatibility.html
+++ b/doc/v3compatibility.html
@@ -84,7 +84,7 @@ to support this feature (as long as it is not totally removed).
To replace it, use the following config directives (compatibility mode
auto-generates them):</p>
<p><b>$ModLoad immark<br>
-$MarkMessageInterval 1800 # 30 minutes</b></p>
+$MarkMessagePeriod 1800 # 30 minutes</b></p>
<h2>-r Option</h2>
<p>Is no longer available in native mode. However, it
is