Index: flashrom-fix_duplicated_file_in_usage_message/flashrom.8
===================================================================
--- flashrom-fix_duplicated_file_in_usage_message/flashrom.8	(Revision 607)
+++ flashrom-fix_duplicated_file_in_usage_message/flashrom.8	(Arbeitskopie)
@@ -4,7 +4,7 @@
 .SH SYNOPSIS
 .B flashrom \fR[\fB\-VfLzhR\fR] [\fB\-E\fR|\fB\-r\fR file|\fB\-w\fR file|\fB\-v\fR file]
          [\fB\-c\fR chipname] [\fB\-s\fR addr] [\fB\-e\fR addr] [\fB\-m\fR [vendor:]part]
-         [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] [file]
+         [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer]
 .SH DESCRIPTION
 .B flashrom
 is a utility for detecting, reading, writing, verifying and erasing flash
Index: flashrom-fix_duplicated_file_in_usage_message/flashrom.c
===================================================================
--- flashrom-fix_duplicated_file_in_usage_message/flashrom.c	(Revision 607)
+++ flashrom-fix_duplicated_file_in_usage_message/flashrom.c	(Arbeitskopie)
@@ -483,7 +483,7 @@
 void usage(const char *name)
 {
 	printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname] [-s addr]\n"
-              "       [-e addr] [-m [vendor:]part] [-l file] [-i image] [-p programmer] [file]\n\n", name);
+              "       [-e addr] [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name);
 
 	printf("Please note that the command line interface for flashrom will "
 		"change before\nflashrom 1.0. Do not use flashrom in scripts "
@@ -510,9 +510,8 @@
 	     "                                     it87spi, ft2232spi)\n"
 	     "   -h | --help:                      print this help text\n"
 	     "   -R | --version:                   print the version (release)\n"
-	     "\nYou can specify one of -E, -r, -w, -v or no operation. "
-	     "If no operation is\nspecified, then all that happens"
-	     " is that flash info is dumped.\n\n");
+	     "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n"
+	     "specified, then all that happens is that flash info is dumped.\n\n");
 	exit(1);
 }
 
