From: Russ Allbery <rra@debian.org>
Date: Mon, 23 Aug 2010 03:50:56 +0000 (-0700)
Subject: Clarify wording of conflicting packages with the same conffile
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=89b314bd4b5e9d9d21dd439443b880067c31bb27;p=debian%2Fdebian-policy.git

Clarify wording of conflicting packages with the same conffile
---

diff --git a/policy.sgml b/policy.sgml
index bc25c16..3fc8446 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8011,14 +8011,14 @@ ln -fs ../sbin/sendmail debian/tmp/usr/bin/runq
 	  </p>
 
 	  <p>
-	    A package that declares the same <tt>conffile</tt> as another,
-	    conflicting package may see left-over configuration files from
-	    that other package.  If a user removes (without purging) one
-	    of the packages and installs the other, the new package will
-	    take over the <tt>conffile</tt> from the old package.  If the
-	    file was modified by the user, it will be treated the same as
-	    any other locally modified <tt>conffile</tt> during an
-	    upgrade.
+	    When two packages both declare the same <tt>conffile</tt>, they
+	    may see left-over configuration files from each other even
+	    though they conflict with each other.  If a user removes
+	    (without purging) one of the packages and installs the other,
+	    the new package will take over the <tt>conffile</tt> from the
+	    old package.  If the file was modified by the user, it will be
+	    treated the same as any other locally
+	    modified <tt>conffile</tt> during an upgrade.
 	  </p>
 
 	  <p>