Просмотр исходного кода

Update dpkg manpage for --force-conf* options

Wichert Akkerman лет назад: 27
Родитель
Сommit
81c09e50e3
2 измененных файлов с 17 добавлено и 0 удалено
  1. 4 0
      ChangeLog
  2. 13 0
      main/dpkg.8

+ 4 - 0
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>
 Thu Oct 14 04:16:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
 
   * Reinstate patch to not read available-file with doing listfiles.
   * Reinstate patch to not read available-file with doing listfiles.

+ 13 - 0
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,
 Install, even if it conflicts with another package. This is dangerous,
 for it will usually cause overwriting of some files.
 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(*):
 \fBoverwrite\fP(*):
 Overwrite one package's file with another's file.
 Overwrite one package's file with another's file.