Cleanup on --help-config: Now called --describe-config, no further options,

machine readable, without headers, not sorted.  Parameter descriptions
adjusted to fit first sentence + rest convention.

src/backend/main/main.c

@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.64 2003/09/27 09:29:31 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.65 2003/10/18 22:59:08 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -222,12 +222,11 @@ main(int argc, char *argv[])
 		exit(BootstrapMain(argc - 1, new_argv + 1));
 
 	/*
-	 * If the first argument is "--help-config", then invoke runtime
-	 * configuration option display mode. We remove "--help-config" from
-	 * the arguments passed on to GucInfoMain.
+	 * If the first argument is "--describe-config", then invoke runtime
+	 * configuration option display mode.
 	 */
-	if (argc > 1 && strcmp(new_argv[1], "--help-config") == 0)
-		exit(GucInfoMain(argc, new_argv));
+	if (argc > 1 && strcmp(new_argv[1], "--describe-config") == 0)
+		exit(GucInfoMain());
 
 	/*
 	 * Otherwise we're a standalone backend.  Invoke PostgresMain,

src/backend/tcop/postgres.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.373 2003/10/16 16:50:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.374 2003/10/18 22:59:08 petere Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1989,8 +1989,7 @@ usage(char *progname)
 	printf(gettext("  -P              disable system indexes\n"));
 	printf(gettext("  -s              show statistics after each query\n"));
 	printf(gettext("  -S SORT-MEM     set amount of memory for sorts (in kbytes)\n"));
-	printf(gettext("  --help-config   show configuration parameters, then exit;\n"
-				   "                  details: --help-config -h\n"));
+	printf(gettext("  --describe-config  describe configuration parameters, then exit\n"));
 	printf(gettext("  --help          show this help, then exit\n"));
 	printf(gettext("  --version       output version information, then exit\n"));
 	printf(gettext("\nDeveloper options:\n"));
@@ -2660,7 +2659,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.373 $ $Date: 2003/10/16 16:50:41 $\n");
+		puts("$Revision: 1.374 $ $Date: 2003/10/18 22:59:08 $\n");
 	}
 
 	/*

src/include/utils/help_config.h

@@ -5,13 +5,13 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- *	  $Id: help_config.h,v 1.3 2003/08/04 02:40:15 momjian Exp $
+ *	  $Id: help_config.h,v 1.4 2003/10/18 22:59:09 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HELP_CONFIG_H
 #define HELP_CONFIG_H 1
 
-extern int	GucInfoMain(int argc, char *argv[]);
+extern int	GucInfoMain(void);
 
 #endif