diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:10:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 14:10:45 +0200 |
| commit | 1b1b6b85e66281939a31685254565845d8d192a0 (patch) | |
| tree | 0e5af6c9cc1b3b6da8135f509ce0b8a0f0390c7d | |
| parent | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff) | |
| parent | 1be79730693be187e99319377cf110fba41cc801 (diff) | |
| download | rsyslog-1b1b6b85e66281939a31685254565845d8d192a0.tar.gz rsyslog-1b1b6b85e66281939a31685254565845d8d192a0.tar.xz rsyslog-1b1b6b85e66281939a31685254565845d8d192a0.zip | |
Merge branch 'v4-devel'
Conflicts:
doc/Makefile.am
doc/manual.html
doc/professional_support.html
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | doc/professional_support.html | 27 |
4 files changed, 3 insertions, 31 deletions
@@ -511,7 +511,7 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14 Thanks for varmojfekoj for pointing me at this bug. - imported changes from 4.5.6 and below --------------------------------------------------------------------------- -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 @@ -1137,7 +1137,7 @@ version before switching to this one. - bugfix: memory leak in ompgsql Thanks to Ken for providing the patch --------------------------------------------------------------------------- -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/doc/Makefile.am b/doc/Makefile.am index 253fe998..e4e7696b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -46,7 +46,6 @@ html_files = \ imuxsock.html \ imklog.html \ pmlastmsg.html \ - professional_support.html \ queues.html \ src/queueWorkerLogic.dia \ queueWorkerLogic.jpg \ diff --git a/doc/manual.html b/doc/manual.html index fb6fed5d..732eb383 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -14,7 +14,7 @@ replacement. Its <a href="features.html"> advanced features</a> make it suitable for enterprise-class, <a href="rsyslog_tls.html">encryption protected syslog</a> 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 +also <a href="http://www.rsyslog.com/professional-services">professional 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 diff --git a/doc/professional_support.html b/doc/professional_support.html deleted file mode 100644 index de3ac800..00000000 --- a/doc/professional_support.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<meta http-equiv="Content-Language" content="en"> -<title>Professional Support for Rsyslog</title> -</head> - -<body> -<h1><a href="http://www.rsyslog.com/Article412.phtml">Professional Services for Rsyslog</a></h1> -<p>Professional services are being offered by <a href="http://www.adiscon.com">Adiscon</a>, the company -that sponsors rsyslog development. For details, please contact <a href="mailto:info%40adiscon.com">Adiscon Sales</a>.</p> - -<p>In an effort to keep the documentation set clean and enable Adiscon to enhance the -professional offerings, the actual -<a href="http://www.rsyslog.com/Article412.phtml">rsyslog service offering</a> -has been moved to a -<a href="http://www.rsyslog.com/Article412.phtml">separate page</a>. -Please follow that link for details. - -<p>[<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> -<p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> -project.<br> -Copyright © 2008, 2009 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and -<a href="http://www.adiscon.com/">Adiscon</a>. -Released under the GNU GPL version 3 or higher.</font></p> -</body> -</html> |