diff options
| -rw-r--r-- | doc/src/sgml/event-trigger.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/libpq.sgml | 2 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 2 | ||||
| -rw-r--r-- | src/test/isolation/specs/detach-partition-concurrently-4.spec | 2 | ||||
| -rw-r--r-- | src/test/recovery/t/001_stream_rep.pl | 2 |
5 files changed, 5 insertions, 5 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 <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. </para> diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 173ab779a08..d0d5aefadc0 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -7625,7 +7625,7 @@ defaultNoticeProcessor(void *arg, const char *message) is called. It is the ideal time to initialize any <literal>instanceData</literal> 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. <synopsis> typedef struct 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(); |