summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-17 15:26:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-17 15:26:11 +0200
commit16f06168e10d0315cc5d65516043809edd9d2232 (patch)
tree7d28755836998e5ff6a6a6f7ecea1fd0d9077a22 /doc
parent0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff)
parentf84c8c4e9637748bd3a6a985bd12afa6b50e9797 (diff)
downloadrsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.gz
rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.xz
rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog
Diffstat (limited to 'doc')
-rw-r--r--doc/imklog.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/imklog.html b/doc/imklog.html
index 5bfab5ce..f273753f 100644
--- a/doc/imklog.html
+++ b/doc/imklog.html
@@ -65,6 +65,8 @@ Linux only, ignored on other platforms (but may be specified)<br style="font-wei
<p>This is obviously platform specific and requires platform
drivers.
Currently, imklog functionality is available on Linux and BSD.</p>
+<p>This module is <b>not supported on Solaris</b> and not needed there.
+For Solaris kernel input, use <a href="imsolaris.html">imsolaris</a>.</p>
<p><b>Sample:</b></p>
<p>The following sample pulls messages from the kernel log. All
parameters are left by default, which is usually a good idea. Please