diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 09:27:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-22 09:27:31 +0200 |
| commit | 9fb39ee7984c7ecffc8557242a55d2e967f0c336 (patch) | |
| tree | 83c21168a70ba52d10fc1c130945791b2cbffea3 | |
| parent | 9516e8f99f0385eb7948df9b6af87b51d3462ccb (diff) | |
| parent | be7bd9b4717a50db47e19edd4cd6ff897ff0a2ec (diff) | |
| download | rsyslog-9fb39ee7984c7ecffc8557242a55d2e967f0c336.tar.gz rsyslog-9fb39ee7984c7ecffc8557242a55d2e967f0c336.tar.bz2 rsyslog-9fb39ee7984c7ecffc8557242a55d2e967f0c336.zip | |
Merge branch 'beta' into master-ratelimit
| -rw-r--r-- | doc/v3compatibility.html | 2 | ||||
| -rw-r--r-- | tools/rsyslog.conf.5 | 9 |
2 files changed, 2 insertions, 9 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 diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index dcc9b7c7..641ba9ba 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -17,7 +17,7 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. .\" -.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "22 October 2012" "Version 7.2.0" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION @@ -335,13 +335,6 @@ Rsyslog offers three different types "filter conditions": * expression-based filters .RE -.SS Blocks -Rsyslogd supports BSD-style blocks inside rsyslog.conf. Each block of lines is separated from -the previous block by a program or hostname specification. A block will only log messages -corresponding to the most recent program and hostname specifications given. Thus, a block which -selects "ppp" as the program, directly followed by a block that selects messages from the -hostname "dialhost", then the second block will only log messages from the ppp program on dialhost. - .SS Selectors .B Selectors are the traditional way of filtering syslog messages. They have been kept in rsyslog with their original syntax, because it is well-known, highly |