Unify spelling of "canceled", "canceling", "cancellation"

petere · petere · commit 6b23ba1093d2 · 2011-07-02T23:30:01.000+03:00
We had previously (af26857) established the U.S. spellings as standard.
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
@@ -1585,7 +1585,7 @@ if (!triggered)
    <para>
     There are also additional types of conflict that can occur with Hot Standby.
     These conflicts are <emphasis>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,18 +1682,18 @@ if (!triggered)
    <para>
     Once the delay specified by <varname>max_standby_archive_delay</> or
     <varname>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 <command>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
     terminated (this behavior might change in the future).
    </para>
 
    <para>
-    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.
    </para>
 
    <para>
@@ -1751,7 +1751,7 @@ if (!triggered)
     Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age">
     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 <varname>max_standby_streaming_delay</>.  However it is
     difficult to guarantee any specific execution-time window with this
     approach, since <varname>vacuum_defer_cleanup_age</> is measured in
@@ -1981,7 +1981,7 @@ LOG:  database system is ready to accept read only connections
     <command>DROP TABLESPACE</> can only succeed if the tablespace is empty.
     Some standby users may be actively using the tablespace via their
     <varname>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.
    </para>
diff --git 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
@@ -4088,7 +4088,7 @@ int PQflush(PGconn *conn);
  </sect1>
 
  <sect1 id="libpq-cancel">
-  <title>Cancelling Queries in Progress</title>
+  <title>Canceling Queries in Progress</title>
 
   <indexterm zone="libpq-cancel">
    <primary>canceling</primary>
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
@@ -282,15 +282,15 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       total disk blocks read, total buffer hits (i.e., block
       read requests avoided by finding the block already in buffer cache),
       number of rows returned, fetched, inserted, updated and deleted, the
