summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmut Tezduyar Lindskog <umut.tezduyar@axis.com>2014-10-29 11:20:02 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-01 14:39:48 -0400
commit2a97b03b3b087e724867e7501ae0c1535ee35031 (patch)
tree7c2f55ba7eb548f71f0b4bf5142d712c5dbd379e
parent311f6cf33f6fd50921540875c3e6eb1ffd339124 (diff)
man: explain journalctl --flush correctly
-rw-r--r--NEWS4
-rw-r--r--man/journalctl.xml4
2 files changed, 6 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d5d4697d79..b8a37767eb 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,10 @@ CHANGES WITH 217:
show log timestamps in the UTC timezone. journalctl now also
accepts -n/--lines=all to disable line capping in a pager.
+ * journalctl gained a new switch, --flush, that flushes
+ logs from /run/log/journal to /var/log/journal if
+ persistent storage is enabled.
+
* Services can notify the manager before they start a reload
(by sending RELOADING=1) or shutdown (by sending
STOPPING=1). This allows the manager to track and show the
diff --git a/man/journalctl.xml b/man/journalctl.xml
index db2a1e142b..0ed3ca3bc8 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -883,9 +883,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