merge with 3.8.3e

1 files changed, 4 insertions, 4 deletions

diff --git a/src/rm.c b/src/rm.c
index 2b17e64c1..acb0e8259 100644
--- a/src/rm.c
+++ b/src/rm.c
@@ -529,20 +529,20 @@ static void
 usage (status)
      int status;
 {
-  fprintf (stderr, "\
+  fprintf (status == 0 ? stdout : stderr, "\
 Usage: %s [OPTION]... PATH...\n\
 \n",
 	   program_name);
 
   if (status == 0)
-    fprintf (stderr, "\
+    fprintf (stdout, "\
   -d, --directory       unlink directory, even if non-empty (super-user only)\n\
   -f, --force           ignore nonexistent files, never prompt\n\
   -i, --interactive     prompt before any removal\n\
   -v, --verbose         explain what is being done\n\
   -r, -R, --recursive   remove the contents of directories recursively\n\
-      --help            provide this help\n\
-      --version         show program version\n");
+      --help            display this help and exit\n\
+      --version         output version information and exit\n");
 
   else
     fprintf (stderr, "Try `%s --help' for more information.\n",