summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:19:56 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-25 12:19:56 +0200
commitde71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch)
tree43a91ec3d4c7306c9ddda820b916e8da71b3d065 /doc
parent2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff)
parent8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff)
downloadrsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz
rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.xz
rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip
Merge branch 'v6-stable'
Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
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 12667161..de05d7ae 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.12 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.4.0 (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