diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-12 08:25:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-12 08:25:05 +0200 |
| commit | b003f8509150cd3a694610edb0ec72d8ca86b667 (patch) | |
| tree | 3dd0a905dbebcc9f2c494b1b5125d8991055e5ec /doc | |
| parent | 7b93d930f2f194969ec24528c2c42d4eebba29f3 (diff) | |
| parent | 8080d3fef6c9d3f1452ff605e05748999b25aa32 (diff) | |
| download | rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.gz rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.xz rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imklog/linux.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/imklog.html | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/imklog.html b/doc/imklog.html index 92c1881a..b5b21e84 100644 --- a/doc/imklog.html +++ b/doc/imklog.html @@ -34,14 +34,19 @@ processing.<span style="font-weight: bold;"></span></li> <li><span style="font-weight: bold;"></span>$DebugPrintKernelSymbols (imklog) [on/<b>off</b>]<br> Linux only, ignored on other platforms (but may be specified)</li> -<li>$klogSymbolLookup (imklog) [<b>on</b>/off] -- -former klogd -x option<br> +<li>$klogSymbolLookup (imklog) [on/<b>off</b>] -- +disables imklog kernel symbol translation (former klogd -x option). NOTE that +this option is counter-productive on recent kernels (>= 2.6) because the +kernel already does the symbol translation and this option breaks the information.<br> +<b>This option is scheduled for removal, probably with version 4.x.</b> Do not use +it except if you have a very good reason. If you have one, let us know +because otherwise new versions will no longer support it.<br> Linux only, ignored on other platforms (but may be specified)</li> <li>$klogUseSyscallInterface (imklog) [on/<b>off</b>] --- former klogd -2 option<br> +-- former klogd -s option<br> Linux only, ignored on other platforms (but may be specified)</li> <li>$klogSymbolsTwice (imklog) [on/<b>off</b>] -- -former klogd -s option<br> +former klogd -2 option<br> Linux only, ignored on other platforms (but may be specified)<br style="font-weight: bold;"> </li> </ul> @@ -66,4 +71,4 @@ Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 3 or higher.</font></p> -</body></html>
\ No newline at end of file +</body></html> |