summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-11-08 18:08:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-11-08 18:08:49 +0100
commit0df3ec66bd4d5872025b65d84c2e86a9c4bdc760 (patch)
treedfa37f3ca0c15c14bb30095d6dd38f66fb66dc4a
parentf81652ce30d2f33557d1e392c9efc3a76cf68b02 (diff)
parent7d4c4340510f1d1207da58812649a06daaff8e6f (diff)
downloadrsyslog-0df3ec66bd4d5872025b65d84c2e86a9c4bdc760.tar.gz
rsyslog-0df3ec66bd4d5872025b65d84c2e86a9c4bdc760.tar.bz2
rsyslog-0df3ec66bd4d5872025b65d84c2e86a9c4bdc760.zip
Merge branch 'v7-stable'
-rw-r--r--doc/rsyslog_conf_global.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index a4d760eb..651808f6 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -67,7 +67,7 @@ default 0 (no delay). Simple rate-limiting!]</li>
<li>$ActionQueueDiscardMark &lt;number&gt; [default
9750]</li>
<li>$ActionQueueDiscardSeverity &lt;number&gt;
-[*numerical* severity! default 4 (warning)]</li>
+[*numerical* severity! default 8 (nothing discarded)]</li>
<li>$ActionQueueFileName &lt;name&gt;</li>
<li>$ActionQueueHighWaterMark &lt;number&gt; [default
8000]</li>