Make documentation of -W options more accurate and uniform.

diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 5bfd378f8a04e0bbdbf5f33a8c5295c5518b850b..fa34407d1776caa01c46e35ca0f3aec8bb6013dc 100644 (file)
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.34 2007/12/11 02:08:59 tgl Exp $
+ *   $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.35 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -308,7 +308,7 @@ usage(void)
    fprintf(stdout, "  -v\t\tWrite a lot of progress messages\n");
    fprintf(stdout, "  -n\t\tDon't remove large objects, just show what would be done\n");
    fprintf(stdout, "  -U username\tUsername to connect as\n");
-   fprintf(stdout, "  -W\t\tPrompt for password\n");
+   fprintf(stdout, "  -W\t\tForce password prompt\n");
    fprintf(stdout, "  -h hostname\tDatabase server host\n");
    fprintf(stdout, "  -p port\tDatabase server port\n\n");
 }

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 15caa1affa31f18accd78b1b43c9ee6749f155e8..2990b2c8af2aaf32a7cd99f1ad988f47f6298795 100644 (file)
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -164,7 +164,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force clusterdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        clusterdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, clusterdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 3b12e94f7934d994fbb648f49c06a33ef1a68a95..c75042c9b7442e601c5c4a6c384c8d15b7d94192 100644 (file)
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -183,7 +183,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as
+        User name to connect as.
        
       
      
@@ -193,7 +193,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force createdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        createdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, createdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index 9441eef1de09d739354de45d24f6a33c1362f372..8383c66a8f9607d8a901dffec7a7a0e7d56a473d 100644 (file)
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
@@ -1,5 +1,5 @@
 
 
@@ -144,7 +144,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force createlang to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        createlang will automatically prompt
+        for a password if the server demands password authentication.
+        However, createlang will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index b002593a2371f751c476940e349f53a7feef685c..95283e6775a655db523c877afa87ed18d9c1721a 100644 (file)
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -1,5 +1,5 @@
 
 
@@ -295,9 +295,20 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt (to connect to the server, not for the
+        Force createuser to prompt for a
+        password (for connecting to the server, not for the
         password of the new user).
        
+
+       
+        This option is never essential, since
+        createuser will automatically prompt
+        for a password if the server demands password authentication.
+        However, createuser will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
+       
       
      
    

diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index b60c7a82522b75d9becb7fcee21c1e688336adbe..daf01287fb7f21503692634bd20391abe7d7d72c 100644 (file)
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -123,7 +123,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as
+        User name to connect as.
        
       
      
@@ -133,7 +133,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force dropdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        dropdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, dropdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml
index c284476c2ae07ce0d0496122799cff3fed321762..ee334e13e5e5dc87c0840010c20942ebe368ed69 100644 (file)
--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
@@ -1,5 +1,5 @@
 
 
@@ -142,7 +142,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as
+        User name to connect as.
        
       
      
@@ -152,7 +152,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force droplang to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        droplang will automatically prompt
+        for a password if the server demands password authentication.
+        However, droplang will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index a1d560009e377b7b7c517e9f3bf4afde816efe32..af57135f120a3534e74d37562aafe5c2ce1f9620 100644 (file)
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -1,5 +1,5 @@
 
 
@@ -125,7 +125,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as (not the user name to drop)
+        User name to connect as (not the user name to drop).
        
       
      
@@ -135,8 +135,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt (to connect to the server, not for the
-        password of the user to be dropped).
+        Force dropuser to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        dropuser will automatically prompt
+        for a password if the server demands password authentication.
+        However, dropuser will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 6bb1cf4a4768db2379af45c812938a45daf5a13c..fd0d56d8c0ef24a7776fef49077c8fda130442d2 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 
 
@@ -647,7 +647,7 @@ PostgreSQL documentation
       --username=username
       
        
-        Connect as the given user.
+        User name to connect as.
        
       
      
@@ -657,8 +657,18 @@ PostgreSQL documentation
       --password
       
        
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force pg_dump to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        pg_dump will automatically prompt
+        for a password if the server demands password authentication.
+        However, pg_dump will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 0d944278c44485316eefd67860173d83d23a7ad1..a697cdbb9115990d7b4b6be9e62b307e3478fb83 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
 
 
@@ -59,7 +59,7 @@ PostgreSQL documentation
   
   pg_dumpall needs to connect several
   times to the PostgreSQL server (once per
-  database).  If you use password authentication it is likely to ask for
+  database).  If you use password authentication it will ask for
   a password each time. It is convenient to have a
   ~/.pgpass file in such cases. See 
   linkend="libpq-pgpass"> for more information.
