diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-19 14:39:55 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-19 14:39:55 +0100 |
| commit | 9a0e844c914595f59f742c1b7a9f33a1922ecc45 (patch) | |
| tree | 80cf1e5667767877b7ded61b845e1e0b4bcd6305 | |
| parent | 5b4e06fc28ef217e9ca26611e11afd974bdd1a4a (diff) | |
| parent | 112b69d983a27a98eacb0d2f90efef287e24a82f (diff) | |
| download | rsyslog-9a0e844c914595f59f742c1b7a9f33a1922ecc45.tar.gz rsyslog-9a0e844c914595f59f742c1b7a9f33a1922ecc45.tar.xz rsyslog-9a0e844c914595f59f742c1b7a9f33a1922ecc45.zip | |
Merge branch 'v4-stable' into v4-beta
| -rw-r--r-- | doc/rsyslog_conf_filter.html | 4 | ||||
| -rw-r--r-- | tools/rsyslog.conf.5 | 4 |
2 files changed, 4 insertions, 4 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, diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index 0a2422c6..f2b915e2 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -164,8 +164,8 @@ a pattern of facilities and priorities belonging to the specified action. The selector field itself again consists of two parts, a 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. +Both facilities and priorities are described in syslog(3). The names mentioned +below correspond to the similar LOG_-values in /usr/include/syslog.h. The facility is one of the following keywords: auth, authpriv, cron, daemon, kern, lpr, mail, mark, news, security (same as auth), syslog, user, uucp and |