summaryrefslogtreecommitdiffstats
path: root/doc/rainerscript.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-29 15:53:22 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-29 15:53:22 +0100
commitee6f5c8ff735cf9a541318c5c59e5c13c6d328c7 (patch)
treec31f3c915e946bc38b827d964264076c454d1293 /doc/rainerscript.html
parent8bf869fafbcc53a134e2842e4fc894ee27ee1c7f (diff)
parentc66ac7d6f1dc53dbae8e99e1a3954d65d418fc2a (diff)
downloadrsyslog-ee6f5c8ff735cf9a541318c5c59e5c13c6d328c7.tar.gz
rsyslog-ee6f5c8ff735cf9a541318c5c59e5c13c6d328c7.tar.bz2
rsyslog-ee6f5c8ff735cf9a541318c5c59e5c13c6d328c7.zip
Merge branch 'v7-stable' into v7-devel
Diffstat (limited to 'doc/rainerscript.html')
-rw-r--r--doc/rainerscript.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/rainerscript.html b/doc/rainerscript.html
index 0a780ac4..19926d37 100644
--- a/doc/rainerscript.html
+++ b/doc/rainerscript.html
@@ -84,6 +84,10 @@ of a and b should be tested as "a &lt;&gt; b". The "not" operator
should be reserved to cases where it actually is needed to form a
complex boolean expression. In those cases, parenthesis are highly
recommended.
+<h2>configuration objects</h2>
+<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>Lookup Tables</h2>
<p><a href="lookup_tables.html">Lookup tables</a> are a powerful construct
to obtain "class" information based on message content (e.g. to build