summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Bartos <mbartos@redhat.com>2012-11-05 12:09:13 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-11-05 12:09:13 +0100
commit33713481095660a3bc2e220961c21f385c2d1765 (patch)
tree2ec8483acbbed36c3d4fff5bf460f49fcd40c384
parenta3742bdffd0622e8cc151accaadf1a433c0720fd (diff)
downloadrsyslog-33713481095660a3bc2e220961c21f385c2d1765.tar.gz
rsyslog-33713481095660a3bc2e220961c21f385c2d1765.tar.bz2
rsyslog-33713481095660a3bc2e220961c21f385c2d1765.zip
Added imkmsg^imklog to imkmsg documentation.
-rw-r--r--doc/imkmsg.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/imkmsg.html b/doc/imkmsg.html
index 61068d09..23b96147 100644
--- a/doc/imkmsg.html
+++ b/doc/imkmsg.html
@@ -25,9 +25,11 @@ Log messages are parsed as necessary into rsyslog msg_t structure. Continuation
as json key/value pairs and added into rsyslog's message json representation.
</p>
<p><b>Configuration Directives</b>:</p>
-This module has no configuration directives.
+<p>This module has no configuration directives.</p>
<b>Caveats/Known Bugs:</b>
-<p>This is Linux specific module and requires /dev/kmsg device with structured kernel logs.
+<p>This module can't be used together with imklog module. When using one of them, make sure the other
+one is not enabled.</p>
+<p>This is Linux specific module and requires /dev/kmsg device with structured kernel logs.</p>
<p><b>Sample:</b></p>
<p>The following sample pulls messages from the /dev/kmsg log device. All
parameters are left by default, which is usually a good idea. Please