@@ -367,7 +367,7 @@ PostgreSQL documentation
       --username=username
       
        
-        Connect as the given user.
+        User name to connect as.
        
       
      
@@ -377,8 +377,24 @@ PostgreSQL documentation
       --password
       
        
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force pg_dumpall to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        pg_dumpall will automatically prompt
+        for a password if the server demands password authentication.
+        However, pg_dumpall will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
+       
+
+       
+        Note that the password prompt will occur again for each database
+        to be dumped.  Usually, it's better to set up a
+        ~/.pgpass file than to rely on manual password entry.
        
       
      


diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml

index a311affc3c385a0392d89e83b2b5b7b39cca5523..17a99e5395e918cea485891cc645371ef258a804 100644 (file)

--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  
@@ -458,7 +458,7 @@
       --username=username
       
        
-        Connect as the given user.
+        User name to connect as.
        
       
      
@@ -468,8 +468,18 @@
       --password
       
        
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force pg_restore to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        pg_restore will automatically prompt
+        for a password if the server demands password authentication.
+        However, pg_restore will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      


diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml

index 63c9c4303cbd1355d460ff2320ea43e4623fe7bc..40a02812fe19ec4973826e8ce43d08ef7f3943b0 100644 (file)

--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -406,25 +406,24 @@ PostgreSQL documentation
       --password
       
       
-      Forces psql to prompt for a
-      password before connecting to a database.  
+       Force psql to prompt for a
+       password before connecting to a database.  
       
 
       
-      psql should automatically prompt for a
-      password whenever the server requests password authentication.
-      However, currently password request detection is not totally
-      reliable, hence this option to force a prompt. If no password
-      prompt is issued and the server requires password authentication,
-      the connection attempt will fail.
+       This option is never essential, since psql
+       will automatically prompt for a password if the server demands
+       password authentication.  However, psql
+       will waste a connection attempt finding out that the server wants a
+       password.  In some cases it is worth typing -W to avoid
+       the extra connection attempt.
       
 
       
-      This option will remain set for the entire session, even if you
-      change the database connection with the meta-command
-      \connect.
+       Note that this option will remain set for the entire session,
+       and so it affects uses of the meta-command
+       \connect as well as the initial connection attempt.
       
-
       
     
 


diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml

index e4469bb12effd7bb54d084beff109d8fdd4610b8..259b170860941ded4a52ba7a0b3f4babcf647b50 100644 (file)

--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -186,7 +186,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force reindexdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        reindexdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, reindexdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      


diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml

index 87c34cee4b2c04a98659ed45b7a6dc0ba22add09..1e915eed5d071a7b527e696d503539c24e6e6c6e 100644 (file)

--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -199,7 +199,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as
+        User name to connect as.
        
       
      
@@ -209,7 +209,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force vacuumdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        vacuumdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, vacuumdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      


diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml

index ab4c60551ff97438107ee9e5659fbd7ba7d1a3dd..4152d3f59a65708538d18ff52701a89247add602 100644 (file)

--- a/doc/src/sgml/vacuumlo.sgml
+++ b/doc/src/sgml/vacuumlo.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  vacuumlo
@@ -38,42 +38,55 @@ vacuumlo [options] database [database2 ... databaseN]
    
     -v
     
