diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-07-05 15:14:36 +0200 |
| commit | d9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch) | |
| tree | 861b66fbde7b876413c00e449315e2fbd81b07a5 /doc/rsyslog_conf_templates.html | |
| parent | 149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff) | |
| parent | 9de526eccd85324f8cff4968ac6b17fa66648c2b (diff) | |
| download | rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip | |
Merge branch 'v4-stable' into tmp
Conflicts:
ChangeLog
Makefile.am
tests/Makefile.am
Diffstat (limited to 'doc/rsyslog_conf_templates.html')
| -rw-r--r-- | doc/rsyslog_conf_templates.html | 3 |
1 files changed, 1 insertions, 2 deletions
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> |