From 5fccf771f37973a2cea543fbdf1ed94ed9706faf Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 11 Mar 2014 19:04:23 +0100
Subject: Imported Upstream version 7.4.8

---
 doc/rainerscript.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'doc/rainerscript.html')

diff --git a/doc/rainerscript.html b/doc/rainerscript.html
index 7cbbfa9..b83184d 100644
--- a/doc/rainerscript.html
+++ b/doc/rainerscript.html
@@ -34,6 +34,16 @@ return a valid result, as you can't really add two letters (to
 concatenate them, use the concatenation operator &amp;).
 &nbsp;However, all type conversions are automatically done by the
 script interpreter when there is need to do so.<br>
+<h3>Constant Strings</h3>
+<p>String constants are necessary in many places: comparisons,
+configuration parameter values and function arguments, to name a
+few important ones.
+<p>In constant strings, special characters are escape by prepending a
+backslash in front of them -- just in the same way this is done in the
+C programming language or PHP.
+<p>If in doubt how to properly escape, use the
+<a href="http://www.rsyslog.com/rainerscript-constant-string-escaper/">RainerScript
+String Escape Online Tool</a>.
 <h2>Expressions</h2>
 The language supports arbitrary complex expressions. All usual
 operators are supported. The precedence of operations is as follows
@@ -51,6 +61,13 @@ 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>action()</h3>
+The <a href="rsyslog_conf_actions.html">action</a> object is the primary
+means of describing actions to be carried out.
+<h3>global()</h3>
+<p>This is used to set global configuration parameters. For details, please
+see the <a href="global.html">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
-- 
cgit v1.2.3