man: document $MAINPID

[elogind.git] / man / systemd.service.xml

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 8ad665643db0202b6bdaa2dc248cb2a34afc8ccb..3b2a7cfece48122cec689413459bb21e0af00fc3 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -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,
                                 <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
                                 <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>
 
                                 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
                                 in which case the list of successful
                                 exit statuses is merged. If the empty
                                 string is assigned to this option, the