Re: rm issue

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Jim Meyering on 2/20/2006 6:06 AM:
>>ChangeLog:
>>2006-02-18  Eric Blake  <address@hidden>
>>      * TODO (rm): Implement rm -I.
>>      * NEWS: Document it, along with change to rm --interactive.
>
> Thanks.  Applied.
>

I missed one spot of documentation, and introduced a typo.  Please apply
this followon patch:

ChangeLog:
2006-02-20  Eric Blake  <address@hidden>

        * man/rm.x: Update documentation to match previous patch.

doc/ChangeLog:
2006-02-20  Eric Blake  <address@hidden>

        * coreutils.texi (rm invocation): Fix typo in last patch.
        (paste invocation): Fix whitespace.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD+fBF84KuGfSFAYARAmt4AJ9QfW6fRoeGkX2BkkadTu2uwts5KgCgxPyK
BKml8zPZNGyWXn3rkvHrNoA=
=JwGh
-----END PGP SIGNATURE-----

Index: doc/coreutils.texi
===================================================================
RCS file: /sources/coreutils/coreutils/doc/coreutils.texi,v
retrieving revision 1.312
diff -u -p -r1.312 coreutils.texi
--- doc/coreutils.texi  20 Feb 2006 13:01:51 -0000      1.312
+++ doc/coreutils.texi  20 Feb 2006 16:35:15 -0000
@@ -4679,7 +4679,7 @@ c
 $ paste num2 let3
 1       a
 2       b
-        c
+       @ c
 @end example
 
 Synopsis:
@@ -7331,7 +7331,7 @@ If the @option{-I} or @option{--interact
 and there are more than three files or the @option{-r}, @option{-R},
 or @option{--recursive} are given, then @command{rm} prompts the user
 for whether to proceed with the entire operation.  If the response is
-not affirmitive, the entire command is aborted.
+not affirmative, the entire command is aborted.
 
 Otherwise, if a file is unwritable, standard input is a terminal, and
 the @option{-f} or @option{--force} option is not given, or the
Index: man/rm.x
===================================================================
RCS file: /sources/coreutils/coreutils/man/rm.x,v
retrieving revision 1.6
diff -u -p -r1.6 rm.x
--- man/rm.x    21 Sep 2004 07:53:54 -0000      1.6
+++ man/rm.x    20 Feb 2006 16:35:15 -0000
@@ -8,11 +8,19 @@ documents the GNU version of
 removes each specified file.  By default, it does not remove
 directories.
 .P
-If a file is unwritable, the standard input is a tty, and
-the \fI\-f\fR or \fI\-\-force\fR option is not given,
+If the \fI\-I\fR or \fI\-\-interactive\=once\fR option is given,
+and there are more than three files or the \fI\-r\fR, \fI\-R\fR,
+or \fI\-\-recursive\fR are given, then
 .B rm
-prompts the user for whether to remove the file.  If the response
-is not affirmative, the file is skipped.
+prompts the user for whether to proceed with the entire operation.  If
+the response is not affirmative, the entire command is aborted.
+.P
+Otherwise, if a file is unwritable, standard input is a terminal, and
+the \fI\-f\fR or \fI\-\-force\fR option is not given, or the
+\fI\-i\fR or \fI\-\-interactive\=always\fR option is given,
+.B rm
+prompts the user for whether to remove the file.  If the response is
+not affirmative, the file is skipped.
 .SH OPTIONS
 [SEE ALSO]
 chattr(1), shred(1)