summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-26 12:12:37 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-26 12:12:37 +0200
commit0944d4b5422b232daadfe4acc6a73c5e2e83c77b (patch)
tree51b0b9377ac5b13b05d319d4951364360a03fb11 /doc
parent7ef0821d4cc8582b01ab56d2fe304993186e40e7 (diff)
parentd19806431653e6575a002ab48206c16d3041e465 (diff)
downloadrsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.tar.gz
rsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.tar.xz
rsyslog-0944d4b5422b232daadfe4acc6a73c5e2e83c77b.zip
Merge branch 'v4-devel' into tmp
Diffstat (limited to 'doc')
-rw-r--r--doc/rsyslog_conf_global.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html
index 2f905877..b71fc761 100644
--- a/doc/rsyslog_conf_global.html
+++ b/doc/rsyslog_conf_global.html
@@ -278,6 +278,9 @@ system is stripped. If set to on, full names are always used.</li>
<li><a href="droppriv.html">$PrivDropToGroupID</a></li>
<li><a href="droppriv.html">$PrivDropToUser</a></li>
<li><a href="droppriv.html">$PrivDropToUserID</a></li>
+<li><b>$Sleep</b> &lt;seconds&gt; - puts the rsyslog main thread to sleep for the specified
+number of seconds immediately when the directive is encountered. You should have a
+good reason for using this directive!</li>
<li><a href="rsconf1_umask.html">$UMASK</a></li>
</ul>
<p><b>Where &lt;size_nbr&gt; is specified above,</b>
@@ -296,7 +299,7 @@ point of view, "1,,0.0.,.,0" also has the value 1000. </p>
[<a href="http://www.rsyslog.com/">rsyslog site</a>]</p>
<p><font size="2">This documentation is part of the
<a href="http://www.rsyslog.com/">rsyslog</a> project.<br>
-Copyright &copy; 2008, 2009 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
+Copyright &copy; 2008-2010 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
<a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL
version 3 or higher.</font></p>
</body>