From: Andrew Sayers <andrew-github.com@pileofstuff.org>
Date: Thu, 23 Jan 2025 08:06:57 +0000 (+0000)
Subject: Clarify that Conflicts= only applies when starting units
X-Git-Tag: v258-rc1~1514
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5038e63e924ee3fa79610c0fd658d46e890d3fb;p=thirdparty%2Fsystemd.git

Clarify that Conflicts= only applies when starting units

The "vice versa" in the old text could be interpreted as either
(wrong) "stopping the former will start the latter", or
(right) "starting the latter will stop the former".

Rephrase to avoid that ambiguity.
---

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 986505e29f7..44eb51c83a4 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -783,8 +783,8 @@
         <term><varname>Conflicts=</varname></term>
 
         <listitem><para>A space-separated list of unit names. Configures negative requirement
-        dependencies. If a unit has a <varname>Conflicts=</varname> setting on another unit, starting the
-        former will stop the latter and vice versa.</para>
+        dependencies. If a unit has a <varname>Conflicts=</varname> requirement on a set of other units,
+        then starting it will stop all of them and starting any of them will stop it.</para>
 
         <para>Note that this setting does not imply an ordering dependency, similarly to the
         <varname>Wants=</varname> and <varname>Requires=</varname> dependencies described above. This means