diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 10:23:19 +0200 |
| commit | 72c235744023d10e1a9b44c90b65a6b34029e471 (patch) | |
| tree | d6e14606cc430beeead93d68fc46de7ed82915c1 /doc | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| parent | 254dc643c260c0f4a489188b2277811a4104063e (diff) | |
| download | rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.gz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.tar.xz rsyslog-72c235744023d10e1a9b44c90b65a6b34029e471.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/impstats.html | 10 | ||||
| -rw-r--r-- | doc/omrelp.html | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/impstats.html b/doc/impstats.html index 3b4191e8..cede4874 100644 --- a/doc/impstats.html +++ b/doc/impstats.html @@ -22,16 +22,16 @@ settings, this impact may be severe (for high-load environments). </p> <p><b>Configuration Directives</b>:</p> <ul> -<li>$PStatsInterval <Seconds><br> +<li>$PStatInterval <Seconds><br> Sets the interval, in <b>seconds</b> at which messages are generated. Please note that the actual interval may be a bit longer. We do not try to be precise and so the interval is actually a sleep period which is entered after generating all messages. So the actual interval is what is configured here plus the actual time required to generate messages. In general, the difference should not really matter. -<li>$PStatsFacility <numerical facility><br> +<li>$PStatFacility <numerical facility><br> The numerical syslog facility code to be used for generated messages. Default is 5 (syslog).This is useful for filtering messages.</li> -<li>$PStatsSeverity <numerical severity><br> +<li>$PStatSeverity <numerical severity><br> The numerical syslog severity code to be used for generated messages. Default is 6 (info).This is useful for filtering messages.</li> </ul> @@ -45,8 +45,8 @@ stats may not get turned on in all places.</li> <p>This activates the module and records messages to /var/log/rsyslog-stats in 10 minute intervals:<br> </p> <textarea rows="8" cols="60">$ModLoad impstats -$PStatsInterval 600 -$PStatsSeverity 7 +$PStatInterval 600 +$PStatSeverity 7 syslog.debug /var/log/rsyslog-stats </textarea> diff --git a/doc/omrelp.html b/doc/omrelp.html index b3132d78..22e6845f 100644 --- a/doc/omrelp.html +++ b/doc/omrelp.html @@ -44,6 +44,7 @@ special "RSYSLOG_ForwardFormat" (case sensitive!) template is used.<br> # port 2514 *.* :omrelp:centralserv:2514;RSYSLOG_ForwardFormat </textarea> +Note: to use IPv6 addresses, encode them in [::1] format. <p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> <p><font size="2">This documentation is part of the |