Update dpkg manpage for --force-conf* options

diff --git a/ChangeLog b/ChangeLog
index 56110b157cb6e30d11374fc0fdd734b3c85123e4..3143a1d8788579cb371aeb05b2d71c507bcac722 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 14 04:39:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Update dpkg manpage to add new --force-conf* options
+
 Thu Oct 14 04:16:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Reinstate patch to not read available-file with doing listfiles.

diff --git a/main/dpkg.8 b/main/dpkg.8
index 9a62457dd94f9b7987aba7422ce0dd23b37009c4..2ec6109a1c421a7797d156a34529be51400662d4 100644 (file)
--- a/main/dpkg.8
+++ b/main/dpkg.8
@@ -364,6 +364,19 @@ Don't care about versions when checking dependencies.
 Install, even if it conflicts with another package. This is dangerous,
 for it will usually cause overwriting of some files.
 
+\fBconfnew\fP:
+If a conffile has been modified always install the new version without
+prompting.
+
+\fBconfold\fP:
+If a conffile has been modified always keep the old version without prompting.
+
+\fBconfdef\fP:
+If a conffile has been modified always choose the default action. If
+\fB--force-confnew\fP or \fB--force-confold\fP have also been given
+always default. If there is no default then we use the old or new
+version, depending on the option given.
+
 \fBoverwrite\fP(*):
 Overwrite one package's file with another's file.