diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
| commit | d0a83a1f7a762010971a9f909a1e28a83fa7cf2c (patch) | |
| tree | 3bb6451baa10296b0cd40fbf25cc2a16238358ee /doc | |
| parent | 9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (diff) | |
| parent | 545a80918b9a0cc75e12de4a9c718dc875a5276a (diff) | |
| download | rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.gz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.xz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.zip | |
Merge branch 'v4-stable-tmp' into v5-devel-tmp
Conflicts:
dirty.h
tools/syslogd.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 1 | ||||
| -rw-r--r-- | doc/rsyslog_conf_templates.html | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index 21786a7f..b254f366 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -143,6 +143,7 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a <li><a href="rsconf1_escape8bitcharsonreceive.html">$Escape8BitCharactersOnReceive</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> diff --git a/doc/rsyslog_conf_templates.html b/doc/rsyslog_conf_templates.html index 23a02049..bd0b3253 100644 --- a/doc/rsyslog_conf_templates.html +++ b/doc/rsyslog_conf_templates.html @@ -146,6 +146,10 @@ with high-precision timestamps and timezone information</li> useful if you send messages to other syslogd's or rsyslogd below version 3.12.5.</li> +<li><span style="font-weight: bold;">RSYSLOG_SysklogdFileFormat</span> +- sysklogd compatible log file format. If used with options: $SpaceLFOnReceive on; +$EscapeControlCharactersOnReceive off; $DropTrailingLFOnReception off, +the log format will conform to sysklogd log format.</li> <li><span style="font-weight: bold;">RSYSLOG_ForwardFormat</span> - a new high-precision forwarding format very similar to the traditional one, but with high-precision timestamps and timezone |