diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:09:51 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:09:51 +0200 |
commit | 8d8d1f01e1cd6ae372088a3ebddc27983e9a0185 (patch) | |
tree | 8aa389a25e899e4ebe26554d3228307020056c75 /doc | |
parent | b81c4252e808de51c022bbfda96a91ddc697e86c (diff) | |
parent | 8bab264ba168b5fee36a7b45020e5e2172c74224 (diff) | |
download | rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.tar.gz rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.tar.xz rsyslog-8d8d1f01e1cd6ae372088a3ebddc27983e9a0185.zip |
Merge branch 'v4-beta' 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 03ed2ff6..90af6940 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 5.1.5 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 5.1.6 (devel 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 |