summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-02 14:49:04 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-02 14:49:04 +0200
commitc250c50633d615ad261d8b3ff0e491f1032de5f6 (patch)
treee684746f76c4ba8086a2b7efee81c18c9e1dad16 /doc
parentae7a01e137f14055f9472408d0cf3ebf9893afba (diff)
parent01adeab0cba21ad6193addf1a4e90689b507d092 (diff)
downloadrsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.gz
rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.tar.xz
rsyslog-c250c50633d615ad261d8b3ff0e491f1032de5f6.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.html1
-rw-r--r--doc/rsyslog_conf.html6
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 87e3d1ed..abaa1ab5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -80,6 +80,7 @@ wiki</a>, a community resource which&nbsp;includes <a href="http://wiki.rsyslog.
online documentation (most current version only)</a></li>
<li><a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog discussion forum - use this for technical support</a></li>
+<li><a href="http://www.rsyslog.com/Topic8.phtml">rsyslog video tutorials</a></li>
<li><a href="http://www.rsyslog.com/Topic4.phtml">rsyslog change log</a></li>
<li><a href="http://www.rsyslog.com/Topic3.phtml">rsyslog FAQ</a></li>
<li><a href="http://www.monitorware.com/en/syslog-enabled-products/">syslog device configuration guide</a> (off-site)</li>
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 8947165c..1a24e793 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -278,7 +278,11 @@ Lines starting with a hash mark ("#'') and empty lines are ignored.
any
format a user might want. They are also used for dynamic file name
generation. Every output in rsyslog uses templates - this holds true
-for files, user messages and so on. The database writer expects its
+for files, user messages and so on.
+Please note that there is an
+<a href="http://www.rsyslog.com/Article354.phtml">online tutorial on rsyslog templates</a>
+available on the web. We recommend viewing it.
+The database writer expects its
template to be a proper SQL statement - so this is highly customizable
too. You might ask how does all of this work when no templates at all
are specified. Good question ;) The answer is simple, though. Templates