chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: grammar and wording improvements
[elogind.git]
/
man
/
journalctl.xml
diff --git
a/man/journalctl.xml
b/man/journalctl.xml
index 8577f614323f89dd7ee5d6c60974c6b4ab27c708..55474c53d9e198b9410a0721215970e4040951e1 100644
(file)
--- 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
alternatives, i.e. the resulting output will show
entries matching any of the specified matches for the
same field. Finally, if the character
- <literal>+</literal> appears as separate word on the
+ <literal>+</literal> appears as
a
separate word on the
command line, all matches before and after are combined
in a disjunction (i.e. logical OR).</para>
command line, all matches before and after are combined
in a disjunction (i.e. logical OR).</para>
@@
-112,14
+112,14
@@
<command>less</command> by default, and long lines are
"truncated" to screen width. The hidden part can be
viewed by using the left-arrow and right-arrow
<command>less</command> 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
, se
e
- <option>--no-pager</option>
and section Environment
- below.</para>
+ keys. Paging can be disabled
; see th
e
+ <option>--no-pager</option>
option and the "Environment"
+
section
below.</para>
<para>When outputing to a tty, lines are colored
according to priority: lines of level ERROR and higher
<para>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
;
other lines are displayed normally.
</para>
</refsect1>
</para>
</refsect1>
@@
-160,7
+160,7
@@
they do not fit in available columns.
The default is to show full fields,
allowing them to wrap or be truncated
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.</para>
+ by the pager
,
if one is used.</para>
<para>The old options
<option>-l</option>/<option>--full</option>
<para>The old options
<option>-l</option>/<option>--full</option>
@@
-232,7
+232,7
@@
<term><option>-r</option></term>
<term><option>--reverse</option></term>
<term><option>-r</option></term>
<term><option>--reverse</option></term>
- <listitem><para>Reverse output
, so
the newest
+ <listitem><para>Reverse output
so that
the newest
entries are displayed first.</para></listitem>
</varlistentry>
entries are displayed first.</para></listitem>
</varlistentry>
@@
-352,7
+352,7
@@
but formats them in
multiple lines in order
to make them more
but formats them in
multiple lines in order
to make them more
- readable
for
humans.</para>
+ readable
by
humans.</para>
</listitem>
</varlistentry>
</listitem>
</varlistentry>
@@
-376,7
+376,7
@@
</term>
<listitem>
<para>generates a very
</term>
<listitem>
<para>generates a very
- terse output only
+ terse output
,
only
showing the actual
message of each journal
entry with no meta data,
showing the actual
message of each journal
entry with no meta data,
@@
-424,8
+424,8
@@
<term><option>--quiet</option></term>
<listitem><para>Suppresses any warning
<term><option>--quiet</option></term>
<listitem><para>Suppresses any warning
- message regarding inaccessible system
- journals when run as normal
+ message
s
regarding inaccessible system
+ journals when run as
a
normal
user.</para></listitem>
</varlistentry>
user.</para></listitem>
</varlistentry>
@@
-457,11
+457,11
@@
<replaceable>offset</replaceable> will look up
boots starting from the end of the
journal. Thus, <constant>1</constant> means the
<replaceable>offset</replaceable> will look up
boots starting from the end of the
journal. Thus, <constant>1</constant> means the
- first boot found in the journal in
the
+ first boot found in the journal in
chronological order, <constant>2</constant> the
second and so on; while <constant>-0</constant>
is the last boot, <constant>-1</constant> the
chronological order, <constant>2</constant> the
second and so on; while <constant>-0</constant>
is the last boot, <constant>-1</constant> the
- boot before
tha
t, and so on. An empty
+ boot before
las
t, and so on. An empty
<replaceable>offset</replaceable> is equivalent
to specifying <constant>-0</constant>, except
when the current boot is not the last boot
<replaceable>offset</replaceable> is equivalent
to specifying <constant>-0</constant>, except
when the current boot is not the last boot
@@
-469,7
+469,7
@@
specified to look at logs from a different
machine).</para>
specified to look at logs from a different
machine).</para>
- <para>If the 32
character
+ <para>If the 32
-
character
<replaceable>ID</replaceable> is specified, it
may optionally be followed by
<replaceable>offset</replaceable> which
<replaceable>ID</replaceable> is specified, it
may optionally be followed by
<replaceable>offset</replaceable> which
@@
-478,7
+478,7
@@
values mean earlier boots and a positive values
mean later boots. If
<replaceable>offset</replaceable> is not
values mean earlier boots and a positive values
mean later boots. If
<replaceable>offset</replaceable> 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
<replaceable>ID</replaceable> are shown.
</para>
logs for the boot given by
<replaceable>ID</replaceable> are shown.
</para>
@@
-490,7
+490,7
@@
<term><option>--list-boots</option></term>
<listitem><para>Show a tabular list of
<term><option>--list-boots</option></term>
<listitem><para>Show a tabular list of
- boot numbers (relative to current
+ boot numbers (relative to
the
current
boot), their IDs, and the timestamps
of the first and last message
pertaining to the boot.
boot), their IDs, and the timestamps
of the first and last message
pertaining to the boot.
@@
-600,8
+600,8
@@
<listitem><para>The cursor is shown after the last
entry after two dashes:</para>
<programlisting>-- cursor: s=0639...</programlisting>
<listitem><para>The cursor is shown after the last
entry after two dashes:</para>
<programlisting>-- cursor: s=0639...</programlisting>
- <para>The format of th
is th
e cursor is private
- and subject
ot
change.</para></listitem>
+ <para>The format of the cursor is private
+ and subject
to
change.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-651,7
+651,7
@@
<listitem><para>Show messages from
system services and the kernel (with
<listitem><para>Show messages from
system services and the kernel (with
- <option>--system</option>).
Show
+ <option>--system</option>). Show
messages from service of current user
(with <option>--user</option>).
If neither is specified, show all
messages from service of current user
(with <option>--user</option>).
If neither is specified, show all
@@
-685,7
+685,7
@@
<varlistentry>
<term><option>--file=<replaceable>GLOB</replaceable></option></term>
<varlistentry>
<term><option>--file=<replaceable>GLOB</replaceable></option></term>
- <listitem><para>Takes a file glob as
+ <listitem><para>Takes a file glob as
an
argument. If specified, journalctl will
operate on the specified journal files
matching <replaceable>GLOB</replaceable>
argument. If specified, journalctl will
operate on the specified journal files
matching <replaceable>GLOB</replaceable>
@@
-699,7
+699,7
@@
<term><option>--root=<replaceable>ROOT</replaceable></option></term>
<listitem><para>Takes a directory path
<term><option>--root=<replaceable>ROOT</replaceable></option></term>
<listitem><para>Takes a directory path
- as argument. If specified, journalctl
+ as a
n a
rgument. If specified, journalctl
will operate on catalog file hierarchy
underneath the specified directory
instead of the root directory
will operate on catalog file hierarchy
underneath the specified directory
instead of the root directory
@@
-713,8
+713,8
@@
<term><option>--new-id128</option></term>
<listitem><para>Instead of showing
<term><option>--new-id128</option></term>
<listitem><para>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
messages. This is intended for usage
by developers who need a new
identifier for a new message they
@@
-744,16
+744,16
@@
<varlistentry>
<term><option>--list-catalog
<varlistentry>
<term><option>--list-catalog
- <optional><replaceable>
ID128
...</replaceable></optional>
+ <optional><replaceable>
128-bit-ID
...</replaceable></optional>
</option></term>
<listitem><para>List the contents of
</option></term>
<listitem><para>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.</para>
<para>If any
description strings.</para>
<para>If any
- <replaceable>
ID128
</replaceable>s are
+ <replaceable>
128-bit-ID
</replaceable>s are
specified, only those entries are shown.
</para>
</listitem>
specified, only those entries are shown.
</para>
</listitem>
@@
-761,18
+761,18
@@
<varlistentry>
<term><option>--dump-catalog
<varlistentry>
<term><option>--dump-catalog
- <optional><replaceable>
ID128
...</replaceable></optional>
+ <optional><replaceable>
128-bit-ID
...</replaceable></optional>
</option></term>
<listitem><para>Show the contents of
the message catalog, with entries
separated by a line consisting of two
</option></term>
<listitem><para>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 <filename>.catalog</filename>
same as <filename>.catalog</filename>
- files.</para>
+ files
)
.</para>
<para>If any
<para>If any
- <replaceable>
ID128
</replaceable>s are
+ <replaceable>
128-bit-ID
</replaceable>s are
specified, only those entries are shown.
</para>
</listitem>
specified, only those entries are shown.
</para>
</listitem>
@@
-784,7
+784,7
@@
<listitem><para>Update the message
catalog index. This command needs to
be executed each time new catalog
<listitem><para>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.</para></listitem>
</varlistentry>
updated to rebuild the binary catalog
index.</para></listitem>
</varlistentry>
@@
-800,18
+800,23
@@
sealing key is stored in the journal
data directory and shall remain on the
host. The verification key should be
sealing key is stored in the journal
data directory and shall remain on the
host. The verification key should be
- stored externally.
Also see
the
+ stored externally.
Refer to
the
<option>Seal=</option> option in
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
<option>Seal=</option> option in
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details.</para></listitem>
+ for information on Forward Secure
+ Sealing and for a link to a refereed
+ scholarly paper detailing the
+ cryptographic theory it is based on.
+ </para></listitem>
</varlistentry>
<varlistentry>
<term><option>--force</option></term>
</varlistentry>
<varlistentry>
<term><option>--force</option></term>
- <listitem><para>When --setup-keys is passed and
- Forward Secure Sealing has already been set up,
- recreate FSS keys.</para></listitem>
+ <listitem><para>When
+ <option>--setup-keys</option> is passed and
+ Forward Secure Sealing (FSS) has already been
+ configured, recreate FSS keys.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-856,8
+861,8
@@
<refsect1>
<title>Exit status</title>
<refsect1>
<title>Exit status</title>
- <para>On success, 0 is returned
, a non-zero failure
-
code otherwise
.</para>
+ <para>On success, 0 is returned
; otherwise, a non-zero
+
failure code is returned
.</para>
</refsect1>
<refsect1>
</refsect1>
<refsect1>