-     Write a lot of progress messages
+     Write a lot of progress messages.
     
    
 
    
     -n
     
-     Don't remove anything, just show what would be done
+     Don't remove anything, just show what would be done.
     
    
 
    
     -U username
     
-     Username to connect as
+     Username to connect as.
     
    
 
    
     -W
     
-     Force prompt for password (generally useless)
+     
+      Force vacuumlo to prompt for a
+      password before connecting to a database.  
+     
+
+     
+      This option is never essential, since
+      vacuumlo will automatically prompt
+      for a password if the server demands password authentication.
+      However, vacuumlo will waste a
+      connection attempt finding out that the server wants a password.
+      In some cases it is worth typing -W to avoid the extra
+      connection attempt.
+     
     
    
 
    
     -h hostname
     
-     Database server's host
+     Database server's host.
     
    
 
    
     -p port
     
-     Database server's port
+     Database server's port.
     
    
   


diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c

index 7fb82b66bd3fdd4af10de38347e7f405c7e231fa..9cca4c282604443934943ff5cace0737889b6795 100644 (file)

--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.119 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.120 2007/12/11 19:57:32 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -132,7 +132,7 @@ usage(void)
    if (!env)
        env = user;
    printf(_("  -U NAME         database user name (default: \"%s\")\n"), env);
-   puts(_("  -W              prompt for password (should happen automatically)"));
+   puts(_("  -W              force password prompt (should happen automatically)"));
 
    puts(_(
           "\nFor more information, type \"\\?\" (for internal commands) or \"\\help\"\n"


diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c

index 261aea2c027fa4754ce06de703e965e845cfd611..09985830c57cac079af5660aeb5aa72d0bea7409 100644 (file)

--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -236,7 +236,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }


diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c

index 71f81aa2c8e34267ccb1296bb82351c46c2f4cc6..b059e0f51505f3b3994faae6d884cde78fa062c8 100644 (file)

--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.24 2007/10/13 20:18:41 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.25 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -218,7 +218,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME          database server host or socket directory\n"));
    printf(_("  -p, --port=PORT              database server port\n"));
    printf(_("  -U, --username=USERNAME      user name to connect as\n"));
-   printf(_("  -W, --password               prompt for password\n"));
+   printf(_("  -W, --password               force password prompt\n"));
    printf(_("\nBy default, a database with the same name as the current user is created.\n"));
    printf(_("\nReport bugs to .\n"));
 }


diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c

index e1d28416735bbf4e1f60166c8e0f3b6c55e2372c..6fe6f25e6f37031579349730c9b461ba0f6f3aef 100644 (file)

--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.26 2007/08/10 00:39:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.27 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -212,7 +212,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));


diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index aa7eac674ff7312c0941aa41f38f93126afdd3f3..f0c087545a8416adc6cf4adf3cf35d15858713ab 100644 (file)

--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.36 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.37 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,7 +329,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    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(_("  -W, --password            force password prompt\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 .\n"));


diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c

index d912338d567bd9b9da7e11c66ad338f357fbe0d2..4be42c3b32af5db17268e7895c9b7ea3c8cc70c7 100644 (file)

--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.20 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.21 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,7 +145,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));


diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c

index 47da28e33a2e4e251d747d509de47d79b5d9a19a..bd255585b43ec097d304e1e8eba85943a18fba32 100644 (file)

--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.23 2007/08/10 00:39:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.24 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,7 +329,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));


diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c

index 3ee2502fe099712dcf2e840b5ea82932d0a9d28d..5d757a12211cbd390e7241fd48f906944c809dca 100644 (file)

