diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
commit | 2082d963975a88c8e4dee3a43b98d939f9a2323f (patch) | |
tree | 340aa3b7084ed619e994b8bed6edbe77e66c45b2 /doc | |
parent | 9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff) | |
parent | fcc4d77dd371744530e46a29b7534e89cf8251c4 (diff) | |
download | rsyslog-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')
-rw-r--r-- | doc/manual.html | 2 |
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 |