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

diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml

index a00c355f4aac5591f9d3d38ede7d265ce65b95b9..11444e85a83b3984b22aa56b815c8f6241261dc7 100644 (file)

--- a/doc/src/sgml/ref/pg_ctl-ref.sgml

+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml

<varlistentry>

<term><option>-w</option></term>

+ <term><option>--wait</option></term>

<listitem>

<para>

Wait for an operation to complete. This is supported for the

<varlistentry>

<term><option>-W</option></term>

+ <term><option>--no-wait</option></term>

<listitem>

<para>

Do not wait for an operation to complete. This is the opposite of the

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

index ab10d2f25c059ffa7943fafa596213028ee9dc61..7d97232613accea215207804d5c14af615978a7c 100644 (file)

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

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

printf(_(" -s, --silent only print errors, no informational messages\n"));

printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));

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

- printf(_(" -w wait until operation completes\n"));

- printf(_(" -W do not wait until operation completes\n"));

+ printf(_(" -w, --wait wait until operation completes\n"));

+ printf(_(" -W, --no-wait do not wait until operation completes\n"));

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

printf(_("(The default is to wait for shutdown, but not for start or restart.)\n\n"));

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

{"silent", no_argument, NULL, 's'},

{"timeout", required_argument, NULL, 't'},

{"core-files", no_argument, NULL, 'c'},

+ {"wait", no_argument, NULL, 'w'},

+ {"no-wait", no_argument, NULL, 'W'},

{NULL, 0, NULL, 0}

};