diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-11-15 11:23:00 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-11-17 11:25:02 +0100 |
| commit | ff946d82434defa63fbd29eddce051309aa0394e (patch) | |
| tree | 1d3f5ac3ccdfb8aba3d25009c5acfe7a80688527 /man/systemctl.xml | |
| parent | man: document the interaction of "systemctl restart" and the FD store (diff) | |
| download | systemd-ff946d82434defa63fbd29eddce051309aa0394e.tar.xz systemd-ff946d82434defa63fbd29eddce051309aa0394e.zip | |
man: write "stop and start" instead of "restart" when explaining the reload fallback operations
We already made a similar change when talking about the "restart"
command, let's also do this for "systemctl reload" and friends.
Follow-up for: 6539dd7c42946d9ba5dc43028b8b5785eb2db3c5
See: #7126
Diffstat (limited to 'man/systemctl.xml')
| -rw-r--r-- | man/systemctl.xml | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index fb6bb0d702..f5df6065fa 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -805,18 +805,16 @@ Sun 2017-02-26 20:57:49 EST 2h 3min left Sun 2017-02-26 11:56:36 EST 6h ago <term><command>reload-or-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> - <para>Reload one or more units if they support it. If not, - restart them instead. If the units are not running yet, they - will be started.</para> + <para>Reload one or more units if they support it. If not, stop and then start them instead. If the units + are not running yet, they will be started.</para> </listitem> </varlistentry> <varlistentry> <term><command>try-reload-or-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> - <para>Reload one or more units if they support it. If not, - restart them instead. This does nothing if the units are not - running.</para> + <para>Reload one or more units if they support it. If not, stop and then start them instead. This does + nothing if the units are not running.</para> <!-- Note that we don't document force-reload here, as that is just compatibility support, and we generally don't document that. --> </listitem> @@ -1035,14 +1033,11 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err <term><command>reset-failed [<replaceable>PATTERN</replaceable>…]</command></term> <listitem> - <para>Reset the <literal>failed</literal> state of the - specified units, or if no unit name is passed, reset the state of all - units. When a unit fails in some way (i.e. process exiting - with non-zero error code, terminating abnormally or timing - out), it will automatically enter the - <literal>failed</literal> state and its exit code and status - is recorded for introspection by the administrator until the - service is restarted or reset with this command.</para> + <para>Reset the <literal>failed</literal> state of the specified units, or if no unit name is passed, reset + the state of all units. When a unit fails in some way (i.e. process exiting with non-zero error code, + terminating abnormally or timing out), it will automatically enter the <literal>failed</literal> state and + its exit code and status is recorded for introspection by the administrator until the service is + stopped/re-started or reset with this command.</para> </listitem> </varlistentry> |