From 8d55f7a6317150e48ba5eeda20d7c64f978ab974 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 27 Jul 2010 12:47:11 +0200
Subject: bumped version numbers

---
 ChangeLog       | 13 +++++++++++++
 configure.ac    |  2 +-
 doc/manual.html |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8da88c4d..1903f959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
 ---------------------------------------------------------------------------
+Version 6.1.0  [DEVEL] (rgerhards), 2010-07-??
+
+*********************************** NOTE **********************************
+The v6 versions of rsyslog feature a greatly redesigned config system 
+which, among others, supports scoping. However, the initial version does
+not contain the whole new system. Rather it will evolve. So it is
+expected that interfaces, even new ones, break during the initial
+6.x.y releases.
+*********************************** NOTE **********************************
+
+- added $Begin, $End and $ScriptScoping config scope statments
+  (at this time for actions only).
+---------------------------------------------------------------------------
 Version 5.5.6  [DEVEL] (rgerhards), 2010-07-21
 - added parser modules
   * pmlastmsg, which supports the notoriously malformed "last message
diff --git a/configure.ac b/configure.ac
index bcfdaf2f..485d71e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[5.5.6],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.1.0],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index 99e44fc2..ca93addc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
 <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
 to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
 project goals.</p>
-<p><b>This documentation is for version 5.5.6 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.1.0 (devel branch) of rsyslog.</b>
 Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b>
 to obtain current version information and project status.
 </p><p><b>If you like rsyslog, you might
-- 
cgit v1.2.3