diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 17:18:11 +0100 |
| commit | 545a80918b9a0cc75e12de4a9c718dc875a5276a (patch) | |
| tree | 9db178a3dab87f3e65b64388513dd8f449ada90e /doc | |
| parent | 159abfbc37e8ae4c86e2c7422f18c7d613b33e7d (diff) | |
| parent | a2e69cffff21ad433e61b45f91a2be4d5ebc5c72 (diff) | |
| download | rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.gz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.tar.xz rsyslog-545a80918b9a0cc75e12de4a9c718dc875a5276a.zip | |
Merge branch 'tmp' into v4-stable-tmp
Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index 9d06a497..4939d4c5 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -131,6 +131,7 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a <li><a href="rsconf1_dynafilecachesize.html">$DynaFileCacheSize</a></li> <li><a href="rsconf1_escapecontrolcharactersonreceive.html">$EscapeControlCharactersOnReceive</a></li> <li><b>$EscapeControlCharactersOnReceive</b> [<b>on</b>|off] - escape USASCII HT character</li> +<li>$SpaceLFOnReceive [on/<b>off</b>] - instructs rsyslogd to replace LF with spaces during message reception (sysklogd compatibility aid)</li> <li>$ErrorMessagesToStderr [<b>on</b>|off] - direct rsyslogd error message to stderr (in addition to other targets)</li> <li><a href="rsconf1_failonchownfailure.html">$FailOnChownFailure</a></li> <li><a href="rsconf1_filecreatemode.html">$FileCreateMode</a></li> |