diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 16:52:08 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-18 16:52:08 +0100 |
commit | a8760241a30dc2618c53c569d23acdec1e06908e (patch) | |
tree | 3144034ca0a8caf530fbea4b5254d501ab389c09 /doc | |
parent | 8538bbe5afdb2a87f31de38ad26bc519235b4512 (diff) | |
parent | 2f1ef6164afa3a91f0bdd92507d0e8d557bea555 (diff) | |
download | rsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.tar.gz rsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.tar.xz rsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.zip |
Merge branch 'v5-beta'
Conflicts:
plugins/imfile/imfile.c
Diffstat (limited to 'doc')
-rw-r--r-- | doc/imfile.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/imfile.html b/doc/imfile.html index 66c13e06..60726ceb 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -97,10 +97,13 @@ to fatal errors (like power fail). Note that this setting affects imfile performance, especially when set to a low value. Frequently writing the state file is very time consuming. <li><b>$InputFileReadMode</b> [mode]</b><br> -Available in 5.7.3+ +Available in 5.7.5+ <br> Mode to be used when reading lines. 0 (the default) means that each line is forwarded as its own log message. +<li>$InputFileBindRuleset <ruleset><br> +Available in 5.7.5+, 6.1.5+ +Binds the listener to a specific <a href="multi_ruleset.html">ruleset</a>.</li> </ul> <b>Caveats/Known Bugs:</b> <p>So far, only 100 files can be monitored. If more are needed, |