summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-10 17:08:47 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-10 17:08:47 +0100
commit159abfbc37e8ae4c86e2c7422f18c7d613b33e7d (patch)
tree1ef30765ce567edb349c1469d3efd132a96e317d /doc
parent5f662e81de4ec13bd29ec7b686646b2a8996f45d (diff)
parente25dc05e9127537cf2ddbae30b15300f601fbff0 (diff)
downloadrsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.tar.gz
rsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.tar.xz
rsyslog-159abfbc37e8ae4c86e2c7422f18c7d613b33e7d.zip
Merge branch 'tmp' into v4-stable-tmp
Diffstat (limited to 'doc')
-rw-r--r--doc/rsyslog_conf_templates.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_templates.html b/doc/rsyslog_conf_templates.html
index baa4ce29..06cc805e 100644
--- a/doc/rsyslog_conf_templates.html
+++ b/doc/rsyslog_conf_templates.html
@@ -117,6 +117,10 @@ with high-precision timestamps and timezone information</li>
useful if you send&nbsp;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