Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 560a2c0

Browse files
committed
Correct optional args in psql \? as pointed out by Ian Barwick.
1 parent cdfe4bb commit 560a2c0

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/bin/psql/help.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.46 2002/03/07 17:54:42 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.47 2002/03/11 18:22:03 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "help.h"
@@ -193,47 +193,47 @@ slashUsage(void)
193193
fprintf(fout, _(" \\c[onnect] [DBNAME|- [USER]]\n"
194194
" connect to new database (currently \"%s\")\n"),
195195
PQdb(pset.db));
196-
fprintf(fout, _(" \\C TITLE set table title\n"));
197-
fprintf(fout, _(" \\cd [DIRNAME] change the current working directory\n"));
196+
fprintf(fout, _(" \\C [TITLE] set table title, or unset with no title\n"));
197+
fprintf(fout, _(" \\cd [DIR] change the current working directory\n"));
198198
fprintf(fout, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
199199
fprintf(fout, _(" \\copyright show PostgreSQL usage and distribution terms\n"));
200-
fprintf(fout, _(" \\d TABLE describe table (or view, index, sequence)\n"));
200+
fprintf(fout, _(" \\d [TABLE] describe table (or view, index, sequence)\n"));
201201
fprintf(fout, _(" \\d{t|i|s|v}... list tables/indexes/sequences/views\n"));
202202
fprintf(fout, _(" \\d{p|S|l} list access privileges, system tables, or large objects\n"));
203203
fprintf(fout, _(" \\da list aggregate functions\n"));
204-
fprintf(fout, _(" \\dd NAME show comment for table, type, function, or operator\n"));
204+
fprintf(fout, _(" \\dd [NAME] show comment for table, type, function, or operator\n"));
205205
fprintf(fout, _(" \\df list functions\n"));
206206
fprintf(fout, _(" \\do list operators\n"));
207207
fprintf(fout, _(" \\dT list data types\n"));
208-
fprintf(fout, _(" \\du [PATTERN] Lists all configured users or only those that match pattern\n"));
209-
fprintf(fout, _(" \\e FILENAME edit the current query buffer or file with external editor\n"));
208+
fprintf(fout, _(" \\du [PATTERN] lists all configured users or only those that match pattern\n"));
209+
fprintf(fout, _(" \\e [FILE] edit the current query buffer or file with external editor\n"));
210210
fprintf(fout, _(" \\echo TEXT write text to standard output\n"));
211211
fprintf(fout, _(" \\encoding ENCODING set client encoding\n"));
212-
fprintf(fout, _(" \\f STRING set field separator\n"));
213-
fprintf(fout, _(" \\g FILENAME send SQL command to server (and write results to file or |pipe)\n"));
212+
fprintf(fout, _(" \\f [SEPARATOR] set field separator, or unset if none\n"));
213+
fprintf(fout, _(" \\g [FILE] send SQL command to server (and write results to file or |pipe)\n"));
214214
fprintf(fout, _(" \\h NAME help on syntax of SQL commands, * for all commands\n"));
215215
fprintf(fout, _(" \\H toggle HTML output mode (currently %s)\n"),
216216
ON(pset.popt.topt.format == PRINT_HTML));
217-
fprintf(fout, _(" \\i FILENAME execute commands from file\n"));
217+
fprintf(fout, _(" \\i FILE execute commands from file\n"));
218218
fprintf(fout, _(" \\l list all databases\n"));
219219
fprintf(fout, _(" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
220-
" large object operations\n"));
221-
fprintf(fout, _(" \\o FILENAME send all query results to file or |pipe\n"));
220+
" large object operations\n"));
221+
fprintf(fout, _(" \\o FILE send all query results to file or |pipe\n"));
222222
fprintf(fout, _(" \\p show the content of the current query buffer\n"));
223223
fprintf(fout, _(" \\pset VAR set table output option (VAR := {format|border|expanded|\n"
224-
" fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"));
224+
" fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"));
225225
fprintf(fout, _(" \\q quit psql\n"));
226226
fprintf(fout, _(" \\qecho TEXT write text to query output stream (see \\o)\n"));
227227
fprintf(fout, _(" \\r reset (clear) the query buffer\n"));
228-
fprintf(fout, _(" \\s FILENAME print history or save it to file\n"));
228+
fprintf(fout, _(" \\s [FILE] print history or save it to file\n"));
229229
fprintf(fout, _(" \\set NAME VALUE set internal variable\n"));
230230
fprintf(fout, _(" \\t show only rows (currently %s)\n"),
231231
ON(pset.popt.topt.tuples_only));
232-
fprintf(fout, _(" \\T TEXT set HTML table tag attributes\n"));
232+
fprintf(fout, _(" \\T [TAG_ATTR] set HTML table tag attributes, or unset if none\n"));
233233
fprintf(fout, _(" \\timing toggle timing of queries (currently %s)\n"),
234234
ON(pset.timing));
235235
fprintf(fout, _(" \\unset NAME unset (delete) internal variable\n"));
236-
fprintf(fout, _(" \\w FILENAME write current query buffer to file\n"));
236+
fprintf(fout, _(" \\w FILE write current query buffer to file\n"));
237237
fprintf(fout, _(" \\x toggle expanded output (currently %s)\n"),
238238
ON(pset.popt.topt.expanded));
239239
fprintf(fout, _(" \\z list table access privileges\n"));

0 commit comments

Comments
 (0)