systemctl: split --help into multiple sections

diff --git a/man/systemd.xml b/man/systemd.xml
index 5129fbb050139865baf74d31a64e0d6f2fd5adac..fc4810767ad1b301591c070e2c928f32de6f7cbe 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -826,7 +826,7 @@
                                 <literal>console</literal>
                                 (resp. <literal>kmsg</literal> on
                                 <literal>SIGRTMIN+28</literal>;
                                 <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>
                                 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 36346eebe86485c4e68168d64899f7f8018eaf48..d94105e93c877ef49ee6e88a33581422fe256a0d 100644 (file)
--- 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"
                "  -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"
                "  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"
                "                                  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"
                "  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"
                "  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"
                "  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"
                "  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"
                "  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"
                "  default                         Enter system default mode\n"
                "  rescue                          Enter system rescue mode\n"
                "  emergency                       Enter system emergency mode\n"