diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-03-14 15:43:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 15:43:03 +0100 |
| commit | 72830b187f5aa06b3e89ca121bbc35451764f1bc (patch) | |
| tree | 42954ca37f3ad5036149ce446b6b3573f0a45f93 /man/systemd.kill.xml | |
| parent | Merge pull request #11785 from dvdhrm/implicit-sasl (diff) | |
| parent | man: say explicitly which settings are not available in --user services (diff) | |
| download | systemd-72830b187f5aa06b3e89ca121bbc35451764f1bc.tar.xz systemd-72830b187f5aa06b3e89ca121bbc35451764f1bc.zip | |
Merge pull request #11989 from poettering/minimal-portable-image
various documentation updates
Diffstat (limited to 'man/systemd.kill.xml')
| -rw-r--r-- | man/systemd.kill.xml | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml index 09029c56a3..3a6d076eb1 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -87,22 +87,17 @@ group and the control group continues to exist after stop unless it is empty.</para> - <para>Processes will first be terminated via - <constant>SIGTERM</constant> (unless the signal to send is - changed via <varname>KillSignal=</varname>). Optionally, this - is immediately followed by a <constant>SIGHUP</constant> (if - enabled with <varname>SendSIGHUP=</varname>). If then, after a - delay (configured via the <varname>TimeoutStopSec=</varname> - option), processes still remain, the termination request is - repeated with the <constant>SIGKILL</constant> signal or the - signal specified via <varname>FinalKillSignal=</varname> (unless - this is disabled via the <varname>SendSIGKILL=</varname> - option). See - <citerefentry><refentrytitle>kill</refentrytitle><manvolnum>2</manvolnum></citerefentry> - for more information.</para> - - <para>Defaults to - <option>control-group</option>.</para></listitem> + <para>Processes will first be terminated via <constant>SIGTERM</constant> (unless the signal to send + is changed via <varname>KillSignal=</varname>). Optionally, this is immediately followed by a + <constant>SIGHUP</constant> (if enabled with <varname>SendSIGHUP=</varname>). If processes still + remain after the main process of a unit has exited or the delay configured via the + <varname>TimeoutStopSec=</varname> has passed, the termination request is repeated with the + <constant>SIGKILL</constant> signal or the signal specified via <varname>FinalKillSignal=</varname> + (unless this is disabled via the <varname>SendSIGKILL=</varname> option). See + <citerefentry><refentrytitle>kill</refentrytitle><manvolnum>2</manvolnum></citerefentry> for more + information.</para> + + <para>Defaults to <option>control-group</option>.</para></listitem> </varlistentry> <varlistentry> |