git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Make spelling of cancelled/cancellation consistent

author Alvaro Herrera <alvherre@alvh.no-ip.org>

2024年1月26日 11:38:15 +0000 (12:38 +0100)

committer Alvaro Herrera <alvherre@alvh.no-ip.org>

2024年1月26日 11:38:15 +0000 (12:38 +0100)

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

doc/src/sgml/event-trigger.sgml patch | blob | blame | history

doc/src/sgml/libpq.sgml patch | blob | blame | history

src/backend/storage/lmgr/proc.c patch | blob | blame | history

src/test/isolation/specs/detach-partition-concurrently-4.spec patch | blob | blame | history

src/test/recovery/t/001_stream_rep.pl patch | blob | blame | history

diff --git a/doc/src/sgml/event-trigger.sgml b/doc/src/sgml/event-trigger.sgml

index 234b4ffd02474053061005c91078f11813c4bd4c..a76bd844257f0500dd67cc7b9a2dc805b3158a3c 100644 (file)

--- 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 173ab779a08540241bc5c8d4ad4a8c959156abb4..d0d5aefadc05d5d99267607f4735a2b7ccf2706c 100644 (file)

--- 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

- 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 4ad96beb87adea8c53c42613c933824ca76bde07..e5977548fe2e37537013f2feb9034a7ca760a811 100644 (file)

--- 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 2c02cae4f1a2413a369e06b3b5528c47591db2a2..829c82248f139a014620a881736539a1960d85ae 100644 (file)

--- 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 cb988f4d10c3d02739ac5ff2405944384fac57fc..5311ade509b2e0bb30ba79f0abe6fc8e5a3b6005 100644 (file)

--- 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();

This is the main PostgreSQL git repository.

RSS Atom