From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 17 May 2023 15:47:53 +0000 (+0800)
Subject: Revert (partially) "man: Clarify when OnFailure= activates after restarts (#7646)"
X-Git-Tag: v254-rc1~455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2200cf47ce7e0f049bcda156a897565f45233838;p=thirdparty%2Fsystemd.git

Revert (partially) "man: Clarify when OnFailure= activates after restarts (#7646)"

This reverts part of commit bd2538b50ba283c9ce39142d5d16d90184a55b90,
specifically changes to the description of service state between auto-restarts.

Fixes #27594
---

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index ba4f4275821..38bb5b7c225 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -886,8 +886,7 @@
         limiting configured with <varname>StartLimitIntervalSec=</varname>
         and <varname>StartLimitBurst=</varname>, see
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details.  A restarted service enters the failed state only
-        after the start limits are reached.</para>
+        for details.</para>
 
         <para>Setting this to <option>on-failure</option> is the
         recommended choice for long-running services, in order to
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index e28bfe845e6..d603ec97444 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -822,8 +822,7 @@
         <term><varname>OnFailure=</varname></term>
 
         <listitem><para>A space-separated list of one or more units that are activated when this unit enters
-        the <literal>failed</literal> state.  A service unit using <varname>Restart=</varname> enters the
-        failed state only after the start limits are reached.</para></listitem>
+        the <literal>failed</literal> state.</para></listitem>
       </varlistentry>
 
       <varlistentry>