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

diff --git a/man/journalctl.xml b/man/journalctl.xml
index b5950c94c..9800cf30e 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -234,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>
@@ -318,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>