From 296c543977db86f821a9d1f6533f696105158b8e Mon Sep 17 00:00:00 2001
From: kay <kay.kim@10gen.com>
Date: Tue, 12 Dec 2017 11:46:21 -0500
Subject: [PATCH 1/3] slight reorg of 3.6 compatibility

---
 source/release-notes/3.6-compatibility.txt | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/release-notes/3.6-compatibility.txt b/source/release-notes/3.6-compatibility.txt
index 5b86ee7cbbe..6a34cd446a8 100644
--- a/source/release-notes/3.6-compatibility.txt
+++ b/source/release-notes/3.6-compatibility.txt
@@ -347,6 +347,16 @@ Arbiter and Priority
 
 .. include:: /includes/fact-arbiter-priority.rst
 
+Deprecate Master-Slave Replication
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+MongoDB 3.6 deprecates master-slave replication.
+
+``--nojournal`` Option with WiredTiger
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. include:: /includes/wiredtiger-node-nojournal.rst
+
 .. _aggregate-compatibility:
 
 ``aggregate`` Command and Results
@@ -420,17 +430,6 @@ For more information on the validate operation, see the
 :dbcommand:`validate` command and the
 :method:`db.collection.validate()` method.
 
-
-``--nojournal`` Option with WiredTiger
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /includes/wiredtiger-node-nojournal.rst
-
-Deprecate Master-Slave Replication
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-MongoDB 3.6 deprecates master-slave replication.
-
 .. _3.6-index-asterisk:
 
 Indexes Named ``*``

From 1ec78664bce510e7e9b6dc4f52c44eaac08646d8 Mon Sep 17 00:00:00 2001
From: kay <kay.kim@10gen.com>
Date: Tue, 12 Dec 2017 12:00:15 -0500
Subject: [PATCH 2/3] DOCSP-1491: deprecate isolated and snapshot options

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

diff --git a/source/release-notes/3.6-compatibility.txt b/source/release-notes/3.6-compatibility.txt
index 6a34cd446a8..9a0a3ea4102 100644
--- a/source/release-notes/3.6-compatibility.txt
+++ b/source/release-notes/3.6-compatibility.txt
@@ -442,6 +442,21 @@ index keys.
 To delete existing indexes named ``*``, delete the index before
 upgrading. To rename them, delete and recreate the index.
 
+.. _3.6-deprecated-options:
+
+Deprecated Options
+~~~~~~~~~~~~~~~~~~
+
+.. versionchanged:: 3.6.1
+
+- MongoDB 3.6.1 deprecates the ``snapshot`` query option. You can use
+  :method:`~cursor.hint()` on the ``{ _id: 1}`` index instead to
+  prevent a cursor from returning a document more than once if an
+  intervening write operation results in a move of the document.
+
+- MongoDB 3.6.1 deprecates the ``$isolated`` option. For more
+  information on read isolation, see
+  :doc:`/core/read-isolation-consistency-recency`.
 
 .. _3.6-compatibility-enabled:
 

From 193fb15fb91068e145de791c288d820e64a7807d Mon Sep 17 00:00:00 2001
From: Frederico Ferreira <frederico.dida1@gmail.com>
Date: Wed, 13 Dec 2017 09:33:06 -0200
Subject: [PATCH 3/3] Fix list all Indexes for a Database 3.6.1

---
 source/tutorial/manage-indexes.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/tutorial/manage-indexes.txt b/source/tutorial/manage-indexes.txt
index 8e6b9aa39aa..c59b9fa8fe2 100644
--- a/source/tutorial/manage-indexes.txt
+++ b/source/tutorial/manage-indexes.txt
@@ -45,7 +45,7 @@ can use the following operation in the :program:`mongo` shell:
 .. code-block:: javascript
 
    db.getCollectionNames().forEach(function(collection) {
-      indexes = db[collection].getIndexes();
+      indexes = db.getCollection(collection).getIndexes();
       print("Indexes for " + collection + ":");
       printjson(indexes);
    });