X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=3b2a7cfece48122cec689413459bb21e0af00fc3;hp=be9bdcaf99689d5e03d34ac3090f6ce0fdcebfca;hb=73e231abde39f22097df50542c745e01de879836;hpb=bcddd5bf8033b0c9cb15a9d017b7714ebe21473a

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index be9bdcaf9..3b2a7cfec 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -747,33 +747,30 @@ 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:
-				<programlisting>SuccessExitStatus=1 2 8 <constant>SIGKILL</constant></programlisting>
-				ensures that exit codes 1, 2, 8 and
-				the termination signal
-				<constant>SIGKILL</constant> are
-				considered clean service terminations.
-			        </para>
-
-				<para>Note that if a process has a
-				signal handler installed and exits by
-				calling
-				<citerefentry><refentrytitle>_exit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-				in response to a signal, the
-				information about the signal is lost.
-				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
-				in which case the list of successful
-				exit statuses is merged. If the empty
-				string is assigned to this option, the
-				list is reset, all prior assignments
-				of this option will have no
-				effect.</para></listitem>
+                                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
+                                <constant>SIGKILL</constant> are
+                                considered clean service terminations.
+                                </para>
+
+                                <para>Note that if a process has a
+                                signal handler installed and exits by
+                                calling
+                                <citerefentry><refentrytitle>_exit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                in response to a signal, the
+                                information about the signal is lost.
+                                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,
+                                in which case the list of successful
+                                exit statuses is merged. If the empty
+                                string is assigned to this option, the
+                                list is reset, all prior assignments
+                                of this option will have no
+                                effect.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -861,7 +858,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
                                 for all file descriptors passed via
                                 socket-based activation. If true, all
                                 file descriptors >= 3 (i.e. all except
-                                STDIN/STDOUT/STDERR) will have
+                                stdin, stdout, and stderr) will have
                                 the <constant>O_NONBLOCK</constant> flag
                                 set and hence are in
                                 non-blocking mode. This option is only