diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:49:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:49:40 +0200 |
| commit | eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557 (patch) | |
| tree | 1f309ab4f05918283aebcafb9ffac963d3a4ff39 /doc | |
| parent | d6da57ae0370aeb705f63fd04e575b5ed4684618 (diff) | |
| parent | c64203c7f2c886712c33c21de7e0e53b7939a883 (diff) | |
| download | rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.tar.gz rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.tar.xz rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rsyslog_conf_global.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index e24b0c15..8cfdd303 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -317,7 +317,7 @@ not be reset. </li> <li><a href="rsconf1_umask.html">$UMASK</a></li> </ul> -<p><b>Where <size_nbr> is specified above,</b> +<p><b>Where <size_nbr> or integers are specified above,</b> modifiers can be used after the number part. For example, 1k means 1024. Supported are k(ilo), m(ega), g(iga), t(era), p(eta) and e(xa). Lower case letters refer to the traditional binary defintion (e.g. 1m @@ -325,7 +325,7 @@ equals 1,048,576) whereas upper case letters refer to their new 1000-based definition (e.g 1M equals 1,000,000).</p> <p>Numbers may include '.' and ',' for readability. So you can for example specify either "1000" or "1,000" with the same result. -Please note that rsyslogd simply ignores the punctuation. Form it's +Please note that rsyslogd simply ignores the punctuation. From it's point of view, "1,,0.0.,.,0" also has the value 1000. </p> <p>[<a href="manual.html">manual index</a>] |