11<!--
2- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.52 2004/11/17 18:29:02 tgl Exp $
2+ $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.53 2004/12/13 18:05:07 petere Exp $
33-->
44<chapter id="backup">
55 <title>Backup and Restore</title>
@@ -317,7 +317,7 @@ tar -cf backup.tar /usr/local/pgsql/data
317317 get a usable backup. Half-way measures such as disallowing all
318318 connections will <emphasis>not</emphasis> work
319319 (mainly because <command>tar</command> and similar tools do not take an
320- atomic snapshot of the state of thefilesystem at a point in
320+ atomic snapshot of the state of thefile system at a point in
321321 time). Information about stopping the server can be found in
322322 <xref linkend="postmaster-shutdown">. Needless to say that you
323323 also need to shut down the server before restoring the data.
@@ -365,7 +365,7 @@ tar -cf backup.tar /usr/local/pgsql/data
365365 If your database is spread across multiple volumes (for example,
366366 data files and WAL log on different disks) there may not be any way
367367 to obtain exactly-simultaneous frozen snapshots of all the volumes.
368- Read yourfilesystem documentation very carefully before trusting
368+ Read yourfile system documentation very carefully before trusting
369369 to the consistent-snapshot technique in such situations.
370370 </para>
371371
@@ -402,7 +402,7 @@ tar -cf backup.tar /usr/local/pgsql/data
402402 database can be restored to consistency by <quote>replaying</> the
403403 log entries made since the last checkpoint. However, the existence
404404 of the log makes it possible to use a third strategy for backing up
405- databases: we can combine afilesystem -level backup with backup of
405+ databases: we can combine afile-system -level backup with backup of
406406 the WAL files. If recovery is needed, we restore the backup and
407407 then replay from the backed-up WAL files to bring the backup up to
408408 current time. This approach is more complex to administer than
@@ -414,7 +414,7 @@ tar -cf backup.tar /usr/local/pgsql/data
414414 We do not need a perfectly consistent backup as the starting point.
415415 Any internal inconsistency in the backup will be corrected by log
416416 replay (this is not significantly different from what happens during
417- crash recovery). So we don't needfilesystem snapshot capability,
417+ crash recovery). So we don't needfile system snapshot capability,
418418 just <application>tar</> or a similar archiving tool.
419419 </para>
420420 </listitem>
@@ -449,7 +449,7 @@ tar -cf backup.tar /usr/local/pgsql/data
449449 </para>
450450
451451 <para>
452- As with the plainfilesystem -backup technique, this method can only
452+ As with the plainfile-system -backup technique, this method can only
453453 support restoration of an entire database cluster, not a subset.
454454 Also, it requires a lot of archival storage: the base backup may be bulky,
455455 and a busy system will generate many megabytes of WAL traffic that
@@ -618,7 +618,7 @@ archive_command = 'test ! -f .../%f && cp %p .../%f'
618618 <filename>postgresql.conf</>, <filename>pg_hba.conf</> and
619619 <filename>pg_ident.conf</>) after the initial base backup.
620620 You may wish to keep the configuration files in a location that will
621- be backed up by your regularfilesystem backup procedures.
621+ be backed up by your regularfile system backup procedures.
622622 </para>
623623 </sect2>
624624
@@ -655,7 +655,7 @@ SELECT pg_start_backup('label');
655655 </listitem>
656656 <listitem>
657657 <para>
658- Perform the backup, using any convenientfilesystem -backup tool
658+ Perform the backup, using any convenientfile-system -backup tool
659659 such as <application>tar</> or <application>cpio</>. It is neither
660660 necessary nor desirable to stop normal operation of the database
661661 while you do this.
@@ -867,7 +867,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
867867 It is important that the command return nonzero exit status on failure.
868868 The command <emphasis>will</> be asked for log files that are not present
869869 in the archive; it must return nonzero when so asked. This is not an
870- error condition. Be aware also that thebasename of the <literal>%p</>
870+ error condition. Be aware also that thebase name of the <literal>%p</>
871871 path will be different from <literal>%f</>; do not expect them to be
872872 interchangeable.
873873 </para>
@@ -948,7 +948,7 @@ restore_command = 'copy /mnt/server/archivedir/%f "%p"' # Windows
948948 </term>
949949 <listitem>
950950 <para>
951- This parameter specifies thetimestamp up to which recovery
951+ This parameter specifies thetime stamp up to which recovery
952952 will proceed.
953953 At most one of <varname>recovery_target_time</> and
954954 <xref linkend="recovery-target-xid"> can be specified.
@@ -1098,7 +1098,7 @@ restore_command = 'copy /mnt/server/archivedir/%f "%p"' # Windows
10981098 <itemizedlist>
10991099 <listitem>
11001100 <para>
1101- Operations on non-btree indexes (hash, R-tree, and GiST indexes) are
1101+ Operations on non-B-tree indexes (hash, R-tree, and GiST indexes) are
11021102 not presently WAL-logged, so replay will not update these index types.
11031103 The recommended workaround is to manually <command>REINDEX</> each
11041104 such index after completing a recovery operation.
@@ -1196,7 +1196,7 @@ psql template1 < backup
11961196
11971197 <para>
11981198 You will always need a SQL dump (<application>pg_dump</> dump) for
1199- migrating to a new release.Filesystem -level backups (including
1199+ migrating to a new release.File-system -level backups (including
12001200 on-line backups) will not work, for the same reason that you can't
12011201 just do the update in-place: the file formats won't necessarily be
12021202 compatible across major releases.