Clean up the help displays.

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 46bcfc42e30d5d434ad1d0847f286b9efa554392..f3f906049ce12051b4508536b9d4b6c8f6c139ec 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.19 2005/09/30 07:13:54 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.20 2005/09/30 07:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -302,7 +302,7 @@ help(const char *progname)
 {
        printf(_("%s creates a new PostgreSQL role.\n\n"), progname);
        printf(_("Usage:\n"));
-       printf(_("  %s [OPTION]... [USERNAME]\n"), progname);
+       printf(_("  %s [OPTION]... [ROLENAME]\n"), progname);
        printf(_("\nOptions:\n"));
        printf(_("  -s, --superuser           role will be superuser\n"));
        printf(_("  -S, --no-superuser        role will not be superuser\n"));
@@ -312,9 +312,9 @@ help(const char *progname)
        printf(_("  -R, --no-createrole       role cannot create roles\n"));
        printf(_("  -l, --login               role can login (default)\n"));
        printf(_("  -L, --no-login            role cannot login\n"));
-       printf(_("  -i, --inherit             role inherits permissions of roles\n"));
-       printf(_("                            it is a member of (default)\n"));
-       printf(_("  -I, --no-inherit          role does not inherit permissions\n"));
+       printf(_("  -i, --inherit             role inherits privileges of roles it is a\n"
+                 "                            member of (default)\n"));
+       printf(_("  -I, --no-inherit          role does not inherit privileges\n"));
        printf(_("  -c, --connection-limit=N  connection limit for role (default: no limit)\n"));
        printf(_("  -P, --pwprompt            assign a password to new role\n"));
        printf(_("  -E, --encrypted           encrypt stored password\n"));
@@ -328,7 +328,7 @@ help(const char *progname)
        printf(_("  -p, --port=PORT           database server port\n"));
        printf(_("  -U, --username=USERNAME   user name to connect as (not the one to create)\n"));
        printf(_("  -W, --password            prompt for password to connect\n"));
-       printf(_("\nIf one of -s, -S, -d, -D, -r, -R and USERNAME is not specified,\n"
-                        "you will be prompted interactively.\n"));
+       printf(_("\nIf one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n"
+                "be prompted interactively.\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 8158d412eb7c38869178174d2bc7cc27dc0c9900..c06197e1d7fbb5eec36e1cae37ec9b5e388f9e13 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.15 2005/08/15 02:40:28 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.16 2005/09/30 07:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -143,9 +143,9 @@ main(int argc, char *argv[])
 static void
 help(const char *progname)
 {
-       printf(_("%s removes a PostgreSQL user.\n\n"), progname);
+       printf(_("%s removes a PostgreSQL role.\n\n"), progname);
        printf(_("Usage:\n"));
-       printf(_("  %s [OPTION]... [USERNAME]\n"), progname);
+       printf(_("  %s [OPTION]... [ROLENAME]\n"), progname);
        printf(_("\nOptions:\n"));
        printf(_("  -e, --echo                show the commands being sent to the server\n"));
        printf(_("  -i, --interactive         prompt before deleting anything\n"));

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index bc39416952cd48ca6a6a8903e85a3b7cf314e92a..2c2430b14edec6573dd29845033f6b82db99a9ae 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.1 2005/07/29 15:13:11 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.2 2005/09/30 07:58:01 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -332,20 +332,20 @@ help(const char *progname)
        printf(_("Usage:\n"));
        printf(_("  %s [OPTION]... [DBNAME]\n"), progname);
        printf(_("\nOptions:\n"));
-       printf(_("  -a, --all                reindex all databases\n"));
-       printf(_("  -s, --system             reindex system catalogs\n"));
-       printf(_("  -d, --dbname=DBNAME      database to reindex\n"));
-       printf(_("  -t, --table=TABLE        reindex specific table only\n"));
-       printf(_("  -i, --index=INDEX        recreate specific index only\n"));
-       printf(_("  -e, --echo               show the commands sent to the server\n"));
-       printf(_("  -q, --quiet              don't write any output\n"));
-       printf(_("  --help                   show this help, then exit\n"));
-       printf(_("  --version                output version information, then exit\n"));
+       printf(_("  -a, --all                 reindex all databases\n"));
+       printf(_("  -s, --system              reindex system catalogs\n"));
+       printf(_("  -d, --dbname=DBNAME       database to reindex\n"));
+       printf(_("  -t, --table=TABLE         reindex specific table only\n"));
+       printf(_("  -i, --index=INDEX         recreate specific index only\n"));
+       printf(_("  -e, --echo                show the commands sent to the server\n"));
+       printf(_("  -q, --quiet               don't write any output\n"));
+       printf(_("  --help                    show this help, then exit\n"));
+       printf(_("  --version                 output version information, then exit\n"));
        printf(_("\nConnection options:\n"));
-       printf(_("  -h, --host=HOSTNAME      database server host or socket direcotry\n"));
-       printf(_("  -p, --port=PORT          database server port\n"));
-       printf(_("  -U, --username=NAME      user name to connect as\n"));
-       printf(_("  -W, --password           prompt for password\n"));
+       printf(_("  -h, --host=HOSTNAME       database server host or socket direcotry\n"));
+       printf(_("  -p, --port=PORT           database server port\n"));
+       printf(_("  -U, --username=NAME       user name to connect as\n"));
+       printf(_("  -W, --password            prompt for password\n"));
        printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
        printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
 }