summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-10-23 00:53:27 +0200
committerMichael Biebl <biebl@debian.org>2012-10-23 00:53:27 +0200
commit30d3515e017ba4b2d74c55c2ad7b897b8a9eb020 (patch)
tree4a4a004202652e61d4c9a7dd3f8597321377856c /doc
parent9e3cfcd680648a9905180bcc01b1d61522c5666f (diff)
downloadrsyslog-30d3515e017ba4b2d74c55c2ad7b897b8a9eb020.tar.gz
Imported Upstream version 7.2.0upstream/7.2.0
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.html2
-rw-r--r--doc/v3compatibility.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 45ba771..e645f2c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 7.1.12 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.2.0 (v7-stable branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might
diff --git a/doc/v3compatibility.html b/doc/v3compatibility.html
index ad8776b..1c15350 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