summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2010-07-03 09:38:48 +0200
committerGuillem Jover <guillem@debian.org>2010-07-03 09:44:42 +0200
commit3a544f8c59b3f9e46f9cfc624edbaaaa5b81d92a (patch)
tree722340ad79fd2fc69ea3ca421b9b03f0e1265b15
parentbd0ae9a42b06f09223383e67edb262041e2bd98d (diff)
downloaddpkg-3a544f8c59b3f9e46f9cfc624edbaaaa5b81d92a.tar.gz
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.
-rw-r--r--man/dpkg.16
1 files changed, 3 insertions, 3 deletions
diff --git a/man/dpkg.1 b/man/dpkg.1
index d550d1107..4529267ae 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.