From a4d3f395dbd7851565f58d81dd1849c5b12e00df Mon Sep 17 00:00:00 2001
From: kay <kay.kim@10gen.com>
Date: Thu, 27 Sep 2012 00:05:36 -0400
Subject: [PATCH 1/3] DOCS-475 nonAtomic option documentation

---
 source/reference/command/mapReduce.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/source/reference/command/mapReduce.txt b/source/reference/command/mapReduce.txt
index be96845d20c..8545b1618b2 100644
--- a/source/reference/command/mapReduce.txt
+++ b/source/reference/command/mapReduce.txt
@@ -123,6 +123,17 @@ mapReduce
                    enabled, the map-reduce operation will shard the
                    results collection according to the ``_id`` field.
 
+   :param nonAtomic: 
+   
+          .. versionadded:: 2.1
+   
+          Optional. Specify output operation as non-atomic such that
+          the output behaves like a normal ``multi`` :method:`update()
+          <db.collection.update()>`. The option is valid only for
+          ``merge`` and ``reduce`` output operations. If ``true``, post
+          processing step will not be executed under the write lock,
+          and partial results will be visible as they are processed.
+
    .. seealso:: ":method:`mapReduce()`" and ":term:`map-reduce`."
 
       Also, the ":wiki:`MapReduce` page, provides a greater overview

From 7a1d47f14ec1486d0064b39f3e69c93350c513b5 Mon Sep 17 00:00:00 2001
From: kay <kay.kim@10gen.com>
Date: Thu, 27 Sep 2012 10:12:53 -0400
Subject: [PATCH 2/3] DOCS-475 nonAtomic doc

---
 source/reference/method/db.collection.mapReduce.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/source/reference/method/db.collection.mapReduce.txt b/source/reference/method/db.collection.mapReduce.txt
index 5f979f23ee4..21951689009 100644
--- a/source/reference/method/db.collection.mapReduce.txt
+++ b/source/reference/method/db.collection.mapReduce.txt
@@ -153,6 +153,17 @@ db.collection.mapReduce()
                    shard the results collection according to the
                    ``_id`` field.
 
+   :param nonAtomic: 
+
+          .. versionadded:: 2.1
+
+          Optional. Specify output operation as non-atomic such that
+          the output behaves like a normal ``multi`` :method:`update()
+          <db.collection.update()>`. The option is valid only for
+          ``merge`` and ``reduce`` output operations. If ``true``, post
+          processing step will not be executed under the write lock,
+          and partial results will be visible as they are processed.
+
    .. seealso:: :term:`map-reduce`, provides a greater overview
       of MongoDB's map-reduce functionality.
 

From 8434deedb294083264b08915b3e938e337149303 Mon Sep 17 00:00:00 2001
From: kay <kay.kim@10gen.com>
Date: Thu, 27 Sep 2012 15:22:17 -0400
Subject: [PATCH 3/3] DOCS-475 nonAtomic doc for mapReduce

---
 source/reference/command/mapReduce.txt              | 9 +++++----
 source/reference/method/db.collection.mapReduce.txt | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/source/reference/command/mapReduce.txt b/source/reference/command/mapReduce.txt
index 8545b1618b2..14525132496 100644
--- a/source/reference/command/mapReduce.txt
+++ b/source/reference/command/mapReduce.txt
@@ -129,10 +129,11 @@ mapReduce
    
           Optional. Specify output operation as non-atomic such that
           the output behaves like a normal ``multi`` :method:`update()
-          <db.collection.update()>`. The option is valid only for
-          ``merge`` and ``reduce`` output operations. If ``true``, post
-          processing step will not be executed under the write lock,
-          and partial results will be visible as they are processed.
+          <db.collection.update()>`. If ``true``, post processing step
+          will not be executed while locking the database, and partial
+          results will be visible as they are processed. The option is
+          valid only for ``merge`` and ``reduce`` output operations for
+          which post processing can be a long operation.
 
    .. seealso:: ":method:`mapReduce()`" and ":term:`map-reduce`."
 
diff --git a/source/reference/method/db.collection.mapReduce.txt b/source/reference/method/db.collection.mapReduce.txt
index 21951689009..9ca9a21b6ae 100644
--- a/source/reference/method/db.collection.mapReduce.txt
+++ b/source/reference/method/db.collection.mapReduce.txt
@@ -159,10 +159,11 @@ db.collection.mapReduce()
 
           Optional. Specify output operation as non-atomic such that
           the output behaves like a normal ``multi`` :method:`update()
-          <db.collection.update()>`. The option is valid only for
-          ``merge`` and ``reduce`` output operations. If ``true``, post
-          processing step will not be executed under the write lock,
-          and partial results will be visible as they are processed.
+          <db.collection.update()>`. If ``true``, post processing step
+          will not be executed while locking the database, and partial
+          results will be visible as they are processed. The option is
+          valid only for ``merge`` and ``reduce`` output operations for
+          which post processing can be a long operation.
 
    .. seealso:: :term:`map-reduce`, provides a greater overview
       of MongoDB's map-reduce functionality.