Make spelling of cancelled/cancellation consistent

This fixes places where words derived from cancel were not using their
common en-US ugly^H^H^H^Hspelling.

Author: Jelte Fennema-Nio <postgres@jeltef.nl>
Reported-by: Thomas Munro <thomas.munro@gmail.com>
Discussion: https://postgr.es/m/CA+hUKG+Lrq+ty6yWXF5572qNQ8KwxGwG5n4fsEcCUap685nWvQ@mail.gmail.com
This commit is contained in:
Alvaro Herrera 2024-01-26 12:38:15 +01:00
parent 64444ce071
commit 8c9da1441d
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
5 changed files with 5 additions and 5 deletions

View File

@ -50,7 +50,7 @@
writing anything to the database when running on a standby. writing anything to the database when running on a standby.
Also, it's recommended to avoid long-running queries in Also, it's recommended to avoid long-running queries in
<literal>login</literal> event triggers. Notes that, for instance, <literal>login</literal> event triggers. Notes that, for instance,
cancelling connection in <application>psql</application> wouldn't cancel canceling connection in <application>psql</application> wouldn't cancel
the in-progress <literal>login</literal> trigger. the in-progress <literal>login</literal> trigger.
</para> </para>

View File

@ -7625,7 +7625,7 @@ defaultNoticeProcessor(void *arg, const char *message)
is called. It is the ideal time to initialize any is called. It is the ideal time to initialize any
<literal>instanceData</literal> an event procedure may need. Only one <literal>instanceData</literal> an event procedure may need. Only one
register event will be fired per event handler per connection. If the register event will be fired per event handler per connection. If the
event procedure fails (returns zero), the registration is cancelled. event procedure fails (returns zero), the registration is canceled.
<synopsis> <synopsis>
typedef struct typedef struct

View File

@ -1353,7 +1353,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
* coding means that there is a tiny chance that the process * coding means that there is a tiny chance that the process
* terminates its current transaction and starts a different one * terminates its current transaction and starts a different one
* before we have a change to send the signal; the worst possible * before we have a change to send the signal; the worst possible
* consequence is that a for-wraparound vacuum is cancelled. But * consequence is that a for-wraparound vacuum is canceled. But
* that could happen in any case unless we were to do kill() with * that could happen in any case unless we were to do kill() with
* the lock held, which is much more undesirable. * the lock held, which is much more undesirable.
*/ */

View File

@ -1,6 +1,6 @@
# This test exercises behavior of foreign keys in the face of concurrent # This test exercises behavior of foreign keys in the face of concurrent
# detach of partitions in the referenced table. # detach of partitions in the referenced table.
# (The cases where the detaching transaction is cancelled is interesting # (The cases where the detaching transaction is canceled is interesting
# because the locking situation is completely different. I didn't verify # because the locking situation is completely different. I didn't verify
# that keeping both variants adds any extra coverage.) # that keeping both variants adds any extra coverage.)
# #

View File

@ -601,7 +601,7 @@ is( $node_primary->poll_query_until(
ok( pump_until( ok( pump_until(
$sigchld_bb, $sigchld_bb_timeout, $sigchld_bb, $sigchld_bb_timeout,
\$sigchld_bb_stderr, qr/backup is not in progress/), \$sigchld_bb_stderr, qr/backup is not in progress/),
'base backup cleanly cancelled'); 'base backup cleanly canceled');
$sigchld_bb->finish(); $sigchld_bb->finish();
done_testing(); done_testing();