diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
| commit | 99b3b670e81bff0afc877f52cd261b354444aec1 (patch) | |
| tree | 381447d88883777b46965db0dd3e75921b21d58a /doc/manual.html | |
| parent | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (diff) | |
| parent | aef0aba9cd00fb225d2803210586b86a13547ce0 (diff) | |
| download | rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.gz rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.bz2 rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.zip | |
Merge branch 'master' into tmp
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omudpspoof/omudpspoof.c
runtime/rsyslog.h
also updated omuxsock and imptcp to new interfaces
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 62f6103d..bfa94fcc 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 |