From 7591abd48079edc1f2adbd922e4b83eb73abeabe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Oct 2012 04:51:53 +0200 Subject: [PATCH] timedatectl,hostnamectl: rework --help text --- src/hostname/hostnamectl.c | 14 +++++++------- src/timedate/timedatectl.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index de2f7242ea1..33245dd4f98 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -303,19 +303,19 @@ static int set_icon_name(DBusConnection *bus, char **args, unsigned n) { static int help(void) { - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Query or set system hostname.\n\n" + printf("%s [OPTIONS...] COMMAND ...\n\n" + "Query or change system hostname.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --no-ask-password Do not prompt for password\n" " --transient Only set transient hostname\n" " --static Only set static hostname\n" " --pretty Only set pretty hostname\n" + " --no-ask-password Do not prompt for password\n" " -H --host=[USER@]HOST Operate on remote host\n\n" "Commands:\n" - " status Show current hostname settings\n" - " set-hostname [NAME] Set system hostname\n" - " set-icon-name [NAME] Set icon name for host\n", + " status Show current hostname settings\n" + " set-hostname NAME Set system hostname\n" + " set-icon-name NAME Set icon name for host\n", program_invocation_short_name); return 0; @@ -348,7 +348,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hp:as:H:P", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hH:P", options, NULL)) >= 0) { switch (c) { diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 29aa1d5b359..2b006ce924a 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -430,8 +430,8 @@ static int list_timezones(DBusConnection *bus, char **args, unsigned n) { static int help(void) { - printf("%s [OPTIONS...] {COMMAND} ...\n\n" - "Query or control system time and date settings.\n\n" + printf("%s [OPTIONS...] COMMAND ...\n\n" + "Query or change system time and date settings.\n\n" " -h --help Show this help\n" " --version Show package version\n" " --adjust-system-clock\n" @@ -440,12 +440,12 @@ static int help(void) { " --no-ask-password Do not prompt for password\n" " -H --host=[USER@]HOST Operate on remote host\n\n" "Commands:\n" - " status Show current time settings\n" - " set-time [TIME] Set system time\n" - " set-timezone [ZONE] Set system timezone\n" - " list-timezones Show known timezones\n" - " set-local-rtc [BOOL] Control whether RTC is in local time\n" - " set-ntp [BOOL] Control whether NTP is enabled\n", + " status Show current time settings\n" + " set-time TIME Set system time\n" + " set-timezone ZONE Set system timezone\n" + " list-timezones Show known timezones\n" + " set-local-rtc BOOL Control whether RTC is in local time\n" + " set-ntp BOOL Control whether NTP is enabled\n", program_invocation_short_name); return 0; @@ -476,7 +476,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+hp:as:H:P", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+hH:P", options, NULL)) >= 0) { switch (c) {