@@ -140,19 +140,19 @@ protocol to make nodes agree on a serializable transactional order.
140140 </varlistentry>
141141
142142 <varlistentry>
143- <term>Warm and Hot Standby Using Point-In-Time Recovery (<acronym>PITR</>) </term>
143+ <term>Transaction Log Shipping </term>
144144 <listitem>
145145
146146 <para>
147147 Warm and hot standby servers can be kept current by reading a
148148 stream of write-ahead log (<acronym>WAL</>)
149149 records. If the main server fails, the standby contains
150150 almost all of the data of the main server, and can be quickly
151- made the new master database server. Thisis asynchronous and
152- can only be done for the entire database server.
151+ made the new master database server. Thiscan be synchronous or
152+ asynchronous and can only be done for the entire database server.
153153 </para>
154154 <para>
155- APITR standby server can be implemented using file-based log shipping
155+ A standby server can be implemented using file-based log shipping
156156 (<xref linkend="warm-standby">) or streaming replication (see
157157 <xref linkend="streaming-replication">), or a combination of both. For
158158 information on hot standby, see <xref linkend="hot-standby">.
@@ -291,7 +291,7 @@ protocol to make nodes agree on a serializable transactional order.
291291 <entry>Feature</entry>
292292 <entry>Shared Disk Failover</entry>
293293 <entry>File System Replication</entry>
294- <entry>Hot/Warm Standby Using PITR </entry>
294+ <entry>Transaction Log Shipping </entry>
295295 <entry>Trigger-Based Master-Standby Replication</entry>
296296 <entry>Statement-Based Replication Middleware</entry>
297297 <entry>Asynchronous Multimaster Replication</entry>
@@ -305,7 +305,7 @@ protocol to make nodes agree on a serializable transactional order.
305305 <entry>Most Common Implementation</entry>
306306 <entry align="center">NAS</entry>
307307 <entry align="center">DRBD</entry>
308- <entry align="center">PITR </entry>
308+ <entry align="center">Streaming Repl. </entry>
309309 <entry align="center">Slony</entry>
310310 <entry align="center">pgpool-II</entry>
311311 <entry align="center">Bucardo</entry>
@@ -360,7 +360,7 @@ protocol to make nodes agree on a serializable transactional order.
360360 <entry>No waiting for multiple servers</entry>
361361 <entry align="center">•</entry>
362362 <entry align="center"></entry>
363- <entry align="center">• </entry>
363+ <entry align="center">with sync off </entry>
364364 <entry align="center">•</entry>
365365 <entry align="center"></entry>
366366 <entry align="center">•</entry>
@@ -371,7 +371,7 @@ protocol to make nodes agree on a serializable transactional order.
371371 <entry>Master failure will never lose data</entry>
372372 <entry align="center">•</entry>
373373 <entry align="center">•</entry>
374- <entry align="center"></entry>
374+ <entry align="center">with sync on </entry>
375375 <entry align="center"></entry>
376376 <entry align="center">•</entry>
377377 <entry align="center"></entry>
@@ -382,7 +382,7 @@ protocol to make nodes agree on a serializable transactional order.
382382 <entry>Standby accept read-only queries</entry>
383383 <entry align="center"></entry>
384384 <entry align="center"></entry>
385- <entry align="center">Hot only </entry>
385+ <entry align="center">with hot </entry>
386386 <entry align="center">•</entry>
387387 <entry align="center">•</entry>
388388 <entry align="center">•</entry>