diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
| commit | 92a782dd2fc85c233f7144d86970321f2bfee588 (patch) | |
| tree | 06156dc4e1665a38cedf56d2c4fa4b4f2778b440 /doc/manual.html | |
| parent | 12a433e000cab7ab1737df479aefbaeccab0dc09 (diff) | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| download | rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.gz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.xz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.zip | |
Merge branch 'v5-devel'
Conflicts:
configure.ac
doc/manual.html
plugins/imtcp/imtcp.c
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index 485f0e3f..45ad749d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -111,5 +111,7 @@ any restriction as long as your license is GPLv3 compatible. If your license is you may even be still permitted to use rsyslog source code. However, then you need to look at the way <a href="licensing.html">rsyslog is licensed</a>.</p> <p>Feedback is always welcome, but if you have a support question, please do not -mail Rainer directly (<a href="free_support.html">why not?</a>). +mail Rainer directly (<a href="free_support.html">why not?</a>) - use the +<a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">rsyslogmailing list</a> +or <a href="http://kb.monitorware.com/rsyslog-f40.html">rsyslog formum</a> instead. </body></html> |