Editorialization for the text emitted by the "help" psql command.

Basically just reuse the same text that psql emitted as part of
its startup banner in prior versions, and make some whitespace
more consistent with the conventions in other psql command output.

diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 9545eeb99a447dd3ba321c945d0d9bab2d090ac8..526674c8181dd2ebcf5e0be775af219f4bdbccbb 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.91 2008/05/16 17:17:00 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.92 2008/06/10 20:58:19 neilc Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -177,12 +177,12 @@ MainLoop(FILE *source)
                        (line[4] == '\0' || line[4] == ';' || isspace((unsigned char) line[4])))
                {
                        free(line);
-                       puts(_("\nYou are using psql, the command-line interface to PostgreSQL."));
-                       puts(_("\t\\? for psql help"));
-                       puts(_("\t\\h or \\help for SQL help\n"));
-                       puts(_("\t\\g or \";\" to execute a query"));
-                       puts(_("\t\\q to quit psql\n"));
-                       puts(_("\t\\copyright to view the copyright\n"));
+                       puts(_("You are using psql, the command-line interface to PostgreSQL."));
+                       printf(_("Type:  \\copyright for distribution terms\n"
+                                        "       \\h for help with SQL commands\n"
+                                        "       \\? for help with psql commands\n"
+                                        "       \\g or terminate with semicolon to execute query\n"
+                                        "       \\q to quit\n"));
 
                        fflush(stdout);
                        continue;