X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=2ebbf30a682df31efd2440f9b8c1e2500280f06d;hb=405053fafa88022c68e7adf04c91a56c1cde7dd8;hp=d7caea83cce6018be4d8b6a1eaba63c403b917c2;hpb=49f43d5f91a99b23f745726aa351d8f159774357;p=elogind.git

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index d7caea83c..2ebbf30a6 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -210,17 +210,12 @@
                                 is running the respective option has
                                 no effect. By default only forwarding
                                 to syslog is enabled. These settings
-                                may be overridden at boot time with the
-                                kernel command line options
+                                may be overridden at boot time with
+                                the kernel command line options
                                 <literal>systemd.journald.forward_to_syslog=</literal>,
                                 <literal>systemd.journald.forward_to_kmsg=</literal>
                                 and
-                                <literal>systemd.journald.forward_to_console=</literal>. If
-                                forwarding to the kernel log buffer and
-                                <varname>ImportKernel=</varname> is
-                                enabled at the same time care is taken
-                                to avoid logging loops. It is safe to
-                                use these options in combination.
+                                <literal>systemd.journald.forward_to_console=</literal>.
                                 </para></listitem>
                         </varlistentry>
 
@@ -270,23 +265,6 @@
                                 <filename>/dev/console</filename>.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><varname>ImportKernel=</varname></term>
-
-                                <listitem><para>Controls whether
-                                kernel log messages shall be stored in
-                                the journal. Takes a boolean argument
-                                and defaults to disabled. Note that
-                                currently only one userspace service
-                                can read kernel messages at a time,
-                                which means that kernel log message
-                                reading might get corrupted if it
-                                is enabled in more than one service,
-                                for example in both the journal and a
-                                traditional syslog service.
-                                </para></listitem>
-                        </varlistentry>
-
                         <varlistentry>
                                 <term><varname>Storage=</varname></term>