X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=5b3afb86d2c64d65830bc75c61c6e68fca25ad89;hb=3379e257ee06f997ec756cd70008353796457b43;hp=8ad665643db0202b6bdaa2dc248cb2a34afc8ccb;hpb=b200a92cdc47b204e2ed7fbdd1eaf15abfd019c6;p=elogind.git

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 8ad665643..5b3afb86d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -674,7 +674,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
                                 processes specified with
                                 <varname>ExecStartPre=</varname>,
                                 <varname>ExecStartPost=</varname>,
-                                <varname>ExecStopPre=</varname>,
+                                <varname>ExecStop=</varname>,
                                 <varname>ExecStopPost=</varname>, or
                                 <varname>ExecReload=</varname>.
                                 When the death of the process is a
@@ -747,10 +747,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
                                 <constant>SIGTERM</constant>, and <constant>SIGPIPE</constant>. Exit status
                                 definitions can either be numeric exit
                                 codes or termination signal names,
-                                separated by spaces. Signals will only
-                                be considered if the service does not implement
-                                a signal handler and exits as a direct result
-                                of receiving the signal. For example:
+                                separated by spaces. For example:
                                 <programlisting>SuccessExitStatus=1 2 8 <constant>SIGKILL</constant></programlisting>
                                 ensures that exit codes 1, 2, 8 and
                                 the termination signal
@@ -767,7 +764,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
                                 Programs should instead perform cleanup and kill themselves with the same signal instead. See
                                 <ulink url="http://www.cons.org/cracauer/sigint.html">Proper handling of SIGINT/SIGQUIT — How to be a proper program</ulink>.</para>
 
-                                <para>This option may appear more than once
+                                <para>This option may appear more than once,
                                 in which case the list of successful
                                 exit statuses is merged. If the empty
                                 string is assigned to this option, the