summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-28 09:59:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-28 09:59:15 +0200
commit72e1ccbc69d3b6047a98cfd45c00acab76c1d327 (patch)
treef24c632abbbf62399912b5990a7d9928c87a444e
parentdfd541a1224a2ed407010e9924b6eab66c4643ba (diff)
downloadrsyslog-72e1ccbc69d3b6047a98cfd45c00acab76c1d327.tar.gz
rsyslog-72e1ccbc69d3b6047a98cfd45c00acab76c1d327.tar.bz2
rsyslog-72e1ccbc69d3b6047a98cfd45c00acab76c1d327.zip
preparing for 6.5.0 releasev6.5.0
-rw-r--r--ChangeLog3
-rw-r--r--doc/manual.html2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ee5beb0..64dfd613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.5.0 [devel] 2012-0?-??
+Version 6.5.0 [devel] 2012-08-28
- imrelp now supports non-cancel thread termination
(but now requires at least librelp 1.0.1)
- implemented freeCnf() module interface
@@ -18,6 +18,7 @@ Version 6.5.0 [devel] 2012-0?-??
Thanks to Miloslav Trmač for the patch
- $SystemLogParseTrusted config file option
Thanks to Milan Bartos for the patch
+- added template config directive
- added new uuid message property
Thanks to Jérôme Renard for the idea and patches.
Note: patches were released under ASL 2.0, see
diff --git a/doc/manual.html b/doc/manual.html
index de05d7ae..9a8644c9 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 6.4.0 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.5.0 (devel branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might