Improve recovery target settings documentation.

Commit 815d71dee hadn't bothered to update the documentation to match the
behavioral change, and a lot of other text in this section was badly in
need of copy-editing.

diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index 0f1ff343a6c8da2bc17ac1cc415683ae48f7b16b..0320bab7e515037fb28ddeca5d73c7fd4fa4c122 100644 (file)
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -152,16 +152,18 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
   
 
     Recovery Target Settings
+
      
       By default, recovery will recover to the end of the WAL log. The
       following parameters can be used to specify an earlier stopping point.
       At most one of recovery_target,
       recovery_target_name, recovery_target_time, or
-      recovery_target_xid can be specified.
+      recovery_target_xid can be used; if more than one of these
+      is specified in the configuration file, the last entry will be used.
      
-     
 
-     
+     
+     
       recovery_target = 'immediate'
       
         recovery_target recovery parameter
@@ -189,8 +191,8 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
       
       
        
-        This parameter specifies the named restore point, created with
-        pg_create_restore_point() to which recovery will proceed.
+        This parameter specifies the named restore point (created with
+        pg_create_restore_point()) to which recovery will proceed.
        
       
      
@@ -231,13 +233,13 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
       
      
      
+
      
        The following options further specify the recovery target, and affect
        what happens when the target is reached:
      
 
      
-
      
                    xreflabel="recovery_target_inclusive">
       recovery_target_inclusive (boolean)
@@ -247,12 +249,12 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
       
       
        
-        Specifies whether we stop just after the specified recovery target
+        Specifies whether to stop just after the specified recovery target
         (true), or just before the recovery target
         (false).
-        Applies to both 
-        and , whichever one is
-        specified for this recovery.  This indicates whether transactions
+        Applies when either 
+        or  is specified.
+        This setting controls whether transactions
         having exactly the target commit time or ID, respectively, will
         be included in the recovery.  Default is true.
        
@@ -294,10 +296,10 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         This is intended to allow queries to be executed against the
         database to check if this recovery target is the most desirable
         point for recovery. The paused state can be resumed by using
-        pg_xlog_replay_resume() (See
+        pg_xlog_replay_resume() (see
         ), which then
         causes recovery to end. If this recovery target is not the
-        desired stopping point, then shutdown the server, change the
+        desired stopping point, then shut down the server, change the
         recovery target settings to a later target and restart to
         continue recovery.