Improve formatting of --help output.

2 files changed, 13 insertions, 9 deletions

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 5f02759c5d..933eac8c57 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.289 2002/09/26 05:17:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.290 2002/10/18 22:05:35 petere Exp $
  *
  * NOTES
  *
@@ -846,7 +846,7 @@ static void
 usage(const char *progname)
 {
 	printf(gettext("%s is the PostgreSQL server.\n\n"), progname);
-	printf(gettext("Usage:\n  %s [options...]\n\n"), progname);
+	printf(gettext("Usage:\n  %s [OPTION]...\n\n"), progname);
 	printf(gettext("Options:\n"));
 #ifdef USE_ASSERT_CHECKING
 	printf(gettext("  -A 1|0          enable/disable run-time assert checking\n"));
@@ -867,6 +867,8 @@ usage(const char *progname)
 	printf(gettext("  -o OPTIONS      pass 'OPTIONS' to each backend server\n"));
 	printf(gettext("  -p PORT         port number to listen on (default %d)\n"), DEF_PGPORT);
 	printf(gettext("  -S              silent mode (start in background without logging output)\n"));
+	printf(gettext("  --help          show this help, then exit\n"));
+	printf(gettext("  --version       output version information, then exit\n"));
 
 	printf(gettext("\nDeveloper options:\n"));
 	printf(gettext("  -n              do not reinitialize shared memory after abnormal exit\n"));
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index ea1b0cb371..38e3211ae7 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.303 2002/10/14 23:49:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.304 2002/10/18 22:05:35 petere Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1156,14 +1156,14 @@ usage(char *progname)
 {
 	printf("%s is the PostgreSQL stand-alone backend.  It is not\nintended to be used by normal users.\n\n", progname);
 
-	printf("Usage:\n  %s [options...] [dbname]\n\n", progname);
+	printf("Usage:\n  %s [OPTION]... [DBNAME]\n\n", progname);
 	printf("Options:\n");
 #ifdef USE_ASSERT_CHECKING
 	printf("  -A 1|0          enable/disable run-time assert checking\n");
 #endif
 	printf("  -B NBUFFERS     number of shared buffers (default %d)\n", DEF_NBUFFERS);
 	printf("  -c NAME=VALUE   set run-time parameter\n");
-	printf("  -d 1-5,0        debugging level (0 is off)\n");
+	printf("  -d 0-5          debugging level (0 is off)\n");
 	printf("  -D DATADIR      database directory\n");
 	printf("  -e              use European date format\n");
 	printf("  -E              echo query before execution\n");
@@ -1173,11 +1173,13 @@ usage(char *progname)
 	printf("  -P              disable system indexes\n");
 	printf("  -s              show statistics after each query\n");
 	printf("  -S SORT-MEM     set amount of memory for sorts (in kbytes)\n");
-	printf("Developer options:\n");
-	printf("  -f [s|i|n|m|h]  forbid use of some plan types\n");
+	printf("  --help          show this help, then exit\n");
+	printf("  --version       output version information, then exit\n");
+	printf("\nDeveloper options:\n");
+	printf("  -f s|i|n|m|h    forbid use of some plan types\n");
 	printf("  -i              do not execute queries\n");
 	printf("  -O              allow system table structure changes\n");
-	printf("  -t [pa|pl|ex]   show timings after each query\n");
+	printf("  -t pa|pl|ex     show timings after each query\n");
 	printf("  -W NUM          wait NUM seconds to allow attach from a debugger\n");
 	printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
 }
@@ -1767,7 +1769,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.303 $ $Date: 2002/10/14 23:49:20 $\n");
+		puts("$Revision: 1.304 $ $Date: 2002/10/18 22:05:35 $\n");
 	}
 
 	/*