Update documentation to more clearly label the streaming replication option.

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index ed34dac023dd860b6d897d545b930780b4883700..e4f2e0163b830583d576d5993d65e15398278cef 100644 (file)
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -140,7 +140,7 @@ protocol to make nodes agree on a serializable transactional order.
   
 
   
-   Warm and Hot Standby Using Point-In-Time Recovery (PITR)
+   Transaction Log Shipping
    
 
     
@@ -148,11 +148,11 @@ protocol to make nodes agree on a serializable transactional order.
      stream of write-ahead log (WAL)
      records.  If the main server fails, the 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.
+     made the new master database server.  This can be synchronous or
+     asynchronous and can only be done for the entire database server.
     
     
-     A PITR standby server can be implemented using file-based log shipping
+     A standby server can be implemented using file-based log shipping
      () or streaming replication (see
      ), or a combination of both. For
      information on hot standby, see .
@@ -291,7 +291,7 @@ protocol to make nodes agree on a serializable transactional order.
      Feature
      Shared Disk Failover
      File System Replication
-     Hot/Warm Standby Using PITR
+     Transaction Log Shipping
      Trigger-Based Master-Standby Replication
      Statement-Based Replication Middleware
      Asynchronous Multimaster Replication
@@ -305,7 +305,7 @@ protocol to make nodes agree on a serializable transactional order.
      Most Common Implementation
      NAS
      DRBD
-     PITR
+     Streaming Repl.
      Slony
      pgpool-II
      Bucardo
@@ -360,7 +360,7 @@ protocol to make nodes agree on a serializable transactional order.
      No waiting for multiple servers
      •
      
-     •
+     with sync off
      •
      
      •
@@ -371,7 +371,7 @@ protocol to make nodes agree on a serializable transactional order.
      Master failure will never lose data
      •
      •
-     
+     with sync on
      
      •
      
@@ -382,7 +382,7 @@ protocol to make nodes agree on a serializable transactional order.
      Standby accept read-only queries
      
      
-     Hot only
+     with hot
      •
      •
      •