summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-15 16:47:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-15 16:47:52 +0200
commit89b92491c813a059487a528e2b055263b4427985 (patch)
tree5c79d90bbedbffcf2f2d73dd98179760d93e9da3
parentc01ed77e5085baec0ad0a8c6ffcb32f11b6939e8 (diff)
downloadrsyslog-89b92491c813a059487a528e2b055263b4427985.tar.gz
rsyslog-89b92491c813a059487a528e2b055263b4427985.tar.xz
rsyslog-89b92491c813a059487a528e2b055263b4427985.zip
preparing for new devel branch (3.21)
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e5715db..36e0feee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
---------------------------------------------------------------------------
+Version 3.21.0 [DEVEL] (rgerhards), 2008-??-??
+---------------------------------------------------------------------------
Version 3.19.11 [BETA] (rgerhards), 2008-??-??
---------------------------------------------------------------------------
Version 3.19.10 [BETA] (rgerhards), 2008-07-15
diff --git a/configure.ac b/configure.ac
index 3e8720f4..43888d64 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],[3.19.11],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.21.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/manual.html b/doc/manual.html
index 91c58a43..fe97ef84 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the
novice user. And as we know what enterprise users really need, there is
also <a href="professional_support.html">professional
rsyslog support</a> available directly from the source!</p>
-<p><b>This documentation is for version 3.19.11 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.21.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