[flashrom] r628 - trunk

Author: hailfinger
Date: 2009-06-24 10:18:38 +0200 (Wed, 24 Jun 2009)
New Revision: 628

Modified:
   trunk/flashrom.8
   trunk/flashrom.c
Log:
Remove duplicated [file] from usage help. A file is already specified
directly in conjunction for -r/-w/-v.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Uwe Hermann

Modified: trunk/flashrom.8
===================================================================
--- trunk/flashrom.8	2009-06-23 20:27:33 UTC (rev 627)
+++ trunk/flashrom.8	2009-06-24 08:18:38 UTC (rev 628)
@@ -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-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

Modified: trunk/flashrom.c
===================================================================
--- trunk/flashrom.c	2009-06-23 20:27:33 UTC (rev 627)
+++ trunk/flashrom.c	2009-06-24 08:18:38 UTC (rev 628)
@@ -493,7 +493,7 @@
 void usage(const char *name)
 {
    printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n"
-              "       [-m [vendor:]part] [-l file] [-i image] [-p programmer] [file]\n\n", name);
+              "       [-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 "
@@ -518,9 +518,8 @@
         "                                     it87spi, ft2232spi, serprog)\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);
 }