summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-23 04:20:22 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-23 04:20:22 +0200
commit34c4b47b7f00041be03919bd36500d0ffb3959d3 (patch)
treef4a795903251b8ccb4036721c89d6f1a6c54d70c
parent253ee27a0c7a410d27d490bb79ea97caed6a2b68 (diff)
systemctl: split --help into multiple sections
-rw-r--r--man/systemd.xml2
-rw-r--r--src/systemctl.c25
2 files changed, 17 insertions, 10 deletions
diff --git a/man/systemd.xml b/man/systemd.xml
index 5129fbb050..fc4810767a 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -826,7 +826,7 @@
<literal>console</literal>
(resp. <literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>;
- resp.<literal>syslog-or-kmsg</literal>
+ resp. <literal>syslog-or-kmsg</literal>
on <literal>SIGRTMIN+29</literal>), as
controlled via
<varname>systemd.log_target=console</varname>
diff --git a/src/systemctl.c b/src/systemctl.c
index 36346eebe8..d94105e93c 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -4265,7 +4265,7 @@ static int systemctl_help(void) {
" -f --force When enabling unit files, override existing symlinks\n"
" When shutting down, execute action immediately\n"
" --defaults When disabling unit files, remove default symlinks only\n\n"
- "Commands:\n"
+ "Unit Commands:\n"
" list-units List units\n"
" start [NAME...] Start (activate) one or more units\n"
" stop [NAME...] Stop (deactivate) one or more units\n"
@@ -4284,22 +4284,29 @@ static int systemctl_help(void) {
" units/jobs or the manager\n"
" reset-failed [NAME...] Reset failed state for all, one, or more\n"
" units\n"
+ " load [NAME...] Load one or more units\n\n"
+ "Unit File Commands:\n"
" enable [NAME...] Enable one or more unit files\n"
" disable [NAME...] Disable one or more unit files\n"
- " is-enabled [NAME...] Check whether unit files are enabled\n"
- " load [NAME...] Load one or more units\n"
+ " is-enabled [NAME...] Check whether unit files are enabled\n\n"
+ "Job Commands:\n"
" list-jobs List jobs\n"
- " cancel [JOB...] Cancel all, one, or more jobs\n"
+ " cancel [JOB...] Cancel all, one, or more jobs\n\n"
+ "Status Commands:\n"
" monitor Monitor unit/job changes\n"
" dump Dump server status\n"
- " dot Dump dependency graph for dot(1)\n"
+ " dot Dump dependency graph for dot(1)\n\n"
+ "Snapshot Commands:\n"
" snapshot [NAME] Create a snapshot\n"
- " delete [NAME...] Remove one or more snapshots\n"
- " daemon-reload Reload systemd manager configuration\n"
- " daemon-reexec Reexecute systemd manager\n"
+ " delete [NAME...] Remove one or more snapshots\n\n"
+ "Environment Commands:\n"
" 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"
+ " unset-environment [NAME...] Unset one or more environment variables\n\n"
+ "Manager Lifecycle Commands:\n"
+ " daemon-reload Reload systemd manager configuration\n"
+ " daemon-reexec Reexecute systemd manager\n\n"
+ "System Commands:\n"
" default Enter system default mode\n"
" rescue Enter system rescue mode\n"
" emergency Enter system emergency mode\n"