X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=ee4d3937565b97c6f35649170212f6f8c2ab56f8;hp=c77992d07c6e1749df86f434fdcef0629064d48b;hb=4bc5f808e4c4891451b83abbc85c4830b3788782;hpb=f8553ccbb3b774ab39acfc5b4dc1564bb31ef801

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index c77992d07..ee4d39375 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -271,11 +271,11 @@
                                 <literal>-</literal> an exit code of
                                 the command normally considered a
                                 failure (i.e. non-zero exit status or
-                                abormal exit due to signal) is ignored
+                                abnormal exit due to signal) is ignored
                                 and considered success. If both
                                 <literal>-</literal> and
                                 <literal>@</literal> are used for the
-                                same command the former must preceed
+                                same command the former must precede
                                 the latter. Unless
                                 <varname>Type=forking</varname> is
                                 set, the process started via this
@@ -314,7 +314,7 @@
                                 after the other,
                                 serially. Alternatively, these
                                 directives may be specified more than
-                                once whith the same effect. However,
+                                once with the same effect. However,
                                 the latter syntax is not recommended
                                 for compatibility with parsers
                                 suitable for XDG
@@ -441,7 +441,7 @@
                                 i.e. terminated with an exit code of
                                 0. If set to
                                 <option>on-failure</option> it will be
-                                restared only when it exited with an
+                                restarted only when it exited with an
                                 exit code not equalling 0, or when
                                 terminated by a signal. If set to
                                 <option>on-abort</option> it will be
@@ -560,17 +560,41 @@
                                 <option>control-group</option>.</para>
 
                                 <para>Processes will first be
-                                terminated via SIGTERM. If then after
-                                a delay (configured via the
+                                terminated via SIGTERM (unless the
+                                signal to send is changed via
+                                <varname>KillSignal=</varname>). If
+                                then after a delay (configured via the
                                 <varname>TimeoutSec=</varname> option)
                                 processes still remain, the
                                 termination request is repeated with
-                                the SIGKILL signal. See
+                                the SIGKILL signal (unless this is
+                                disabled via the
+                                <varname>SendSIGKILL=</varname>
+                                option). See
                                 <citerefentry><refentrytitle>kill</refentrytitle><manvolnum>2</manvolnum></citerefentry>
                                 for more
                                 information.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>KillSignal=</varname></term>
+                                <listitem><para>Specifies which signal
+                                to use when killing a
+                                service. Defaults to SIGTERM.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>SendSIGKILL=</varname></term>
+                                <listitem><para>Specifies whether to
+                                send SIGKILL to remaining processes
+                                after a timeout, if the normal
+                                shutdown procedure left processes of
+                                the service around. Takes a boolean
+                                value. Defaults to "yes".
+                                </para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>NonBlocking=</varname></term>
                                 <listitem><para>Set O_NONBLOCK flag