summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-17 11:46:06 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-17 11:46:06 +0100
commitd3da845a61129c256c3e96fe144ea1dd67bac7c6 (patch)
treedd33fccce6c88b0225c609c382bd6c0c211173ae /doc
parentda75472096c45dd136d41c6e9ad7bf740069d3a1 (diff)
parent2181515805e65c37b9db5e0badef2a0a86164234 (diff)
downloadrsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.gz
rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.xz
rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'doc')
-rw-r--r--doc/rsyslog_conf_filter.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rsyslog_conf_filter.html b/doc/rsyslog_conf_filter.html
index 63c29817..34839616 100644
--- a/doc/rsyslog_conf_filter.html
+++ b/doc/rsyslog_conf_filter.html
@@ -85,12 +85,12 @@ selector field is capable to overwrite the preceding ones. Using this
behavior you can exclude some priorities from the pattern.</p>
<p>Rsyslogd has a syntax extension to the original BSD source,
that makes its use more intuitively. You may precede every priority
-with an equation sign ("='') to specify only this single priority and
+with an equals sign ("='') to specify only this single priority and
not any of the above. You may also (both is valid, too) precede the
priority with an exclamation mark ("!'') to ignore all that
priorities, either exact this one or this and any higher priority. If
you use both extensions than the exclamation mark must occur before the
-equation sign, just use it intuitively.</p>
+equals sign, just use it intuitively.</p>
<h3>Property-Based Filters</h3>
<p>Property-based filters are unique to rsyslogd. They allow to
filter on any property, like HOSTNAME, syslogtag and msg. A list of all