summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:52:33 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:52:33 +0200
commitaae2955a895b7753f6b588839325e660c9941aa1 (patch)
tree413569f94c2a17270c5d8c4a31cc91cff657601c /doc
parent85c13205190b29e2c188ed613d61730030cca9db (diff)
parentbac5b5abe4521c4265e493c897cb34996839d5d1 (diff)
downloadrsyslog-aae2955a895b7753f6b588839325e660c9941aa1.tar.gz
rsyslog-aae2955a895b7753f6b588839325e660c9941aa1.tar.xz
rsyslog-aae2955a895b7753f6b588839325e660c9941aa1.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html
index c9021e52..7af5c5eb 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 6.3.9 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.10 (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