diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
| commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
| tree | d534a1941848a4f9577076cd11330f3ee014033c /doc/manual.html | |
| parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
| parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
| download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/manual.html b/doc/manual.html index e40f0c06..884c43c0 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also <a href="professional_support.html">professional rsyslog support</a> available directly from the source!</p> -<p><b>This documentation is for version 3.21.5 (devel branch) of rsyslog.</b> +<p><b>This documentation is for version 3.21.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 @@ -78,13 +78,12 @@ wiki</a>, a community resource which includes <a href="http://wiki.rsyslog. <li><a href="http://www.rsyslog.com/module-Static_Docs-view-f-manual.html.phtml">rsyslog online documentation (most current version only)</a></li> -<li><a href="http://www.rsyslog.com/PNphpBB2.phtml">rsyslog -discussion forum - use this for technical support</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> +<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/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> +<li><a href="http://www.rsyslog.com/PNphpBB2.phtml">rsyslog discussion forum - use this for technical support</a></li> +<li><a href="http://kb.monitorware.com/rsyslog-f49.html">deutsches rsyslog forum</a> (forum in German language)</li> </ul> <p>And don't forget about the <a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">rsyslog mailing list</a>. If you are interested in the "backstage", you |