summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWichert Akkerman <wakkerma@debian.org>2002-05-08 14:07:41 +0000
committerWichert Akkerman <wakkerma@debian.org>2002-05-08 14:07:41 +0000
commite73c5d89962ec7a088f270d1c1cf03e63ff0f2fc (patch)
tree27391e8711a8d057f2513d6477d6cd2694ddf852
parentc01a401220816405179370476e94d75fb5b0e0b0 (diff)
downloaddpkg-e73c5d89962ec7a088f270d1c1cf03e63ff0f2fc.tar.gz
Clarify confold and confnew handling
-rw-r--r--man/en/dpkg.8.sgml8
1 files changed, 6 insertions, 2 deletions
diff --git a/man/en/dpkg.8.sgml b/man/en/dpkg.8.sgml
index 3e6906379..fe4869ad3 100644
--- a/man/en/dpkg.8.sgml
+++ b/man/en/dpkg.8.sgml
@@ -1048,7 +1048,9 @@
<listitem><para>
If a conffile has been modified always install the new
- version without prompting.
+ version without prompting, unless the
+ <option>--force-confdef</option> is also specified, in
+ which case the default action is preferred.
</para></listitem>
</varlistentry>
@@ -1057,7 +1059,9 @@
<listitem><para>
If a conffile has been modified always keep the old version
- without prompting.
+ without prompting, unless the <option>--force-confdef</option>
+ is also specified, in which case the default action is
+ preferred.
</para></listitem>
</varlistentry>