From 59f8c7023983c5936b99eea083753031d3ff69a0 Mon Sep 17 00:00:00 2001 From: dryabtse Date: Mon, 18 Jan 2016 15:21:56 +1100 Subject: [PATCH] Update glossary.txt Swapped words for the "write conflict" definition as it could originally be read as "MongoDB [server] will abort". Now it should be clear that only one of the conflicting operations will be aborted and retried. --- source/reference/glossary.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/reference/glossary.txt b/source/reference/glossary.txt index a6e2d66989f..a363ae4d775 100644 --- a/source/reference/glossary.txt +++ b/source/reference/glossary.txt @@ -1038,8 +1038,8 @@ Glossary A situation in which two concurrent operations, at least one of which is a write, attempt to use a resource in a way that would violate constraints imposed by a storage engine - using optimistic :term:`concurrency control`. MongoDB will abort - and transparently retry one of the conflicting operations. + using optimistic :term:`concurrency control`. MongoDB will + transparently abort and retry one of the conflicting operations. write lock An exclusive :term:`lock` on a resource such as a collection