aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Riggs <simon@2ndQuadrant.com>2010-05-02 11:32:53 +0000
committerSimon Riggs <simon@2ndQuadrant.com>2010-05-02 11:32:53 +0000
commit98bbab47bcff25734660505066bffb612bb99eb6 (patch)
treebcfbcdba3d1f59348b78a15bb2dbb4323b3d9879
parentf9ed327f760e7794faecfda54b19515a95ba901d (diff)
downloadpostgresql-98bbab47bcff25734660505066bffb612bb99eb6.tar.gz
postgresql-98bbab47bcff25734660505066bffb612bb99eb6.zip
Mention that max_standby_delay has units of milliseconds. Units are mentioned
for all other parameters where the default is expressed in a different unit.
-rw-r--r--doc/src/sgml/config.sgml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f9c13e7c491..f4e1b313be6 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.273 2010/05/02 02:10:32 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.274 2010/05/02 11:32:53 sriggs Exp $ -->
<chapter Id="runtime-config">
<title>Server Configuration</title>
@@ -1950,7 +1950,7 @@ SET ENABLE_SEQSCAN TO OFF;
If a conflict should occur the server will delay up to this long
before it cancels conflicting queries, as
described in <xref linkend="hot-standby-conflict">.
- The default is 30 seconds.
+ The default is 30 seconds (30 s). Units are milliseconds.
A value of -1 causes the standby to wait forever for a conflicting
query to complete.
This parameter can only be set in the <filename>postgresql.conf</>