prepare for 7.3.6v7.3.6

4 files changed, 19 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index e1bb9481..a262794a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 ---------------------------------------------------------------------------
-Version 7.3.6  [devel] 2012-12-??
+Version 7.3.6  [devel] 2013-01-28
+- greatly improved speed of large-array  [N]EQ RainerScript comparisons
+  Thanks to David Lang for a related discussion that inspired the idea
+  to do this with a much simpler (yet sufficient) approach than orignally
+  planned for.
+- greatly improved speed of DNS cache for large cache sizes
+- general performance improvements
 - omfile: added stats counters for dynafile caches
 - omfile: improved async writing, finally enabled full async write
   also fixed a couple of smaller issues along that way
@@ -11,10 +17,6 @@ Version 7.3.6  [devel] 2012-12-??
 - fix compile problem in imklog
 - added capability to output thread-id-to-function debug info
   This is a useful debug aid, but nothing of concern for regular users.
-- greatly improved speed of large-array  [N]EQ RainerScript comparisons
-  Thanks to David Lang for a related discussion that inspired the idea
-  to do this with a much simpler (yet sufficient) approach than orignally
-  planned for.
 ---------------------------------------------------------------------------
 Version 7.3.5  [devel] 2012-12-19
 - ommysql: addded batching/transaction support
diff --git a/configure.ac b/configure.ac
index db4d8149..e9fce3f7 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],[7.3.6.ex8],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[7.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 1d8e1f19..05a03e29 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ professional services</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 7.3.5 (devel branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.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
diff --git a/platform/redhat/rsyslog.conf b/platform/redhat/rsyslog.conf
index 2210962b..340874d1 100644
--- a/platform/redhat/rsyslog.conf
+++ b/platform/redhat/rsyslog.conf
@@ -1,11 +1,13 @@
-# rsyslog configuration file (for Red Hat-based systems)
-# note that most of this config file uses old-style format,
-# because it is well-known AND quite suitable for simple cases
-# like we have with the default config. For more advanced 
-# things, RainerScript configuration is suggested.
-
-# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
-# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+/* rsyslog configuration file (for Red Hat-based systems)
+ * note that most of this config file uses old-style format,
+ * because it is well-known AND quite suitable for simple cases
+ * like we have with the default config. For more advanced 
+ * things, RainerScript configuration is suggested.
+ *
+ * For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
+ * or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html 
+ * If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
+ */
 
 #### MODULES ####