diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-23 12:47:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-23 12:47:07 +0200 |
| commit | adf717bcfd6d1ea27b6cc4f8a351f1d1f3097bac (patch) | |
| tree | 64bc55090a348f972f12c9d6efee2f4774709a4f | |
| parent | 952b4473bc392652b1d4c9dae5ec88fd003c4e1d (diff) | |
| parent | 20d936ba8167f4224cd01903e97fa852c00c0988 (diff) | |
Merge pull request #1648 from evverx/clarify-journalctl-quiet-option
journalctl: clarify -q option
| -rw-r--r-- | man/journalctl.xml | 4 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index 91a5536ade..9784b9f2a8 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -368,7 +368,9 @@ <term><option>-q</option></term> <term><option>--quiet</option></term> - <listitem><para>Suppresses any warning messages regarding + <listitem><para>Suppresses all info messages + (i.e. "-- Logs begin at ...", "-- Reboot --"), + any warning messages regarding inaccessible system journals when run as a normal user.</para></listitem> </varlistentry> diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 5dafb0bcab..863c15b738 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -218,7 +218,7 @@ static void help(void) { " -x --catalog Add message explanations where available\n" " --no-full Ellipsize fields\n" " -a --all Show all fields, including long and unprintable\n" - " -q --quiet Do not show privilege warning\n" + " -q --quiet Do not show info messages and privilege warning\n" " --no-pager Do not pipe output into a pager\n" " -m --merge Show entries from all available journals\n" " -D --directory=PATH Show journal files from directory\n" |