Improve \? wording, remove 'internal'.

diff --git a/doc/TODO b/doc/TODO
index 89c1430f789af666e0f988087c91ab9bb9432931..563c8379118f3db0fad60fe7ca0f317f82055554 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:          Thu Feb 12 13:11:14 EST 2004
+Last updated:          Thu Feb 12 13:14:40 EST 2004
 
 Current maintainer:    Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -456,7 +456,7 @@ Source Code
 * Acquire lock on a relation before building a relcache entry for it
 * Research interaction of setitimer() and sleep() used by statement_timeout
 * -Add checks for fclose() failure (Tom)
-* Change CVS $PostgreSQL: pgsql/doc/TODO,v 1.1211 2004/02/12 18:11:16 momjian Exp $ to $PostgreSQL: pgsql/doc/TODO,v 1.1211 2004/02/12 18:11:16 momjian Exp $
+* Change CVS $PostgreSQL: pgsql/doc/TODO,v 1.1212 2004/02/12 19:58:16 momjian Exp $ to $PostgreSQL: pgsql/doc/TODO,v 1.1212 2004/02/12 19:58:16 momjian Exp $
 * Exit postmaster if postgresql.conf can not be opened
 * Rename /scripts directory because they are all C programs now
 * Allow the regression tests to start postmaster with -i so the tests

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 2e17c0310a08efb666e1267cd81f522d99b6ee03..37ebdc045fcc094a5fb3c6b1594eaf26ed1a29ff 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.104 2004/01/20 23:48:56 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.105 2004/02/12 19:58:16 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -524,7 +524,7 @@ Welcome to psql &version;, the PostgreSQL interactive terminal.
 
 Type:  \copyright for distribution terms
        \h for help with SQL commands
-       \? for help on internal slash commands
+       \? for help with psql commands
        \g or terminate with semicolon to execute query
        \q to quit
 

diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index ac5111679efe1a5fa6517118ca82f06882e26a0e..88be062428f7ac3a8e17efecb585d6121f496ac6 100644 (file)
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.34 2004/02/12 16:38:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.35 2004/02/12 19:58:16 momjian Exp $
 -->
 
  <chapter id="tutorial-start">
@@ -321,7 +321,7 @@ Welcome to psql &version;, the PostgreSQL interactive terminal.
  
 Type:  \copyright for distribution terms
        \h for help with SQL commands
-       \? for help on internal slash commands
+       \? for help with psql commands
        \g or terminate with semicolon to execute query
        \q to quit
  

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 04e64748814e3442998c678869fa6e4e3b64b43f..a29ff23d7999187a7b7a1423551c6fc4c167e7c6 100644 (file)
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.83 2004/01/25 03:07:22 neilc Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.84 2004/02/12 19:58:16 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -267,8 +267,8 @@ main(int argc, char *argv[])
                        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"
+                                                  "       \\? 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