[dpkg] 51/200: man: Fix bogus description of --force-confmiss

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit 82ad2a662b4e24cc298f2319f36112fd235088fb
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Dec 4 04:52:47 2016 +0100

    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 at gmx.de>
    Closes: #846395
---
 debian/changelog | 3 +++
 man/dpkg.man     | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75ef727..8218ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dpkg (1.18.16) UNRELEASED; urgency=medium
       hooks.
     - Add a new ENVIRONMENT section to dpkg-gensymbols(1) and document
       DPKG_GENSYMBOLS_CHECK_LEVEL there.
+    - Fix bogus description of --force-confmiss in dpkg(1). Regression
+      introduced in 1.16.4. Reported by Sven Joachim <svenjoac at gmx.de>.
+      Closes: #846395
 
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
diff --git a/man/dpkg.man b/man/dpkg.man
index 80e7363..abdaf0f 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.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git