X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournalctl.xml;h=9800cf30ed260ecfd8b4650f06f6a8a23e7f2d2c;hb=490d99e9bf949a855ff9183465f2c265777a3272;hp=1ea004fc8156b56fe101ab8ba33b484d721e7b50;hpb=31094aae09dd5a773e1634334bcd12fc8834a030;p=elogind.git

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 1ea004fc8..9800cf30e 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -189,6 +189,7 @@
                                 <literal>verbose</literal>,
                                 <literal>export</literal>,
                                 <literal>json</literal>,
+                                <literal>json-pretty</literal>,
                                 <literal>cat</literal>. <literal>short</literal>
                                 is the default and generates an output
                                 that is mostly identical to the
@@ -209,7 +210,13 @@
                                 Export Format</ulink> for more
                                 information). <literal>json</literal>
                                 formats entries as JSON data
-                                structures. <literal>cat</literal>
+                                structures, one per
+                                line. <literal>json-pretty</literal>
+                                also formats entries as JSON data
+                                structures, but formats them in
+                                multiple lines in order to make them
+                                more readable for
+                                humans. <literal>cat</literal>
                                 generates a very terse output only
                                 showing the actual message of each
                                 journal entry with no meta data, not
@@ -227,11 +234,13 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><option>--local</option></term>
-                                <term><option>-l</option></term>
+                                <term><option>--merge</option></term>
+                                <term><option>-m</option></term>
 
-                                <listitem><para>Show only locally
-                                generated messages.</para></listitem>
+                                <listitem><para>Show entries
+                                interleaved from all available
+                                journals, including remote
+                                ones.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -311,6 +320,14 @@
                                 accessed.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--disk-usage</option></term>
+
+                                <listitem><para>Shows the current disk
+                                usage of all
+                                journal files.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>--setup-keys</option></term>