summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-02 11:56:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-02 11:56:34 +0200
commit2082d963975a88c8e4dee3a43b98d939f9a2323f (patch)
tree340aa3b7084ed619e994b8bed6edbe77e66c45b2 /doc/manual.html
parent9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff)
parentfcc4d77dd371744530e46a29b7534e89cf8251c4 (diff)
downloadrsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.gz
rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.xz
rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
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 91c58a43..75b521fd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -16,7 +16,7 @@ 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="professional_support.html">professional
rsyslog support</a> available directly from the source!</p>
-<p><b>This documentation is for version 3.19.11 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 3.19.12 (beta branch) of rsyslog.</b>
Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current
version information and project status.
</p><p><b>If you like rsyslog, you might