aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2008-05-16 17:17:00 +0000
committerBruce Momjian <bruce@momjian.us>2008-05-16 17:17:00 +0000
commit9263d86f59b7676e388785824ee5945a91b855ed (patch)
treec11339a9a9a67a1ce4ef37a59d86bce9d1fdba72 /doc/src
parent7adddb4002dd683950fea8095fbb3dfbb64feab9 (diff)
downloadpostgresql-9263d86f59b7676e388785824ee5945a91b855ed.tar.gz
postgresql-9263d86f59b7676e388785824ee5945a91b855ed.zip
Update psql startup banner to be shorter, suggest "help" for help.
Add a few "help" entries. Move \g help entry into "General". Update psql version mismatch warning text. Joshua D. Drake
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/psql-ref.sgml11
-rw-r--r--doc/src/sgml/start.sgml11
2 files changed, 7 insertions, 15 deletions
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 75392accf7d..57664e3082e 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.205 2008/05/16 16:59:05 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.206 2008/05/16 17:17:00 momjian Exp $
PostgreSQL documentation
-->
@@ -571,13 +571,10 @@ $ <userinput>psql "service=myservice sslmode=require"</userinput>
the string <literal>=&gt;</literal>. For example:
<programlisting>
$ <userinput>psql testdb</userinput>
-Welcome to psql &version;, the PostgreSQL interactive terminal.
+psql (&version;)
+Type "help" for help.
-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
+test=>
testdb=&gt;
</programlisting>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index 1ae900852fa..fbc0e3f7b3a 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.46 2008/01/23 02:04:47 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/start.sgml,v 1.47 2008/05/16 17:17:00 momjian Exp $ -->
<chapter id="tutorial-start">
<title>Getting Started</title>
@@ -329,13 +329,8 @@ createdb: database creation failed: ERROR: permission denied to create database
In <command>psql</command>, you will be greeted with the following
message:
<screen>
-Welcome to psql &version;, 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
+psql (&version;)
+Type "help" for help.
mydb=&gt;
</screen>