From fcb747c57d2b8beacade7194f99fa1de8fb0a4fb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 20 May 2010 16:43:46 +0200
Subject: some doc fixes; incorrect config samples could cause confusion

thanks to Anthony Edwards for pointing the problems out
---
 ChangeLog                       | 2 ++
 doc/rsyslog_conf_filter.html    | 2 +-
 doc/rsyslog_conf_templates.html | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c77751a..0b9844d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Version 4.6.3  [v4-stable] (rgerhards), 2010-04-??
   message-induced off-by-one error (potential segfault) (see 4.6.2)
   The analysis has been completed and a better fix been crafted and 
   integrated.
+- 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>
 \ = \\ --&gt; '\' 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>
-- 
cgit v1.2.3