summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-11-30 12:11:09 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-11-30 12:11:09 +0100
commitd1ccc0302653017782a59c3ff9e5f7e69811173e (patch)
tree0b2de603f6a8182c73fab29d1d0c63e24b29197b /doc/manual.html
parent786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (diff)
parent1aac36dfd077073a76b80368f893810e1741a1ec (diff)
downloadrsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.gz
rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.xz
rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.zip
Merge branch 'v5-devel'v6.1.1
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 6affe746..ab1725fb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ 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 5.7.1 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.1.1 (beta 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