diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-05 16:49:00 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-05 16:49:00 -0700 |
| commit | 9e8a535faa370bab283cb2c3c52b0a0d44e9d193 (patch) | |
| tree | bc246836f8b3a067ef7357b7b4ea41a3d77bb3a4 /man/journalctl.xml | |
| parent | d87be9b0af81a6e07d4fb3028e45c4409100dc26 (diff) | |
journalctl: replace --local by --merge, i.e. don't interleave remote journals by default
Diffstat (limited to 'man/journalctl.xml')
| -rw-r--r-- | man/journalctl.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index b5950c94c..296e3fd2f 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -234,11 +234,13 @@ </varlistentry> <varlistentry> - <term><option>--local</option></term> - <term><option>-l</option></term> + <term><option>--merge</option></term> + <term><option>-m</option></term> - <listitem><para>Show only locally - generated messages.</para></listitem> + <listitem><para>Show entries + interleaved from all available + journals, including remote + ones.</para></listitem> </varlistentry> <varlistentry> |