summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-27 12:03:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-27 12:03:01 +0200
commitbfdca9ea1835492bec363a36014f6c43bb1e8a56 (patch)
tree76b4ea35ed5cdf4ae79f7d52216327f773b810ce /doc
parent2cccec9a9ff5a5d1b0db6f869a525c4b3c601c33 (diff)
parent6812fceef4f955610e6075c798f729e7a0617b24 (diff)
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 7af5c5eb..1bc8f1f7 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.10 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.11 (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