summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:53:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-17 14:53:22 +0200
commit359ddad3c5dce82ab48964c1d8b804c4155ea39c (patch)
tree8e93dffd3eff113cc05537d9699d5065dcb06ee4 /doc
parent26a668f8fa352e63aefcc762eadd123002b3895d (diff)
parent943a2070a6f556c48a903d55da0317b5942a41b6 (diff)
downloadrsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.gz
rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.tar.xz
rsyslog-359ddad3c5dce82ab48964c1d8b804c4155ea39c.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
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