summaryrefslogtreecommitdiff
path: root/src/systemctl
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-19 13:55:44 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-19 13:55:59 -0500
commit3fb90db2d6aa6eb7711dbccb34a07e3e7ae85c91 (patch)
tree56380b52724730bacb0a51e83426575e95792db6 /src/systemctl
parent40f0b71b063da6a36b8d7ec75ef20103abd18243 (diff)
systemctl: fix import-environment description, trim help to 80 cols
Diffstat (limited to 'src/systemctl')
-rw-r--r--src/systemctl/systemctl.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d57b577913..00e283c463 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6002,8 +6002,8 @@ static void systemctl_help(void) {
" Operate on remote host\n"
" -M --machine=CONTAINER\n"
" Operate on local container\n"
- " -t --type=TYPE List only units of a particular type\n"
- " --state=STATE List only units with particular LOAD or SUB or ACTIVE state\n"
+ " -t --type=TYPE List units of a particular type\n"
+ " --state=STATE List units with particular LOAD or SUB or ACTIVE state\n"
" -p --property=NAME Show only properties by this name\n"
" -a --all Show all loaded units/properties, including dead/empty\n"
" ones. To list all units installed on the system, use\n"
@@ -6021,8 +6021,7 @@ static void systemctl_help(void) {
" -q --quiet Suppress output\n"
" --no-block Do not wait until operation finished\n"
" --no-wall Don't send wall message before halt/power-off/reboot\n"
- " --no-reload When enabling/disabling unit files, don't reload daemon\n"
- " configuration\n"
+ " --no-reload Don't reload daemon after en-/dis-abling unit files\n"
" --no-legend Do not print a legend (column headers and hints)\n"
" --no-pager Do not pipe output into a pager\n"
" --no-ask-password\n"
@@ -6031,8 +6030,7 @@ static void systemctl_help(void) {
" --runtime Enable unit files only temporarily until next reboot\n"
" -f --force When enabling unit files, override existing symlinks\n"
" When shutting down, execute action immediately\n"
- " --preset-mode= Specifies whether fully apply presets, or only enable,\n"
- " or only disable\n"
+ " --preset-mode= Apply only enable, only disable, or all presets\n"
" --root=PATH Enable unit files in the specified root directory\n"
" -n --lines=INTEGER Number of journal entries to show\n"
" -o --output=STRING Change journal output mode (short, short-iso,\n"
@@ -6100,7 +6098,7 @@ static void systemctl_help(void) {
" show-environment Dump environment\n"
" set-environment NAME=VALUE... Set one or more environment variables\n"
" unset-environment NAME... Unset one or more environment variables\n"
- " import-environment NAME... Import all, one or more environment variables\n\n"
+ " import-environment [NAME...] Import all or some environment variables\n\n"
"Manager Lifecycle Commands:\n"
" daemon-reload Reload systemd manager configuration\n"
" daemon-reexec Reexecute systemd manager\n\n"