diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:50:55 +0200 |
commit | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (patch) | |
tree | ec1023ab0ad27589a6f425c79855f92f7637b686 /doc/manual.html | |
parent | f02d77f4b45d0a5a0ce86a87f056c91de1e4b731 (diff) | |
parent | ebba229db9d89e69b60e542e3c49f25ed9ebc6fc (diff) | |
download | rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.gz rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.tar.bz2 rsyslog-d72fe36f868ea12f246ed23bb81ece0240dd6c12.zip |
Merge branch 'master' into newconf
Conflicts:
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 ca93addc..62f6103d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -20,7 +20,7 @@ rsyslog support</a> available directly from the source!</p> 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.1.0 (devel branch) of rsyslog.</b> -Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></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 want to lend us a helping hand. </b>It doesn't require a lot of |