From 0b198ebc5935716111e349b4061f5d6999559407 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 11 Jul 2008 16:54:38 +0200
Subject: prepared for 3.18.0 release

---
 ChangeLog       | 4 +++-
 configure.ac    | 4 +---
 doc/Makefile.am | 6 ++++++
 doc/manual.html | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a058063..d945bf81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---------------------------------------------------------------------------
-Version 3.18.0 (rgerhards), 2008-07-??
+Version 3.18.0 (rgerhards), 2008-07-11
+- begun a new v3-stable based on former 3.17.4 beta plus patches to
+  previous v3-stable
 - bugfix in RainerScript: syntax error was not always detected
 ---------------------------------------------------------------------------
 Version 3.17.5 (rgerhards), 2008-06-27
diff --git a/configure.ac b/configure.ac
index d55cb93a..a2f5172d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rsyslog],[3.17.5],[rsyslog@lists.adiscon.com])
-=======
-AC_INIT([rsyslog],[3.16.3],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[3.18.0],[rsyslog@lists.adiscon.com])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([syslogd.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 653ed627..518b90ed 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -72,6 +72,12 @@ html_files = \
 	rsconf1_resetconfigvariables.html \
 	rsconf1_umask.html \
 	v3compatibility.html \
+	gssapi.html \
+	licensing.html \
+	ommail.html \
+	omrelp.html \
+	status.html \
+	troubleshoot.html \
 	src/classes.dia
 
 EXTRA_DIST = $(html_files)
diff --git a/doc/manual.html b/doc/manual.html
index 9a017faf..5b2a039f 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.17.5 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.18.0 (v3-stable 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
-- 
cgit