diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:45:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-20 16:45:41 +0200 |
commit | 1bac66db05ecbc078d009c40fcb40093cc7b0bc8 (patch) | |
tree | 96c9ac41d9823d2b62a5502ef432a0b3e6bc25e8 /doc | |
parent | 1ab2bb26d20eaffc36999cb2bb1d7c9be3994c56 (diff) | |
parent | fcb747c57d2b8beacade7194f99fa1de8fb0a4fb (diff) | |
download | rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.gz rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.tar.xz rsyslog-1bac66db05ecbc078d009c40fcb40093cc7b0bc8.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
-rw-r--r-- | doc/rsyslog_conf_filter.html | 2 | ||||
-rw-r--r-- | doc/rsyslog_conf_templates.html | 3 |
2 files changed, 2 insertions, 3 deletions
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> |