X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=491c3df1cb6a375eba0f0b221b41674fd610b880;hb=19125c205aa6084c225b5c11cc6dcbe18c6dbcc0;hp=69060a53b297ad706dd996c859c16766e2bdb0a6;hpb=9980033377c105d2cd6539c9d73ee61d4c2263b0;p=elogind.git

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 69060a53b..491c3df1c 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -535,18 +535,20 @@
                                 <option>on-failure</option> it will be
                                 restarted only when it exited with an
                                 exit code not equalling 0, when
-                                terminated by a signal, when an
-                                operation times out or when the
+                                terminated by a signal (including on
+                                core dump), when an operation (such as
+                                service reload) times out or when the
                                 configured watchdog timeout is
                                 triggered. If set to
                                 <option>on-abort</option> it will be
                                 restarted only if it exits due to
-                                reception of an uncaught signal. If
-                                set to <option>always</option> the
-                                service will be restarted regardless
-                                whether it exited cleanly or not,
-                                got terminated abnormally by a
-                                signal or hit a timeout.</para></listitem>
+                                reception of an uncaught signal
+                                (including on core dump). If set to
+                                <option>always</option> the service
+                                will be restarted regardless whether
+                                it exited cleanly or not, got
+                                terminated abnormally by a signal or
+                                hit a timeout.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -756,7 +758,27 @@
                                 are allowed (defaults to 5). These
                                 configuration options are particularly
                                 useful in conjunction with
-                                <varname>Restart=</varname>.</para></listitem>
+                                <varname>Restart=</varname>, however
+                                apply to all kinds of starts
+                                (including manual), not just those
+                                triggered by the
+                                <varname>Restart=</varname> logic.
+                                Note that units which are configured
+                                for <varname>Restart=</varname> and
+                                which reach the start limit are not
+                                attempted to be restarted anymore,
+                                however they may still be restarted
+                                manually at a later point from which
+                                point on the restart logic is again
+                                activated. Note that
+                                <command>systemctl
+                                reset-failed</command> will cause the
+                                restart rate counter for a service to
+                                be flushed, which is useful if the
+                                administrator wants to manually start
+                                a service and the start limit
+                                interferes with
+                                that.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>