X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournald.conf.xml;h=2ebbf30a682df31efd2440f9b8c1e2500280f06d;hb=4bfa638d43c05e8db052cd55818765bb3575a405;hp=72d81fbdf454d668173087bb96eed00a4a37c561;hpb=e156d769c3ee756cdb20f8522ace9ea459a82655;p=elogind.git

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 72d81fbdf..2ebbf30a6 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -174,7 +174,7 @@
                                 influences the granularity in which
                                 disk space is made available through
                                 rotation, i.e. deletion of historic
-                                data. Defaults to one eigth of the
+                                data. Defaults to one eighth of the
                                 values configured with
                                 <varname>SystemMaxUse=</varname> and
                                 <varname>RuntimeMaxUse=</varname>, so
@@ -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,30 +265,13 @@
                                 <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 enabled. 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>
 
                                 <listitem><para>Controls where to
                                 store journal data. One of
                                 <literal>volatile</literal>,
-                                <literal>permanent</literal>,
+                                <literal>persistent</literal>,
                                 <literal>auto</literal> and
                                 <literal>none</literal>. If
                                 <literal>volatile</literal> journal
@@ -302,7 +280,7 @@
                                 <filename>/run/log/journal</filename>
                                 hierarchy (which is created if
                                 needed). If
-                                <literal>permanent</literal> data will
+                                <literal>persistent</literal> data will
                                 be stored preferably on disk,
                                 i.e. below the
                                 <filename>/var/log/journal</filename>
@@ -313,11 +291,11 @@
                                 early boot and if the disk is not
                                 writable. <literal>auto</literal> is
                                 similar to
-                                <literal>permanent</literal> but the
+                                <literal>persistent</literal> but the
                                 directory
                                 <filename>/var/log/journal</filename>
                                 is not created if needed, so that its
-                                existance controls where log data
+                                existence controls where log data
                                 goes. <literal>none</literal> turns
                                 off all storage, all log data received
                                 will be dropped. Forwarding to other