From 51b2b6433b33c449fd92739cb93da756dc4ce3c2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 10 Mar 2003 15:46:03 +0000
Subject: [PATCH] Cleanup up psql \connect and \pset pager setting display,
Dennis Bj?rklund.
---
src/bin/psql/command.c | 8 ++++----
src/bin/psql/help.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 0019755c0aa..feb6ba32a90 100644
--- 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 2dcf798d9dd..d1a30e40ae7 100644
--- 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"));
--
GitLab