From acd5803053eb5ff6ad055ac1f7670625f1d111e0 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 18 Apr 2013 23:35:19 -0400 Subject: Standardize spelling of "nonblocking" Only adjusted the user-exposed messages and documentation, not all source code comments. --- doc/src/sgml/indexam.sgml | 2 +- doc/src/sgml/mvcc.sgml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml index e03ebc93680..e15f60fdece 100644 --- a/doc/src/sgml/indexam.sgml +++ b/doc/src/sgml/indexam.sgml @@ -746,7 +746,7 @@ amrestrpos (IndexScanDesc scan); When the ampredlocks flag is not set, any scan using that index access method within a serializable transaction will acquire a - non-blocking predicate lock on the full index. This will generate a + nonblocking predicate lock on the full index. This will generate a 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 diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml index db820d6f43f..b2d172f725d 100644 --- a/doc/src/sgml/mvcc.sgml +++ b/doc/src/sgml/mvcc.sgml @@ -1366,7 +1366,7 @@ SELECT pg_advisory_lock(q.id) FROM As mentioned in , Serializable transactions are just Repeatable Read transactions which add - non-blocking monitoring for dangerous patterns of read/write conflicts. + nonblocking monitoring for dangerous patterns of read/write conflicts. When a pattern is detected which could cause a cycle in the apparent order of execution, one of the transactions involved is rolled back to break the cycle. -- cgit v1.2.3