summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2010-10-13 17:24:51 +0000
committerPeter Eisentraut2010-10-13 17:24:51 +0000
commitceb5b787c6fcfbb8667f3b0254d2f2796cee20e2 (patch)
tree370089df2a883d9dfe18a2a2cf81a7d6d5525983
parentef204db5778f04225dcf145f6480402a614fff73 (diff)
Mention the default pg_ctl wait time in the -t option documentation
-rw-r--r--doc/src/sgml/ref/pg_ctl-ref.sgml5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index df3794f8cd3..31a1262fca4 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -314,7 +314,7 @@ PostgreSQL documentation
<listitem>
<para>
The number of seconds to wait when waiting for start or shutdown
- to complete.
+ to complete. The default is 60 seconds.
</para>
</listitem>
</varlistentry>
@@ -324,7 +324,8 @@ PostgreSQL documentation
<listitem>
<para>
Wait for the start or shutdown to complete. The default wait time
- is 60 seconds. This is the default option for shutdowns. A successful
+ is 60 seconds but can be overridden with the option <option>-t</option>.
+ To wait is the default option for shutdowns. A successful
shutdown is indicated by removal of the <acronym>PID</acronym>
file. For starting up, a successful <command>psql -l</command>
indicates success. <command>pg_ctl</command> will attempt to