git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c

index 15f66cd4938be1f7dff99654d779d0408e22b06a..4885b21e69a73ac92433c5b7aaf94cb651ae57b0 100644 (file)

--- a/src/bin/initdb/initdb.c

+++ b/src/bin/initdb/initdb.c

* Portions Copyright (c) 1994, Regents of the University of California

* Portions taken from FreeBSD.

*

- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.167 2009年01月22日 20:16:07 tgl Exp $

+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.168 2009年02月25日 13:03:06 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("Usage:\n"));

printf(_(" %s [OPTION]... [DATADIR]\n"), progname);

printf(_("\nOptions:\n"));

+ printf(_(" -A, --auth=METHOD default authentication method for local connections\n"));

printf(_(" [-D, --pgdata=]DATADIR location for this database cluster\n"));

printf(_(" -E, --encoding=ENCODING set default encoding for new databases\n"));

- printf(_(" --locale=LOCALE set default locale for new databases\n"));

- printf(_(" --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"

- " --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"

- " set default locale in the respective\n"

- " category for new databases (default\n"

- " taken from environment)\n"));

- printf(_(" --no-locale equivalent to --locale=C\n"));

+ printf(_(" --locale=LOCALE set default locale for new databases\n"));

+ printf(_(" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"

+ " --lc-monetary=, --lc-numeric=, --lc-time=LOCALE\n"

+ " set default locale in the respective category for\n"

+ " new databases (default taken from environment)\n"));

+ printf(_(" --no-locale equivalent to --locale=C\n"));

+ printf(_(" --pwfile=FILE read password for the new superuser from file\n"));

printf(_(" -T, --text-search-config=CFG\n"

" default text search configuration\n"));

- printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"));

- printf(_(" -A, --auth=METHOD default authentication method for local connections\n"));

printf(_(" -U, --username=NAME database superuser name\n"));

printf(_(" -W, --pwprompt prompt for a password for the new superuser\n"));

- printf(_(" --pwfile=FILE read password for the new superuser from file\n"));

- printf(_(" -?, --help show this help, then exit\n"));

- printf(_(" -V, --version output version information, then exit\n"));

+ printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"));

printf(_("\nLess commonly used options:\n"));

printf(_(" -d, --debug generate lots of debugging output\n"));

- printf(_(" -s, --show show internal settings\n"));

printf(_(" -L DIRECTORY where to find the input files\n"));

printf(_(" -n, --noclean do not clean up after errors\n"));

+ printf(_(" -s, --show show internal settings\n"));

+ printf(_("\nOther options:\n"));

+ printf(_(" -?, --help show this help, then exit\n"));

+ printf(_(" -V, --version output version information, then exit\n"));

printf(_("\nIf the data directory is not specified, the environment variable PGDATA\n"

"is used.\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c

index 4089922a45ffd1b592902e4dd76455efdf0bc2a9..245c2f052d7407a346a4bc552c6fc3bb7f11887e 100644 (file)

--- a/src/bin/pg_ctl/pg_ctl.c

+++ b/src/bin/pg_ctl/pg_ctl.c

*

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.108 2009年01月28日 11:19:37 mha Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.109 2009年02月25日 13:03:06 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("If the -D option is omitted, the environment variable PGDATA is used.\n"));

printf(_("\nOptions for start or restart:\n"));

- printf(_(" -l, --log FILENAME write (or append) server log to FILENAME\n"));

- printf(_(" -o OPTIONS command line options to pass to postgres\n"

- " (PostgreSQL server executable)\n"));

- printf(_(" -p PATH-TO-POSTGRES normally not necessary\n"));

#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_CORE)

printf(_(" -c, --core-files allow postgres to produce core files\n"));

#else

printf(_(" -c, --core-files not applicable on this platform\n"));

#endif

+ printf(_(" -l, --log FILENAME write (or append) server log to FILENAME\n"));

+ printf(_(" -o OPTIONS command line options to pass to postgres\n"

+ " (PostgreSQL server executable)\n"));

+ printf(_(" -p PATH-TO-POSTGRES normally not necessary\n"));

printf(_("\nOptions for stop or restart:\n"));

printf(_(" -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"));

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index 1e971bc37cd05fe8ecbfba46ee33dc52c0a01679..7de9f4ec6a540a7905db71b7dd8777620eb39caf 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c

+++ b/src/bin/pg_dump/pg_dump.c

* by PostgreSQL

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.525 2009年02月24日 10:06:33 petere Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.526 2009年02月25日 13:03:06 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" -n, --schema=SCHEMA dump the named schema(s) only\n"));

printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"));

printf(_(" -o, --oids include OIDs in dump\n"));

- printf(_(" -O, --no-owner skip restoration of object ownership\n"

- " in plain text format\n"));

+ printf(_(" -O, --no-owner skip restoration of object ownership in\n"

+ " plain-text format\n"));

printf(_(" -s, --schema-only dump only the schema, no data\n"));

- printf(_(" -S, --superuser=NAME specify the superuser user name to use in\n"

- " plain text format\n"));

+ printf(_(" -S, --superuser=NAME superuser user name to use in plain-text format\n"));

printf(_(" -t, --table=TABLE dump the named table(s) only\n"));

printf(_(" -T, --exclude-table=TABLE do NOT dump the named table(s)\n"));

printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));

printf(_(" --no-tablespaces do not dump tablespace assignments\n"));

printf(_(" --role=ROLENAME do SET ROLE before dump\n"));

printf(_(" --use-set-session-authorization\n"

- " use SESSION AUTHORIZATION commands instead of\n"

- " ALTER OWNER commands to set ownership\n"));

+ " use SET SESSION AUTHORIZATION commands instead of\n"

+ " ALTER OWNER commands to set ownership\n"));

printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c

index d37e254c257cad1e1c2fd4e5be3920b6e7478b8c..799fee7616e73055e020b0d21b28add62d775607 100644 (file)

--- a/src/bin/pg_dump/pg_dumpall.c

+++ b/src/bin/pg_dump/pg_dumpall.c

* Portions Copyright (c) 1994, Regents of the University of California

*

*

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.115 2009年02月18日 12:07:08 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.116 2009年02月25日 13:03:06 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" %s [OPTION]...\n"), progname);

printf(_("\nGeneral options:\n"));

- printf(_(" -f, --file=FILENAME output file name\n"));

- printf(_(" --help show this help, then exit\n"));

- printf(_(" --version output version information, then exit\n"));

- printf(_(" --lock-wait-timeout=TIMEOUT\n"

- " fail after waiting TIMEOUT for a table lock\n"));

+ printf(_(" -f, --file=FILENAME output file name\n"));

+ printf(_(" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"));

+ printf(_(" --help show this help, then exit\n"));

+ printf(_(" --version output version information, then exit\n"));

printf(_("\nOptions controlling the output content:\n"));

- printf(_(" -a, --data-only dump only the data, not the schema\n"));

- printf(_(" -c, --clean clean (drop) databases before recreating\n"));

- printf(_(" -d, --inserts dump data as INSERT, rather than COPY, commands\n"));

- printf(_(" -D, --column-inserts dump data as INSERT commands with column names\n"));

- printf(_(" -g, --globals-only dump only global objects, no databases\n"));

- printf(_(" -o, --oids include OIDs in dump\n"));

- printf(_(" -O, --no-owner skip restoration of object ownership\n"));

- printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n"));

- printf(_(" -s, --schema-only dump only the schema, no data\n"));

- printf(_(" -S, --superuser=NAME specify the superuser user name to use in the dump\n"));

- printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"));

- printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));

- printf(_(" --disable-dollar-quoting\n"

- " disable dollar quoting, use SQL standard quoting\n"));

- printf(_(" --disable-triggers disable triggers during data-only restore\n"));

- printf(_(" --no-tablespaces do not dump tablespace assignments\n"));

- printf(_(" --role=ROLENAME do SET ROLE before dump\n"));

+ printf(_(" -a, --data-only dump only the data, not the schema\n"));

+ printf(_(" -c, --clean clean (drop) databases before recreating\n"));

