diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 14:58:58 +0200 |
| commit | 829385ce407433af0f7679eedb09357ad4055f2e (patch) | |
| tree | 62e9576f42154c5ed29eb3a6c868a08e066e9f6f /doc | |
| parent | 010060289a729dd930ac04b72237f0ca0db9ea1d (diff) | |
| parent | 0550512b28049c391be424ad518ed0debb77089e (diff) | |
| download | rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.gz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.xz rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf.html
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/manual.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 0b03a255..51271701 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p> <p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a> to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the project goals.</p> -<p><b>This documentation is for version 4.1.5 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 4.1.6 (devel branch) of rsyslog.</b> Visit the <i> <a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></b> to obtain current version information and project status. </p><p><b>If you like rsyslog, you might @@ -87,6 +87,7 @@ wiki</a>, a community resource which 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> |