summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--doc/status.html15
4 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 6316a945..e6e27bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
---------------------------------------------------------------------------
+Version 5.5.0 [DEVEL] (rgerhards), 2009-11-??
+---------------------------------------------------------------------------
Version 5.3.5 [BETA] (rgerhards), 2009-11-13
- some light performance enhancement by replacing time() call with much
faster (at least under linux) gettimeofday() calls.
diff --git a/configure.ac b/configure.ac
index d850dfda..eeb2c2f4 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.3.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.5.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 e65628a7..c24d1080 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.3.5 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.5.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
diff --git a/doc/status.html b/doc/status.html
index ff056489..e67323d4 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -2,31 +2,28 @@
<html><head><title>rsyslog status page</title></head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2009-11-05.</p>
+<p>This page reflects the status as of 2009-11-13.</p>
<h2>Current Releases</h2>
+<!-- not at the moment!
<p><b>v5 development:</b> 5.3.4 [2009-11-04] -
<a href="http://www.rsyslog.com/Article423.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-185.phtml">download</a>
<br>
-<!-- not at the moment!
<b>v4 development:</b> 4.5.1 [2009-07-15] -
<a href="http://www.rsyslog.com/Article388.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-167.phtml">download</a></p>
-->
-<!-- not at the moment!
-<br><b>v5-beta:</b> 5.1.6 [2009-10-15] -
-<a href="http://www.rsyslog.com/Article413.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-180.phtml">download</a>
--->
+<br><b>v5-beta:</b> 5.3.5 [2009-11-13] -
+<a href="http://www.rsyslog.com/Article427.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-187.phtml">download</a>
<br><b>v4-beta:</b> 4.5.6 [2009-11-05] -
<a href="http://www.rsyslog.com/Article425.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-186.phtml">download</a></p>
-<p><b>v5 stable:</b> 5.2.0 [2009-11-02] (recommended to use
-<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-183.phtml">5.3.3</a> instead) -
+<p><b>v5 stable:</b> 5.2.0 [2009-11-02] (recommended to use v5-beta instead) -
<a href="http://www.rsyslog.com/Article421.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-184.phtml">download</a>