summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-19 14:40:55 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-19 14:40:55 +0100
commitb88c4885b4d2e7d6a4788c796a2f6c21eb0f43fc (patch)
tree00f466fb432952c722a42d84012861d15b938c25 /doc
parentcc08b3b0586460e4f6ce24746b8bf09f33645203 (diff)
parent452fb9282d3c53ce2a7256adfc1948b10b5b532e (diff)
downloadrsyslog-b88c4885b4d2e7d6a4788c796a2f6c21eb0f43fc.tar.gz
rsyslog-b88c4885b4d2e7d6a4788c796a2f6c21eb0f43fc.tar.xz
rsyslog-b88c4885b4d2e7d6a4788c796a2f6c21eb0f43fc.zip
Merge branch 'beta'
Conflicts: ChangeLog
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 1d30d8ae..841ec9c7 100644
--- a/doc/rsyslog_conf_filter.html
+++ b/doc/rsyslog_conf_filter.html
@@ -48,8 +48,8 @@ in rsyslog and offer the best performance for this job.</p>
facility and a priority, separated by a period (".''). Both parts are
case insensitive and can also be specified as decimal numbers, but
don't do that, you have been warned. Both facilities and priorities are
-described in rsyslog(3). The names mentioned below correspond to the
-similar LOG_-values in /usr/include/rsyslog.h.<br>
+described in syslog(3). The names mentioned below correspond to the
+similar LOG_-values in /usr/include/syslog.h.<br>
<br>
The facility is one of the following keywords: auth, authpriv, cron,
daemon, kern, lpr, mail, mark, news, security (same as auth), syslog,