summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2016-12-04 04:52:47 +0100
committerGuillem Jover <guillem@debian.org>2016-12-17 01:41:18 +0100
commit82ad2a662b4e24cc298f2319f36112fd235088fb (patch)
tree3a5bf546d937df1464408b298cf1a8d1f91653c2 /man
parent230d3a5acd9c94a74a38faf37e8a2f9bf75cc322 (diff)
downloaddpkg-82ad2a662b4e24cc298f2319f36112fd235088fb.tar.gz
man: Fix bogus description of --force-confmiss
This force option is the only one that performs its action independently of the conffile changing or not in the new package. The description was bogusly updated when trying to clarify the other conf force options. Regression introduced in commit 4bcc6b8e0a587b432b145fafa642674607cddddd. Reported-by: Sven Joachim <svenjoac@gmx.de> Closes: #846395
Diffstat (limited to 'man')
-rw-r--r--man/dpkg.man7
1 files changed, 3 insertions, 4 deletions
diff --git a/man/dpkg.man b/man/dpkg.man
index 80e736321..abdaf0f64 100644
--- a/man/dpkg.man
+++ b/man/dpkg.man
@@ -544,9 +544,8 @@ Install, even if it conflicts with another package. This is dangerous,
for it will usually cause overwriting of some files.
\fBconfmiss\fP:
-If a conffile is missing and the version in the package did change, always
-install the missing conffile without prompting. This is dangerous, since
-it means not preserving a change (removing) made to the file.
+Always install the missing conffile without prompting. This is dangerous,
+since it means not preserving a change (removing) made to the file.
\fBconfnew\fP:
If a conffile has been modified and the version in the package did change,
@@ -571,7 +570,7 @@ that to decide the final action.
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 (since dpkg 1.15.8).
-If any of \fB\-\-force\-confmiss\fP, \fB\-\-force\-confnew\fP,
+If any 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.