This patch, put together by Manuel Novoa III, is a merge of work

done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.

coreutils/rm.c

@@ -84,7 +84,7 @@ extern int rm_main(int argc, char **argv)
 						stopIt = TRUE;
 						break;
 					default:
-						usage(rm_usage);
+						show_usage();
 				}
 			argc--;
 			argv++;
@@ -94,7 +94,7 @@ extern int rm_main(int argc, char **argv)
 	}
 
 	if (argc < 1 && forceFlag == FALSE) {
-		usage(rm_usage);
+		show_usage();
 	}
 
 	while (argc-- > 0) {