From 33a2855c69bf1a86ca658fcbcee8eea6b6e23221 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 5 Aug 2010 11:33:14 +0200 Subject: preparing for 3.22.2 --- ChangeLog | 2 +- configure.ac | 2 +- doc/Makefile.am | 1 - doc/manual.html | 6 +-- doc/professional_support.html | 88 ------------------------------------------- 5 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 doc/professional_support.html diff --git a/ChangeLog b/ChangeLog index 5864d934..6d67a35e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? +Version 3.22.2 [v3-stable] (rgerhards), 2010-08-05 - bugfix: comment char ('#') in literal terminated script parsing and thus could not be used. but tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=119 diff --git a/configure.ac b/configure.ac index 987a8fb9..ce6d6165 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],[3.22.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.22.2],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/Makefile.am b/doc/Makefile.am index d38d4d0b..e9b6fe96 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -39,7 +39,6 @@ html_files = \ imrelp.html \ imuxsock.html \ imklog.html \ - professional_support.html \ queues.html \ src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ diff --git a/doc/manual.html b/doc/manual.html index 22fd63b8..424caf21 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -14,10 +14,10 @@ replacement. Its advanced features make it suitable for enterprise-class, encryption protected syslog 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 professional +also professional rsyslog support available directly from the source!

-

This documentation is for version 3.22.1 (v3-stable branch) of rsyslog. -Visit the rsyslog status page to obtain current +

This documentation is for version 3.22.2 (v3-stable branch) of rsyslog. +Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might want to lend us a helping hand. It doesn't require a lot of diff --git a/doc/professional_support.html b/doc/professional_support.html deleted file mode 100644 index 2cb6c1e1..00000000 --- a/doc/professional_support.html +++ /dev/null @@ -1,88 +0,0 @@ - - -Professional Support for Rsyslog - - - -

Professional Services for Rsyslog

-

Professional services are being offered by Adiscon, the company -that sponsors rsyslog development. For details, please contact Adiscon Sales

- -

EMail Support Service

-Price: 99.00 EURO
-Duration: 180 days -
-Support level: 8x5 -

Purchase rsyslog support directly from the source. This -contract provides priority email support. It is a great option if you -need to provide proof of software support in your organization. This -contract provides

- -

Under this contract, fixes for old rsyslog releases will be -provided / created, provided that it is possible to do that with the -code base in question. Phone support is not included.

-

Custom-Written Config File

-Price: 29.00 EURO -
-Duration: N/A -
-Support level: 8x5 -

Creating rsyslog config files is easy - but if you would like -to have that extra feature and have no time to do it, this service is -for you. Important: BEFORE you purchase this service, contact us and -inquire (via info@adiscon.com) -whether or not your desired result can be achieved via rsyslog. Once -this is clear, order the service and we will ship a custom-made -configuration file within 5 working days (at latest, most often much -faster). For security reasons, we will not put passwords into the -configuration file, but will place easy to read comments in the places -where you need to put them in. The agreement is governed under German -law. You may also purchase this service if you would like to have your -own configuration file reviewed, e.g. for auditing purposes.

-

Custom Development

-

Do you need an exotic feature that otherwise would not be implemented? -Do you need something really quick, quicker than it is available via -the regular development schedule? Then, you may consider funding -development for a specific functionality. We are always looking for -interesting projects. If you hire us to to do the job, you can be sure -to get the best possible and probably quickest solution, because we are -obviously at the heart of the source code. No need to get aquainted to -anything, no risk of misunderstanding program concepts. Benefit from -our vast syslog experience.

-

Please note that custom development is not limited to rsyslog. We offer -a number of logging solutions and can also work as part of your time -for specific requirements. The opportunities are endless, just ask. We -will work with you on your requirements and provide a quote on the -estimated cost. Just write to sales@adiscon.com for details.

Consulting Services

-

Do you have demanding logging requirements? Why not talk to a -real logging professional? Instead of trying to find the solution -like a needle in the haystack, talk to the team that brought rsyslog, -phpLogCon, the Windows MonitorWare products and other logging -solutions. We sweat logging for over 15 years now and can help quickly. -Depending on your needs, consulting can be carried out via email, the -phone or on your premises (for larger or local projects). Everything is -possible, it just depends on your needs. Consulting services are -available in English and German. Just mail sales@adiscon.com what you are interested in and we will work with you on a proposal that fits your needs. -

All agreements are -governed under German law. -

- -

[manual index] [rsyslog site]

-

This documentation is part of the -rsyslog -project.
-Copyright © 2008 by Rainer -Gerhards and -Adiscon. -Released under the GNU GPL version 3 or higher.

- \ No newline at end of file -- cgit From 318adf58de35d7b8c6ca891b93c351220628586b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 5 Aug 2010 13:57:12 +0200 Subject: preparing for 4.6.4 --- ChangeLog | 2 +- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5fed292..df29694c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 4.6.4 [v4-stable] (rgerhards), 2010-??-?? +Version 4.6.4 [v4-stable] (rgerhards), 2010-08.05 - bugfix: zero-sized (empty) messages were processed by imtcp they are now dropped as they always should have been - bugfix: programname filter in ! configuration can not be reset diff --git a/configure.ac b/configure.ac index e41b76f4..bc3965d5 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],[4.6.3],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[4.6.4],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/doc/manual.html b/doc/manual.html index 15396eb5..aff23c8b 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support available directly from the source!

Please visit the rsyslog sponsor's page to honor the project sponsors or become one yourself! We are very grateful for any help towards the project goals.

-

This documentation is for version 4.6.3 (v4-stable branch) of rsyslog. +

This documentation is for version 4.6.4 (v4-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit