Cleanup up psql \connect and \pset pager setting display, Dennis

Bj?rklund.

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 0019755c0aa2d19cb7c91a8503673ecc04efbdb0..feb6ba32a9092ee3e24d2ce34c772d5551f196b3 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.90 2003/02/19 04:04:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.91 2003/03/10 15:46:01 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -1899,11 +1899,11 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
        if (!quiet)
        {
            if (popt->topt.pager == 1)
-               puts(gettext("Using pager is on."));
+               puts(gettext("Pager is on (for long output)."));
            else if (popt->topt.pager == 2)
-               puts(gettext("Using pager is always."));
+               puts(gettext("Pager is always (used)."));
            else
-               puts(gettext("Using pager is off."));
+               puts(gettext("Pager is off."));
        }
    }
 

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 2dcf798d9dd6b8c68680bed4b78aa594ed62c1b7..d1a30e40ae7e38fb52a536caa0fe1e3d0e56397c 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.69 2003/01/07 20:56:07 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.70 2003/03/10 15:46:03 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -173,7 +173,7 @@ slashUsage(unsigned short int pager)
     */
    fprintf(output, _("General\n"));
    fprintf(output, _("  \\c[onnect] [DBNAME|- [USER]]\n"
-                     "                connect to new database (currently \"%s\")\n"),
+                     "                 connect to new database (currently \"%s\")\n"),
            PQdb(pset.db));
    fprintf(output, _("  \\cd [DIR]      change the current working directory\n"));
    fprintf(output, _("  \\copyright     show PostgreSQL usage and distribution terms\n"));