Merge branch 'master' of github.com:MongoEngine/mongoengine into drop_py2_support

mongoengine/document.py

@@ -54,7 +54,7 @@ class InvalidCollectionError(Exception):
 
 
 class EmbeddedDocument(BaseDocument, metaclass=DocumentMetaclass):
-    """A :class:`~mongoengine.Document` that isn't stored in its own
+    r"""A :class:`~mongoengine.Document` that isn't stored in its own
     collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
     fields on :class:`~mongoengine.Document`\ s through the
     :class:`~mongoengine.EmbeddedDocumentField` field type.

mongoengine/queryset/base.py

@@ -688,8 +688,8 @@ class BaseQuerySet:
     def in_bulk(self, object_ids):
         """"Retrieve a set of documents by their ids.
 
-        :param object_ids: a list or tuple of ``ObjectId``\ s
-        :rtype: dict of ObjectIds as keys and collection-specific
+        :param object_ids: a list or tuple of ObjectId's
+        :rtype: dict of ObjectId's as keys and collection-specific
                 Document subclasses as values.
 
         .. versionadded:: 0.3
@@ -1134,7 +1134,7 @@ class BaseQuerySet:
 
     def explain(self):
         """Return an explain plan record for the
-        :class:`~mongoengine.queryset.QuerySet`\ 's cursor.
+        :class:`~mongoengine.queryset.QuerySet` cursor.
         """
         return self._cursor.explain()