X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fjournalctl.xml;h=0bbcee33ab39bf9f4de59dfb31a65289a5b5b098;hp=1ea004fc8156b56fe101ab8ba33b484d721e7b50;hb=16dad32e437fdf2ffca03cc60a083d84bd31886f;hpb=31094aae09dd5a773e1634334bcd12fc8834a030
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 1ea004fc8..0bbcee33a 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -62,7 +62,7 @@
journal as written by
systemd-journald.service8.
- If called without parameter will show the full
+ If called without parameter it will show the full
contents of the journal, starting with the oldest
entry collected.
@@ -149,7 +149,7 @@
- Show only most recent
+ Show only the most recent
journal entries, and continuously print
new entries as they are appended to
the journal.
@@ -161,11 +161,14 @@
Controls the number of
journal lines to show, counting from
- the most recent ones. Takes a positive
- integer argument. In follow mode
- defaults to 10, otherwise is unset
- thus not limiting how many lines are
- shown.
+ the most recent ones. The argument is
+ optional, and if specified is a
+ positive integer. If not specified and
+ in follow mode defaults to 10. If this
+ option is not passed and follow mode
+ is not enabled, how many lines are
+ shown is not
+ limited.
@@ -189,6 +192,8 @@
verbose,
export,
json,
+ json-pretty,
+ json-sse,
cat. short
is the default and generates an output
that is mostly identical to the
@@ -209,7 +214,18 @@
Export Format for more
information). json
formats entries as JSON data
- structures. cat
+ structures, one per
+ line. json-pretty
+ also formats entries as JSON data
+ structures, but formats them in
+ multiple lines in order to make them
+ more readable for
+ humans. json-sse
+ also formats entries as JSON data
+ structures, but wraps them in a format
+ suitable for Server-Sent
+ Events. cat
generates a very terse output only
showing the actual message of each
journal entry with no meta data, not
@@ -227,11 +243,13 @@
-
-
+
+
- Show only locally
- generated messages.
+ Show entries
+ interleaved from all available
+ journals, including remote
+ ones.
@@ -242,13 +260,53 @@
current boot.
+
+
+
+
+ Start showing entries
+ from the location in the journal
+ specified by the passed
+ cursor.
+
+
+
+
+
+
+ Start showing entries
+ on or newer than the specified date,
+ or on or older than the specified
+ date, respectively. Date specifications should be of
+ the format "2012-10-30 18:17:16". If
+ the time part is omitted, 00:00:00 is
+ assumed. If only the seconds component
+ is omitted, :00 is assumed. If the
+ date component is ommitted, the
+ current day is assumed. Alternatively
+ the strings
+ yesterday,
+ today,
+ tomorrow are
+ understood, which refer to 00:00:00 of
+ the day before the current day, the
+ current day, or the day after the
+ current day, respectively. now
+ refers to the current time. Finally,
+ relative times may be specified,
+ prefixed with - or
+ +, referring to
+ times before or after the current
+ time, respectively.
+
+
Takes an absolute
directory path as argument. If
- specified will operate on the
+ specified journalctl will operate on the
specified journal directory instead of
the default runtime and system journal
paths.
@@ -278,7 +336,7 @@
info (6),
debug (7). If a
single log level is specified all
- messages with this log levels or a
+ messages with this log level or a
lower (hence more important) log level
are shown. If a range is specified all
messages within the range are shown,
@@ -307,10 +365,18 @@
Instead of showing
journal contents show internal header
- information of the journal fiels
+ information of the journal fields
accessed.
+
+
+
+ Shows the current disk
+ usage of all
+ journal files.
+
+
@@ -408,7 +474,7 @@
journalctl _SYSTEMD_UNIT=avahi-daemon.service _SYSTEMD_UNIT=dbus.serviceIf the separator "+" is used
- two expression may be combined in a logical OR. The
+ two expressions may be combined in a logical OR. The
following will show all messages from the Avahi
service process with the PID 28097 plus all messages
from the D-Bus service (from any of its