Skip to content

Commit 21f1e15

Browse files
committed
Unify spelling of "canceled", "canceling", "cancellation"
We had previously (af26857) established the U.S. spellings as standard.
1 parent 465883b commit 21f1e15

30 files changed

+82
-82
lines changed

doc/src/sgml/high-availability.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ if (!triggered)
15851585
<para>
15861586
There are also additional types of conflict that can occur with Hot Standby.
15871587
These conflicts are <emphasis>hard conflicts</> in the sense that queries
1588-
might need to be cancelled and, in some cases, sessions disconnected to resolve them.
1588+
might need to be canceled and, in some cases, sessions disconnected to resolve them.
15891589
The user is provided with several ways to handle these
15901590
conflicts. Conflict cases include:
15911591

@@ -1682,18 +1682,18 @@ if (!triggered)
16821682
<para>
16831683
Once the delay specified by <varname>max_standby_archive_delay</> or
16841684
<varname>max_standby_streaming_delay</> has been exceeded, conflicting
1685-
queries will be cancelled. This usually results just in a cancellation
1685+
queries will be canceled. This usually results just in a cancellation
16861686
error, although in the case of replaying a <command>DROP DATABASE</>
16871687
the entire conflicting session will be terminated. Also, if the conflict
16881688
is over a lock held by an idle transaction, the conflicting session is
16891689
terminated (this behavior might change in the future).
16901690
</para>
16911691

