summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf_global.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-07-05 15:14:36 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-07-05 15:14:36 +0200
commitd9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch)
tree861b66fbde7b876413c00e449315e2fbd81b07a5 /doc/rsyslog_conf_global.html
parent149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff)
parent9de526eccd85324f8cff4968ac6b17fa66648c2b (diff)
downloadrsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz
rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz
rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip
Merge branch 'v4-stable' into tmp
Conflicts: ChangeLog Makefile.am tests/Makefile.am
Diffstat (limited to 'doc/rsyslog_conf_global.html')
-rw-r--r--doc/rsyslog_conf_global.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index 7d223c1b..ca0c9941 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -236,7 +236,7 @@ in that case by sending rsyslogd a HUP signal.
of the output file. The higher the number, the better the compression, but also the
more CPU is required for zipping.</li>
<li><b>$OMFileIOBufferSize</b> &lt;size_nbr&gt;, default 4k, size of the buffer used to writing output data. The larger the buffer, the potentially better performance is. The default of 4k is quite conservative, it is useful to go up to 64k, and 128K if you used gzip compression (then, even higher sizes may make sense)</li>
-<li><b>$OMFileFlushOnTXEnd</b> &lt;[on/<b>off</b>]&gt;, default ff. Omfile has the
+<li><b>$OMFileFlushOnTXEnd</b> &lt;[<b>on</b>/off]&gt;, default on. Omfile has the
capability to
write output using a buffered writer. Disk writes are only done when the buffer is
full. So if an error happens during that write, data is potentially lost. In cases where
@@ -244,7 +244,7 @@ this is unacceptable, set $OMFileFlushOnTXEnd to on. Then, data is written at th
of each transaction (for pre-v5 this means after <b>each</b> log message) and the usual
error recovery thus can handle write errors without data loss. Note that this option
severely reduces the effect of zip compression and should be switched to off
-for that use case. Note that the default -off- is primarily an aid to preserve
+for that use case. Note that the default -on- is primarily an aid to preserve
the traditional syslogd behaviour.</li>
<li><a href="rsconf1_omfileforcechown.html">$omfileForceChown</a> - force ownership change for all files</li>
<li><b>$RepeatedMsgContainsOriginalMsg</b> [on/<b>off</b>] - "last message repeated n times" messages, if generated,