summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-27 10:45:45 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-27 10:45:45 +0100
commit306ba17b54bd89843ad083f23e11fde43758f928 (patch)
treefeeeb111983360f51c58c5fb6650f938ecb7de86 /doc
parentf77dc853ed217e824d86bf8feb0c6e75cc0f230e (diff)
parent26893eb8edfa38fb06c61379919a817dadf01615 (diff)
downloadrsyslog-306ba17b54bd89843ad083f23e11fde43758f928.tar.gz
rsyslog-306ba17b54bd89843ad083f23e11fde43758f928.tar.xz
rsyslog-306ba17b54bd89843ad083f23e11fde43758f928.zip
Merge branch 'v4-devel' into master
I needed to (temporarily) remove the $EscapeControlCharacterTab config directive as it no longer fits into the rewritten rsyslog parser part. Conflicts: dirty.h tools/syslogd.c
Diffstat (limited to 'doc')
-rw-r--r--doc/rsyslog_conf_global.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index beb90e02..8796de65 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -141,6 +141,7 @@ our paper on <a href="multi_ruleset.html">using multiple rule sets in rsyslog</a
<li><a href="rsconf1_droptrailinglfonreception.html">$DropTrailingLFOnReception</a></li>
<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>$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>