소스 검색

Clarify confold and confnew handling

Wichert Akkerman 24 년 전
부모
커밋
e73c5d8996
1개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 6 2
      man/en/dpkg.8.sgml

+ 6 - 2
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>