Merge branch 'v3-stable' into v4-stable

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/professional_support.html

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/manual.html b/doc/manual.html
index 4a292832..15396eb5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -14,14 +14,14 @@ 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
 project goals.</p>
 <p><b>This documentation is for version 4.6.3 (v4-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.
+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
 want to lend us a helping hand. </b>It doesn't require a lot of
 time - even a single mouse click helps. Learn <a href="how2help.html">how to help the rsyslog project</a>.