diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 15:58:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 15:58:09 +0100 |
| commit | a8ae9582ec88c247124bd983ef7e6f6ef7352006 (patch) | |
| tree | afbf88fb87a031ad9492af7385bc5cc3deda0961 | |
| parent | ee6f5c8ff735cf9a541318c5c59e5c13c6d328c7 (diff) | |
| download | rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.tar.gz rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.tar.bz2 rsyslog-a8ae9582ec88c247124bd983ef7e6f6ef7352006.zip | |
fix merge problem
| -rw-r--r-- | doc/rainerscript.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/rainerscript.html b/doc/rainerscript.html index 19926d37..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 @@ -84,10 +87,6 @@ of a and b should be tested as "a <> 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 |