summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-07 21:31:13 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-07 21:31:13 +0100
commita86a47ce1f63476631635fbcbc10af8877172114 (patch)
tree0cd7a6de7a631df92a744593e1e3d906b69b7a8c /src
parent74c7b1ed052fc42d9841a5d83d310fa96124c47c (diff)
clients: try to follow roughly the same order in --help texts for common options
Diffstat (limited to 'src')
-rw-r--r--src/analyze/analyze.c4
-rw-r--r--src/hostname/hostnamectl.c8
-rw-r--r--src/libsystemd-bus/busctl.c4
-rw-r--r--src/locale/localectl.c4
-rw-r--r--src/timedate/timedatectl.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 715ad73ff9..4637424d62 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 959ec6d3b2..3e517781c3 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 717b91120e..895dd03971 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 748a14841d..31deb674dc 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 54b39a1806..2267733d91 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"