summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:44:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:44:13 +0200
commitf84c8c4e9637748bd3a6a985bd12afa6b50e9797 (patch)
treed2b83642cd1225f350ebe365ea8b59b2eeb90e4d
parentf06862eff598b0355fa5e21424906e48dc7581da (diff)
parent9a0548d290fd8306251c02bc3bb14e1267cd4e8f (diff)
downloadrsyslog-f84c8c4e9637748bd3a6a985bd12afa6b50e9797.tar.gz
rsyslog-f84c8c4e9637748bd3a6a985bd12afa6b50e9797.tar.xz
rsyslog-f84c8c4e9637748bd3a6a985bd12afa6b50e9797.zip
Merge branch 'v4-stable' into v5-stable
-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