From: Wichert Akkerman <wakkerma@debian.org>
Date: Mon, 13 May 2002 21:00:32 +0000 (+0000)
Subject: Document --force-confmiss and --force-bad-verify
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2b0d924a8a79030a475f1883b6fd32d2c881ea8;p=dpkg

Document --force-confmiss and --force-bad-verify
---

diff --git a/ChangeLog b/ChangeLog
index 1a731fcc..55d56547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 13 22:44:48 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * man/en/dpkg.8.sgml: document --force-confmiss and --force-bad-verify
+
 Mon May  6 16:26:51 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * lots-a-files: update email address for Ian Jackson
diff --git a/debian/changelog b/debian/changelog
index d5908b42..66f43511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,7 @@ dpkg (1.10) unstable; urgency=low
   * Add Large File Summit extensions. Closes: Bug#130509
   * Fix typo in dpkg-source manpage. Closes: Bug#141906
   * Re-fix handling of multiple blank lines in control. Closes: Bug#143117
+  * Document --force-confmiss and --force-bad-verify. Closes: Bug#146855
 
  -- Wichert Akkerman <wakkerma@debian.org>  Mon, 20 Aug 2001 14:54:38 +0200
 
diff --git a/man/en/dpkg.8.sgml b/man/en/dpkg.8.sgml
index fe4869ad..74cabe23 100644
--- a/man/en/dpkg.8.sgml
+++ b/man/en/dpkg.8.sgml
@@ -1043,6 +1043,16 @@
 	      </para></listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term>confmiss</term>
+
+	      <listitem><para>
+		Always install a missing configuration file. This is dangerous,
+		since it means not preserving a change (removing) made to the
+		file.
+	      </para></listitem>
+	    </varlistentry>
+
 	    <varlistentry>
 	      <term>confnew</term>
 
@@ -1118,6 +1128,16 @@
 	      </para></listitem>
 	    </varlistentry>
 
+	    <varlistentry>
+	      <term>bad-verify</term>
+
+	      <listitem><para>
+	        Install a package even if <command>debsig</command>
+		verification fails. <emphasis>This can be a security
+		risk.</emphasis>
+	      </para></listitem>
+	    </varlistentry>
+
 	    <varlistentry>
 	      <term>not-root</term>