summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2012-02-16 13:29:44 +0100
committerJim Meyering <meyering@redhat.com>2012-02-16 14:54:49 +0100
commitbf5ba002c20578a5bdc9599b250cdad5468fa9ab (patch)
tree1610185baf4170887a6ff1b7b63665dad0ae8329
parent4bb5dbcfef55c4f66755dd3c48b906e4e9030b96 (diff)
downloadcoreutils-bf5ba002c20578a5bdc9599b250cdad5468fa9ab.tar.xz
doc: improve 'rm -f' description
* doc/coreutils.texi (rm invocation): Mention that the -f option also silences the message for missing operands, which is useful in scripts e.g., for "rm -f $file_list" when $file_list is empty. * src/rm.c (usage): Likewise. Reported by Jérémy Magrin in http://bugs.gnu.org/10819
-rw-r--r--THANKS.in1
-rw-r--r--doc/coreutils.texi2
-rw-r--r--src/rm.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/THANKS.in b/THANKS.in
index 904bb3eda..c8dd75f85 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -276,6 +276,7 @@ Jens Elkner elkner@imsgroup.de
Jens Schmidt jms@jsds.hamburg.com
Jeph Cowan jeph@ucar.edu
Jeremy Maitin-Shepard jbms@cmu.edu
+Jérémy Magrin jeremy.magrin@epitech.eu
Jerome Abela abela@hsc.fr
Jérôme Zago bug-coreutils-ml@agt-the-walker.net
Jesse Kornblum kornblum@usna.edu
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 02c3a2a5d..8c6a2870f 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8769,7 +8769,7 @@ The program accepts the following options. Also see @ref{Common options}.
@itemx --force
@opindex -f
@opindex --force
-Ignore nonexistent files and never prompt the user.
+Ignore nonexistent files and missing operands, and never prompt the user.
Ignore any previous @option{--interactive} (@option{-i}) option.
@item -i
diff --git a/src/rm.c b/src/rm.c
index db525d02c..02809f214 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -135,7 +135,7 @@ usage (int status)
fputs (_("\
Remove (unlink) the FILE(s).\n\
\n\
- -f, --force ignore nonexistent files, never prompt\n\
+ -f, --force ignore nonexistent files and arguments, never prompt\n\
-i prompt before every removal\n\
"), stdout);
fputs (_("\