1- <!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.128 2009/06/05 13:40:31 momjian Exp $ -->
1+ <!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.129 2009/06/26 22:06:11 tgl Exp $ -->
22
33<chapter id="backup">
44 <title>Backup and Restore</title>
@@ -1108,8 +1108,9 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
11081108 last valid restart point. That is the earliest file that must be kept
11091109 to allow a restore to be restartable, so this information can be used
11101110 to truncate the archive to just the minimum required to support
1111- restart of the current restore. <literal>%r</> would only be used in a
1112- warm-standby configuration (see <xref linkend="warm-standby">).
1111+ restart from the current restore. <literal>%r</> would typically be
1112+ used in a warm-standby configuration
1113+ (see <xref linkend="warm-standby">).
11131114 Write <literal>%%</> to embed an actual <literal>%</> character
11141115 in the command.
11151116 </para>
@@ -1132,19 +1133,23 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
11321133 <para>
11331134 This parameter specifies a shell command that will be executed once only
11341135 at the end of recovery. This parameter is optional. The purpose of the
1135- recovery_end_command is to provide a mechanism for cleanup following
1136- replication or recovery.
1136+ <varname> recovery_end_command</> is to provide a mechanism for cleanup
1137+ following replication or recovery.
11371138 Any <literal>%r</> is replaced by the name of the file
11381139 containing the last valid restart point. That is the earliest file that
11391140 must be kept to allow a restore to be restartable, so this information
11401141 can be used to truncate the archive to just the minimum required to
1141- support restart of the current restore. <literal>%r</> would only be
1142- used in a warm-standby configuration (see <xref linkend="warm-standby">).
1142+ support restart from the current restore. <literal>%r</> would
1143+ typically be used in a warm-standby configuration
1144+ (see <xref linkend="warm-standby">).
11431145 Write <literal>%%</> to embed an actual <literal>%</> character
11441146 in the command.
1147+ </para>
1148+ <para>
11451149 If the command returns a non-zero exit status then a WARNING log
1146- message will be written, unless signalled in which case we return
1147- a FATAL error.
1150+ message will be written and the database will proceed to start up
1151+ anyway. An exception is that if the command was terminated by a
1152+ signal, the database will not proceed with startup.
11481153 </para>
11491154 </listitem>
11501155 </varlistentry>