From 21f1e15aafb13ab2430e831a3da7d4d4f525d1ce Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 29 Jun 2011 09:26:14 +0300 Subject: Unify spelling of "canceled", "canceling", "cancellation" We had previously (af26857a2775e7ceb0916155e931008c2116632f) established the U.S. spellings as standard. --- doc/src/sgml/high-availability.sgml | 12 ++++++------ doc/src/sgml/indexam.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/monitoring.sgml | 14 +++++++------- doc/src/sgml/protocol.sgml | 2 +- doc/src/sgml/ref/set_transaction.sgml | 2 +- doc/src/sgml/release-7.4.sgml | 2 +- doc/src/sgml/release-8.0.sgml | 2 +- doc/src/sgml/release-8.1.sgml | 4 ++-- doc/src/sgml/release-8.2.sgml | 2 +- doc/src/sgml/release-8.3.sgml | 2 +- doc/src/sgml/release-8.4.sgml | 2 +- doc/src/sgml/release-9.1.sgml | 2 +- 13 files changed, 25 insertions(+), 25 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 80665a5cb24..0d3baa04bcd 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1585,7 +1585,7 @@ if (!triggered) There are also additional types of conflict that can occur with Hot Standby. These conflicts are hard conflicts in the sense that queries - might need to be cancelled and, in some cases, sessions disconnected to resolve them. + might need to be canceled and, in some cases, sessions disconnected to resolve them. The user is provided with several ways to handle these conflicts. Conflict cases include: @@ -1682,7 +1682,7 @@ if (!triggered) Once the delay specified by max_standby_archive_delay or max_standby_streaming_delay has been exceeded, conflicting - queries will be cancelled. This usually results just in a cancellation + queries will be canceled. This usually results just in a cancellation error, although in the case of replaying a DROP DATABASE the entire conflicting session will be terminated. Also, if the conflict is over a lock held by an idle transaction, the conflicting session is @@ -1690,10 +1690,10 @@ if (!triggered) - Cancelled queries may be retried immediately (after beginning a new + Canceled queries may be retried immediately (after beginning a new transaction, of course). Since query cancellation depends on the nature of the WAL records being replayed, a query that was - cancelled may well succeed if it is executed again. + canceled may well succeed if it is executed again. @@ -1751,7 +1751,7 @@ if (!triggered) Another option is to increase on the primary server, so that dead rows will not be cleaned up as quickly as they normally would be. This will allow more time for queries to - execute before they are cancelled on the standby, without having to set + execute before they are canceled on the standby, without having to set a high max_standby_streaming_delay. However it is difficult to guarantee any specific execution-time window with this approach, since vacuum_defer_cleanup_age is measured in @@ -1981,7 +1981,7 @@ LOG: database system is ready to accept read only connections DROP TABLESPACE can only succeed if the tablespace is empty. Some standby users may be actively using the tablespace via their temp_tablespaces parameter. If there are temporary files in the - tablespace, all active queries are cancelled to ensure that temporary + tablespace, all active queries are canceled to ensure that temporary files are removed, so the tablespace can be removed and WAL replay can continue. diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml index c7e997793db..bb942583853 100644 --- a/doc/src/sgml/indexam.sgml +++ b/doc/src/sgml/indexam.sgml @@ -712,7 +712,7 @@ amrestrpos (IndexScanDesc scan); read-write conflict with the insert of any tuple into that index by a concurrent serializable transaction. If certain patterns of read-write conflicts are detected among a set of concurrent serializable - transactions, one of those transactions may be cancelled to protect data + transactions, one of those transactions may be canceled to protect data integrity. When the flag is set, it indicates that the index access method implements finer-grained predicate locking, which will tend to reduce the frequency of such transaction cancellations. diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 3a57295bd3a..fd8b5343564 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -4088,7 +4088,7 @@ int PQflush(PGconn *conn); - Cancelling Queries in Progress + Canceling Queries in Progress canceling diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 553c16873f9..8da8f85e709 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -282,7 +282,7 @@ postgres: user database host @@ -290,7 +290,7 @@ postgres: user database host pg_stat_database_conflictspg_stat_database_conflicts One row per database, showing database OID, database name and - the number of queries that have been cancelled in this database due to + the number of queries that have been canceled in this database due to dropped tablespaces, lock timeouts, old snapshots, pinned buffers and deadlocks. Will only contain information on standby servers, since conflicts do not occur on master servers. @@ -639,7 +639,7 @@ postgres: user database host pg_stat_get_db_conflict_tablespace(oid) bigint - Number of queries cancelled because of recovery conflict with dropped tablespaces in database + Number of queries canceled because of recovery conflict with dropped tablespaces in database @@ -647,7 +647,7 @@ postgres: user database host pg_stat_get_db_conflict_lock(oid) bigint - Number of queries cancelled because of recovery conflict with locks in database + Number of queries canceled because of recovery conflict with locks in database @@ -655,7 +655,7 @@ postgres: user database host pg_stat_get_db_conflict_snapshot(oid) bigint - Number of queries cancelled because of recovery conflict with old snapshots in database + Number of queries canceled because of recovery conflict with old snapshots in database @@ -663,7 +663,7 @@ postgres: user database host pg_stat_get_db_conflict_bufferpin(oid) bigint - Number of queries cancelled because of recovery conflict with pinned buffers in database + Number of queries canceled because of recovery conflict with pinned buffers in database @@ -671,7 +671,7 @@ postgres: user database host pg_stat_get_db_conflict_startup_deadlock(oid) bigint - Number of queries cancelled because of recovery conflict with deadlocks in database + Number of queries canceled because of recovery conflict with deadlocks in database diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index d3de330916d..508991bcc2b 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1142,7 +1142,7 @@ - Cancelling Requests in Progress + Canceling Requests in Progress During the processing of a query, the frontend might request diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml index f864bbf6a61..e28a7e1cde2 100644 --- a/doc/src/sgml/ref/set_transaction.sgml +++ b/doc/src/sgml/ref/set_transaction.sgml @@ -143,7 +143,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION transa transaction, the transaction may block when first acquiring its snapshot, after which it is able to run without the normal overhead of a SERIALIZABLE transaction and without any risk of - contributing to or being cancelled by a serialization failure. This mode + contributing to or being canceled by a serialization failure. This mode is well suited for long-running reports or backups. diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml index ee8184b16ca..f13957b0264 100644 --- a/doc/src/sgml/release-7.4.sgml +++ b/doc/src/sgml/release-7.4.sgml @@ -465,7 +465,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml index 469a76d8935..5d6d60e607f 100644 --- a/doc/src/sgml/release-8.0.sgml +++ b/doc/src/sgml/release-8.0.sgml @@ -609,7 +609,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml index 4e1a0c5dd0b..5f74abf45e7 100644 --- a/doc/src/sgml/release-8.1.sgml +++ b/doc/src/sgml/release-8.1.sgml @@ -849,7 +849,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. @@ -4203,7 +4203,7 @@ psql -t -f fixseq.sql db1 | psql -e db1 While the statement_timeout configuration parameter allows a query taking more than a certain amount of - time to be cancelled, the NOWAIT option allows a + time to be canceled, the NOWAIT option allows a query to be canceled as soon as a SELECT ... FOR UPDATE/SHARE command cannot immediately acquire a row lock. diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml index 0a9ee5031af..2ab644fa3fe 100644 --- a/doc/src/sgml/release-8.2.sgml +++ b/doc/src/sgml/release-8.2.sgml @@ -1334,7 +1334,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml index bccc141a549..7db9d6bcb03 100644 --- a/doc/src/sgml/release-8.3.sgml +++ b/doc/src/sgml/release-8.3.sgml @@ -1566,7 +1566,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml index e4fddd44e6e..27e4e2902db 100644 --- a/doc/src/sgml/release-8.4.sgml +++ b/doc/src/sgml/release-8.4.sgml @@ -2062,7 +2062,7 @@ - This fix prevents a PANIC if a VACUUM FULL is cancelled + This fix prevents a PANIC if a VACUUM FULL is canceled after it's already committed its tuple movements, as well as transient errors if a plain VACUUM is interrupted after having truncated the table. diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml index 2d6c8edf9bd..9dfca1c7866 100644 --- a/doc/src/sgml/release-9.1.sgml +++ b/doc/src/sgml/release-9.1.sgml @@ -779,7 +779,7 @@ - This helps avoid cancelling long-running queries on the standby. + This helps avoid canceling long-running queries on the standby. -- cgit v1.2.3