man: document that Documentation= follows an order

[elogind.git] / man / journalctl.xml

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 0bbcee33ab39bf9f4de59dfb31a65289a5b5b098..026bb22940d502e8c2b369d0bad5f176589313d7 100644 (file)
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -159,16 +159,13 @@
                                 <term><option>--lines=</option></term>
                                 <term><option>-n</option></term>
 
                                 <term><option>--lines=</option></term>
                                 <term><option>-n</option></term>
 

-                                <listitem><para>Controls the number of
-                                journal lines to show, counting from
-                                the most recent ones. The argument is
-                                optional, and if specified is a
-                                positive integer. If not specified and
-                                in follow mode defaults to 10. If this
-                                option is not passed and follow mode
-                                is not enabled, how many lines are
-                                shown is not
-                                limited.</para></listitem>
+                                <listitem><para>Show the most recent
+                                journal events and limit the number of
+                                events shown. If
+                                <option>--follow</option> is used,
+                                this option is implied. The argument,
+                                a positive integer, is optional, and
+                                defaults to 10. </para></listitem>

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


@@ -215,7 +212,10 @@
                                 information). <literal>json</literal>
                                 formats entries as JSON data
                                 structures, one per
                                 information). <literal>json</literal>
                                 formats entries as JSON data
                                 structures, one per

-                                line. <literal>json-pretty</literal>
+                                line (see <ulink
+                                url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal
+                                JSON Format</ulink> for more
+                                information). <literal>json-pretty</literal>

                                 also formats entries as JSON data
                                 structures, but formats them in
                                 multiple lines in order to make them
                                 also formats entries as JSON data
                                 structures, but formats them in
                                 multiple lines in order to make them


@@ -257,7 +257,56 @@
                                 <term><option>-b</option></term>
 
                                 <listitem><para>Show data only from
                                 <term><option>-b</option></term>
 
                                 <listitem><para>Show data only from

-                                current boot.</para></listitem>
+                                current boot. This will add a match
+                                for <literal>_BOOT_ID=</literal> for
+                                the current boot ID of the
+                                kernel.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--unit=</option></term>
+                                <term><option>-u</option></term>
+
+                                <listitem><para>Show data only of the
+                                specified unit. This will add a match
+                                for <literal>_SYSTEMD_UNIT=</literal>
+                                for the specified
+                                unit.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-p</option></term>
+                                <term><option>--priority=</option></term>
+
+                                <listitem><para>Filter output by
+                                message priorities or priority
+                                ranges. Takes either a single numeric
+                                or textual log level (i.e. between
+                                0/<literal>emerg</literal> and
+                                7/<literal>debug</literal>), or a
+                                range of numeric/text log levels in
+                                the form FROM..TO. The log levels are
+                                the usual syslog log levels as
+                                documented in
+                                <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+                                i.e. <literal>emerg</literal> (0),
+                                <literal>alert</literal> (1),
+                                <literal>crit</literal> (2),
+                                <literal>err</literal> (3),
+                                <literal>warning</literal> (4),
+                                <literal>notice</literal> (5),
+                                <literal>info</literal> (6),
+                                <literal>debug</literal> (7). If a
+                                single log level is specified all
+                                messages with this log level or a
+                                lower (hence more important) log level
+                                are shown. If a range is specified all
+                                messages within the range are shown,
+                                including both the start and the end
+                                value of the range. This will add
+                                <literal>PRIORITY=</literal> matches
+                                for the specified
+                                priorities.</para></listitem>

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


@@ -300,6 +349,16 @@
                                 time, respectively.</para></listitem>
                         </varlistentry>
 
                                 time, respectively.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><option>--field=</option></term>
+                                <term><option>-F</option></term>
+
+                                <listitem><para>Print all possible
+                                data values the specified field can
+                                take in all entries of the
+                                journal.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><option>--directory=</option></term>
                                 <term><option>-D</option></term>
                         <varlistentry>
                                 <term><option>--directory=</option></term>
                                 <term><option>-D</option></term>


@@ -312,38 +371,6 @@
                                 paths.</para></listitem>
                         </varlistentry>
 
                                 paths.</para></listitem>
                         </varlistentry>
 

-                        <varlistentry>
-                                <term><option>-p</option></term>
-                                <term><option>--priority=</option></term>
-
-                                <listitem><para>Filter output by
-                                message priorities or priority
-                                ranges. Takes either a single numeric
-                                or textual log level (i.e. between
-                                0/<literal>emerg</literal> and
-                                7/<literal>debug</literal>), or a
-                                range of numeric/text log levels in
-                                the form FROM..TO. The log levels are
-                                the usual syslog log levels as
-                                documented in
-                                <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                                i.e. <literal>emerg</literal> (0),
-                                <literal>alert</literal> (1),
-                                <literal>crit</literal> (2),
-                                <literal>err</literal> (3),
-                                <literal>warning</literal> (4),
-                                <literal>notice</literal> (5),
-                                <literal>info</literal> (6),
-                                <literal>debug</literal> (7). If a
-                                single log level is specified all
-                                messages with this log level or a
-                                lower (hence more important) log level
-                                are shown. If a range is specified all
-                                messages within the range are shown,
-                                including both the start and the end
-                                value of the range.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>--new-id128</option></term>
 
                         <varlistentry>
                                 <term><option>--new-id128</option></term>