diff options
Diffstat (limited to 'src/bin/psql/help.c')
| -rw-r--r-- | src/bin/psql/help.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 45d9c1e2f9e..6f90450b1e3 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.56 2002/09/04 20:31:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.57 2002/09/22 20:57:21 petere Exp $ */ #include "postgres_fe.h" #include "print.h" @@ -80,10 +80,10 @@ usage(void) } /* If this " is the start of the string then it ought to end there to fit in 80 columns >> " */ - printf(_("This is psql %s, the PostgreSQL interactive terminal.\n"), + printf(_("This is psql %s, the PostgreSQL interactive terminal.\n\n"), PG_VERSION); puts(_("Usage:")); - puts(_(" psql [options] [dbname [username]]\n")); + puts(_(" psql [OPTIONS] [DBNAME [USERNAME]]\n")); puts(_("Options:")); puts(_(" -a Echo all input from script")); puts(_(" -A Unaligned table output mode (-P format=unaligned)")); @@ -210,23 +210,23 @@ slashUsage(bool pager) */ fprintf(output, _(" \\a toggle between unaligned and aligned output mode\n")); fprintf(output, _(" \\c[onnect] [DBNAME|- [USER]]\n" - " connect to new database (currently \"%s\")\n"), + " connect to new database (currently \"%s\")\n"), PQdb(pset.db)); fprintf(output, _(" \\C [STRING] set table title, or unset if none\n")); fprintf(output, _(" \\cd [DIR] change the current working directory\n")); fprintf(output, _(" \\copy ... perform SQL COPY with data stream to the client host\n")); fprintf(output, _(" \\copyright show PostgreSQL usage and distribution terms\n")); fprintf(output, _(" \\d [NAME] describe table, index, sequence, or view\n")); - fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n")); - fprintf(output, _(" list tables/indexes/sequences/views/system tables\n")); + fprintf(output, _(" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n" + " list tables/indexes/sequences/views/system tables\n")); fprintf(output, _(" \\da [PATTERN] list aggregate functions\n")); fprintf(output, _(" \\dd [PATTERN] show comment for object\n")); fprintf(output, _(" \\dD [PATTERN] list domains\n")); - fprintf(output, _(" \\df [PATTERN] list functions (add '+' for more detail)\n")); + fprintf(output, _(" \\df [PATTERN] list functions (add \"+\" for more detail)\n")); fprintf(output, _(" \\do [NAME] list operators\n")); - fprintf(output, _(" \\dl list large objects, same as lo_list\n")); + fprintf(output, _(" \\dl list large objects, same as \\lo_list\n")); fprintf(output, _(" \\dp [PATTERN] list table access privileges\n")); - fprintf(output, _(" \\dT [PATTERN] list data types (add '+' for more detail)\n")); + fprintf(output, _(" \\dT [PATTERN] list data types (add \"+\" for more detail)\n")); fprintf(output, _(" \\du [PATTERN] list users\n")); fprintf(output, _(" \\e [FILE] edit the query buffer (or file) with external editor\n")); fprintf(output, _(" \\echo [STRING] write string to standard output\n")); @@ -242,8 +242,9 @@ slashUsage(bool pager) " large object operations\n")); fprintf(output, _(" \\o FILE send all query results to file or |pipe\n")); fprintf(output, _(" \\p show the contents of the query buffer\n")); - fprintf(output, _(" \\pset NAME [VALUE] set table output option (NAME := {format|border|expanded|\n" - " fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n")); + fprintf(output, _(" \\pset NAME [VALUE] set table output option\n" + " (NAME := {format|border|expanded|fieldsep|null|recordsep|\n" + " tuples_only|title|tableattr|pager})\n")); fprintf(output, _(" \\q quit psql\n")); fprintf(output, _(" \\qecho [STRING] write string to query output stream (see \\o)\n")); fprintf(output, _(" \\r reset (clear) the query buffer\n")); @@ -251,8 +252,8 @@ slashUsage(bool pager) fprintf(output, _(" \\set [NAME [VALUE]] set internal variable, or list all if no parameters\n")); fprintf(output, _(" \\t show only rows (currently %s)\n"), ON(pset.popt.topt.tuples_only)); - fprintf(output, _(" \\T [STRING] set HTML <table>-tag attributes, or unset if none\n")); - fprintf(output, _(" \\timing toggle timing of queries (currently %s)\n"), + fprintf(output, _(" \\T [STRING] set HTML <table> tag attributes, or unset if none\n")); + fprintf(output, _(" \\timing toggle timing of commands (currently %s)\n"), ON(pset.timing)); fprintf(output, _(" \\unset NAME unset (delete) internal variable\n")); fprintf(output, _(" \\w [FILE] write query buffer to file\n")); |