Merge branch 'v6-stable' into beta

This commit is contained in:
Rainer Gerhards 2012-10-22 09:15:41 +02:00
commit ff9ad0de55

View File

@ -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