summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-09-19 12:47:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-09-19 12:47:21 +0200
commitceb336f0398e37ab51b4b54a14fa394d53ccdf3f (patch)
tree098edde0c0847cee8d0fdd45d829610caea0e16f
parent6ce87411a6c93b674a9c813928bc853620a4ae3b (diff)
downloadrsyslog-6.3.6.tar.gz
rsyslog-6.3.6.tar.xz
rsyslog-6.3.6.zip
preparing for 6.3.6 releasev6.3.6
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html3
3 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 73b1e5d3..e6ea72ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 6.3.6 [DEVEL] 2011-09-??
+Version 6.3.6 [DEVEL] 2011-09-19
- added $InputRELPServerBindRuleset directive to specify rulesets for RELP
- bugfix: config parser did not support properties with dashes in them
inside property-based filters. Thanks to Gerrit Seré for reporting this.
diff --git a/configure.ac b/configure.ac
index 76b0ed6b..40f5bc8f 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],[6.3.5],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.3.6],[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 f440afdd..07de4530 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.3.5 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.6 (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
@@ -40,6 +40,7 @@ if you do not read the doc, but doing so will definitely improve your experience
<p><b>Follow the links below for the</b></p>
<ul>
<li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
+<li><a href="http://www.rsyslog.com/doc/node1.html">rsyslog.conf, new RainerScript-based format (v6+)</a></li>
<li><a href="rsyslog_conf.html">configuration file format (rsyslog.conf)</a></li>
<li><a href="http://www.rsyslog.com/tool-regex">a regular expression checker/generator tool for rsyslog</a></li>
<li> <a href="property_replacer.html">property replacer, an important core component</a></li>