-      total number of queries cancelled due to conflict with recovery (on
+      total number of queries canceled due to conflict with recovery (on
       standby servers), and time of last statistics reset.
      </entry>
      </row>
 
      <row>
       <entry><structname>pg_stat_database_conflicts</><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
       <entry>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,39 +639,39 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
       <entry><literal><function>pg_stat_get_db_conflict_tablespace</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       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
       </entry>
      </row>
 
      <row>
       <entry><literal><function>pg_stat_get_db_conflict_lock</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with locks in database
+       Number of queries canceled because of recovery conflict with locks in database
       </entry>
      </row>
 
      <row>
       <entry><literal><function>pg_stat_get_db_conflict_snapshot</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       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
       </entry>
      </row>
 
      <row>
       <entry><literal><function>pg_stat_get_db_conflict_bufferpin</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       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
       </entry>
      </row>
 
      <row>
       <entry><literal><function>pg_stat_get_db_conflict_startup_deadlock</function>(<type>oid</type>)</literal></entry>
       <entry><type>bigint</type></entry>
       <entry>
-       Number of queries cancelled because of recovery conflict with deadlocks in database
+       Number of queries canceled because of recovery conflict with deadlocks in database
       </entry>
      </row>
 
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
@@ -1142,7 +1142,7 @@
   </sect2>
 
   <sect2>
-   <title>Cancelling Requests in Progress</title>
+   <title>Canceling Requests in Progress</title>
 
    <para>
     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
@@ -143,7 +143,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
    transaction, the transaction may block when first acquiring its snapshot,
    after which it is able to run without the normal overhead of a
    <literal>SERIALIZABLE</literal> 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.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml
@@ -465,7 +465,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>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
@@ -609,7 +609,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>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
@@ -849,7 +849,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>VACUUM</> is interrupted after having
       truncated the table.
@@ -4203,7 +4203,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
       <para>
        While the <varname>statement_timeout</> configuration
        parameter allows a query taking more than a certain amount of
-       time to be cancelled, the <command>NOWAIT</> option allows a
+       time to be canceled, the <command>NOWAIT</> option allows a
        query to be canceled as soon as a <command>SELECT ... FOR
        UPDATE/SHARE</> command cannot immediately acquire a row lock.
       </para>
diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml
@@ -1334,7 +1334,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>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
@@ -1566,7 +1566,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>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
@@ -2062,7 +2062,7 @@
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is cancelled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
       after it's already committed its tuple movements, as well as transient
       errors if a plain <literal>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
@@ -779,7 +779,7 @@
       </para>
 
       <para>
-       This helps avoid cancelling long-running queries on the standby.
+       This helps avoid canceling long-running queries on the standby.
       </para>
      </listitem>
 
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -8375,13 +8375,13 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
 
 		/*
 		 * If we see a shutdown checkpoint while waiting for an end-of-backup
-		 * record, the backup was cancelled and the end-of-backup record will
+		 * record, the backup was canceled and the end-of-backup record will
 		 * never arrive.
 		 */
 		if (InArchiveRecovery &&
 			!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))
 			ereport(ERROR,
-					(errmsg("online backup was cancelled, recovery cannot continue")));
+					(errmsg("online backup was canceled, recovery cannot continue")));
 
 		/*
 		 * If we see a shutdown checkpoint, we know that nothing was running
@@ -9337,7 +9337,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive)
 						(errmsg("pg_stop_backup still waiting for all required WAL segments to be archived (%d seconds elapsed)",
 								waits),
 						 errhint("Check that your archive_command is executing properly.  "
-								 "pg_stop_backup can be cancelled safely, "
+								 "pg_stop_backup can be canceled safely, "
 								 "but the database backup will not be usable without all the WAL segments.")));
 			}
 		}
@@ -9819,21 +9819,21 @@ CancelBackup(void)
 	if (stat(BACKUP_LABEL_FILE, &stat_buf) < 0)
 		return;
 
-	/* remove leftover file from previously cancelled backup if it exists */
+	/* remove leftover file from previously canceled backup if it exists */
 	unlink(BACKUP_LABEL_OLD);
 
 	if (rename(BACKUP_LABEL_FILE, BACKUP_LABEL_OLD) == 0)
 	{
 		ereport(LOG,
-				(errmsg("online backup mode cancelled"),
+				(errmsg("online backup mode canceled"),
 				 errdetail("\"%s\" was renamed to \"%s\".",
 						   BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
 	else
 	{
 		ereport(WARNING,
 				(errcode_for_file_access(),
-				 errmsg("online backup mode was not cancelled"),
+				 errmsg("online backup mode was not canceled"),
 				 errdetail("Could not rename \"%s\" to \"%s\": %m.",
 						   BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
 	}
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -78,7 +78,7 @@ static bool vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast,
  * tables separately.
  *
  * for_wraparound is used by autovacuum to let us know when it's forcing
- * a vacuum for wraparound, which should not be auto-cancelled.
+ * a vacuum for wraparound, which should not be auto-canceled.
  *
  * bstrategy is normally given as NULL, but in autovacuum it can be passed
  * in to use the same buffer strategy object across multiple vacuum() calls.
@@ -867,7 +867,7 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast, bool for_wraparound)
 		 * here by violating transaction semantics.)
 		 *
 		 * We also set the VACUUM_FOR_WRAPAROUND flag, which is passed down by
-		 * autovacuum; it's used to avoid cancelling a vacuum that was invoked
+		 * autovacuum; it's used to avoid canceling a vacuum that was invoked
 		 * in an emergency.
 		 *
 		 * Note: these flags remain set until CommitTransaction or
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
@@ -714,7 +714,7 @@ AutoVacLauncherMain(int argc, char *argv[])
 					worker->wi_links.next = (SHM_QUEUE *) AutoVacuumShmem->av_freeWorkers;
 					AutoVacuumShmem->av_freeWorkers = worker;
 					AutoVacuumShmem->av_startingWorker = NULL;
-					elog(WARNING, "worker took too long to start; cancelled");
+					elog(WARNING, "worker took too long to start; canceled");
 				}
 			}
 			else
@@ -1461,7 +1461,7 @@ AutoVacWorkerMain(int argc, char *argv[])
 	pqsignal(SIGHUP, SIG_IGN);
 
 	/*
-	 * SIGINT is used to signal cancelling the current table's vacuum; SIGTERM
+	 * SIGINT is used to signal canceling the current table's vacuum; SIGTERM
 	 * means abort and exit cleanly, and SIGQUIT means abandon ship.
 	 */
 	pqsignal(SIGINT, StatementCancelHandler);
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
@@ -1182,7 +1182,7 @@ CompactBgwriterRequestQueue()
 	 * intervening FORGET_RELATION_FSYNC or FORGET_DATABASE_FSYNC request, so
 	 * we do it this way.  It would be possible to be even smarter if we made
 	 * the code below understand the specific semantics of such requests (it
-	 * could blow away preceding entries that would end up being cancelled
+	 * could blow away preceding entries that would end up being canceled
 	 * anyhow), but it's not clear that the extra complexity would buy us
 	 * anything.
 	 */
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -2465,7 +2465,7 @@ LockBufferForCleanup(Buffer buffer)
 
 /*
  * Check called from RecoveryConflictInterrupt handler when Startup
- * process requests cancelation of all pin holders that are blocking it.
+ * process requests cancellation of all pin holders that are blocking it.
  */
 bool
 HoldingBufferPinThatDelaysRecovery(void)
diff --git a/src/backend/storage/lmgr/README-SSI b/src/backend/storage/lmgr/README-SSI
@@ -239,9 +239,9 @@ serialization anomalies will fail with SQLSTATE 40001, which has a
 standard meaning of "serialization failure".
 
     * This SSI implementation makes an effort to choose the
-transaction to be cancelled such that an immediate retry of the
+transaction to be canceled such that an immediate retry of the
 transaction will not fail due to conflicts with exactly the same
-transactions.  Pursuant to this goal, no transaction is cancelled
+transactions.  Pursuant to this goal, no transaction is canceled
 until one of the other transactions in the set of conflicts which
 could generate an anomaly has successfully committed.  This is
 conceptually similar to how write conflicts are handled.  To fully
@@ -567,7 +567,7 @@ on conflicts with the same transactions.
 information about older committed transactions to put an upper bound
 on RAM used. Beyond that limit, information spills to disk.
 Performance can degrade in a pessimal situation, but it should be
-tolerable, and transactions won't need to be cancelled or blocked
+tolerable, and transactions won't need to be canceled or blocked
 from starting.
 
 
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c
@@ -535,7 +535,7 @@ FindLockCycleRecurse(PGPROC *checkProc,
 					 * Note we read vacuumFlags without any locking.  This is
 					 * OK only for checking the PROC_IS_AUTOVACUUM flag,
 					 * because that flag is set at process start and never
-					 * reset; there is logic elsewhere to avoid cancelling an
+					 * reset; there is logic elsewhere to avoid canceling an
 					 * autovacuum that is working for preventing Xid
 					 * wraparound problems (which needs to read a different
 					 * vacuumFlag bit), but we don't do that here to avoid
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
diff --git a/src/port/path.c b/src/port/path.c
diff --git a/src/test/regress/expected/prepared_xacts.out b/src/test/regress/expected/prepared_xacts.out
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
