From 321e3ed6c592a58643b9c46e85c460a578df4fe5 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Thu, 12 Jul 2012 18:46:47 -0400
Subject: [PATCH 1/2] SERVER-6226 adding note about find and modify change to
 the release notes

---
 source/release-notes/2.2.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/source/release-notes/2.2.txt b/source/release-notes/2.2.txt
index f214f516963..2d680366d96 100644
--- a/source/release-notes/2.2.txt
+++ b/source/release-notes/2.2.txt
@@ -362,6 +362,21 @@ Documentation: :ref:`sharding-shard-key-indexes`
 Additional Improvements
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+``findAndMondify`` Returns Null value for Upserts
+`````````````````````````````````````````````````
+
+In 2.2, for :term:`upsert` operations, :dbcommand:`findAndModify`
+commands will now return the  following output:
+
+.. code-block:: javascript
+
+   {'ok': 1.0, 'value': null}
+
+In the :program:`mongo` shell, :dbcommand:`findAndModify` operations
+running as upserts will only output a ``null` value.
+
+See: :issue:`SERVER-6226`.
+
 ``_id`` Index not Required for Updates to Capped Collections
 ````````````````````````````````````````````````````````````
 

From a48f94cb2be61dafba21decb1c2feddd2c1b9756 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <samk@10gen.com>
Date: Fri, 13 Jul 2012 12:52:17 -0400
Subject: [PATCH 2/2] release notes: SERVER-6226 related edits

---
 source/release-notes/2.2.txt | 38 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/source/release-notes/2.2.txt b/source/release-notes/2.2.txt
index 2d680366d96..919e6fd56c9 100644
--- a/source/release-notes/2.2.txt
+++ b/source/release-notes/2.2.txt
@@ -145,6 +145,29 @@ Tag Aware Sharding
 
 .. including tagging
 
+Compatibility Changes
+~~~~~~~~~~~~~~~~~~~~~
+
+.. TODO add sections here to describe compatibility changes with
+   regards to authentication, drivers, and mongos'
+
+``findAndMondify`` Returns Null value for Upserts
+`````````````````````````````````````````````````
+
+In version 2.2, for :term:`upsert` operations, :dbcommand:`findAndModify`
+commands will now return the following output:
+
+.. code-block:: javascript
+
+   {'ok': 1.0, 'value': null}
+
+In the :program:`mongo` shell, :dbcommand:`findAndModify` operations
+running as upserts will only output a ``null`` value.
+
+Previously, in version 2.0 these operations would return an empty
+document, e.g. ``{ }``.
+
+See: :issue:`SERVER-6226`.
 
 Naming
 ~~~~~~
@@ -362,21 +385,6 @@ Documentation: :ref:`sharding-shard-key-indexes`
 Additional Improvements
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-``findAndMondify`` Returns Null value for Upserts
-`````````````````````````````````````````````````
-
-In 2.2, for :term:`upsert` operations, :dbcommand:`findAndModify`
-commands will now return the  following output:
-
-.. code-block:: javascript
-
-   {'ok': 1.0, 'value': null}
-
-In the :program:`mongo` shell, :dbcommand:`findAndModify` operations
-running as upserts will only output a ``null` value.
-
-See: :issue:`SERVER-6226`.
-
 ``_id`` Index not Required for Updates to Capped Collections
 ````````````````````````````````````````````````````````````