X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fjournalctl.xml;h=fa29c4103ca521007485611591c790eafd548e4b;hb=5199cbe4a4cb0f3e4134e8577dda37c05abf7dc0;hp=d9ca0a6074d97f54683f049b22ed2da0cef0f9d8;hpb=2927b326ccf67236e148444679f582ea1437ef5a;p=elogind.git
diff --git a/man/journalctl.xml b/man/journalctl.xml
index d9ca0a607..fa29c4103 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -84,7 +84,7 @@
alternatives, i.e. the resulting output will show
entries matching any of the specified matches for the
same field. Finally, if the character
- "+" appears as separate word on the
+ + appears as separate word on the
command line all matches before and after are combined
in a disjunction (i.e. logical OR).
@@ -138,6 +138,7 @@
+ Show all (printable) fields in
@@ -414,14 +415,15 @@
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 omitted, the
- current day is assumed. Alternatively
- the strings
+ 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 omitted, the current
+ day is assumed. Alternatively the strings
yesterday,
today,
tomorrow are
@@ -448,15 +450,43 @@
-
-
+
+
- Takes a
- directory path as argument. If
- specified journalctl will operate on the
- specified journal directory instead of
- the default runtime and system journal
- paths.
+ Show messages from
+ system services and the kernel (with
+ ). Show
+ messages from service of current user
+ (with ).
+ If neither is specified, show all
+ messages that the user can see.
+
+
+
+
+
+
+
+ Takes a directory path
+ as argument. If specified journalctl
+ will operate on the specified journal
+ directory
+ DIR instead
+ of the default runtime and system
+ journal paths.
+
+
+
+
+
+ Takes a file glob as
+ argument. If specified journalctl will
+ operate on the specified journal files
+ matching GLOB
+ instead of the default runtime and
+ system journal paths. May be specified
+ multiple times, in which case files will
+ be suitably interleaved.
@@ -564,7 +594,10 @@
sealing key is stored in the journal
data directory and shall remain on the
host. The verification key should be
- stored externally.
+ stored externally. Also see the
+ option in
+ journald.conf5
+ for details.
@@ -649,7 +682,7 @@
journalctl _SYSTEMD_UNIT=avahi-daemon.service _SYSTEMD_UNIT=dbus.service
- If the separator "+" is used
+ If the separator + is used
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