On Sun, June 22, 2014 00:10, Pavel Stehule wrote:
> [help-variables-01.patch ]
+1. This patch is a very useful improvement, IMHO.
I edited the text somewhat; and removed some obvious typos.
thanks,
Erik Rijkers
--- src/bin/psql/help.c.orig 2014-06-22 00:31:55.450860460 +0200
+++ src/bin/psql/help.c 2014-06-22 01:28:23.546375133 +0200
@@ -292,36 +292,36 @@
printf(_("Usage:\n"));
printf(_(" psql --set=NAME=VALUE\n or \\set NAME VALUE in interactive mode\n\n"));
- printf(_(" AUTOCOMMIT when is on, successful SQL command is automatically commited\n"));
+ printf(_(" AUTOCOMMIT successful SQL commands are automatically committed\n"));
printf(_(" COMP_KEYWORD_CASE determines which letter case to use when completing an SQL key word\n"));
- printf(_(" DBNAME the name of currently connected database\n"));
- printf(_(" ECHO all lines from input can be written to standard output\n"));
- printf(_(" ECHO_HIDDEN display queries for internal commands (same as -E option)\n"));
- printf(_(" ENCODING the current client character set encoding\n"));
- printf(_(" FETCH_COUNT how many rows should be for one page (default 0 unlimited)\n"));
- printf(_(" HISTCONTROL when is set, control history list [ignorespace, ignoredups, ignoreboth]\n"));
- printf(_(" HISTFILE file name that be used for store history list\n"));
+ printf(_(" DBNAME name of currently connected database\n"));
+ printf(_(" ECHO write all input lines to standard output\n"));
+ printf(_(" ECHO_HIDDEN display internal queries (same as -E option)\n"));
+ printf(_(" ENCODING current client character set encoding\n"));
+ printf(_(" FETCH_COUNT this many rows at a time (use less memory) (default 0 unlimited)\n"));
+ printf(_(" HISTCONTROL when set, controls history list [ignorespace, ignoredups, ignoreboth]\n"));
+ printf(_(" HISTFILE file name used to store the history list\n"));
printf(_(" HISTSIZE the number of commands to store in the command history\n"));
printf(_(" HOST the currently connected database server\n"));
printf(_(" IGNOREEOF if unset, sending an EOF to interactive session terminates application\n"));
printf(_(" LASTOID the value of last affected OID\n"));
- printf(_(" ON_ERROR_ROLLBACK when is on, raise ROLLBACK on error automatically\n"));
- printf(_(" ON_ERROR_STOP when is set, then batch execution stop immediately after error\n"));
- printf(_(" PORT the database server port to which is currently used\n"));
- printf(_(" PROPMPT1, PROPMT2, PROPMPT3 specify a look of psql prompt\n"));
- printf(_(" QUIET when is set, run quietly (same as -q option)\n"));
- printf(_(" SIGLELINE end of line terminates SQL command mode (same as -S option)\n"));
+ printf(_(" ON_ERROR_ROLLBACK when on, ROLLBACK on error\n"));
+ printf(_(" ON_ERROR_STOP stop batch execution after error\n"));
+ printf(_(" PORT the database server port\n"));
+ printf(_(" PROMPT1, PROMPT2, PROMPT3 specify the psql prompt\n"));
+ printf(_(" QUIET run quietly (same as -q option)\n"));
+ printf(_(" SINGLELINE end of line terminates SQL command mode (same as -S option)\n"));
printf(_(" SINGLESTEP confirm each query mode (same as -s option)\n"));
- printf(_(" USER the database user that are currently connected\n"));
+ printf(_(" USER the database user currently connected\n"));
printf(_(" VERBOSITY control verbosity of error reports [default, verbose, terse]\n"));
printf(_("\nPrinting options:\n"));
printf(_("Usage:\n"));
printf(_(" psql --pset=NAME[=VALUE]\n or \\pset NAME [VALUE] in interactive mode\n\n"));
- printf(_(" border number of border style\n"));
- printf(_(" fieldsep specify field separator for unaligned output\n"));
- printf(_(" fieldsep_zero field separator in unaligned mode will be zero\n"));
+ printf(_(" border border style (number)\n"));
+ printf(_(" fieldsep field separator for unaligned output (default '|')\n"));
+ printf(_(" fieldsep_zero set field separator in unaligned mode to zero\n"));
printf(_(" format set output format [unaligned, aligned, wrapped, html, latex, ..]\n"));
printf(_(" linestyle sets the border line drawing style [ascii, old-ascii, unicode]\n"));
printf(_(" null sets the string to be printed in place of a null value\n"));
@@ -333,7 +333,7 @@
printf(_("\nEnvironment options:\n"));
printf(_("Usage:\n"));
- printf(_(" NAME=VALUE, [NAME=VALUE] psql ...\n or \\setenv NAME [VALUE] in interactive mode\n\n"));
+ printf(_(" NAME=VALUE [NAME=VALUE] psql ...\n or \\setenv NAME [VALUE] in interactive mode\n\n"));
printf(_(" COLUMNS number of columns for wrapped format\n"));
printf(_(" PAGER used pager\n"));
@@ -341,9 +341,10 @@
printf(_(" PGHOST same as the host connection parameter\n"));
printf(_(" PGPORT same as the port connection parameter\n"));
printf(_(" PGUSER same as the user connection parameter\n"));
- printf(_(" PGPASSWORD possibility to set password\n"));
+ printf(_(" PGPASSWORD possibility to set password (not recommended)\n"));
+ printf(_(" PGPASSFILE password file (default ~/.pgpass)\n"));
printf(_(" PSQL_EDITOR, EDITOR, VISUAL editor used by \\e \\ef commands\n"));
- printf(_(" PSQL_EDITOR_LINE_NUMBER_ARG style how to line number is used in editor\n"));
+ printf(_(" PSQL_EDITOR_LINE_NUMBER_ARG style how line number is used in editor\n"));
printf(_(" PSQL_HISTORY alternative location for the command history file\n"));
printf(_(" PSQL_RC alternative location of the user's .psqlrc file\n"));
printf(_(" SHELL command executed by the \\! command\n"));
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
