Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorRobert Haas2011-03-17 18:02:41 +0000
committerRobert Haas2011-03-17 18:04:11 +0000
commit84abea76f60c5fd1c008b8ddf250b4bc89e288fc (patch)
tree616782c846ce0cead81f632add5f5a7208660b32 /doc/src
parent9a56dc3389b9470031e9ef8e45c95a680982e01a (diff)
Add pause_at_recovery_target to recovery.conf.sample; improve docs.
Fujii Masao, but with the proposed behavior change reverted, and the rest adjusted accordingly.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/recovery-config.sgml6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index e9e95acb8dc..7f515dc0117 100644
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -261,7 +261,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
<listitem>
<para>
Specifies whether recovery should pause when the recovery target
- is reached. The default is true, if a recovery target is set.
+ is reached. The default is true.
This is intended to allow queries to be executed against the
database to check if this recovery target is the most desirable
point for recovery. The paused state can be resumed by using
@@ -272,6 +272,10 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
recovery target settings to a later target and restart to
continue recovery.
</para>
+ <para>
+ This setting has no effect if <xref linkend="guc-hot-standby"> is not
+ enabled, or if no recovery target is set.
+ </para>
</listitem>
</varlistentry>