+ printf(_(" -d, --inserts dump data as INSERT commands, rather than COPY\n"));

+ printf(_(" -D, --column-inserts dump data as INSERT commands with column names\n"));

+ printf(_(" -g, --globals-only dump only global objects, no databases\n"));

+ printf(_(" -o, --oids include OIDs in dump\n"));

+ printf(_(" -O, --no-owner skip restoration of object ownership\n"));

+ printf(_(" -r, --roles-only dump only roles, no databases or tablespaces\n"));

+ printf(_(" -s, --schema-only dump only the schema, no data\n"));

+ printf(_(" -S, --superuser=NAME superuser user name to use in the dump\n"));

+ printf(_(" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"));

+ printf(_(" -x, --no-privileges do not dump privileges (grant/revoke)\n"));

+ printf(_(" --disable-dollar-quoting disable dollar quoting, use SQL standard quoting\n"));

+ printf(_(" --disable-triggers disable triggers during data-only restore\n"));

+ printf(_(" --no-tablespaces do not dump tablespace assignments\n"));

+ printf(_(" --role=ROLENAME do SET ROLE before dump\n"));

printf(_(" --use-set-session-authorization\n"

- " use SESSION AUTHORIZATION commands instead of\n"

- " OWNER TO commands\n"));

+ " use SET SESSION AUTHORIZATION commands instead of\n"

+ " ALTER OWNER commands to set ownership\n"));

printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

- printf(_(" -l, --database=DBNAME specify an alternative default database\n"));

+ printf(_(" -l, --database=DBNAME alternative default database\n"));

printf(_(" -p, --port=PORT database server port number\n"));

printf(_(" -U, --username=NAME connect as specified database user\n"));

printf(_(" -W, --password force password prompt (should happen automatically)\n"));

- printf(_("\nThe SQL script will be written to the standard output.\n\n"));

+ printf(_("\nIf -f/--file is not used, then the SQL script will be written to the standard\n"

+ "output.\n\n"));

printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c

index cee5f9e6208d43621609a73d1de94d84f1d07fb6..a0ab3efecf706904ff55a8437c592448eca30b62 100644 (file)

--- a/src/bin/pg_dump/pg_restore.c

+++ b/src/bin/pg_dump/pg_restore.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.92 2009年02月02日 20:07:37 adunstan Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.93 2009年02月25日 13:03:06 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("\nGeneral options:\n"));

printf(_(" -d, --dbname=NAME connect to database name\n"));

printf(_(" -f, --file=FILENAME output file name\n"));

- printf(_(" -F, --format=c|t specify backup file format\n"));

+ printf(_(" -F, --format=c|t backup file format (should be automatic)\n"));

printf(_(" -l, --list print summarized TOC of the archive\n"));

printf(_(" -v, --verbose verbose mode\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" -a, --data-only restore only the data, no schema\n"));

printf(_(" -c, --clean clean (drop) database objects before recreating\n"));

printf(_(" -C, --create create the target database\n"));

+ printf(_(" -e, --exit-on-error exit on error, default is to continue\n"));

printf(_(" -I, --index=NAME restore named index\n"));

- printf(_(" -L, --use-list=FILENAME use specified table of contents for ordering\n"

- " output from this file\n"));

+ printf(_(" -L, --use-list=FILENAME use table of contents from this file for\n"

+ " selecting/ordering output\n"));

printf(_(" -m, --multi-thread=NUM use this many parallel connections to restore\n"));

printf(_(" -n, --schema=NAME restore only objects in this schema\n"));

printf(_(" -O, --no-owner skip restoration of object ownership\n"));

printf(_(" -P, --function=NAME(args)\n"

" restore named function\n"));

printf(_(" -s, --schema-only restore only the schema, no data\n"));

- printf(_(" -S, --superuser=NAME specify the superuser user name to use for\n"

- " disabling triggers\n"));

+ printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n"));

printf(_(" -t, --table=NAME restore named table\n"));

printf(_(" -T, --trigger=NAME restore named trigger\n"));

printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));

printf(_(" --no-tablespaces do not dump tablespace assignments\n"));

