From e867878c653a4f99e2ffe4c297ef80b8b5a6c041 Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Thu, 14 Dec 2023 13:31:18 +0100 Subject: [PATCH v23 1/4] Fix spelling of canceled/cancellation This fixes places where words derived from cancel were not using their common en-US spelling. --- doc/src/sgml/event-trigger.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- src/backend/storage/lmgr/proc.c | 2 +- src/test/recovery/t/001_stream_rep.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/event-trigger.sgml b/doc/src/sgml/event-trigger.sgml index 234b4ffd024..a76bd844257 100644 --- a/doc/src/sgml/event-trigger.sgml +++ b/doc/src/sgml/event-trigger.sgml @@ -50,7 +50,7 @@ writing anything to the database when running on a standby. Also, it's recommended to avoid long-running queries in login event triggers. Notes that, for instance, - cancelling connection in psql wouldn't cancel + canceling connection in psql wouldn't cancel the in-progress login trigger. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index ed88ac001a1..1c6a6b3f4e2 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -7555,7 +7555,7 @@ defaultNoticeProcessor(void *arg, const char *message) is called. It is the ideal time to initialize any instanceData an event procedure may need. Only one 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. typedef struct diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index b6451d9d083..0b87a3bf179 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/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl index 95f9b0d7726..a5e68c12b25 100644 --- a/src/test/recovery/t/001_stream_rep.pl +++ b/src/test/recovery/t/001_stream_rep.pl @@ -605,7 +605,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(); base-commit: 0e917508b89dd21c5bcd9183e77585f01055a20d -- 2.34.1