From ae03512503e7ac6c948449d3c32e01d2cee24e8f Mon Sep 17 00:00:00 2001

From: "Jason St. John" <jstjohn@purdue.edu>

Date: Tue, 17 Dec 2013 21:36:27 -0500

Subject: [PATCH] journalctl,zsh-completion: fix several issues in --help

 message text

-- fix grammar and reword some descriptions for clarity

-- add a useful description of what --follow does

-- fix the description for --after-cursor

-- properly introduce the FSS acronym for "Forward Secure Sealing" in

both sections

-- clarify the --disk-usage command

[zj: perform similar changes to zsh completions]

squash! journalctl: fix several issues in --help message text

(cherry picked from commit c736283bfb81f5b00756e08a13946c113a41527f)

Conflicts:

	src/journal/journalctl.c

---

 shell-completion/zsh/_journalctl | 14 +++++++-------

 src/journal/journalctl.c         | 34 +++++++++++++++++-----------------

 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl

index 29ff3e34ee..8c3dbb0758 100644

--- a/shell-completion/zsh/_journalctl

+++ b/shell-completion/zsh/_journalctl

@@ -71,14 +71,14 @@ _arguments -s \

     {-m,--merge}'[Show entries from all available journals]' \

     {-b+,--boot=}'[Show data only from the specified boot or offset]:boot id or offset:_journal_boots' \

     '--list-boots[List boots ordered by time]' \

-    {-k,--dmesg}'[Show only kernel messages, Implies -b]' \

+    {-k,--dmesg}'[Show only kernel messages from the current boot]' \

     {-u+,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \

     '--user-unit=[Show data only from the specified user session unit]:units:_journal_fields USER_UNIT' \

     {-p+,--priority=}'[Show only messages within the specified priority range]:priority:_journal_fields PRIORITY' \

-    {-c+,--cursor=}'[Start showing entries from specified cursor]:cursors:_journal_fields __CURSORS' \

-    '--after-cursor=[Start showing entries from the location in the journal after the cursor]:cursors:_journal_fields __CURSORS' \

-    '--since=[Start showing entries newer or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \

-    '--until=[Stop showing entries older or of the specified date]:YYYY-MM-DD HH\:MM\:SS' \

+    {-c+,--cursor=}'[Start showing entries from the specified cursor]:cursors:_journal_fields __CURSORS' \

+    '--after-cursor=[Start showing entries from after the specified cursor]:cursors:_journal_fields __CURSORS' \

+    '--since=[Start showing entries on or newer than the specified date]:YYYY-MM-DD HH\:MM\:SS' \

+    '--until=[Stop showing entries on or older than the specified date]:YYYY-MM-DD HH\:MM\:SS' \

     {-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \

     '--system[Show system and kernel messages]' \

     '--user[Show messages from user services]' \

@@ -91,8 +91,8 @@ _arguments -s \

     '--list-catalog[List messages in catalog]' \

     '--dump-catalog[Dump messages in catalog]' \

     '--update-catalog[Update binary catalog database]' \

-    '--setup-keys[Generate new FSS key pair]' \

-    '--force[Force recreation of FSS keys]' \

+    '--setup-keys[Generate a new FSS key pair]' \

+    '--force[Force recreation of the FSS keys]' \

     '--interval=[Time interval for changing the FSS sealing key]:time interval' \

     '--verify[Verify journal file consistency]' \

     '--verify-key=[Specify FSS verification key]:FSS key' \

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c

index 71e28b0a70..1d66792708 100644

--- a/src/journal/journalctl.c

+++ b/src/journal/journalctl.c

@@ -130,30 +130,30 @@ static int help(void) {

                "Query the journal.\n\n"

                "Flags:\n"

                "     --system              Show only the system journal\n"

-               "     --user                Show only the user journal for current user\n"

-               "     --since=DATE          Start showing entries newer or of the specified date\n"

-               "     --until=DATE          Stop showing entries older or of the specified date\n"

-               "  -c --cursor=CURSOR       Start showing entries from specified cursor\n"

-               "     --after-cursor=CURSOR Start showing entries from specified cursor\n"

+               "     --user                Show only the user journal for the current user\n"

+               "     --since=DATE          Start showing entries on or newer than the specified date\n"

+               "     --until=DATE          Stop showing entries on or older than the specified date\n"

+               "  -c --cursor=CURSOR       Start showing entries from the specified cursor\n"

+               "     --after-cursor=CURSOR Start showing entries from after the specified cursor\n"

                "     --show-cursor         Print the cursor after all the entries\n"

-               "  -b --boot[=ID]           Show data only from ID or current boot if unspecified\n"

+               "  -b --boot[=ID]           Show data only from ID or, if unspecified, the current boot\n"

                "     --list-boots          Show terse information about recorded boots\n"

-               "  -k --dmesg               Show kernel message log from current boot\n"

+               "  -k --dmesg               Show kernel message log from the current boot\n"

                "  -u --unit=UNIT           Show data only from the specified unit\n"

                "     --user-unit=UNIT      Show data only from the specified user session unit\n"

                "  -p --priority=RANGE      Show only messages within the specified priority range\n"

                "  -e --pager-end           Immediately jump to end of the journal in the pager\n"

-               "  -f --follow              Follow journal\n"

+               "  -f --follow              Follow the journal\n"

                "  -n --lines[=INTEGER]     Number of journal entries to show\n"

                "     --no-tail             Show all lines, even in follow mode\n"

                "  -r --reverse             Show the newest entries first\n"

                "  -o --output=STRING       Change journal output mode (short, short-iso,\n"

-               "                           short-precise, short-monotonic, verbose,\n"

-               "                           export, json, json-pretty, json-sse, cat)\n"

+               "                                   short-precise, short-monotonic, verbose,\n"

+               "                                   export, json, json-pretty, json-sse, cat)\n"

                "  -x --catalog             Add message explanations where available\n"

                "  -l --full                Do not ellipsize fields\n"

                "  -a --all                 Show all fields, including long and unprintable\n"

-               "  -q --quiet               Don't show privilege warning\n"

+               "  -q --quiet               Do not show 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"

@@ -162,20 +162,20 @@ static int help(void) {

 #ifdef HAVE_GCRYPT

                "     --interval=TIME       Time interval for changing the FSS sealing key\n"

                "     --verify-key=KEY      Specify FSS verification key\n"

-               "     --force               Force overriding new FSS key pair with --setup-keys\n"

+               "     --force               Force overriding of the FSS key pair with --setup-keys\n"

 #endif

                "\nCommands:\n"

-               "  -h --help                Show this help\n"

+               "  -h --help                Show this help text\n"

                "     --version             Show package version\n"

-               "     --new-id128           Generate a new 128 Bit ID\n"

+               "     --new-id128           Generate a new 128-bit ID\n"

                "     --header              Show journal header information\n"

-               "     --disk-usage          Show total disk usage\n"

-               "  -F --field=FIELD         List all values a certain field takes\n"

+               "     --disk-usage          Show total disk usage of all journal files\n"

+               "  -F --field=FIELD         List all values that a specified field takes\n"

                "     --list-catalog        Show message IDs of all entries in the message catalog\n"

                "     --dump-catalog        Show entries in the message catalog\n"

                "     --update-catalog      Update the message catalog database\n"

 #ifdef HAVE_GCRYPT

-               "     --setup-keys          Generate new FSS key pair\n"

+               "     --setup-keys          Generate a new FSS key pair\n"

                "     --verify              Verify journal file consistency\n"

 #endif

                , program_invocation_short_name);