DOCS-957: clarification behavior on upserts that turn into inserts

Author: Sam Kleinman

source/reference/command/findAndModify.txt

@@ -95,18 +95,26 @@ findAndModify
           Optional. Used in conjunction with the ``update`` field. When
           ``true``, the :dbcommand:`findAndModify` command creates a
           new document if the ``query`` returns no documents. The
-          default is ``false``. In version 2.2, the
-          :dbcommand:`findAndModify` command returns ``null`` when
-          ``upsert`` is ``true``.
+          default is ``false``. 
 
           .. code-block:: javascript
 
              upsert: <boolean>
 
+          If you specify ``{ new: false }`` and the upsert operation
+          performs an insert operation, then the operation will return
+          a document that resembles the following: 
+          
+          .. code-block:: javascript
+
+             { 'ok': 1.0, 'value': null }
+
+
           .. versionchanged:: 2.2
-             Previously, ``upsert`` operations returned a an empty
-             document (e.g. ``{ }``,) see :ref:`the 2.2 release notes
-             <2.2-findandmodify-returns-null>` for more information.
+             Previously, ``upsert`` operations that performed inserts
+             returned an empty document (e.g. ``{ }``,) see :ref:`the
+             2.2 release notes <2.2-findandmodify-returns-null>` for
+             more information.
 
    Consider the following example:
 

source/release-notes/2.2.txt

@@ -265,21 +265,22 @@ If your cluster runs with authentication:
 
 .. _2.2-findandmodify-returns-null:
 
-``findAndModify`` Returns Null Value for Upserts
-````````````````````````````````````````````````
+``findAndModify`` Returns Null Value for Upserts that Perform Inserts
+`````````````````````````````````````````````````````````````````````
 
-In version 2.2, for :term:`upsert` operations, :dbcommand:`findAndModify`
-commands will now return the following output:
+In version 2.2, for :term:`upsert` that perform inserts,
+:dbcommand:`findAndModify` commands will now return the following
+output:
 
 .. code-block:: javascript
 
-   {'ok': 1.0, 'value': null}
+   { 'ok': 1.0, 'value': null }
 
-In the :program:`mongo` shell, :dbcommand:`findAndModify` operations
-running as upserts will only output a ``null`` value.
+In the :program:`mongo` shell, upsert :dbcommand:`findAndModify`
+operations that perform inserts only output a ``null`` value.
 
-Previously, in version 2.0 these operations would return an empty
-document, e.g. ``{ }``.
+In version 2.0 these operations would return an empty document,
+e.g. ``{ }``.
 
 See: :issue:`SERVER-6226` for more information.