aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2010-02-08 13:41:06 +0000
committerBruce Momjian <bruce@momjian.us>2010-02-08 13:41:06 +0000
commit3ab41f02edabf534a24ff58aacc1b1b623b2601c (patch)
treec2d5c71b01ec32789619e0d99d0a686094a3bb4c
parent4cea603128e53d47a8520b4f80332d95ec77589f (diff)
downloadpostgresql-3ab41f02edabf534a24ff58aacc1b1b623b2601c.tar.gz
postgresql-3ab41f02edabf534a24ff58aacc1b1b623b2601c.zip
Update high availability/replication documentation chart for new hot
standby featureset.
-rw-r--r--doc/src/sgml/high-availability.sgml6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 6591dae193e..0e8351ed634 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.38 2010/02/05 23:53:22 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.39 2010/02/08 13:41:06 momjian Exp $ -->
<chapter id="high-availability">
<title>High Availability, Load Balancing, and Replication</title>
@@ -283,7 +283,7 @@ protocol to make nodes agree on a serializable transactional order.
<entry>Feature</entry>
<entry>Shared Disk Failover</entry>
<entry>File System Replication</entry>
- <entry>Warm Standby Using PITR</entry>
+ <entry>Hot/Warm Standby Using PITR</entry>
<entry>Trigger-Based Master-Slave Replication</entry>
<entry>Statement-Based Replication Middleware</entry>
<entry>Asynchronous Multimaster Replication</entry>
@@ -374,7 +374,7 @@ protocol to make nodes agree on a serializable transactional order.
<entry>Slaves accept read-only queries</entry>
<entry align="center"></entry>
<entry align="center"></entry>
- <entry align="center"></entry>
+ <entry align="center">Hot only</entry>
<entry align="center">&bull;</entry>
<entry align="center">&bull;</entry>
<entry align="center">&bull;</entry>