diff options
| author | Benno Schulenberg <bensberg@justemail.net> | 2012-10-15 13:06:37 +0200 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2012-11-09 13:16:36 +0000 |
| commit | 51e7c777f827899e196812552f30d7457372e503 (patch) | |
| tree | b3c1f15ac7de322375aa92245a8e0a52bdf54eb4 | |
| parent | a395b637a62a380f2d11e12f8c9e0eceb9e86a8f (diff) | |
| download | coreutils-51e7c777f827899e196812552f30d7457372e503.tar.xz | |
doc: with cp -n, option -f is not redundant but ignored
* src/cp.c (usage): Replace "redundant" with "ignored".
* doc/coreutils.texi (cp invocation): Likewise.
| -rw-r--r-- | doc/coreutils.texi | 4 | ||||
| -rw-r--r-- | src/cp.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/coreutils.texi b/doc/coreutils.texi index b251b3d91..f126f4945 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -7734,8 +7734,8 @@ description of @option{--remove-destination}. This option is independent of the @option{--interactive} or @option{-i} option: neither cancels the effect of the other. -This option is redundant if the @option{--no-clobber} or @option{-n} option is -used. +This option is ignored when the @option{--no-clobber} or @option{-n} option +is also used. @item -H @opindex -H @@ -177,9 +177,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); fputs (_("\ -f, --force if an existing destination file cannot be\n\ - opened, remove it and try again (redundant if\ -\n\ - the -n option is used)\n\ + opened, remove it and try again (this option\n\ + is ignored when the -n option is also used)\n\ -i, --interactive prompt before overwrite (overrides a previous -n\ \n\ option)\n\ |