X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournalctl.xml;h=0703bf9fb613f45c58370174b1beab5f4c104aca;hp=db2a1e142b9d8df85b359110a4b091b72fbf6dce;hb=0fa9e53d12a64981e071e0adb24698f4735e2599;hpb=74055aa76278232ff05574fc47c4e6b3560554a7

diff --git a/man/journalctl.xml b/man/journalctl.xml
index db2a1e142..0703bf9fb 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -761,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>
@@ -883,9 +912,9 @@
 
                                 <listitem><para>Asks the Journal
                                 daemon to flush any log data stored in
-                                <filename>/run/systemd/log</filename>
+                                <filename>/run/log/journal</filename>
                                 into
-                                <filename>/var/systemd/log</filename>,
+                                <filename>/var/log/journal</filename>,
                                 if persistent storage is enabled. This
                                 call does not return until the
                                 operation is