X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-journald.service.xml;h=0a20e211597ba24db58ca2055a0ff7c723aa0cd1;hp=45091c62abb1804b02db4e911d6b6b54c17aec97;hb=b1e90ec515408aec2702522f6f68c4920b56375b;hpb=65cd79f7f574532e5f91d581aaff923c29655bbd

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 45091c62a..0a20e2115 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -59,15 +59,15 @@
                 <title>Description</title>
 
                 <para><filename>systemd-journald</filename> is a
-                system service that collects and stores logging
-                data. It creates and maintains structured, indexed
-                journals based on logging information that is received
-                from the kernel, from user processes via the libc
+                system service that collects and stores logging data.
+                It creates and maintains structured, indexed journals
+                based on logging information that is received from the
+                kernel, from user processes via the libc
                 <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call, from STDOUT/STDERR of system services or via its
-                native API. It will implicitly collect numerous meta
-                data fields for each log messages in a secure and
-                unfakeable way. See
+                call, from standard input and standard error of system
+                services or via its native API. It will implicitly
+                collect numerous meta data fields for each log
+                messages in a secure and unfakeable way. See
                 <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 for more information about the collected meta data.
                 </para>
@@ -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>