(cp invocation): Mark --reply as deprecated.

(mv invocation): Likewise.

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 8e69b726d08f694dbb28473b63a476196a99b2ce..8c421d39e0acd577a35095aac26beecc231fa09b 100644 (file)
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -6510,15 +6510,13 @@ any missing intermediate directories.
 @itemx @w{@kbd{--reply}[=@var{how}]}
 @opindex --reply
 @cindex interactivity
+@c FIXME: remove in 2008
+@strong{Deprecated: to be removed in 2008.}@*
 Using @option{--reply=yes} makes @command{cp} act as if @samp{yes} were
 given as a response to every prompt about a destination file.  That effectively
 cancels any preceding @option{--interactive} or @option{-i} option.
 Specify @option{--reply=no} to make @command{cp} act as if @samp{no} were
 given as a response to every prompt about a destination file.
-Note that @option{--reply=no} has an effect only when mv would prompt
-without @option{-i} or equivalent, i.e., when a destination file exists and is
-not writable, standard input is a terminal, and no @option{-f} (or equivalent)
-option is specified.
 Specify @option{--reply=query} to make @command{cp} prompt the user
 about each existing destination file.
 
@@ -7147,11 +7145,17 @@ If the response is not affirmative, the file is skipped.
 @itemx @w{@kbd{--reply}[=@var{how}]}
 @opindex --reply
 @cindex interactivity
+@c FIXME: remove in 2008
+@strong{Deprecated: to be removed in 2008.}@*
 Specifying @option{--reply=yes} is equivalent to using @option{--force}.
 Specify @option{--reply=no} to make @command{mv} act as if @samp{no} were
 given as a response to every prompt about a destination file.
 Specify @option{--reply=query} to make @command{mv} prompt the user
 about each existing destination file.
+Note that @option{--reply=no} has an effect only when @command{mv} would prompt
+without @option{-i} or equivalent, i.e., when a destination file exists and is
+not writable, standard input is a terminal, and no @option{-f} (or equivalent)
+option is specified.
 
 @item -u
 @itemx --update