printf(_(" --role=ROLENAME do SET ROLE before restore\n"));

printf(_(" --use-set-session-authorization\n"

- " use SESSION AUTHORIZATION commands instead of\n"

- " OWNER TO commands\n"));

+ " use SET SESSION AUTHORIZATION commands instead of\n"

+ " ALTER OWNER commands to set ownership\n"));

printf(_(" -1, --single-transaction\n"

" restore as a single transaction\n"));

printf(_(" -p, --port=PORT database server port number\n"));

printf(_(" -U, --username=NAME connect as specified database user\n"));

printf(_(" -W, --password force password prompt (should happen automatically)\n"));

- printf(_(" -e, --exit-on-error exit on error, default is to continue\n"));

printf(_("\nIf no input file name is supplied, then standard input is used.\n\n"));

printf(_("Report bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c

index 5cfb97c41a6cca34032aecc3d0b23407699f9ffb..3e45d878f4af8511b114c39c5fe1168a534d00ee 100644 (file)

--- a/src/bin/pg_resetxlog/pg_resetxlog.c

+++ b/src/bin/pg_resetxlog/pg_resetxlog.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.71 2009年01月01日 17:23:54 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.72 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("%s resets the PostgreSQL transaction log.\n\n"), progname);

printf(_("Usage:\n %s [OPTION]... DATADIR\n\n"), progname);

printf(_("Options:\n"));

+ printf(_(" -e XIDEPOCH set next transaction ID epoch\n"));

printf(_(" -f force update to be done\n"));

printf(_(" -l TLI,FILE,SEG force minimum WAL starting location for new transaction log\n"));

printf(_(" -m XID set next multitransaction ID\n"));

printf(_(" -o OID set next OID\n"));

printf(_(" -O OFFSET set next multitransaction offset\n"));

printf(_(" -x XID set next transaction ID\n"));

- printf(_(" -e XIDEPOCH set next transaction ID epoch\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c

index 32687b464566c4b68bd556096cfdf61cabff2e2a..25d023ff07fe194842f2200e597575f4e9edb547 100644 (file)

--- a/src/bin/psql/help.c

+++ b/src/bin/psql/help.c

*

* Copyright (c) 2000-2009, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.138 2009年01月07日 03:05:26 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.139 2009年02月25日 13:03:07 petere Exp $

*/

#include "postgres_fe.h"

env = getenv("PGDATABASE");

if (!env)

env = user;

- printf(_(" -d DBNAME specify database name to connect to (default: \"%s\")\n"), env);

puts(_(" -c COMMAND run only single command (SQL or internal) and exit"));

+ printf(_(" -d DBNAME database name to connect to (default: \"%s\")\n"), env);

puts(_(" -f FILENAME execute commands from file, then exit"));

- puts(_(" -1 (\"one\") execute command file as a single transaction"));

puts(_(" -l list available databases, then exit"));

puts(_(" -v NAME=VALUE set psql variable NAME to VALUE"));

puts(_(" -X do not read startup file (~/.psqlrc)"));

+ puts(_(" -1 (\"one\") execute command file as a single transaction"));

puts(_(" --help show this help, then exit"));

puts(_(" --version output version information, then exit"));

puts(_(" -a echo all input from script"));

puts(_(" -e echo commands sent to server"));

puts(_(" -E display queries that internal commands generate"));

- puts(_(" -q run quietly (no messages, only query output)"));

- puts(_(" -o FILENAME send query results to file (or |pipe)"));

+ puts(_(" -L FILENAME send session log to file"));

puts(_(" -n disable enhanced command line editing (readline)"));

+ puts(_(" -o FILENAME send query results to file (or |pipe)"));

+ puts(_(" -q run quietly (no messages, only query output)"));

puts(_(" -s single-step mode (confirm each query)"));

puts(_(" -S single-line mode (end of line terminates SQL command)"));

- puts(_(" -L FILENAME send session log to file"));

puts(_("\nOutput format options:"));

puts(_(" -A unaligned table output mode (-P format=unaligned)"));

+ printf(_(" -F STRING set field separator (default: \"%s\") (-P fieldsep=)\n"),

+ DEFAULT_FIELD_SEP);

puts(_(" -H HTML table output mode (-P format=html)"));

+ puts(_(" -P VAR[=ARG] set printing option VAR to ARG (see \\pset command)"));

+ puts(_(" -R STRING set record separator (default: newline) (-P recordsep=)"));

puts(_(" -t print rows only (-P tuples_only)"));

puts(_(" -T TEXT set HTML table tag attributes (width, border) (-P tableattr=)"));

puts(_(" -x turn on expanded table output (-P expanded)"));

- puts(_(" -P VAR[=ARG] set printing option VAR to ARG (see \\pset command)"));

- printf(_(" -F STRING set field separator (default: \"%s\") (-P fieldsep=)\n"),

- DEFAULT_FIELD_SEP);

- puts(_(" -R STRING set record separator (default: newline) (-P recordsep=)"));

puts(_("\nConnection options:"));

/* Display default host */

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c

index 4903f2d92396b6123e01a95ff5955f56072b85f0..e2755c5be64c5ab1bae25f9d538ee32730caf381 100644 (file)

--- a/src/bin/scripts/clusterdb.c

+++ b/src/bin/scripts/clusterdb.c

*

* Portions Copyright (c) 2002-2009, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.23 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.24 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("\nOptions:\n"));

printf(_(" -a, --all cluster all databases\n"));

printf(_(" -d, --dbname=DBNAME database to cluster\n"));

- printf(_(" -t, --table=TABLE cluster specific table only\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -q, --quiet don't write any messages\n"));

+ printf(_(" -t, --table=TABLE cluster specific table only\n"));

printf(_(" -v, --verbose write a lot of output\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c

index 0141a4cbbff8e98d5fc574c817f5a12436764707..a587771f23037ce89fc9a5e26c289503f5f3b460 100644 (file)

--- a/src/bin/scripts/createdb.c

+++ b/src/bin/scripts/createdb.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.30 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.31 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" %s [OPTION]... [DBNAME] [DESCRIPTION]\n"), progname);

printf(_("\nOptions:\n"));

printf(_(" -D, --tablespace=TABLESPACE default tablespace for the database\n"));

+ printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -E, --encoding=ENCODING encoding for the database\n"));

printf(_(" -l, --locale=LOCALE locale settings for the database\n"));

- printf(_(" --lc-collate=LOCALE LC_COLLATE setting for the database\n"));

- printf(_(" --lc-ctype=LOCALE LC_CTYPE setting for the database\n"));

+ printf(_(" --lc-collate=LOCALE LC_COLLATE setting for the database\n"));

+ printf(_(" --lc-ctype=LOCALE LC_CTYPE setting for the database\n"));

printf(_(" -O, --owner=OWNER database user to own the new database\n"));

printf(_(" -T, --template=TEMPLATE template database to copy\n"));

- printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c

index 4d396fda90891b7007bdd67252ec43637763db2e..dcfef2b608d1f7ceb8bb635e0a5d5238eb81cd69 100644 (file)

--- a/src/bin/scripts/createlang.c

+++ b/src/bin/scripts/createlang.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.32 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.33 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" -d, --dbname=DBNAME database to install language in\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -l, --list show a list of currently installed languages\n"));

