From: Lennart Poettering Date: Thu, 7 Nov 2013 20:31:13 +0000 (+0100) Subject: clients: try to follow roughly the same order in --help texts for common options X-Git-Tag: v209~1532 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a86a47ce1f63476631635fbcbc10af8877172114;hp=74c7b1ed052fc42d9841a5d83d310fa96124c47c clients: try to follow roughly the same order in --help texts for common options --- diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 715ad73ff..4637424d6 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1157,6 +1157,7 @@ static int help(void) { "Process systemd profiling information.\n\n" " -h --help Show this help\n" " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" " --system Connect to system manager\n" " --user Connect to user manager\n" " -H --host=[USER@]HOST Operate on remote host\n" @@ -1169,8 +1170,7 @@ static int help(void) { " --fuzz=TIMESPAN When printing the tree of the critical chain, print also\n" " services, which finished TIMESPAN earlier, than the\n" " latest in the branch. The unit of TIMESPAN is seconds\n" - " unless specified with a different unit, i.e. 50ms\n" - " --no-pager Do not pipe output into a pager\n\n" + " unless specified with a different unit, i.e. 50ms\n\n" "Commands:\n" " time Print time spent in the kernel before reaching userspace\n" " blame Print list of running units ordered by time to init\n" diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index 959ec6d3b..3e517781c 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -294,12 +294,12 @@ static int help(void) { "Query or change system hostname.\n\n" " -h --help Show this help\n" " --version Show package version\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" - " -M --machine=CONTAINER Operate on local container\n\n" + " -M --machine=CONTAINER Operate on local container\n" + " --transient Only set transient hostname\n" + " --static Only set static hostname\n" + " --pretty Only set pretty hostname\n\n" "Commands:\n" " status Show current hostname settings\n" " set-hostname NAME Set system hostname\n" diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c index 717b91120..895dd0397 100644 --- a/src/libsystemd-bus/busctl.c +++ b/src/libsystemd-bus/busctl.c @@ -183,14 +183,14 @@ static int help(void) { "Introspect the bus.\n\n" " -h --help Show this help\n" " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" " --system Connect to system bus\n" " --user Connect to user bus\n" " -H --host=[USER@]HOST Operate on remote host\n" " -M --machine=CONTAINER Operate on local container\n" " --address=ADDRESS Connect to bus specified by address\n" " --no-unique Only show well-known names\n" - " --match=MATCH Only show matching messages\n" - " --no-pager Do not pipe output into a pager\n\n" + " --match=MATCH Only show matching messages\n\n" "Commands:\n" " list List bus names\n" " monitor [SERVICE...] Show bus traffic\n", diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 748a14841..31deb674d 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -617,11 +617,11 @@ static int help(void) { "Query or change system locale and keyboard settings.\n\n" " -h --help Show this help\n" " --version Show package version\n" - " --no-convert Don't convert keyboard mappings\n" " --no-pager Do not pipe output into a pager\n" " --no-ask-password Do not prompt for password\n" " -H --host=[USER@]HOST Operate on remote host\n" - " -M --machine=CONTAINER Operate on local container\n\n" + " -M --machine=CONTAINER Operate on local container\n" + " --no-convert Don't convert keyboard mappings\n\n" "Commands:\n" " status Show current locale settings\n" " set-locale LOCALE... Set system locale\n" diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 54b39a180..2267733d9 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -413,12 +413,12 @@ static int help(void) { "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" - " Adjust system clock when changing local RTC mode\n" " --no-pager Do not pipe output into a pager\n" " --no-ask-password Do not prompt for password\n" " -H --host=[USER@]HOST Operate on remote host\n" - " -M --machine=CONTAINER Operate on local container\n\n" + " -M --machine=CONTAINER Operate on local container\n" + " --adjust-system-clock\n" + " Adjust system clock when changing local RTC mode\n\n" "Commands:\n" " status Show current time settings\n" " set-time TIME Set system time\n"