diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
| commit | 68a01594000b788e530ee8f716545dafccf85982 (patch) | |
| tree | c5b54c9add730528f99c816db4faa55dfcfdbd1a /doc/manual.html | |
| parent | e8e881e9795e5dc9fc14fd7f34523bcd6ae13106 (diff) | |
| parent | f09ee69ee1b7f8c098d0720c8e85a6753cc7d342 (diff) | |
| download | rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.gz rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.xz rsyslog-68a01594000b788e530ee8f716545dafccf85982.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/manual.html')
| -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 db9eb907..a5a26e75 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.8.2 (stable branch) of rsyslog.</b> +<p><b>This documentation is for version 5.8.2 (v5-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 |