The following commit has been merged in the master branch:
commit 3a544f8c59b3f9e46f9cfc624edbaaaa5b81d92a
Author: Guillem Jover <guil...@debian.org>
Date:   Sat Jul 3 09:38:48 2010 +0200

    man: Clarify --force-confask description
    
    Mention any of the other --force-conf options can be given, not just
    one. And that --force-confmiss can also be used with --force-confask.

diff --git a/man/dpkg.1 b/man/dpkg.1
index d550d11..4529267 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -430,9 +430,9 @@ which case it will use that to decide the final action.
 \fBconfask\fP:
 If a conffile has been modified always offer to replace it with the
 version in the package, even if the version in the package did not
-change. If one of \fB\-\-force\-confnew\fP, \fB\-\-force\-confold\fP,
-or \fB\-\-force\-confdef\fP is also given, it will be used to decide
-the final action.
+change. If any of \fB\-\-force\-confmiss\fP, \fB\-\-force\-confnew\fP,
+\fB\-\-force\-confold\fP, or \fB\-\-force\-confdef\fP is also given,
+it will be used to decide the final action.
 
 \fBoverwrite\fP:
 Overwrite one package's file with another's file.

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to