diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 5b78da305a9d4b1971f2db8857e2e9c8e0a0b467..d38f496cd7ca94300b466ea15eb63d0f9317dc07 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.254 2010/02/25 19:20:38 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.255 2010/02/27 09:29:20 heikki Exp $ -->
 
 <chapter Id="runtime-config">
   <title>Server Configuration</title>
@@ -1868,9 +1868,8 @@ archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
         described in <xref linkend="hot-standby-conflict">. Typically,
         this parameter makes sense only during replication, so when
         performing an archive recovery to recover from data loss a very high
-        parameter setting is recommended.  The default is 30 seconds.
-        There is no wait-forever setting because of the potential for deadlock
-        which that setting would introduce.
+        parameter setting or -1 which means wait forever is recommended.
+        The default is 30 seconds.
         This parameter can only be set in the <filename>postgresql.conf</>
         file or on the server command line.
        </para>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index a949ff348f69dc6f80e9b2cbbe66f6ead234efb6..dc42d22f3ab0ec9165e2ad4cb5093ed46cec1bf0 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.51 2010/02/25 09:16:42 heikki Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.52 2010/02/27 09:29:20 heikki Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -1521,7 +1521,10 @@ LOG:  database system is ready to accept read only connections
     <varname>max_standby_delay</> or even set it to zero, though that is a
     very aggressive setting. If the standby server is tasked as an additional
     server for decision support queries then it might be acceptable to set this
-    to a value of many hours (in seconds).
+    to a value of many hours (in seconds).  It is also possible to set
+    <varname>max_standby_delay</> to -1 which means wait forever for queries
+    to complete, if there are conflicts; this will be useful when performing
+    an archive recovery from a backup.
    </para>
 
    <para>