From 29652d24602eaec80d0e5ff1d2188519efec9dad Mon Sep 17 00:00:00 2001
From: Bernie Hackett <bernie@10gen.com>
Date: Fri, 17 Jul 2015 13:17:23 -0700
Subject: [PATCH] Note that not all deprecated features raise
 DeprecationWarning

---
 doc/migrate-to-pymongo3.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/migrate-to-pymongo3.rst b/doc/migrate-to-pymongo3.rst
index 38d9f5cee..6a02c4e8c 100644
--- a/doc/migrate-to-pymongo3.rst
+++ b/doc/migrate-to-pymongo3.rst
@@ -37,6 +37,11 @@ Warnings can also be changed to errors::
 
   python -Wd -Werror <your application>
 
+.. note:: Not all deprecated features raise :exc:`DeprecationWarning` when
+  used. For example, the :meth:`~pymongo.collection.Collection.find` options
+  renamed in PyMongo 3.0 do not raise :exc:`DeprecationWarning` when used in
+  PyMongo 2.x. See also `Removed features with no migration path`_.
+
 CRUD API
 --------
 
@@ -519,8 +524,8 @@ can be replaced by this in PyMongo 2.9 or later:
   >>> from bson.son import SON
   >>> encoded = BSON.encode({"a": 1}, codec_options=CodecOptions(SON))
 
-Advice for features removed in PyMongo 3
-----------------------------------------
+Removed features with no migration path
+---------------------------------------
 
 MasterSlaveConnection is removed
 ................................