diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
| commit | 53265e3c7403c290158b70f7efad2b9388a06e6c (patch) | |
| tree | 6fd45b1de23595348f5f011cff83b5877bac4d73 /doc/rsyslog_conf_global.html | |
| parent | 6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.gz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.xz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/rsyslog_conf_global.html')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index b58ae9c2..9d06a497 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -261,7 +261,8 @@ default may change as uniprocessor systems become less common. [available since <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> -<li>$WorkDirectory <name> (directory for spool and other work files)</li> +<li>$WorkDirectory <name> (directory for spool and other work files. +Do <b>not</b> use trailing slashes)</li> <li>$UDPServerAddress <IP> (imudp) -- local IP address (or name) the UDP listens should bind to</li> <li>$UDPServerRun <port> (imudp) -- former |