+ printf(_(" --help show this help, then exit\n"));

+ printf(_(" --version output version information, then exit\n"));

+ printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

printf(_(" -p, --port=PORT database server port\n"));

printf(_(" -U, --username=USERNAME user name to connect as\n"));

printf(_(" -W, --password force password prompt\n"));

- printf(_(" --help show this help, then exit\n"));

- printf(_(" --version output version information, then exit\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c

index 8f0f60b018ba1a1b6eed50fb7a10626d38025b1e..852cafd648f046551ba57d6eb7e6d9b34c84b70c 100644 (file)

--- a/src/bin/scripts/createuser.c

+++ b/src/bin/scripts/createuser.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.40 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.41 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("Usage:\n"));

printf(_(" %s [OPTION]... [ROLENAME]\n"), progname);

printf(_("\nOptions:\n"));

- printf(_(" -s, --superuser role will be superuser\n"));

- printf(_(" -S, --no-superuser role will not be superuser\n"));

+ printf(_(" -c, --connection-limit=N connection limit for role (default: no limit)\n"));

printf(_(" -d, --createdb role can create new databases\n"));

printf(_(" -D, --no-createdb role cannot create databases\n"));

- printf(_(" -r, --createrole role can create new roles\n"));

- printf(_(" -R, --no-createrole role cannot create roles\n"));

- printf(_(" -l, --login role can login (default)\n"));

- printf(_(" -L, --no-login role cannot login\n"));

+ printf(_(" -e, --echo show the commands being sent to the server\n"));

+ printf(_(" -E, --encrypted encrypt stored password\n"));

printf(_(" -i, --inherit role inherits privileges of roles it is a\n"

" member of (default)\n"));

printf(_(" -I, --no-inherit role does not inherit privileges\n"));

- printf(_(" -c, --connection-limit=N connection limit for role (default: no limit)\n"));

- printf(_(" -P, --pwprompt assign a password to new role\n"));

- printf(_(" -E, --encrypted encrypt stored password\n"));

+ printf(_(" -l, --login role can login (default)\n"));

+ printf(_(" -L, --no-login role cannot login\n"));

printf(_(" -N, --unencrypted do not encrypt stored password\n"));

- printf(_(" -e, --echo show the commands being sent to the server\n"));

+ printf(_(" -P, --pwprompt assign a password to new role\n"));

+ printf(_(" -r, --createrole role can create new roles\n"));

+ printf(_(" -R, --no-createrole role cannot create roles\n"));

+ printf(_(" -s, --superuser role will be superuser\n"));

+ printf(_(" -S, --no-superuser role will not be superuser\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nConnection options:\n"));

printf(_(" -p, --port=PORT database server port\n"));

printf(_(" -U, --username=USERNAME user name to connect as (not the one to create)\n"));

printf(_(" -W, --password force password prompt\n"));

- printf(_("\nIf one of -s, -S, -d, -D, -r, -R and ROLENAME is not specified, you will\n"

+ printf(_("\nIf one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you will\n"

"be prompted interactively.\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c

index e35400f7b71f7fc1c1495dbaa9cb5e27c206a126..28747180788d55eaec23d494d9d07d7ec8b11403 100644 (file)

--- a/src/bin/scripts/dropdb.c

+++ b/src/bin/scripts/dropdb.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.24 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.25 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("\nOptions:\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -i, --interactive prompt before deleting anything\n"));

+ printf(_(" --help show this help, then exit\n"));

+ printf(_(" --version output version information, then exit\n"));

+ printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

printf(_(" -p, --port=PORT database server port\n"));

printf(_(" -U, --username=USERNAME user name to connect as\n"));

printf(_(" -W, --password force password prompt\n"));

- printf(_(" --help show this help, then exit\n"));

- printf(_(" --version output version information, then exit\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c

index fe4365e0e7ecafff5a3a3a39cbe78625c8509254..13f8e325bb58a055ca9052d9af04fc052ac4f7a0 100644 (file)

--- a/src/bin/scripts/droplang.c

+++ b/src/bin/scripts/droplang.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.29 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.30 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" -d, --dbname=DBNAME database from which to remove the language\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -l, --list show a list of currently installed languages\n"));

+ printf(_(" --help show this help, then exit\n"));

+ printf(_(" --version output version information, then exit\n"));

+ printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

printf(_(" -p, --port=PORT database server port\n"));

printf(_(" -U, --username=USERNAME user name to connect as\n"));

printf(_(" -W, --password force password prompt\n"));

- printf(_(" --help show this help, then exit\n"));

- printf(_(" --version output version information, then exit\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c

index 80d986ddd9dce43e1e7722c3da25832336e38469..a5087afcf05b6987193e0b5afd7df966e6e22ff7 100644 (file)

--- a/src/bin/scripts/dropuser.c

+++ b/src/bin/scripts/dropuser.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.25 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.26 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("\nOptions:\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -i, --interactive prompt before deleting anything\n"));

+ printf(_(" --help show this help, then exit\n"));

+ printf(_(" --version output version information, then exit\n"));

+ printf(_("\nConnection options:\n"));

printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

printf(_(" -p, --port=PORT database server port\n"));

printf(_(" -U, --username=USERNAME user name to connect as (not the one to drop)\n"));

printf(_(" -W, --password force password prompt\n"));

- printf(_(" --help show this help, then exit\n"));

- printf(_(" --version output version information, then exit\n"));

printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

}

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c

index eb73d65ac2e7ceaf167dfa0a977be92ac39b3939..ebccd04f5e14ccc4dde5b31be3a4db61de44004b 100644 (file)

--- a/src/bin/scripts/reindexdb.c

+++ b/src/bin/scripts/reindexdb.c

*

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

*

- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.15 2009年01月01日 17:23:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.16 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_(" %s [OPTION]... [DBNAME]\n"), progname);

printf(_("\nOptions:\n"));

printf(_(" -a, --all reindex all databases\n"));

- printf(_(" -s, --system reindex system catalogs\n"));

printf(_(" -d, --dbname=DBNAME database to reindex\n"));

- printf(_(" -t, --table=TABLE reindex specific table only\n"));

- printf(_(" -i, --index=INDEX recreate specific index only\n"));

printf(_(" -e, --echo show the commands being sent to the server\n"));

+ printf(_(" -i, --index=INDEX recreate specific index only\n"));

printf(_(" -q, --quiet don't write any messages\n"));

+ printf(_(" -s, --system reindex system catalogs\n"));

+ printf(_(" -t, --table=TABLE reindex specific table only\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c

index 0ed85118577c31392e711edbe88653fb823ed4a3..204ec7b7f2be19a74e92a760adedb5441e7bf8fa 100644 (file)

--- a/src/bin/scripts/vacuumdb.c

+++ b/src/bin/scripts/vacuumdb.c

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.23 2009年02月18日 12:11:55 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.24 2009年02月25日 13:03:07 petere Exp $

*

*-------------------------------------------------------------------------

*/

printf(_("\nOptions:\n"));

printf(_(" -a, --all vacuum all databases\n"));

printf(_(" -d, --dbname=DBNAME database to vacuum\n"));

- printf(_(" -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"));

+ printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -f, --full do full vacuuming\n"));

- printf(_(" -z, --analyze update optimizer hints\n"));

printf(_(" -F, --freeze freeze row transaction information\n"));

- printf(_(" -e, --echo show the commands being sent to the server\n"));

printf(_(" -q, --quiet don't write any messages\n"));

+ printf(_(" -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"));

printf(_(" -v, --verbose write a lot of output\n"));

+ printf(_(" -z, --analyze update optimizer hints\n"));

printf(_(" --help show this help, then exit\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nConnection options:\n"));

diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c

index 5784dca1fce7fba0bd7acd395c5bd1f32fa390fa..55296dc0bd24cb05139e4b8ae69d73df33922d15 100644 (file)

--- a/src/interfaces/ecpg/preproc/ecpg.c

+++ b/src/interfaces/ecpg/preproc/ecpg.c

-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.108 2009年01月30日 12:53:12 petere Exp $ */

+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.109 2009年02月25日 13:03:07 petere Exp $ */

/* New main for ecpg, the PostgreSQL embedded SQL precompiler. */

/* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */

printf(_(" -o OUTFILE write result to OUTFILE\n"));

printf(_(" -r OPTION specify run-time behavior; OPTION can be:\n"

" \"no_indicator\", \"prepare\", \"questionmarks\"\n"));

+ printf(_(" --regression run in regression testing mode\n"));

printf(_(" -t turn on autocommit of transactions\n"));

printf(_(" --help show this help, then exit\n"));

- printf(_(" --regression run in regression testing mode\n"));

printf(_(" --version output version information, then exit\n"));

printf(_("\nIf no output file is specified, the name is formed by adding .c to the\n"

"input file name, after stripping off .pgc if present.\n"));