From 84abea76f60c5fd1c008b8ddf250b4bc89e288fc Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Thu, 17 Mar 2011 14:02:41 -0400
Subject: 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.
---
 doc/src/sgml/recovery-config.sgml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc/src')

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>
 
-- 
cgit v1.2.3