cgroup: setup BlockIODeviceWeight in bus_cgroup_set_property

[elogind.git] / man / journalctl.xml

diff --git a/man/journalctl.xml b/man/journalctl.xml
index dcc6d5dce919bab6234a3c84730ddf1b89f9e1a9..b52caa47bfd6cf95562e3a2361e4bf66da376e27 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -253,12 +253,11 @@
 
                                         <varlistentry>
                                                 <term>
 
                                         <varlistentry>
                                                 <term>

-                                                        <option>short-monotonic</option>
+                                                        <option>short-iso</option>

                                                 </term>
                                                 <listitem>
                                                 </term>
                                                 <listitem>

-                                                        <para>is very similar
-                                                        but shows monotonic
-                                                        timestamps instead of
+                                                        <para>is very similar,
+                                                        but shows ISO 8601

                                                         wallclock timestamps.
                                                         </para>
                                                 </listitem>
                                                         wallclock timestamps.
                                                         </para>
                                                 </listitem>


@@ -266,11 +265,25 @@
 
                                         <varlistentry>
                                                 <term>
 
                                         <varlistentry>
                                                 <term>

-                                                        <option>short-iso</option>
+                                                        <option>short-precise</option>

                                                 </term>
                                                 <listitem>
                                                         <para>is very similar,
                                                 </term>
                                                 <listitem>
                                                         <para>is very similar,

-                                                        but shows ISO 8601
+                                                        but shows timestamps
+                                                        with full microsecond
+                                                        precision.
+                                                        </para>
+                                                </listitem>
+                                        </varlistentry>
+
+                                        <varlistentry>
+                                                <term>
+                                                        <option>short-monotonic</option>
+                                                </term>
+                                                <listitem>
+                                                        <para>is very similar
+                                                        but shows monotonic
+                                                        timestamps instead of

                                                         wallclock timestamps.
                                                         </para>
                                                 </listitem>
                                                         wallclock timestamps.
                                                         </para>
                                                 </listitem>


@@ -379,7 +392,7 @@
                                 context of an error or log event,
                                 possible solutions, as well as
                                 pointers to support forums, developer
                                 context of an error or log event,
                                 possible solutions, as well as
                                 pointers to support forums, developer

-                                documentation and any other relevant
+                                documentation, and any other relevant

                                 manuals. Note that help texts are not
                                 available for all messages, but only
                                 for selected ones. For more
                                 manuals. Note that help texts are not
                                 available for all messages, but only
                                 for selected ones. For more


@@ -387,7 +400,14 @@
                                 please refer to the <ulink
                                 url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message
                                 Catalog Developer
                                 please refer to the <ulink
                                 url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message
                                 Catalog Developer

-                                Documentation</ulink>.</para></listitem>
+                                Documentation</ulink>.</para>
+
+                                <para>Note: when attaching
+                                <command>journalctl</command> output
+                                to bug reports, please do
+                                <emphasis>not</emphasis> use
+                                <option>-x</option>.</para>
+                                </listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>