From 27678dc430ffc39ff1db774f47e5c367de4d3408 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 5 Aug 2010 14:27:37 +0200
Subject: minor bug fixes

- doc for pmlastmsg and ruleset parsers were hard to read
- pmrfc3164sd had wrong name
---
 ChangeLog                         | 5 +++++
 doc/pmlastmsg.html                | 4 ++--
 doc/rsconf1_rulesetparser.html    | 8 ++++++--
 plugins/pmrfc3164sd/pmrfc3164sd.c | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ad51197..099f57da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------
+Version 5.5.7  [V5-BETA] (rgerhards), 2010-08-??
+- doc bugfix: pmlastmsg doc samples had errors
+- bugfix[minor]: pmrfc3164sd had invalid name (resided in rsyslog name 
+  space, what should not be the case for a contributed module)
+---------------------------------------------------------------------------
 Version 5.5.6  [DEVEL] (rgerhards), 2010-07-21
 - added parser modules
   * pmlastmsg, which supports the notoriously malformed "last message
diff --git a/doc/pmlastmsg.html b/doc/pmlastmsg.html
index 397016df..2abeac6a 100644
--- a/doc/pmlastmsg.html
+++ b/doc/pmlastmsg.html
@@ -36,10 +36,10 @@ should be used. Note that when a parser is specified, the default parser chain
 is removed, so we need to specify all three parsers. We use this together with the
 default ruleset.
 </p>
-<textarea rows="15" cols="80">$ModLoad pmlastline # this parser is NOT a built-in module
+<textarea rows="15" cols="80">$ModLoad pmlastmsg # this parser is NOT a built-in module
 
 # note that parser are tried in the
-# order they appear in rsyslog.conf, so put pmlastline first
+# order they appear in rsyslog.conf, so put pmlastmsg first
 $RulesetParser rsyslog.lastline
 # as we have removed the default parser chain, we
 # need to add the default parsers as well.
diff --git a/doc/rsconf1_rulesetparser.html b/doc/rsconf1_rulesetparser.html
index 84350431..ef29c2a8 100644
--- a/doc/rsconf1_rulesetparser.html
+++ b/doc/rsconf1_rulesetparser.html
@@ -9,7 +9,7 @@
 <p><b>Type:</b> ruleset-specific configuration directive</p>
 <p><b>Parameter Values:</b> string</p>
 <p><b>Available since:</b> 5.3.4+</p>
-<p><b>Default:</b> rsyslog.rfc5424;rsyslog.rfc5425</p>
+<p><b>Default:</b> rsyslog.rfc5424 followed by rsyslog.rfc5425</p>
 <p><b>Description:</b></p>
 <p>
 This directive permits to specify which
@@ -37,7 +37,7 @@ messages that are malformed in various ways. The route to take then is
 <li>make sure you find a custom parser for that device; if there is no one, you
 may consider writing one yourself (it is not that hard) or getting one written
 as part of
-<a href="http://www.rsyslog.com/professional-servcies">Adiscon's professional services
+<a href="http://www.rsyslog.com/professional-services">Adiscon's professional services
 for rsyslog</a>.
 <li>load your custom parsers via $ModLoad
 <li>create a ruleset for each malformed format; assign the custom parser to it
@@ -104,6 +104,10 @@ $UDPServerRun 10514
 $InputUDPServerBindRuleset maldev2
 $UDPServerRun 10515
 </textarea>
+
+<p>For an example of how multiple parser can be chained (and an actual use case), please see
+the example section on the <a href="pmlastmsg.html">pmlastmsg</a> parser
+module.
 <p>Note the positions of the directives. With the current config language,
 <b>sequence of statements is very important</b>. This is ugly, but unfortunately
 the way it currently works.
diff --git a/plugins/pmrfc3164sd/pmrfc3164sd.c b/plugins/pmrfc3164sd/pmrfc3164sd.c
index bc439f3f..41a9252d 100644
--- a/plugins/pmrfc3164sd/pmrfc3164sd.c
+++ b/plugins/pmrfc3164sd/pmrfc3164sd.c
@@ -45,7 +45,7 @@
 #include "unicode-helper.h"
 
 MODULE_TYPE_PARSER
-PARSER_NAME("rsyslog.rfc3164sd")
+PARSER_NAME("contributed.rfc3164sd")
 
 /* internal structures
  */
-- 
cgit