Peter Eisentraut wrote:
> David Fetter wrote:
> > > > \? for help with psql commands
> 
> > If you wanted to pick one of the two patches, which one would it be?
> > If not, what should the patch look like?
> 
> There seems to be a consensus on the form left standing above.  That 
> seems OK to me.

Attached patch applied.  Thanks.

---------------------------------------------------------------------------

Welcome to psql 7.5devel, the PostgreSQL interactive terminal.

Type:  \copyright for distribution terms
       \h for help with SQL commands
       \? for help with psql commands
       \g or terminate with semicolon to execute query
       \q to quit

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  [EMAIL PROTECTED]               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
Index: doc/TODO
===================================================================
RCS file: /cvsroot/pgsql-server/doc/TODO,v
retrieving revision 1.1211
diff -c -c -r1.1211 TODO
*** doc/TODO    12 Feb 2004 18:11:16 -0000      1.1211
--- doc/TODO    12 Feb 2004 19:57:01 -0000
***************
*** 1,6 ****
  TODO list for PostgreSQL
  ========================
! Last updated:         Thu Feb 12 13:11:14 EST 2004
  
  Current maintainer:   Bruce Momjian ([EMAIL PROTECTED])
  
--- 1,6 ----
  TODO list for PostgreSQL
  ========================
! Last updated:         Thu Feb 12 13:14:40 EST 2004
  
  Current maintainer:   Bruce Momjian ([EMAIL PROTECTED])
  
Index: doc/src/sgml/start.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/start.sgml,v
retrieving revision 1.34
diff -c -c -r1.34 start.sgml
*** doc/src/sgml/start.sgml     12 Feb 2004 16:38:04 -0000      1.34
--- doc/src/sgml/start.sgml     12 Feb 2004 19:57:01 -0000
***************
*** 321,327 ****
   
  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
   
--- 321,327 ----
   
  Type:  \copyright for distribution terms
         \h for help with SQL commands
!        \? for help with psql commands
         \g or terminate with semicolon to execute query
         \q to quit
   
Index: doc/src/sgml/ref/psql-ref.sgml
===================================================================
RCS file: /cvsroot/pgsql-server/doc/src/sgml/ref/psql-ref.sgml,v
retrieving revision 1.104
diff -c -c -r1.104 psql-ref.sgml
*** doc/src/sgml/ref/psql-ref.sgml      20 Jan 2004 23:48:56 -0000      1.104
--- doc/src/sgml/ref/psql-ref.sgml      12 Feb 2004 19:57:05 -0000
***************
*** 524,530 ****
  
  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
  
--- 524,530 ----
  
  Type:  \copyright for distribution terms
         \h for help with SQL commands
!        \? for help with psql commands
         \g or terminate with semicolon to execute query
         \q to quit
  
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/psql/startup.c,v
retrieving revision 1.83
diff -c -c -r1.83 startup.c
*** src/bin/psql/startup.c      25 Jan 2004 03:07:22 -0000      1.83
--- src/bin/psql/startup.c      12 Feb 2004 19:57:08 -0000
***************
*** 267,274 ****
                        printf(gettext("Welcome to %s %s, the PostgreSQL interactive 
terminal.\n\n"
                                                   "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\n"),
                                   pset.progname, PG_VERSION);
  #ifdef USE_SSL
--- 267,274 ----
                        printf(gettext("Welcome to %s %s, the PostgreSQL interactive 
terminal.\n\n"
                                                   "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\n"),
                                   pset.progname, PG_VERSION);
  #ifdef USE_SSL
---------------------------(end of broadcast)---------------------------
TIP 7: don't forget to increase your free space map settings

Reply via email to