mount: don't creat local-fs.target links for mount units when runnin in user mode

[elogind.git] / man / systemd-journald.service.xml

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 45091c62abb1804b02db4e911d6b6b54c17aec97..2f877f565c5580999de9641789d4deaad53d6e24 100644 (file)
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -77,7 +77,7 @@
                 necessary. All objects stored in the journal can be up
                 to 2^64-1 bytes in size.</para>
 
-                <para>By default the journal stores log data in
+                <para>By default, the journal stores log data in
                 <filename>/run/log/journal/</filename>. Since
                 <filename>/run/</filename> is volatile, log data is
                 lost at reboot. To make the data persistent, it
@@ -206,11 +206,15 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><filename>/run/log/journal/<replaceable>machine-id</replaceable>/*.journal</filename></term>
+                                <term><filename>/run/log/journal/<replaceable>machine-id</replaceable>/*.journal~</filename></term>
                                 <term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal</filename></term>
                                 <term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal~</filename></term>
 
                                 <listitem><para><command>systemd-journald</command>
                                 writes entries to files in
+                                <filename>/run/log/journal/<replaceable>machine-id</replaceable>/</filename>
+                                or
                                 <filename>/var/log/journal/<replaceable>machine-id</replaceable>/</filename>
                                 with the <literal>.journal</literal>
                                 suffix. If the daemon is stopped
@@ -219,7 +223,15 @@
                                 using the <literal>.journal~</literal>
                                 suffix, and
                                 <command>systemd-journald</command>
-                                starts writing to a new file.
+                                starts writing to a new
+                                file. <filename>/run</filename> is
+                                used when
+                                <filename>/var/log/journal</filename>
+                                is not available, or when
+                                <option>Storage=volatile</option> is
+                                set in the
+                                <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                                configuration file.
                                 </para></listitem>
                         </varlistentry>
                 </variablelist>