textual: using angular brackets around individual arguments

And separate short and long options with the standard comma.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index f160eaca522dc3c9821095448b5a7972ffaad7cd..dabacb85c7684010749158835e5cd0f89b1706bf 100644 (file)
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -49,19 +49,19 @@ static void __attribute__((__noreturn__)) usage(int ex)
 {
        fprintf(stderr, USAGE_HEADER);
        fprintf(stderr,
-               _(" %1$s [options] <file|directory> <command> [<arguments>...]\n"
-                 " %1$s [options] <file|directory> -c <command>\n"
+               _(" %1$s [options] <file>|<directory> <command> [<argument>...]\n"
+                 " %1$s [options] <file>|<directory> -c <command>\n"
                  " %1$s [options] <file descriptor number>\n"),
                program_invocation_short_name);
        fputs(USAGE_OPTIONS, stderr);
-       fputs(_(  " -s  --shared             get a shared lock\n"), stderr);
-       fputs(_(  " -x  --exclusive          get an exclusive lock (default)\n"), stderr);
-       fputs(_(  " -u  --unlock             remove a lock\n"), stderr);
-       fputs(_(  " -n  --nonblock           fail rather than wait\n"), stderr);
-       fputs(_(  " -w  --timeout <secs>     wait for a limited amount of time\n"), stderr);
-       fputs(_(  " -E  --conflict-exit-code <number>  exit code after conflict or timeout\n"), stderr);
-       fputs(_(  " -o  --close              close file descriptor before running command\n"), stderr);
-       fputs(_(  " -c  --command <command>  run a single command string through the shell\n"), stderr);
+       fputs(_(  " -s, --shared             get a shared lock\n"), stderr);
+       fputs(_(  " -x, --exclusive          get an exclusive lock (default)\n"), stderr);
+       fputs(_(  " -u, --unlock             remove a lock\n"), stderr);
+       fputs(_(  " -n, --nonblock           fail rather than wait\n"), stderr);
+       fputs(_(  " -w, --timeout <secs>     wait for a limited amount of time\n"), stderr);
+       fputs(_(  " -E, --conflict-exit-code <number>  exit code after conflict or timeout\n"), stderr);
+       fputs(_(  " -o, --close              close file descriptor before running command\n"), stderr);
+       fputs(_(  " -c, --command <command>  run a single command string through the shell\n"), stderr);
        fprintf(stderr, USAGE_SEPARATOR);
        fprintf(stderr, USAGE_HELP);
        fprintf(stderr, USAGE_VERSION);