X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fjournalctl.xml;h=23bb96051dc98bd852a85d24a79ef80f8f22de99;hb=9a7adc9a0ed53d6e422321e9196eb83d18afcba5;hp=8680e53285fd8a651099e458624ed6c6dce67df5;hpb=f02d836794d519e717e51d81501557da55915ce2;p=elogind.git
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 8680e5328..23bb96051 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 a separate word on the
command line, all matches before and after are combined
in a disjunction (i.e. logical OR).
@@ -104,7 +104,7 @@
All users are granted access to their private
per-user journals. However, by default, only root and
- users who are members of the adm
+ users who are members of the systemd-journal
group get access to the system journal and the
journals of other users.
@@ -112,14 +112,14 @@
less by default, and long lines are
"truncated" to screen width. The hidden part can be
viewed by using the left-arrow and right-arrow
- keys. Paging can be disabled, see
- and section Environment
- below.
+ keys. Paging can be disabled; see the
+ option and the "Environment"
+ section below.
When outputing to a tty, lines are colored
according to priority: lines of level ERROR and higher
- are colored red, lines of level NOTICE and higher are
- highlighted, and other lines are displayed normally.
+ are colored red; lines of level NOTICE and higher are
+ highlighted; and other lines are displayed normally.
@@ -152,11 +152,20 @@
-
+
+
+
+ Ellipsize fields when
+ they do not fit in available columns.
+ The default is to show full fields,
+ allowing them to wrap or be truncated
+ by the pager, if one is used.
- Show all (printable) fields in
- full.
+ The old options
+ /
+ are not useful anymore, except to undo
+ .
@@ -223,7 +232,7 @@
- Reverse output, so the newest
+ Reverse output so the newest
entries are displayed first.
@@ -281,7 +290,7 @@
- is very similar
+ is very similar,
but shows monotonic
timestamps instead of
wallclock timestamps.
@@ -343,7 +352,7 @@
but formats them in
multiple lines in order
to make them more
- readable for humans.
+ readable by humans.
@@ -367,7 +376,7 @@
generates a very
- terse output only
+ terse output, only
showing the actual
message of each journal
entry with no meta data,
@@ -392,7 +401,7 @@
context of an error or log event,
possible solutions, as well as
pointers to support forums, developer
- documentation and any other relevant
+ documentation, and any other relevant
manuals. Note that help texts are not
available for all messages, but only
for selected ones. For more
@@ -400,7 +409,14 @@
please refer to the Message
Catalog Developer
- Documentation.
+ Documentation.
+
+ Note: when attaching
+ journalctl output
+ to bug reports, please do
+ not use
+ .
+
@@ -408,8 +424,8 @@
Suppresses any warning
- message regarding inaccessible system
- journals when run as normal
+ messages regarding inaccessible system
+ journals when run as a normal
user.
@@ -441,11 +457,11 @@
offset will look up
boots starting from the end of the
journal. Thus, 1 means the
- first boot found in the journal in the
+ first boot found in the journal in
chronological order, 2 the
second and so on; while -0
is the last boot, -1 the
- boot before that, and so on. An empty
+ boot before last, and so on. An empty
offset is equivalent
to specifying -0, except
when the current boot is not the last boot
@@ -453,7 +469,7 @@
specified to look at logs from a different
machine).
- If the 32 character
+ If the 32-character
ID is specified, it
may optionally be followed by
offset which
@@ -462,7 +478,7 @@
values mean earlier boots and a positive values
mean later boots. If
offset is not
- specified, a value of zero is assumed and the
+ specified, a value of zero is assumed, and the
logs for the boot given by
ID are shown.
@@ -470,6 +486,17 @@
+
+
+
+ Show a tabular list of
+ boot numbers (relative to the current
+ boot), their IDs, and the timestamps
+ of the first and last message
+ pertaining to the boot.
+
+
+
@@ -558,11 +585,23 @@
- Start showing entries from the
- location in the journal
- after the location
- specified by the this cursor.
-
+ Start showing entries
+ from the location in the journal
+ after the
+ location specified by the this cursor.
+ The cursor is shown when the
+ option
+ is used.
+
+
+
+
+
+ The cursor is shown after the last
+ entry after two dashes:
+ -- cursor: s=0639...
+ The format of the cursor is private
+ and subject to change.
@@ -612,7 +651,7 @@
Show messages from
system services and the kernel (with
- ). Show
+ ). Show
messages from service of current user
(with ).
If neither is specified, show all
@@ -620,6 +659,16 @@
+
+
+
+
+ Show messages from a
+ running, local container. Specify a
+ container name to connect
+ to.
+
+
@@ -636,13 +685,13 @@
- Takes a file glob as
+ Takes a file glob as an
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
+ multiple times, in which case, files will
be suitably interleaved.
@@ -650,7 +699,7 @@
Takes a directory path
- as argument. If specified, journalctl
+ as an argument. If specified, journalctl
will operate on catalog file hierarchy
underneath the specified directory
instead of the root directory
@@ -664,8 +713,8 @@
Instead of showing
- journal contents, generate a new 128
- bit ID suitable for identifying
+ journal contents, generate a new 128-bit
+ ID suitable for identifying
messages. This is intended for usage
by developers who need a new
identifier for a new message they
@@ -695,16 +744,16 @@
List the contents of
- the message catalog, as table of
- message IDs plus their short
+ the message catalog as a table of
+ message IDs, plus their short
description strings.If any
- ID128s are
+ 128-bit-IDs are
specified, only those entries are shown.
@@ -712,18 +761,18 @@
Show the contents of
the message catalog, with entries
separated by a line consisting of two
- dashes and the id (the format is the
+ dashes and the ID (the format is the
same as .catalog
- files.
+ files).If any
- ID128s are
+ 128-bit-IDs are
specified, only those entries are shown.
@@ -735,7 +784,7 @@
Update the message
catalog index. This command needs to
be executed each time new catalog
- files are installed, removed or
+ files are installed, removed, or
updated to rebuild the binary catalog
index.
@@ -760,9 +809,10 @@
- When --setup-keys is passed and
- Forward Secure Sealing has already been set up,
- recreate FSS keys.
+ When
+ is passed and
+ Forward Secure Sealing (FSS) has already been
+ configured, recreate FSS keys.
@@ -807,8 +857,8 @@
Exit status
- On success, 0 is returned, a non-zero failure
- code otherwise.
+ On success, 0 is returned; otherwise, a non-zero
+ failure code is returned.