From: Wichert Akkerman <wakkerma@debian.org>
Date: Wed, 8 May 2002 14:07:41 +0000 (+0000)
Subject: Clarify confold and confnew handling
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e73c5d89962ec7a088f270d1c1cf03e63ff0f2fc;p=dpkg

Clarify confold and confnew handling
---

diff --git a/man/en/dpkg.8.sgml b/man/en/dpkg.8.sgml
index 3e690637..fe4869ad 100644
--- a/man/en/dpkg.8.sgml
+++ b/man/en/dpkg.8.sgml
@@ -1048,7 +1048,9 @@
 
 	      <listitem><para>
 		If a conffile has been modified always install the new
-		version without prompting.
+		version without prompting, unless the
+		<option>--force-confdef</option> is also specified, in
+		which case the default action is preferred.
 	      </para></listitem>
 	    </varlistentry>
 
@@ -1057,7 +1059,9 @@
 
 	      <listitem><para>
 		If a conffile has been modified always keep the old version
-		without prompting.
+		without prompting, unless the <option>--force-confdef</option>
+		is also specified, in which case the default action is
+		preferred.
 	      </para></listitem>
 	    </varlistentry>