summaryrefslogtreecommitdiffstats
path: root/doc/rainerscript.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-29 16:59:19 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-29 16:59:19 +0100
commitc4501ebb5263b3b85bc6a854fcc3b6a35e94840a (patch)
tree8ecca199cfeba599e1465e4426b55ca9a67da3b0 /doc/rainerscript.html
parent56e2157bae6e5ad9e64ef672735a6e6e45e34312 (diff)
parenta98b1822a389cd209cb7a6660060abf995fbf715 (diff)
downloadrsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.gz
rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.bz2
rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.zip
Merge branch 'v7-devel' into tmp
Conflicts: action.c
Diffstat (limited to 'doc/rainerscript.html')
-rw-r--r--doc/rainerscript.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/rainerscript.html b/doc/rainerscript.html
index 0a780ac4..217ef28a 100644
--- a/doc/rainerscript.html
+++ b/doc/rainerscript.html
@@ -67,6 +67,9 @@ $MainMsgQ... statements are ignored.
<p>Example:</p>
<textarea rows="2" cols="60">main_queue(queue.size="100000" queue.type="LinkedList")
</textarea>
+<h3>global()</h3>
+<p>This is used to set global configuration parameters. For details, please
+see the <a href="rsyslog_global">rsyslog global configuration object</a>.
<h2>Expressions</h2>
The language supports arbitrary complex expressions. All usual
operators are supported. The precedence of operations is as follows