Update psql banner

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index b3a350bf982fa1c44ab525baaf37fa7232786193..1dbc930eba9137b7f3832cd6d559a41e0c040c60 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.16 1999/11/05 15:44:56 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.17 1999/11/05 18:21:08 momjian Exp $
 Postgres documentation
 -->
 
@@ -133,11 +133,11 @@ Postgres documentation
 $ <userinput>psql testdb</userinput>
 Welcome to psql, the PostgreSQL interactive terminal.
 
-Type \copyright for distribution terms
-     \h for help with SQL commands
-     \? for help on internal slash commands
-     \g or terminate with semicolon to execute query
-     \q to quit
+Type:  \copyright for distribution terms
+       \h for help with SQL commands
+       \? for help on internal slash commands
+       \g or terminate with semicolon to execute query
+       \q to quit
 
 testdb=>
     </programlisting>

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 2b08c74e155d9f89cabcb0a4fc84abcecb982a67..c94f2526b336d54cdd0e6ad97be48e98c494b886 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -177,15 +177,15 @@ main(int argc, char **argv)
 
        if (!GetVariable(settings.vars, "quiet") && !settings.notty && !options.action)
        {
-               puts("Welcome to psql, the PostgreSQL interactive terminal.\n\n");
+               puts("Welcome to psql, the PostgreSQL interactive terminal.\n");
 
                //showVersion(&settings, false);
 
-               puts("Type \\copyright for distribution terms\n"
-                        "     \\h for help with SQL commands\n"
-                        "     \\? for help on internal slash commands\n"
-                        "     \\g or terminate with semicolon to execute query\n"
-                        "     \\q to quit\n");
+               puts("Type:  \\copyright for distribution terms\n"
+                        "       \\h for help with SQL commands\n"
+                        "       \\? for help on internal slash commands\n"
+                        "       \\g or terminate with semicolon to execute query\n"
+                        "       \\q to quit\n");
        }
 
        process_psqlrc(&settings);