From 6569ae456bebcad691c3af924620c913616571f7 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 09:11:30 +0200 Subject: doc: v3 compatibility doc lists invalid config directive closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 --- doc/v3compatibility.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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):

$ModLoad immark
-$MarkMessageInterval 1800 # 30 minutes

+$MarkMessagePeriod 1800 # 30 minutes

-r Option

Is no longer available in native mode. However, it is -- cgit v1.2.3 From be7bd9b4717a50db47e19edd4cd6ff897ff0a2ec Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 22 Oct 2012 09:22:55 +0200 Subject: doc: remove BSD blocks from rsyslog.conf manpage Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 --- tools/rsyslog.conf.5 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 -- cgit v1.2.3