Skip to content

Commit a4f09ef

Browse files
committed
doc: use wording "restore" instead of "reload" of dumps
Reported-by: axel.kluener@gmail.com Discussion: https://postgr.es/m/164736074430.660.3645615289283943146@wrigleys.postgresql.org Backpatch-through: 11
1 parent 624aa2a commit a4f09ef

13 files changed

+32
-32
lines changed

doc/src/sgml/ddl.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ CREATE TABLE products (
557557
tests, it cannot guarantee that the database will not reach a state
558558
in which the constraint condition is false (due to subsequent changes
559559
of the other row(s) involved). This would cause a database dump and
560-
reload to fail. The reload could fail even when the complete
560+
restore to fail. The restore could fail even when the complete
561561
database state is consistent with the constraint, due to rows not
562562
being loaded in an order that will satisfy the constraint. If
563563
possible, use <literal>UNIQUE</literal>, <literal>EXCLUDE</literal>,
@@ -569,10 +569,10 @@ CREATE TABLE products (
569569
If what you desire is a one-time check against other rows at row
570570
insertion, rather than a continuously-maintained consistency
571571
guarantee, a custom <link linkend="triggers">trigger</link> can be used
572-
to implement that. (This approach avoids the dump/reload problem because
572+
to implement that. (This approach avoids the dump/restore problem because
573573
<application>pg_dump</application> does not reinstall triggers until after
574-
reloading data, so that the check will not be enforced during a
575-
dump/reload.)
574+
restoring data, so that the check will not be enforced during a
575+
dump/restore.)
576576
</para>
577577
</note>
578578

@@ -594,7 +594,7 @@ CREATE TABLE products (
594594
function. <productname>PostgreSQL</productname> does not disallow
595595
that, but it will not notice if there are rows in the table that now
596596
violate the <literal>CHECK</literal> constraint. That would cause a
597-
subsequent database dump and reload to fail.
597+
subsequent database dump and restore to fail.
598598
The recommended way to handle such a change is to drop the constraint
599599
(using <command>ALTER TABLE</command>), adjust the function definition,
600600
and re-add the constraint, thereby rechecking it against all table rows.

doc/src/sgml/extend.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ SET LOCAL search_path TO @extschema@, pg_temp;
982982
<application>pg_dump</application>. But that behavior is undesirable for a
983983
configuration table; any data changes made by the user need to be
984984
included in dumps, or the extension will behave differently after a dump
985-
and reload.
985+
and restore.
986986
</para>
987987

988988
<indexterm>

doc/src/sgml/perform.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
17851785

17861786
<para>
17871787
Dump scripts generated by <application>pg_dump</application> automatically apply
1788-
several, but not all, of the above guidelines. To reload a
1788+
several, but not all, of the above guidelines. To restore a
17891789
<application>pg_dump</application> dump as quickly as possible, you need to
17901790
do a few extra things manually. (Note that these points apply while
17911791
<emphasis>restoring</emphasis> a dump, not while <emphasis>creating</emphasis> it.

doc/src/sgml/plhandler.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
attached to a function when <varname>check_function_bodies</varname> is on.
157157
Therefore, checks whose results might be affected by GUC parameters
158158
definitely should be skipped when <varname>check_function_bodies</varname> is
159-
off, to avoid false failures when reloading a dump.
159+
off, to avoid false failures when restoring a dump.
160160
</para>
161161

162162
<para>

doc/src/sgml/ref/alter_type.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> SET ( <replaceable
411411
around</quote> since the original creation of the enum type). The slowdown is
412412
usually insignificant; but if it matters, optimal performance can be
413413
regained by dropping and recreating the enum type, or by dumping and
414-
reloading the database.
414+
restoring the database.
415415
</para>
416416
</refsect1>
417417

doc/src/sgml/ref/create_domain.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ INSERT INTO tab (domcol) VALUES ((SELECT domcol FROM tab WHERE false));
234234
function. <productname>PostgreSQL</productname> does not disallow that,
235235
but it will not notice if there are stored values of the domain type that
236236
now violate the <literal>CHECK</literal> constraint. That would cause a
237-
subsequent database dump and reload to fail. The recommended way to
237+
subsequent database dump and restore to fail. The recommended way to
238238
handle such a change is to drop the constraint (using <command>ALTER
239239
DOMAIN</command>), adjust the function definition, and re-add the
240240
constraint, thereby rechecking it against stored data.

doc/src/sgml/ref/pg_dump.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ PostgreSQL documentation
684684
...</literal>). This will make restoration very slow; it is mainly
685685
useful for making dumps that can be loaded into
686686
non-<productname>PostgreSQL</productname> databases.
687-
Any error during reloading will cause only rows that are part of the
687+
Any error during restoring will cause only rows that are part of the
688688
problematic <command>INSERT</command> to be lost, rather than the
689689
entire table contents.
690690
</para>
@@ -708,9 +708,9 @@ PostgreSQL documentation
708708
This option is relevant only when creating a data-only dump.
709709
It instructs <application>pg_dump</application> to include commands
710710
to temporarily disable triggers on the target tables while
711-
the data is reloaded. Use this if you have referential
711+
the data is restored. Use this if you have referential
712712
integrity checks or other triggers on the tables that you
713-
do not want to invoke during data reload.
713+
do not want to invoke during data restore.
714714
</para>
715715

716716
<para>
@@ -828,7 +828,7 @@ PostgreSQL documentation
828828
than <command>COPY</command>). This will make restoration very slow;
829829
it is mainly useful for making dumps that can be loaded into
830830
non-<productname>PostgreSQL</productname> databases.
831-
Any error during reloading will cause only rows that are part of the
831+
Any error during restoring will cause only rows that are part of the
832832
problematic <command>INSERT</command> to be lost, rather than the
833833
entire table contents. Note that the restore might fail altogether if
834834
you have rearranged column order. The
@@ -847,7 +847,7 @@ PostgreSQL documentation
847847
target the root of the partitioning hierarchy that contains it, rather
848848
than the partition itself. This causes the appropriate partition to
849849
be re-determined for each row when the data is loaded. This may be
850-
useful when reloading data on a server where rows do not always fall
850+
useful when restoring data on a server where rows do not always fall
851851
into the same partitions as they did on the original server. That
852852
could happen, for example, if the partitioning column is of type text
853853
and the two systems have different definitions of the collation used
@@ -859,7 +859,7 @@ PostgreSQL documentation
859859
with this option, because <application>pg_restore</application> will
860860
not know exactly which partition(s) a given archive data item will
861861
load data into. This could result in inefficiency due to lock
862-
conflicts between parallel jobs, or perhaps even reload failures due
862+
conflicts between parallel jobs, or perhaps even restore failures due
863863
to foreign key constraints being set up before all the relevant data
864864
is loaded.
865865
</para>
@@ -1028,7 +1028,7 @@ PostgreSQL documentation
10281028
Dump data as <command>INSERT</command> commands (rather than
10291029
<command>COPY</command>). Controls the maximum number of rows per
10301030
<command>INSERT</command> command. The value specified must be a
1031-
number greater than zero. Any error during reloading will cause only
1031+
number greater than zero. Any error during restoring will cause only
10321032
rows that are part of the problematic <command>INSERT</command> to be
10331033
lost, rather than the entire table contents.
10341034
</para>

doc/src/sgml/ref/pg_dumpall.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ PostgreSQL documentation
276276
This option is relevant only when creating a data-only dump.
277277
It instructs <application>pg_dumpall</application> to include commands
278278
to temporarily disable triggers on the target tables while
279-
the data is reloaded. Use this if you have referential
279+
the data is restored. Use this if you have referential
280280
integrity checks or other triggers on the tables that you
281-
do not want to invoke during data reload.
281+
do not want to invoke during data restore.
282282
</para>
283283

284284
<para>
@@ -355,7 +355,7 @@ PostgreSQL documentation
355355
target the root of the partitioning hierarchy that contains it, rather
356356
than the partition itself. This causes the appropriate partition to
357357
be re-determined for each row when the data is loaded. This may be
358-
useful when reloading data on a server where rows do not always fall
358+
useful when restoring data on a server where rows do not always fall
359359
into the same partitions as they did on the original server. That
360360
could happen, for example, if the partitioning column is of type text
361361
and the two systems have different definitions of the collation used
@@ -530,7 +530,7 @@ PostgreSQL documentation
530530
Dump data as <command>INSERT</command> commands (rather than
531531
<command>COPY</command>). Controls the maximum number of rows per
532532
<command>INSERT</command> command. The value specified must be a
533-
number greater than zero. Any error during reloading will cause only
533+
number greater than zero. Any error during restoring will cause only
534534
rows that are part of the problematic <command>INSERT</command> to be
535535
lost, rather than the entire table contents.
536536
</para>
@@ -799,7 +799,7 @@ PostgreSQL documentation
799799
</para>
800800

801801
<para>
802-
To reload database(s) from this file, you can use:
802+
To restore database(s) from this file, you can use:
803803
<screen>
804804
<prompt>$</prompt> <userinput>psql -f db.out postgres</userinput>
805805
</screen>

doc/src/sgml/ref/pg_resetwal.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ PostgreSQL documentation
5555
After running this command, it should be possible to start the server,
5656
but bear in mind that the database might contain inconsistent data due to
5757
partially-committed transactions. You should immediately dump your data,
58-
run <command>initdb</command>, and reload. After reload, check for
58+
run <command>initdb</command>, and restore. After restore, check for
5959
inconsistencies and repair as needed.
6060
</para>
6161

@@ -78,7 +78,7 @@ PostgreSQL documentation
7878
discussed below. If you are not able to determine correct values for all
7979
these fields, <option>-f</option> can still be used, but
8080
the recovered database must be treated with even more suspicion than
81-
usual: an immediate dump and reload is imperative. <emphasis>Do not</emphasis>
81+
usual: an immediate dump and restore is imperative. <emphasis>Do not</emphasis>
8282
execute any data-modifying operations in the database before you dump,
8383
as any such action is likely to make the corruption worse.
8484
</para>

doc/src/sgml/ref/pg_restore.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,9 +538,9 @@ PostgreSQL documentation
538538
This option is relevant only when performing a data-only restore.
539539
It instructs <application>pg_restore</application> to execute commands
540540
to temporarily disable triggers on the target tables while
541-
the data is reloaded. Use this if you have referential
541+
the data is restored. Use this if you have referential
542542
integrity checks or other triggers on the tables that you
543-
do not want to invoke during data reload.
543+
do not want to invoke during data restore.
544544
</para>
545545

546546
<para>
@@ -969,7 +969,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
969969
</para>
970970

971971
<para>
972-
To reload the dump into a new database called <literal>newdb</literal>:
972+
To restore the dump into a new database called <literal>newdb</literal>:
973973

974974
<screen>
975975
<prompt>$</prompt> <userinput>createdb -T template0 newdb</userinput>

doc/src/sgml/ref/pgupgrade.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ PostgreSQL documentation
3939
<para>
4040
<application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data
4141
stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname>
42-
major version without the data dump/reload typically required for
42+
major version without the data dump/restore typically required for
4343
major version upgrades, e.g., from 9.5.8 to 9.6.4 or from 10.7 to 11.2.
4444
It is not required for minor version upgrades, e.g., from 9.6.2 to 9.6.3
4545
or from 10.1 to 10.2.
@@ -420,7 +420,7 @@ NET STOP postgresql-&majorversion;
420420

421421
<para>
422422
The <option>--jobs</option> option allows multiple CPU cores to be used
423-
for copying/linking of files and to dump and reload database schemas
423+
for copying/linking of files and to dump and restore database schemas
424424
in parallel; a good place to start is the maximum of the number of
425425
CPU cores and tablespaces. This option can dramatically reduce the
426426
time to upgrade a multi-database server running on a multiprocessor

doc/src/sgml/runtime.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
16501650
For <emphasis>major</emphasis> releases of <productname>PostgreSQL</productname>, the
16511651
internal data storage format is subject to change, thus complicating
16521652
upgrades. The traditional method for moving data to a new major version
1653-
is to dump and reload the database, though this can be slow. A
1653+
is to dump and restore the database, though this can be slow. A
16541654
faster method is <xref linkend="pgupgrade"/>. Replication methods are
16551655
also available, as discussed below.
16561656
(If you are using a pre-packaged version
@@ -1736,7 +1736,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
17361736

17371737
<para>
17381738
One upgrade method is to dump data from one major version of
1739-
<productname>PostgreSQL</productname> and reload it in another &mdash; to do
1739+
<productname>PostgreSQL</productname> and restore it in another &mdash; to do
17401740
this, you must use a <emphasis>logical</emphasis> backup tool like
17411741
<application>pg_dumpall</application>; file system
17421742
level backup methods will not work. (There are checks in place that prevent

doc/src/sgml/textsearch.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1974,7 +1974,7 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE
19741974
explicitly when creating <type>tsvector</type> values inside triggers,
19751975
so that the column's contents will not be affected by changes to
19761976
<varname>default_text_search_config</varname>. Failure to do this is likely to
1977-
lead to problems such as search results changing after a dump and reload.
1977+
lead to problems such as search results changing after a dump and restore.
19781978
</para>
19791979

19801980
</sect2>

0 commit comments

Comments
 (0)