From 6deb649cd3d985ca25c4e229ff9ab249a657b329 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 27 Aug 2002 18:28:29 +0000
Subject: [PATCH] Add '+' mention in \? help.  More clean of \? to do.

---
 src/bin/psql/describe.c |  6 +++---
 src/bin/psql/describe.h |  4 ++--
 src/bin/psql/help.c     | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 562d5a7f96..43ebe94e58 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.64 2002/08/24 15:00:46 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.65 2002/08/27 18:28:28 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -293,7 +293,7 @@ describeOperators(const char *pattern)
  * for \l, \list, and -l switch
  */
 bool
-listAllDbs(bool desc)
+listAllDbs(bool verbose)
 {
 	PGresult   *res;
 	PQExpBufferData buf;
@@ -310,7 +310,7 @@ listAllDbs(bool desc)
 			 ",\n       pg_catalog.pg_encoding_to_char(d.encoding) as \"%s\"",
 			 _("Encoding"));
 #endif
-	if (desc)
+	if (verbose)
 		appendPQExpBuffer(&buf,
 			 ",\n       pg_catalog.obj_description(d.oid, 'pg_database') as \"%s\"",
 				 _("Description"));
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index 41edcd98fb..0c22cafcbc 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2000-2002 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.17 2002/08/10 03:56:24 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.18 2002/08/27 18:28:29 momjian Exp $
  */
 #ifndef DESCRIBE_H
 #define DESCRIBE_H
@@ -35,7 +35,7 @@ bool		objectDescription(const char *pattern);
 bool		describeTableDetails(const char *pattern, bool verbose);
 
 /* \l */
-bool		listAllDbs(bool desc);
+bool		listAllDbs(bool verbose);
 
 /* \dt, \di, \ds, \dS, etc. */
 bool		listTables(const char *tabtypes, const char *pattern, bool verbose);
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 4e00c5e7d1..a224898d12 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.54 2002/08/10 19:35:01 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.55 2002/08/27 18:28:29 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "print.h"
@@ -211,17 +211,17 @@ slashUsage(bool pager)
 	fprintf(output, _(" \\cd [DIR]      change the current working directory\n"));
 	fprintf(output, _(" \\copy ...      perform SQL COPY with data stream to the client host\n"));
 	fprintf(output, _(" \\copyright     show PostgreSQL usage and distribution terms\n"));
-	fprintf(output, _(" \\d [NAME]      describe table (or view, index, sequence)\n"));
-	fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN]\n"));
+	fprintf(output, _(" \\d [NAME]      describe table, index, sequence, or view\n"));
+	fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"));
 	fprintf(output, _("                list tables/indexes/sequences/views/system tables\n"));
 	fprintf(output, _(" \\da [PATTERN]  list aggregate functions\n"));
 	fprintf(output, _(" \\dd [PATTERN]  show comment for object\n"));
 	fprintf(output, _(" \\dD [PATTERN]  list domains\n"));
-	fprintf(output, _(" \\df [PATTERN]  list functions\n"));
+	fprintf(output, _(" \\df [PATTERN]  list functions (add '+' for more detail)\n"));
 	fprintf(output, _(" \\do [NAME]     list operators\n"));
 	fprintf(output, _(" \\dl            list large objects, same as lo_list\n"));
 	fprintf(output, _(" \\dp [PATTERN]  list table access privileges\n"));
-	fprintf(output, _(" \\dT [PATTERN]  list data types\n"));
+	fprintf(output, _(" \\dT [PATTERN]  list data types (add '+' for more detail)\n"));
 	fprintf(output, _(" \\du [PATTERN]  list users\n"));
 	fprintf(output, _(" \\e [FILE]      edit the query buffer (or file) with external editor\n"));
 	fprintf(output, _(" \\echo [STRING] write string to standard output\n"));