summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-13 02:39:42 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-13 02:39:42 +0200
commit7903677bfba6fd897010d9c5dbb56531bfe0d825 (patch)
tree110e409834bab0fb1edd8f869e911c8d8d510493 /doc/manual.html
parentad777330629c31447018e47b4033a7ebaa9fe655 (diff)
parent15921d4e4e9d03e0cfd4ca5a9745c89b5dcd37c3 (diff)
downloadrsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.tar.gz
rsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.tar.bz2
rsyslog-7903677bfba6fd897010d9c5dbb56531bfe0d825.zip
Merge branch 'v7-stable' into v7-stable-tlsfix
Conflicts: ChangeLog runtime/rsyslog.h
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/manual.html b/doc/manual.html
index fc14031f..dc6453bc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -13,13 +13,13 @@ It is quite compatible to stock sysklogd and can be used as a drop-in
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="http://www.rsyslog.com/professional-services">professional
-rsyslog support</a> available directly from the source!</p>
+novice user. And as we know what enterprise users really need, there are
+also <a href="http://www.rsyslog.com/professional-services"> rsyslog
+professional services</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 7.2.7 (v7.2-stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 7.4.4 (v7.4-stable branch) of rsyslog.</b>
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