diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
| commit | 398966be6d5a94d2602a08305b0533bf4a502a95 (patch) | |
| tree | 6d2a7458311963fb4393ecc8549e1ece2062a7e5 /doc | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/log_rotation_fix_size.html | 2 | ||||
| -rw-r--r-- | doc/rsyslog_conf_output.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/log_rotation_fix_size.html b/doc/log_rotation_fix_size.html index 190b24cb..51edf033 100644 --- a/doc/log_rotation_fix_size.html +++ b/doc/log_rotation_fix_size.html @@ -34,7 +34,7 @@ Channels to achieve this. Putting the following directive</p> # outchannel definiation $outchannel log_rotation,/var/log/log_rotation.log, 52428800,/home/me/./log_rotation_script # activate the channel and log everything to it -*.* $log_rotation +*.* :omfile:$log_rotation # end log rotation via outchannel </pre></p> diff --git a/doc/rsyslog_conf_output.html b/doc/rsyslog_conf_output.html index c52aaa5e..426f2f27 100644 --- a/doc/rsyslog_conf_output.html +++ b/doc/rsyslog_conf_output.html @@ -49,7 +49,7 @@ does not activate it. To do so, you must use a selector line (see below). That selector line includes the channel name plus an $ sign in front of it. A sample might be:<br> <br> -*.* $mychannel<br> +*.* :omfile:$mychannel<br> <br> In its current form, output channels primarily provide the ability to size-limit an output file. To do so, specify a maximum size. When this |