diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-19 21:05:07 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-19 21:13:08 -0400 |
| commit | 4e6029435111adcad71489aca2dd68bc65aeffd4 (patch) | |
| tree | 07ce83808e399ad2ad63bad9a568863bd6f755ef /man | |
| parent | be8f4a9fa732d61e845e1ab1a62ac3a6b368d3a7 (diff) | |
| download | systemd-4e6029435111adcad71489aca2dd68bc65aeffd4.tar.gz systemd-4e6029435111adcad71489aca2dd68bc65aeffd4.tar.bz2 systemd-4e6029435111adcad71489aca2dd68bc65aeffd4.zip | |
journalctl,man: allow + only between terms
https://bugzilla.redhat.com/show_bug.cgi?id=1110712
Diffstat (limited to 'man')
| -rw-r--r-- | man/journalctl.xml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index 47b5a0593b..df9c79465f 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -84,10 +84,11 @@ field, then they are automatically matched as 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 a separate word on the - command line, all matches before and after are combined - in a disjunction (i.e. logical OR).</para> + same field. Finally, the character + <literal>+</literal> may appears as a separate word + between other terms on the command line. This causes + all matches before and after to be combined in a + disjunction (i.e. logical OR).</para> <para>As shortcuts for a few types of field/value matches, file paths may be specified. If a file path @@ -98,11 +99,21 @@ <literal>_KERNEL_DEVICE=</literal> match for the device.</para> + <para>Additional contraints may be added using options + <option>--boot</option>, <option>--unit=</option>, + etc, to futher limit what entries will be shown + (logical AND).</para> + <para>Output is interleaved from all accessible journal files, whether they are rotated or currently being written, and regardless of whether they belong to the system itself or are accessible user journals.</para> + <para>The set of journal files which will be used + can be modified using the <option>--user</option>, + <option>--system</option>, <option>--directory</option>, + and <option>--file</option> options, see below.</para> + <para>All users are granted access to their private per-user journals. However, by default, only root and users who are members of the <literal>systemd-journal</literal> |