doc: mv,cp: undocument the --reply option

* doc/coreutils.texi (mv invocation): Remove documentation for mv --reply.
(cp invocation): Likewise.
* NEWS: mention this.

2 files changed, 8 insertions, 22 deletions

diff --git a/NEWS b/NEWS
index dfe893c75..8de63556b 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ GNU coreutils NEWS                                    -*- outline -*-
   comm accepts new option, --output-delimiter=STR, that allows specification
   of an output delimiter other than the default single TAB.
 
+  cp and mv: the deprecated --reply=X option is now also undocumented.
+
   dd accepts iflag=fullblock to make it accumulate full input blocks.
   With this new option, after a short read, dd repeatedly calls read,
   until it fills the incomplete block, reaches EOF, or encounters an error.
@@ -22,6 +24,8 @@ GNU coreutils NEWS                                    -*- outline -*-
   factor accepts arbitrarily large numbers and factors them using
   Pollard's rho algorithm.
 
+  ls now colorizes files with capabilities if libcap is available
+
   md5sum now accepts the new option, --quiet, to suppress the printing of
   'OK' messages.  sha1sum, sha224sum, sha384sum, and sha512sum accept it, too.
 
@@ -34,8 +38,6 @@ GNU coreutils NEWS                                    -*- outline -*-
   represents the maximum number of inputs that will be merged at once.
   When processing more than NMERGE inputs, sort uses temporary files.
 
-  ls now colorizes files with capabilities if libcap is available
-
 ** Bug fixes
 
   chcon --verbose now prints a newline after each message
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index cf46c744f..fd1e79e09 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7320,18 +7320,12 @@ cp --parents a/b/c existing_dir
 copies the file @file{a/b/c} to @file{existing_dir/a/b/c}, creating
 any missing intermediate directories.
 
+@c The --reply option was deprecated in 2005, and is scheduled to
+@c be removed in 2008.  It is already missing from the --help output.
 @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.
-Specify @option{--reply=query} to make @command{cp} prompt the user
-about each existing destination file.
+This option is deprecated.
 
 @item -R
 @itemx -r
@@ -8015,17 +8009,7 @@ 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.
+This option is deprecated.
 
 @item -u
 @itemx --update