diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
| commit | 29cacc3c8ad6694b1ae2a5480fca7059773d06f0 (patch) | |
| tree | 1c4996d03a90ddb4ad6ea236ee8f72194a13b99e /doc | |
| parent | cbbf1586a204a897a050b6cb294b120e3ff5f23c (diff) | |
| parent | d7c98e7a6ec28a6c76bccf16d83f36b34a705410 (diff) | |
| download | rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.gz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.xz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.zip | |
Merge branch 'master' into v5-devel
Conflicts:
tests/Makefile.am
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index c1f1bcac..a3cb8ba5 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -198,7 +198,7 @@ large enough for the whole message. (Introduced with 4.1.5). Once set, it affect <li><a href="rsconf1_resetconfigvariables.html">$ResetConfigVariables</a></li> <li><b>$OptimizeForUniprocessor</b> [on/<b>off</b>] - turns on optimizatons which lead to better performance on uniprocessors. If you run on multicore-machiens, turning this off lessens CPU load. The -default may change as uniprocessor systems become less common.</li> +default may change as uniprocessor systems become less common. [available since 4.1.0]</li> <li>$PreserveFQDN [on/<b>off</b>) - if set to off (legacy default to remain compatible to sysklogd), the domain part from a name that is within the same domain as the receiving system is stripped. If set to on, full names are always used.</li> |