summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/coreutils.texi6
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f2d23be3b..bb84f1960 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * coreutils.texi (cp invocation): Say that -i and -f are
+ independent. Clarify -i's behavior.
+
2006-09-08 Paul Eggert <eggert@cs.ucla.edu>
* coreutils.texi (tail invocation): Ignore -f when standard input
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 51493874c..461423707 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -6890,6 +6890,9 @@ tries to open it again. Contrast this behavior with that enabled by
is never opened but rather is unlinked unconditionally. Also see the
description of @option{--remove-destination}.
+This option is independent of the @option{--interactive} or
+@option{-i} option: neither cancels the effect of the other.
+
@item -H
@opindex -H
If a command line argument specifies a symbolic link, then copy the
@@ -6901,7 +6904,8 @@ via recursive traversal.
@itemx --interactive
@opindex -i
@opindex --interactive
-Prompt whether to overwrite existing regular destination files.
+When copying a regular file, prompt whether to overwrite an existing
+destination file.
@item -l
@itemx --link