Merge tag 'upstream/7.6.1'

Upstream version 7.6.1

1 files changed, 17 insertions, 1 deletions

diff --git a/doc/imptcp.html b/doc/imptcp.html
index aece428..e1e3523 100644
--- a/doc/imptcp.html
+++ b/doc/imptcp.html
@@ -77,7 +77,7 @@ The default, 0, means that the operating system defaults are used. This has only
 effect if keep-alive is enabled. The functionality may not be available on
 all platforms.
 <li><b>KeepAlive.Interval</b> &lt;number&gt;<br>
-The interval between subsequential keepalive probes, regardless of what the connection has exchanged in the meantime.
+The interval between subsequent keepalive probes, regardless of what the connection has exchanged in the meantime.
 The default, 0, means that the operating system defaults are used. This has only 
 effect if keep-alive is enabled. The functionality may not be available on
 all platforms.
@@ -96,12 +96,28 @@ the message was received from.
 Binds specified ruleset to next server defined.
 <li><b>Address</b> &lt;name&gt;<br>
 On multi-homed machines, specifies to which local address the listerner should be bound.
+<li><b>defaultTZ</b> &lt;timezone-info&gt;<br>
+This is an <b>experimental</b> parameter; details may change at any time and it may
+also be discoutinued without any early warning.<br>
+Permits to set a default timezone for this listener. This is useful when working with
+legacy syslog (RFC3164 et al) residing in different timezones. If set it will be used as
+timezone for all messages <b>that do not contain timezone info</b>.
+Currently, the format <b>must</b> be "+/-hh:mm", e.g. "-05:00", "+01:30". Other formats,
+including TZ names (like EST) are NOT yet supported. Note that consequently no daylight
+saving settings are evaluated when working with timezones. If an invalid format is used,
+"interesting" things can happen, among them malformed timestamps and rsyslogd segfaults.
+This will obviously be changed at the time this feature becomes non-experimental.</li>
 <li><b>RateLimit.Interval</b> [number] - (available since 7.3.1) specifies the rate-limiting
 interval in seconds.  Default value is 0, which turns off rate limiting. Set it to a number
 of seconds (5 recommended) to activate rate-limiting.
 </li>
 <li><b>RateLimit.Burst</b> [number] - (available since 7.3.1) specifies the rate-limiting
 burst in number of messages. Default is 10,000.
+<li><b>compression.mode</b><i>mode</i><br>
+<i>mode</i> is one of "none" or "stream:always". 
+It is the counterpart to the compression modes set in
+<a href="omfile.html">omfile</a>.
+Please see it's documentation for details.
 </li>
 </ul>
 <b>Caveats/Known Bugs:</b>