16921692
<para>
1693-
Cancelled queries may be retried immediately (after beginning a new
1693+
Canceled queries may be retried immediately (after beginning a new
16941694
transaction, of course). Since query cancellation depends on
16951695
the nature of the WAL records being replayed, a query that was
1696-
cancelled may well succeed if it is executed again.
1696+
canceled may well succeed if it is executed again.
16971697
</para>
16981698

16991699
<para>
@@ -1751,7 +1751,7 @@ if (!triggered)
17511751
Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age">
17521752
on the primary server, so that dead rows will not be cleaned up as quickly
17531753
as they normally would be. This will allow more time for queries to
1754-
execute before they are cancelled on the standby, without having to set
1754+
execute before they are canceled on the standby, without having to set
17551755
a high <varname>max_standby_streaming_delay</>. However it is
17561756
difficult to guarantee any specific execution-time window with this
17571757
approach, since <varname>vacuum_defer_cleanup_age</> is measured in
@@ -1981,7 +1981,7 @@ LOG: database system is ready to accept read only connections
19811981
<command>DROP TABLESPACE</> can only succeed if the tablespace is empty.
19821982
Some standby users may be actively using the tablespace via their
19831983
<varname>temp_tablespaces</> parameter. If there are temporary files in the
1984-
tablespace, all active queries are cancelled to ensure that temporary
1984+
tablespace, all active queries are canceled to ensure that temporary
19851985
files are removed, so the tablespace can be removed and WAL replay
19861986
can continue.
19871987
</para>

doc/src/sgml/indexam.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ amrestrpos (IndexScanDesc scan);
712712
read-write conflict with the insert of any tuple into that index by a
713713
concurrent serializable transaction. If certain patterns of read-write
714714
conflicts are detected among a set of concurrent serializable
715-
transactions, one of those transactions may be cancelled to protect data
715+
transactions, one of those transactions may be canceled to protect data
716716
integrity. When the flag is set, it indicates that the index access
717717
method implements finer-grained predicate locking, which will tend to
718718
reduce the frequency of such transaction cancellations.

doc/src/sgml/libpq.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4088,7 +4088,7 @@ int PQflush(PGconn *conn);
40884088
</sect1>
40894089

40904090
<sect1 id="libpq-cancel">
4091-
<title>Cancelling Queries in Progress</title>
4091+
<title>Canceling Queries in Progress</title>
40924092

40934093
<indexterm zone="libpq-cancel">
40944094
<primary>canceling</primary>

doc/src/sgml/monitoring.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
282282
total disk blocks read, total buffer hits (i.e., block
283283
read requests avoided by finding the block already in buffer cache),
284284
number of rows returned, fetched, inserted, updated and deleted, the
285-
total number of queries cancelled due to conflict with recovery (on
285+
total number of queries canceled due to conflict with recovery (on
286286
standby servers), and time of last statistics reset.
287287
</entry>
288288
</row>
289289

290290
<row>
291291
<entry><structname>pg_stat_database_conflicts</><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
292292
<entry>One row per database, showing database OID, database name and
293-
the number of queries that have been cancelled in this database due to
293+
the number of queries that have been canceled in this database due to
294294
dropped tablespaces, lock timeouts, old snapshots, pinned buffers and
295295
deadlocks. Will only contain information on standby servers, since
296296
conflicts do not occur on master servers.
@@ -639,39 +639,39 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
639639
<entry><literal><function>pg_stat_get_db_conflict_tablespace</function>(<type>oid</type>)</literal></entry>
640640
<entry><type>bigint</type></entry>
641641
<entry>
642-
Number of queries cancelled because of recovery conflict with dropped tablespaces in database
642+
Number of queries canceled because of recovery conflict with dropped tablespaces in database
643643
</entry>
644644
</row>
645645

646646
<row>
647647
<entry><literal><function>pg_stat_get_db_conflict_lock</function>(<type>oid</type>)</literal></entry>
648648
<entry><type>bigint</type></entry>
649649
<entry>
650-
Number of queries cancelled because of recovery conflict with locks in database
650+
Number of queries canceled because of recovery conflict with locks in database
651651
</entry>
652652
</row>
653653

654654
<row>
655655
<entry><literal><function>pg_stat_get_db_conflict_snapshot</function>(<type>oid</type>)</literal></entry>
656656
<entry><type>bigint</type></entry>
657657
<entry>
658-
Number of queries cancelled because of recovery conflict with old snapshots in database
658+
Number of queries canceled because of recovery conflict with old snapshots in database
659659
</entry>
660660
</row>
661661

662662
<row>
663663
<entry><literal><function>pg_stat_get_db_conflict_bufferpin</function>(<type>oid</type>)</literal></entry>
664664
<entry><type>bigint</type></entry>
665665
<entry>
666-
Number of queries cancelled because of recovery conflict with pinned buffers in database
666+
Number of queries canceled because of recovery conflict with pinned buffers in database
667667
</entry>
668668
</row>
669669

670670
<row>
671671
<entry><literal><function>pg_stat_get_db_conflict_startup_deadlock</function>(<type>oid</type>)</literal></entry>
672672
<entry><type>bigint</type></entry>
673673
<entry>
674-
Number of queries cancelled because of recovery conflict with deadlocks in database
674+
Number of queries canceled because of recovery conflict with deadlocks in database
675675
</entry>
676676
</row>
677677

doc/src/sgml/protocol.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@
11421142
</sect2>
11431143

11441144
<sect2>
1145-
<title>Cancelling Requests in Progress</title>
1145+
<title>Canceling Requests in Progress</title>
11461146

11471147
<para>
11481148
During the processing of a query, the frontend might request

doc/src/sgml/ref/set_transaction.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
143143
transaction, the transaction may block when first acquiring its snapshot,
144144
after which it is able to run without the normal overhead of a
145145
<literal>SERIALIZABLE</literal> transaction and without any risk of
146-
contributing to or being cancelled by a serialization failure. This mode
146+
contributing to or being canceled by a serialization failure. This mode
147147
is well suited for long-running reports or backups.
148148
</para>
149149
</refsect1>

doc/src/sgml/release-7.4.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@
465465
</para>
466466

467467
<para>
468-
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
468+
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
469469
after it's already committed its tuple movements, as well as transient
470470
errors if a plain <literal>VACUUM</> is interrupted after having
471471
truncated the table.

doc/src/sgml/release-8.0.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
</para>
610610

611611
<para>
612-
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
612+
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
613613
after it's already committed its tuple movements, as well as transient
614614
errors if a plain <literal>VACUUM</> is interrupted after having
615615
truncated the table.

doc/src/sgml/release-8.1.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@
849849
</para>
850850

851851
<para>
852-
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
852+
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
853853
after it's already committed its tuple movements, as well as transient
854854
errors if a plain <literal>VACUUM</> is interrupted after having
855855
truncated the table.
@@ -4203,7 +4203,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
42034203
<para>
42044204
While the <varname>statement_timeout</> configuration
42054205
parameter allows a query taking more than a certain amount of
4206-
time to be cancelled, the <command>NOWAIT</> option allows a
4206+
time to be canceled, the <command>NOWAIT</> option allows a
42074207
query to be canceled as soon as a <command>SELECT ... FOR
42084208
UPDATE/SHARE</> command cannot immediately acquire a row lock.
42094209
</para>

doc/src/sgml/release-8.2.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@
13341334
</para>
13351335

13361336
<para>
1337-
This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
1337+
This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
13381338
after it's already committed its tuple movements, as well as transient
13391339
errors if a plain <literal>VACUUM</> is interrupted after having
13401340
truncated the table.

0 commit comments

Comments
 (0)