aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/TODO4
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml4
-rw-r--r--doc/src/sgml/start.sgml4
-rw-r--r--src/bin/psql/startup.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/TODO b/doc/TODO
index 89c1430f789..563c8379118 100644
--- 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 2e17c0310a0..37ebdc045fc 100644
--- 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 ac5111679ef..88be062428f 100644
--- 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 04e64748814..a29ff23d799 100644
--- 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