Tweak contrib --help output to match common style

petere · petere · commit 081ca7a0d199 · 2012-05-08T21:55:05.000+03:00
Placeholders such as OPTION are typically kept in singular.
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
@@ -177,7 +177,7 @@ help(const char *progname)
 {
 	printf("%s helps examining the file structure used by PostgreSQL.\n\n"
 		   "Usage:\n"
-		   "  %s [OPTIONS]...\n"
+		   "  %s [OPTION]...\n"
 		   "\nOptions:\n"
 		   "  -d DBNAME    database to connect to\n"
 		   "  -f FILENODE  show info for table with given file node\n"
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -218,7 +218,7 @@ usage(void)
 {
 	printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\
 \nUsage:\n\
-  pg_upgrade [OPTIONS]...\n\
+  pg_upgrade [OPTION]...\n\
 \n\
 Options:\n\
   -b, --old-bindir=OLDBINDIR    old cluster executable directory\n\
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -338,7 +338,7 @@ usage(const char *progname)
 {
 	printf("%s is a benchmarking tool for PostgreSQL.\n\n"
 		   "Usage:\n"
-		   "  %s [OPTIONS]... [DBNAME]\n"
+		   "  %s [OPTION]... [DBNAME]\n"
 		   "\nInitialization options:\n"
 		   "  -i           invokes initialization mode\n"
 		   "  -F NUM       fill factor\n"

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ help(const char *progname)`
`177`	`177`	`{`
`178`	`178`	`printf("%s helps examining the file structure used by PostgreSQL.\n\n"`
`179`	`179`	`"Usage:\n"`
`180`		`- " %s [OPTIONS]...\n"`
	`180`	`+ " %s [OPTION]...\n"`
`181`	`181`	`"\nOptions:\n"`
`182`	`182`	`" -d DBNAME database to connect to\n"`
`183`	`183`	`" -f FILENODE show info for table with given file node\n"`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ usage(void)`
`218`	`218`	`{`
`219`	`219`	`printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\`
`220`	`220`	`\nUsage:\n\`
`221`		`- pg_upgrade [OPTIONS]...\n\`
	`221`	`+ pg_upgrade [OPTION]...\n\`
`222`	`222`	`\n\`
`223`	`223`	`Options:\n\`
`224`	`224`	`-b, --old-bindir=OLDBINDIR old cluster executable directory\n\`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ usage(const char *progname)`
`338`	`338`	`{`
`339`	`339`	`printf("%s is a benchmarking tool for PostgreSQL.\n\n"`
`340`	`340`	`"Usage:\n"`
`341`		`- " %s [OPTIONS]... [DBNAME]\n"`
	`341`	`+ " %s [OPTION]... [DBNAME]\n"`
`342`	`342`	`"\nInitialization options:\n"`
`343`	`343`	`" -i invokes initialization mode\n"`
`344`	`344`	`" -F NUM fill factor\n"`