--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.21 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.22 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -144,7 +144,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));
-   printf(_("  -W, --password            prompt for password to connect\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));


diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c

index 99a676f8f545e316cda24d6a5671d7a8784632f6..0e32e1714c6026d6990e92c7199138a261baf174 100644 (file)

--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.11 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.12 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -322,7 +322,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }


diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index b4f65b2dc2e07ae7f59496a2fc929b92ce26fa1d..3d4f719aee3dc1b3b7abc8a97ed7a595935bb305 100644 (file)

--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -265,7 +265,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index a311affc3c385a0392d89e83b2b5b7b39cca5523..17a99e5395e918cea485891cc645371ef258a804 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  
@@ -458,7 +458,7 @@
       --username=username
       
        
-        Connect as the given user.
+        User name to connect as.
        
       
      
@@ -468,8 +468,18 @@
       --password
       
        
-        Force a password prompt.  This should happen automatically if
-        the server requires password authentication.
+        Force pg_restore to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        pg_restore will automatically prompt
+        for a password if the server demands password authentication.
+        However, pg_restore will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 63c9c4303cbd1355d460ff2320ea43e4623fe7bc..40a02812fe19ec4973826e8ce43d08ef7f3943b0 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 
 
@@ -406,25 +406,24 @@ PostgreSQL documentation
       --password
       
       
-      Forces psql to prompt for a
-      password before connecting to a database.  
+       Force psql to prompt for a
+       password before connecting to a database.  
       
 
       
-      psql should automatically prompt for a
-      password whenever the server requests password authentication.
-      However, currently password request detection is not totally
-      reliable, hence this option to force a prompt. If no password
-      prompt is issued and the server requires password authentication,
-      the connection attempt will fail.
+       This option is never essential, since psql
+       will automatically prompt for a password if the server demands
+       password authentication.  However, psql
+       will waste a connection attempt finding out that the server wants a
+       password.  In some cases it is worth typing -W to avoid
+       the extra connection attempt.
       
 
       
-      This option will remain set for the entire session, even if you
-      change the database connection with the meta-command
-      \connect.
+       Note that this option will remain set for the entire session,
+       and so it affects uses of the meta-command
+       \connect as well as the initial connection attempt.
       
-
       
     
 

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index e4469bb12effd7bb54d084beff109d8fdd4610b8..259b170860941ded4a52ba7a0b3f4babcf647b50 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -186,7 +186,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force reindexdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        reindexdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, reindexdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 87c34cee4b2c04a98659ed45b7a6dc0ba22add09..1e915eed5d071a7b527e696d503539c24e6e6c6e 100644 (file)
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 
 
@@ -199,7 +199,7 @@ PostgreSQL documentation
       --username username
       
        
-        User name to connect as
+        User name to connect as.
        
       
      
@@ -209,7 +209,18 @@ PostgreSQL documentation
       --password
       
        
-        Force password prompt.
+        Force vacuumdb to prompt for a
+        password before connecting to a database.  
+       
+
+       
+        This option is never essential, since
+        vacuumdb will automatically prompt
+        for a password if the server demands password authentication.
+        However, vacuumdb will waste a
+        connection attempt finding out that the server wants a password.
+        In some cases it is worth typing -W to avoid the extra
+        connection attempt.
        
       
      

diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml
index ab4c60551ff97438107ee9e5659fbd7ba7d1a3dd..4152d3f59a65708538d18ff52701a89247add602 100644 (file)
--- a/doc/src/sgml/vacuumlo.sgml
+++ b/doc/src/sgml/vacuumlo.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  vacuumlo
@@ -38,42 +38,55 @@ vacuumlo [options] database [database2 ... databaseN]
    
     -v
     
-     Write a lot of progress messages
+     Write a lot of progress messages.
     
    
 
    
     -n
     
-     Don't remove anything, just show what would be done
+     Don't remove anything, just show what would be done.
     
    
 
    
     -U username
     
-     Username to connect as
+     Username to connect as.
     
    
 
    
     -W
     
-     Force prompt for password (generally useless)
+     
+      Force vacuumlo to prompt for a
+      password before connecting to a database.  
+     
+
+     
+      This option is never essential, since
+      vacuumlo will automatically prompt
+      for a password if the server demands password authentication.
+      However, vacuumlo will waste a
+      connection attempt finding out that the server wants a password.
+      In some cases it is worth typing -W to avoid the extra
+      connection attempt.
+     
     
    
 
    
     -h hostname
     
-     Database server's host
+     Database server's host.
     
    
 
    
     -p port
     
-     Database server's port
+     Database server's port.
     
    
   

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 7fb82b66bd3fdd4af10de38347e7f405c7e231fa..9cca4c282604443934943ff5cace0737889b6795 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.119 2007/11/15 21:14:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.120 2007/12/11 19:57:32 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -132,7 +132,7 @@ usage(void)
    if (!env)
        env = user;
    printf(_("  -U NAME         database user name (default: \"%s\")\n"), env);
-   puts(_("  -W              prompt for password (should happen automatically)"));
+   puts(_("  -W              force password prompt (should happen automatically)"));
 
    puts(_(
           "\nFor more information, type \"\\?\" (for internal commands) or \"\\help\"\n"

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 261aea2c027fa4754ce06de703e965e845cfd611..09985830c57cac079af5660aeb5aa72d0bea7409 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -236,7 +236,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command CLUSTER for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 71f81aa2c8e34267ccb1296bb82351c46c2f4cc6..b059e0f51505f3b3994faae6d884cde78fa062c8 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.24 2007/10/13 20:18:41 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.25 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -218,7 +218,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME          database server host or socket directory\n"));
    printf(_("  -p, --port=PORT              database server port\n"));
    printf(_("  -U, --username=USERNAME      user name to connect as\n"));
-   printf(_("  -W, --password               prompt for password\n"));
+   printf(_("  -W, --password               force password prompt\n"));
    printf(_("\nBy default, a database with the same name as the current user is created.\n"));
    printf(_("\nReport bugs to .\n"));
 }

diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index e1d28416735bbf4e1f60166c8e0f3b6c55e2372c..6fe6f25e6f37031579349730c9b461ba0f6f3aef 100644 (file)
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.26 2007/08/10 00:39:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.27 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -212,7 +212,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index aa7eac674ff7312c0941aa41f38f93126afdd3f3..f0c087545a8416adc6cf4adf3cf35d15858713ab 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.36 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.37 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,7 +329,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    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(_("  -W, --password            force password prompt\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 .\n"));

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index d912338d567bd9b9da7e11c66ad338f357fbe0d2..4be42c3b32af5db17268e7895c9b7ea3c8cc70c7 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.20 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.21 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -145,7 +145,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));

diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 47da28e33a2e4e251d747d509de47d79b5d9a19a..bd255585b43ec097d304e1e8eba85943a18fba32 100644 (file)
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.23 2007/08/10 00:39:31 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.24 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -329,7 +329,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 3ee2502fe099712dcf2e840b5ea82932d0a9d28d..5d757a12211cbd390e7241fd48f906944c809dca 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.21 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.22 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -144,7 +144,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));
-   printf(_("  -W, --password            prompt for password to connect\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("  --help                    show this help, then exit\n"));
    printf(_("  --version                 output version information, then exit\n"));
    printf(_("\nReport bugs to .\n"));

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 99a676f8f545e316cda24d6a5671d7a8784632f6..0e32e1714c6026d6990e92c7199138a261baf174 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.11 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.12 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -322,7 +322,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command REINDEX for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index b4f65b2dc2e07ae7f59496a2fc929b92ce26fa1d..3d4f719aee3dc1b3b7abc8a97ed7a595935bb305 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.19 2007/12/11 19:57:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -265,7 +265,7 @@ help(const char *progname)
    printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
    printf(_("  -p, --port=PORT           database server port\n"));
    printf(_("  -U, --username=USERNAME   user name to connect as\n"));
-   printf(_("  -W, --password            prompt for password\n"));
+   printf(_("  -W, --password            force password prompt\n"));
    printf(_("\nRead the description of the SQL command VACUUM for details.\n"));
    printf(_("\nReport bugs to .\n"));
 }