aboutsummaryrefslogtreecommitdiff
path: root/doc/src/sgml/high-availability.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/sgml/high-availability.sgml')
-rw-r--r--doc/src/sgml/high-availability.sgml7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index a949ff348f6..dc42d22f3ab 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>