diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-04-18 23:35:19 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-04-18 23:35:19 -0400 |
| commit | acd5803053eb5ff6ad055ac1f7670625f1d111e0 (patch) | |
| tree | 5babb7fc7da1afe07987202ee9909c1d65af88bf /doc/src | |
| parent | 5286963066ce7420d80882528b5f07c28f39eacf (diff) | |
| download | postgresql-acd5803053eb5ff6ad055ac1f7670625f1d111e0.tar.gz postgresql-acd5803053eb5ff6ad055ac1f7670625f1d111e0.zip | |
Standardize spelling of "nonblocking"
Only adjusted the user-exposed messages and documentation, not all
source code comments.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/indexam.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/mvcc.sgml | 2 |
2 files changed, 2 insertions, 2 deletions
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); <para> When the <structfield>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 <para> As mentioned in <xref linkend="xact-serializable">, 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. |