From 6ba9b9102aade07fae0b7e8f10813a54d385b5a1 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 5 Feb 2010 23:53:22 +0000
Subject: [PATCH] Mention warm and now "hot" standby servers in the high
 availability docs.

---
 doc/src/sgml/high-availability.sgml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index a51b00b9e5..6591dae193 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.37 2010/02/03 17:25:05 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.38 2010/02/05 23:53:22 momjian Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -135,21 +135,22 @@ protocol to make nodes agree on a serializable transactional order.
   </varlistentry>
 
   <varlistentry>
-   <term>Warm Standby Using Point-In-Time Recovery (<acronym>PITR</>)</term>
+   <term>Warm and Hot Standby Using Point-In-Time Recovery (<acronym>PITR</>)</term>
    <listitem>
 
     <para>
-     A warm standby server (see <xref linkend="warm-standby">) can
-     be kept current by reading a stream of write-ahead log (<acronym>WAL</>)
+     Warm and hot standby servers can be kept current by reading a
+     stream of write-ahead log (<acronym>WAL</>)
      records.  If the main server fails, the warm standby contains
      almost all of the data of the main server, and can be quickly
      made the new master database server.  This is asynchronous and
      can only be done for the entire database server.
     </para>
     <para>
-     A PITR warm standby server can be kept more up-to-date using the
-     streaming replication feature built into <productname>PostgreSQL</> 8.5
-     onwards;  see <xref linkend="warm-standby">.
+     A PITR standby server can be kept more up-to-date using streaming
+     replication.;  see <xref linkend="streaming-replication">.  For
+     warm standby information, see <xref linkend="warm-standby">, and
+     for hot standby, see <xref linkend="hot-standby">.
     </para>
    </listitem>
   </varlistentry>
-- 
2.11.0