X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournalctl.xml;h=0703bf9fb613f45c58370174b1beab5f4c104aca;hb=e7a2419a2ae2a8f56a3e2840f8d623d2a449277a;hp=bf187569d07b766d19ef444f7fd2928a40a106b4;hpb=a1d4404f9ab20159d88fbe9b4ed9a4f3f5b8345e;p=elogind.git

diff --git a/man/journalctl.xml b/man/journalctl.xml
index bf187569d..0703bf9fb 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -99,9 +99,9 @@
                 <literal>_KERNEL_DEVICE=</literal> match for the
                 device.</para>
 
-                <para>Additional contraints may be added using options
+                <para>Additional constraints may be added using options
                 <option>--boot</option>, <option>--unit=</option>,
-                etc, to futher limit what entries will be shown
+                etc, to further limit what entries will be shown
                 (logical AND).</para>
 
                 <para>Output is interleaved from all accessible
@@ -128,7 +128,7 @@
                 <option>--no-pager</option> option and the "Environment"
                 section below.</para>
 
-                <para>When outputing to a tty, lines are colored
+                <para>When outputting to a tty, lines are colored
                 according to priority: lines of level ERROR and higher
                 are colored red; lines of level NOTICE and higher are
                 highlighted; other lines are displayed normally.
@@ -189,9 +189,9 @@
                                 that the pager will not buffer logs of
                                 unbounded size. This may be overridden
                                 with an explicit <option>-n</option>
-                                with some other numeric value on the
-                                command line. Note that this option is
-                                only supported for the
+                                with some other numeric value while
+                                <option>-nall</option> will disable this cap.
+                                Note that this option is only supported for the
                                 <citerefentry project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                                 pager.</para></listitem>
                         </varlistentry>
@@ -204,9 +204,10 @@
                                 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>
+                                this option is implied. The argument is
+                                a positive integer or <literal>all</literal>
+                                to disable line limiting. The default value is
+                                10 if no argument is given.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -378,6 +379,13 @@
                                 </listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--utc</option></term>
+
+                                <listitem><para>Express time in Coordinated Universal
+                                Time (UTC).</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-x</option></term>
                                 <term><option>--catalog</option></term>
@@ -497,6 +505,20 @@
                                 </para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>-t</option></term>
+                                <term><option>--identifier=<replaceable>SYSLOG_IDENTIFIER</replaceable>|<replaceable>PATTERN</replaceable></option></term>
+
+                                <listitem><para>Show messages for the
+                                specified syslog identifier
+                                <replaceable>SYSLOG_IDENTIFIER</replaceable>, or
+                                for any of the messages with a <literal>SYSLOG_IDENTIFIER</literal>
+                                matched by <replaceable>PATTERN</replaceable>.</para>
+
+                                <para>This parameter can be specified
+                                multiple times.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-u</option></term>
                                 <term><option>--unit=<replaceable>UNIT</replaceable>|<replaceable>PATTERN</replaceable></option></term>
@@ -739,8 +761,37 @@
                                 <term><option>--disk-usage</option></term>
 
                                 <listitem><para>Shows the current disk
-                                usage of all
-                                journal files.</para></listitem>
+                                usage of all journal files. This shows
+                                the sum of the disk usage of all
+                                archived and active journal
+                                files.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--vacuum-size=</option></term>
+                                <term><option>--vacuum-time=</option></term>
+
+                                <listitem><para>Removes archived
+                                journal files until the disk space
+                                they use falls below the specified
+                                size (specified with the usual K, M,
+                                G, T suffixes), or all journal files
+                                contain no data older than the
+                                specified timespan (specified with the
+                                usual s, min, h, days, months, weeks,
+                                years suffixes). Note that running
+                                <option>--vacuum-size=</option> has
+                                only indirect effect on the output
+                                shown by <option>--disk-usage</option>
+                                as the latter includes active journal
+                                files, while the former only operates
+                                on archived journal
+                                files. <option>--vacuum-size=</option>
+                                and <option>--vacuum-time=</option>
+                                may be combined in a single invocation
+                                to enforce both a size and time limit
+                                on the archived journal
+                                files.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -856,6 +907,20 @@
                                 operation.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--flush</option></term>
+
+                                <listitem><para>Asks the Journal
+                                daemon to flush any log data stored in
+                                <filename>/run/log/journal</filename>
+                                into
+                                <filename>/var/log/journal</filename>,
+                                if persistent storage is enabled. This
+                                call does not return until the
+                                operation is
+                                complete.</para></listitem>
+                        </varlistentry>
+
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
                         <xi:include href="standard-options.xml" xpointer="no-pager" />