From 6bd7ceb7e160200af80e0b8f0a526cd98d90eeab Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 2 Aug 2007 12:44:11 +0000
Subject: added capability to have multiple actions per selector

---
 doc/features.html     |  3 ++-
 doc/rsyslog_conf.html | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/doc/features.html b/doc/features.html
index 378c298d..8d79c52a 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -39,7 +39,8 @@ is going on, you can also subscribe to the <a href="http://lists.adiscon.net/mai
 	ability to control repeated line reduction (&quot;last message repeated n times&quot;) 
 	on a per selector-line basis<li>
 	supports sub-configuration files, which can be automatically read from 
-	directories. Includes are specified in the main configuration file</ul>
+	directories. Includes are specified in the main configuration file<li>
+	supports multiple actions per selector/filter condition</ul>
 <p>&nbsp;</p>
 <h2>Upcoming Features</h2>
 <p>The list below is something like a repository of ideas we'd like to 
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 757aed59..85a902ff 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -243,7 +243,7 @@ on.</p>
 <ul>
 	<li>turning on this option most probably destroys non-western character sets 
 	(like Japanese, Chinese and Korean)</li>
-	<li>turning on this option destroys digital signutures if such exists inside 
+	<li>turning on this option destroys digital signatures if such exists inside 
 	the message</li>
 </ul>
 <h2>FailOnChownFailure</h2>
@@ -589,8 +589,23 @@ template name.<br>
 Beware: templates MUST be defined BEFORE they are used. It is OK to define some 
 templates, then use them in selector lines, define more templates and use use 
 them in the following selector lines. But it is NOT permitted to use a template 
-in a selectore line that is above its definition. If you do this, the selector 
-line will be ignored.</p>
+in a selector line that is above its definition. If you do this, the action will be ignored.</p>
+<p><b>You can have multiple actions for a single selector </b>&nbsp;(or more 
+precisely a single filter of such a selector line). Each action must be on its 
+own line and the line must start with an ampersand ('&amp;') character and have no 
+filters. An example would be</p>
+<p><code><b>*.=crit rger<br>
+&amp; root<br>
+&amp; /var/log/critmsgs</b></code></p>
+<p>These three lines send critical messages to the usrs rger and root and also 
+store them in /var/log/critmsgs. Using multiple actions per selector is 
+convenient and also comes with a performance benefit. As the filter needs to be 
+evaluated only once, there is less computation required to process the directive 
+compared to these otherwise-equal config directives:</p>
+<p><code><b>*.=crit rger<br>
+*.=crit root<br>
+*.=crit /var/log/critmsgs</b></code></p>
+<p>&nbsp;</p>
 <h3>Regular File</h3>
 <p>Typically messages are logged to real files. The file has to be specified with 
 full pathname, beginning with a slash &quot;/''.<br>
-- 
cgit v1.2.3