Skip to content

Commit 0046d80

Browse files
bmomjianbmomjian
committed
Back out psql help change. Not done yet.
1 parent 6ca16d7 commit 0046d80

File tree

1 file changed

+31
-49
lines changed

1 file changed

+31
-49
lines changed

‎src/bin/psql/help.c‎

Lines changed: 31 additions & 49 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.62 2002/12/11 04:07:39 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.63 2002/12/11 04:09:51 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "common.h"
@@ -171,34 +171,14 @@ slashUsage(unsigned short int pager)
171171
* if this " is the start of the string then it ought to end there to
172172
* fit in 80 columns >> "
173173
*/
174-
fprintf(output, _("General\n"));
174+
fprintf(output, _(" \\a toggle between unaligned and aligned output mode\n"));
175175
fprintf(output, _(" \\c[onnect] [DBNAME|- [USER]]\n"
176176
" connect to new database (currently \"%s\")\n"),
177177
PQdb(pset.db));
178-
fprintf(output, _(" \\q quit psql\n"));
179-
fprintf(output, _(" \\h [NAME] help on syntax of SQL commands, * for all commands\n"));
180-
fprintf(output, _(" \\copyright show PostgreSQL usage and distribution terms\n"));
178+
fprintf(output, _(" \\C [STRING] set table title, or unset if none\n"));
181179
fprintf(output, _(" \\cd [DIR] change the current working directory\n"));
182-
fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));
183-
fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n"));
184-
fprintf(output, _(" \\set [NAME [VALUE]] set internal variable, or list all if no parameters\n"));
185-
fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));
186-
fprintf(output, _(" \\timing toggle timing of commands (currently %s)\n"),
187-
ON(pset.timing));
188-
fprintf(output, _("\n"));
189-
190-
fprintf(output, _("Query Buffer\n"));
191-
fprintf(output, _(" \\g [FILE] send query buffer to server (and results to file or |pipe)\n"));
192-
fprintf(output, _(" \\r reset (clear) the query buffer\n"));
193-
fprintf(output, _(" \\e [FILE] edit the query buffer (or file) with external editor\n"));
194-
fprintf(output, _(" \\i FILE execute commands from file\n"));
195-
fprintf(output, _(" \\p show the contents of the query buffer\n"));
196-
fprintf(output, _(" \\w [FILE] write query buffer to file\n"));
197-
fprintf(output, _(" \\o FILE send all query results to file or |pipe\n"));
198-
fprintf(output, _(" \\s [FILE] display history or save it to file\n"));
199-
fprintf(output, _("\n"));
200-
201-
fprintf(output, _("Informational\n"));
180+
fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
181+
fprintf(output, _(" \\copyright show PostgreSQL usage and distribution terms\n"));
202182
fprintf(output, _(" \\d [NAME] describe table, index, sequence, or view\n"));
203183
fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
204184
" list tables/indexes/sequences/views/system tables\n"));
@@ -211,37 +191,39 @@ slashUsage(unsigned short int pager)
211191
fprintf(output, _(" \\dp [PATTERN] list table access privileges\n"));
212192
fprintf(output, _(" \\dT [PATTERN] list data types (add \"+\" for more detail)\n"));
213193
fprintf(output, _(" \\du [PATTERN] list users\n"));
214-
fprintf(output, _(" \\l list all databases (add \"+\" for more detail)\n"));
215-
fprintf(output, _(" \\z [PATTERN] list table access privileges (same as \\dp)\n"));
216-
fprintf(output, _("\n"));
217-
218-
fprintf(output, _("Large Object, Copy\n"));
219-
fprintf(output, _(" \\lo_export\n"));
220-
fprintf(output, _(" \\lo_import\n"));
221-
fprintf(output, _(" \\lo_list\n"));
222-
fprintf(output, _(" \\lo_unlink large object operations\n"));
223-
fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n"));
224-
fprintf(output, _("\n"));
225-
226-
fprintf(output, _("Formatting\n"));
227-
fprintf(output, _(" \\x toggle expanded output (currently %s)\n"),
228-
ON(pset.popt.topt.expanded));
229-
fprintf(output, _(" \\a toggle between unaligned and aligned output mode\n"));
194+
fprintf(output, _(" \\e [FILE] edit the query buffer (or file) with external editor\n"));
195+
fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
196+
fprintf(output, _(" \\encoding [ENCODING] show or set client encoding\n"));
230197
fprintf(output, _(" \\f [STRING] show or set field separator for unaligned query output\n"));
198+
fprintf(output, _(" \\g [FILE] send query buffer to server (and results to file or |pipe)\n"));
199+
fprintf(output, _(" \\h [NAME] help on syntax of SQL commands, * for all commands\n"));
200+
fprintf(output, _(" \\H toggle HTML output mode (currently %s)\n"),
201+
ON(pset.popt.topt.format == PRINT_HTML));
202+
fprintf(output, _(" \\i FILE execute commands from file\n"));
203+
fprintf(output, _(" \\l list all databases\n"));
204+
fprintf(output, _(" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
205+
" large object operations\n"));
206+
fprintf(output, _(" \\o FILE send all query results to file or |pipe\n"));
207+
fprintf(output, _(" \\p show the contents of the query buffer\n"));
231208
fprintf(output, _(" \\pset NAME [VALUE] set table output option\n"
232209
" (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
233210
" tuples_only|title|tableattr|pager})\n"));
234-
fprintf(output, _(" \\C [STRING] set table title, or unset if none\n"));
211+
fprintf(output, _(" \\q quit psql\n"));
212+
fprintf(output, _(" \\qecho [STRING] write string to query output stream (see \\o)\n"));
213+
fprintf(output, _(" \\r reset (clear) the query buffer\n"));
214+
fprintf(output, _(" \\s [FILE] display history or save it to file\n"));
215+
fprintf(output, _(" \\set [NAME [VALUE]] set internal variable, or list all if no parameters\n"));
235216
fprintf(output, _(" \\t show only rows (currently %s)\n"),
236217
ON(pset.popt.topt.tuples_only));
237-
fprintf(output, _(" \\echo [STRING] write string to standard output\n"));
238-
fprintf(output, _(" \\qecho [STRING] write string to query output stream (see \\o)\n"));
239-
fprintf(output, _("\n"));
240-
241-
fprintf(output, _("HTML Output\n"));
242-
fprintf(output, _(" \\H toggle HTML output mode (currently %s)\n"),
243-
ON(pset.popt.topt.format == PRINT_HTML));
244218
fprintf(output, _(" \\T [STRING] set HTML <table> tag attributes, or unset if none\n"));
219+
fprintf(output, _(" \\timing toggle timing of commands (currently %s)\n"),
220+
ON(pset.timing));
221+
fprintf(output, _(" \\unset NAME unset (delete) internal variable\n"));
222+
fprintf(output, _(" \\w [FILE] write query buffer to file\n"));
223+
fprintf(output, _(" \\x toggle expanded output (currently %s)\n"),
224+
ON(pset.popt.topt.expanded));
225+
fprintf(output, _(" \\z [PATTERN] list table access privileges (same as \\dp)\n"));
226+
fprintf(output, _(" \\! [COMMAND] execute command in shell or start interactive shell\n"));
245227

246228
if (output != stdout)
247229
{

0 commit comments

Comments
 (0)