From c736283bfb81f5b00756e08a13946c113a41527f Mon Sep 17 00:00:00 2001 From: "Jason St. John" Date: Tue, 17 Dec 2013 21:36:27 -0500 Subject: 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 --- src/journal/journalctl.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/journal') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index cc338e0987..cb252eb0b8 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -130,31 +130,31 @@ 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" + " --user Show only the user journal for the current user\n" " -M --machine=CONTAINER Operate on local container\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" + " --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" " --no-full 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" @@ -163,20 +163,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); -- cgit v1.2.3-54-g00ecf