diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:40:26 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:40:26 +0100 |
| commit | a6df6a1740956b72acb7cbf9d17a51635ea18dfc (patch) | |
| tree | 35ff58dc4c818df504b7c5d1d38e6ccbcffb2f09 /doc | |
| parent | e983ea31b8d8af4916a60d4074ce4fb663e493a7 (diff) | |
| parent | c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (diff) | |
| download | rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.tar.gz rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.tar.xz rsyslog-a6df6a1740956b72acb7cbf9d17a51635ea18dfc.zip | |
Merge branch 'master' into master-solaris
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/property_replacer.html | 3 | ||||
| -rw-r--r-- | doc/status.html | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/property_replacer.html b/doc/property_replacer.html index 390fc0d0..4d242a34 100644 --- a/doc/property_replacer.html +++ b/doc/property_replacer.html @@ -344,7 +344,8 @@ date-rfc3164-buggyday option can be used in migration scenarios where otherwise lots of scripts would need to be adjusted. It is recommended <i>not</i> to use this option when forwarding to remote hosts - they may treat the date as invalid (especially when parsing strictly according to RFC 3164).</td> -<br><i>This feature was introduced in rsyslog 5.5.3.</i> +<br><i>This feature was introduced in rsyslog 4.6.2 and v4 versions above and +5.5.3 and all versions above.</i> </tr> <tr> <td><b>date-rfc3339</b></td> diff --git a/doc/status.html b/doc/status.html index dfb0c8c6..8a5192cb 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,7 +2,7 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2010-03-04.</p> +<p>This page reflects the status as of 2010-03-08.</p> <h2>Current Releases</h2> <p><b>development:</b> 5.5.2 [2010-02-05] - @@ -13,15 +13,15 @@ <b>v4 development:</b> 4.5.1 [2009-07-15] - <a href="http://www.rsyslog.com/Article388.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-167.phtml">download</a></p> ---> <p><b>beta:</b> 5.3.7 [2010-01-27] - <a href="http://www.rsyslog.com/Article437.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-192.phtml">download</a></p> +--> -<p><b>v5 stable:</b> 5.2.0 [2009-11-02] (recommended to use v5-beta instead) - -<a href="http://www.rsyslog.com/Article421.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-184.phtml">download</a> +<p><b>v5 stable:</b> 5.4.0 [2010-03-08] - +<a href="http://www.rsyslog.com/Article447.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-197.phtml">download</a> <br><b>v4 stable:</b> 4.6.1 [2010-03-04] - <a href="http://www.rsyslog.com/Article445.phtml">change log</a> - |