diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:46:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:46:56 +0200 |
| commit | 4b906fe9cf75948ebb600a8734ad440edc741f38 (patch) | |
| tree | 2c2b909215fc64b911ba02ef5e092564c625afc2 | |
| parent | d9bec41238de36fbc9be2bc36c5aadac2c99f2a3 (diff) | |
| parent | 1bac66db05ecbc078d009c40fcb40093cc7b0bc8 (diff) | |
| download | rsyslog-4b906fe9cf75948ebb600a8734ad440edc741f38.tar.gz rsyslog-4b906fe9cf75948ebb600a8734ad440edc741f38.tar.xz rsyslog-4b906fe9cf75948ebb600a8734ad440edc741f38.zip | |
Merge branch 'v4-devel'
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/rsyslog_conf_filter.html | 2 | ||||
| -rw-r--r-- | doc/rsyslog_conf_templates.html | 3 |
3 files changed, 4 insertions, 3 deletions
@@ -503,6 +503,8 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-03-?? all 32-bit platforms - bugfix: local unix system log socket was deleted even when it was not configured +- some doc fixes; incorrect config samples could cause confusion + thanks to Anthony Edwards for pointing the problems out --------------------------------------------------------------------------- Version 4.6.2 [v4-stable] (rgerhards), 2010-03-26 - new feature: "." action type added to support writing files to relative diff --git a/doc/rsyslog_conf_filter.html b/doc/rsyslog_conf_filter.html index 841ec9c7..63c29817 100644 --- a/doc/rsyslog_conf_filter.html +++ b/doc/rsyslog_conf_filter.html @@ -231,7 +231,7 @@ A few quick samples:<br> <br> <code> *.* /var/log/file1 # the traditional way<br> -if $msg contains 'error' /var/log/errlog # the expression-based way<br> +if $msg contains 'error' then /var/log/errlog # the expression-based way<br> </code> <br> Right now, you need to specify numerical values if you would like to diff --git a/doc/rsyslog_conf_templates.html b/doc/rsyslog_conf_templates.html index 6c68b801..baa4ce29 100644 --- a/doc/rsyslog_conf_templates.html +++ b/doc/rsyslog_conf_templates.html @@ -87,8 +87,7 @@ option. Otherwise you will become vulnerable to SQL injection. <br> To escape:<br> % = \%<br> \ = \\ --> '\' is used to escape (as in C)<br> -$template TraditionalFormat,%timegenerated% %HOSTNAME% -%syslogtag%%msg%\n"<br> +$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg%\n"<br> <br> Properties can be accessed by the <a href="property_replacer.html">property replacer</a> (see there for details).</p> |