diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 12:54:49 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 12:54:49 +0200 |
| commit | 8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024 (patch) | |
| tree | bdea958d43cef054f2d9eed45f09957a0a44ec85 /doc | |
| parent | cb2a78b30bf55fd3d356cad7048b9e70968dbb95 (diff) | |
| parent | 10430a189af0ecdbdad6c2542280f6d397ec4752 (diff) | |
| download | rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.gz rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.xz rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.zip | |
Merge branch 'beta' into master-module
Conflicts:
ChangeLog
configure.ac
plugins/imklog/imklog.c
plugins/imklog/imklog.h
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 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 |