aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2024-01-26 12:38:15 +0100
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2024-01-26 12:38:15 +0100
commit8c9da1441df18bd609f025778e8349873a3e9bbd (patch)
tree5b3f100b19e2c97b1a7dbeab93c535668eaa60c4 /src
parent64444ce071f6b04d3fc836f436fa08108a6d11e2 (diff)
downloadpostgresql-8c9da1441df18bd609f025778e8349873a3e9bbd.tar.gz
postgresql-8c9da1441df18bd609f025778e8349873a3e9bbd.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/backend/storage/lmgr/proc.c2
-rw-r--r--src/test/isolation/specs/detach-partition-concurrently-4.spec2
-rw-r--r--src/test/recovery/t/001_stream_rep.pl2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 4ad96beb87a..e5977548fe2 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -1353,7 +1353,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
* coding means that there is a tiny chance that the process
* terminates its current transaction and starts a different one
* 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
* the lock held, which is much more undesirable.
*/
diff --git a/src/test/isolation/specs/detach-partition-concurrently-4.spec b/src/test/isolation/specs/detach-partition-concurrently-4.spec
index 2c02cae4f1a..829c82248f1 100644
--- a/src/test/isolation/specs/detach-partition-concurrently-4.spec
+++ b/src/test/isolation/specs/detach-partition-concurrently-4.spec
@@ -1,6 +1,6 @@
# This test exercises behavior of foreign keys in the face of concurrent
# 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
# that keeping both variants adds any extra coverage.)
#
diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl
index cb988f4d10c..5311ade509b 100644
--- a/src/test/recovery/t/001_stream_rep.pl
+++ b/src/test/recovery/t/001_stream_rep.pl
@@ -601,7 +601,7 @@ is( $node_primary->poll_query_until(
ok( pump_until(
$sigchld_bb, $sigchld_bb_timeout,
\$sigchld_bb_stderr, qr/backup is not in progress/),
- 'base backup cleanly cancelled');
+ 'base backup cleanly canceled');
$sigchld_bb->finish();
done_testing();