diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
commit | c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (patch) | |
tree | 107991afae384af32c95be306c86f387ea67083b /doc | |
parent | 81c9cf86267fb0ec1156e578439d09499c97e80f (diff) | |
parent | de7726cbf0957384cc9261ac47d6bf65906739b5 (diff) | |
download | rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.gz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.xz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.zip |
Merge branch 'v5-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/property_replacer.html
runtime/datetime.h
Diffstat (limited to 'doc')
-rw-r--r-- | doc/property_replacer.html | 3 |
1 files changed, 2 insertions, 1 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> |