From f3d8b86a26c815c5701479b8b7907d33ea65df8a Mon Sep 17 00:00:00 2001
From: Bernie Hackett <bernie@10gen.com>
Date: Sat, 17 Dec 2011 18:29:59 -0800
Subject: [PATCH] Minor doc updates.

---
 bson/binary.py                    | 5 +++--
 doc/changelog.rst                 | 1 +
 pymongo/__init__.py               | 2 +-
 pymongo/collection.py             | 4 +++-
 pymongo/common.py                 | 5 +++--
 pymongo/connection.py             | 4 ++--
 pymongo/replica_set_connection.py | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bson/binary.py b/bson/binary.py
index c6ba7d81c..b3d000842 100644
--- a/bson/binary.py
+++ b/bson/binary.py
@@ -51,7 +51,8 @@ This is the new BSON binary subtype for UUIDs. The
 current default is :data:`OLD_UUID_SUBTYPE` but will
 change to this in a future release.
 
-.. versionchanged:: 2.0.1+
+.. versionchanged:: 2.1
+   Changed to subtype 4.
 .. versionadded:: 1.5
 """
 
@@ -61,7 +62,7 @@ OLD_UUID_SUBTYPE = 3
 :class:`uuid.UUID` instances will automatically be encoded
 by :mod:`bson` using this subtype.
 
-.. versionadded:: 2.0.1+
+.. versionadded:: 2.1
 """
 
 MD5_SUBTYPE = 5
diff --git a/doc/changelog.rst b/doc/changelog.rst
index fe7817e24..a34721e51 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -30,6 +30,7 @@ Important New Features:
 - Added support for the MongoDB URI options socketTimeoutMS and connectTimeoutMS.
 - Added support for the ContinueOnError insert flag.
 - Added basic SSL support.
+- Added basic support for Jython.
 - Secondaries can be used for :meth:`~pymongo.cursor.Cursor.count`,
   :meth:`~pymongo.cursor.Cursor.distinct`, :meth:`~pymongo.collection.Collection.group`,
   and querying :class:`~gridfs.GridFS`.
diff --git a/pymongo/__init__.py b/pymongo/__init__.py
index b99123691..85fa5a729 100644
--- a/pymongo/__init__.py
+++ b/pymongo/__init__.py
@@ -33,7 +33,7 @@ GEO2D = "2d"
 GEOHAYSTACK = "geoHaystack"
 """Index specifier for a 2-dimensional `haystack index`_.
 
-.. versionadded:: 2.0.1+
+.. versionadded:: 2.1
 
 .. note:: Geo-spatial indexing requires server version **>= 1.5.6+**.
 
diff --git a/pymongo/collection.py b/pymongo/collection.py
index 744d5dfed..eca8fdc33 100644
--- a/pymongo/collection.py
+++ b/pymongo/collection.py
@@ -63,6 +63,8 @@ class Collection(common.BaseObject):
           - `**kwargs` (optional): additional keyword arguments will
             be passed as options for the create collection command
 
+        .. versionadded:: 2.1
+           uuid_subtype attribute
         .. versionchanged:: 1.5
            deprecating `options` in favor of kwargs
         .. versionadded:: 1.5
@@ -280,7 +282,7 @@ class Collection(common.BaseObject):
 
         .. note:: `continue_on_error` requires server version **>= 1.9.1**
 
-        .. versionadded:: 2.0.1+
+        .. versionadded:: 2.1
            Support for continue_on_error.
         .. versionadded:: 1.8
            Support for passing `getLastError` options as keyword
diff --git a/pymongo/common.py b/pymongo/common.py
index 476f19703..581329d30 100644
--- a/pymongo/common.py
+++ b/pymongo/common.py
@@ -186,7 +186,8 @@ class BaseObject(object):
     def __get_slave_okay(self):
         """DEPRECATED. Use `read_preference` instead.
 
-        .. versionchanged:: 2.0.1+
+        .. versionchanged:: 2.1
+           Deprecated slave_okay.
         .. versionadded:: 2.0
         """
         return self.__slave_okay
@@ -204,7 +205,7 @@ class BaseObject(object):
 
         See :class:`~pymongo.ReadPreference` for available options.
 
-        .. versionadded:: 2.0.1+
+        .. versionadded:: 2.1
         """
         return self.__read_pref
 
diff --git a/pymongo/connection.py b/pymongo/connection.py
index 46125100e..a649e4e55 100644
--- a/pymongo/connection.py
+++ b/pymongo/connection.py
@@ -270,7 +270,7 @@ class Connection(common.BaseObject):
             instead.
 
         .. seealso:: :meth:`end_request`
-        .. versionchanged:: 2.0.1+
+        .. versionchanged:: 2.1
            Support `w` = integer or string.
            Added `ssl` option.
            DEPRECATED slave_okay/slaveOk.
@@ -720,7 +720,7 @@ class Connection(common.BaseObject):
         could lead to unexpected results.
 
         .. seealso:: :meth:`end_request`
-        .. versionadded:: 2.0.1+
+        .. versionadded:: 2.1
         """
         self.disconnect()
 
diff --git a/pymongo/replica_set_connection.py b/pymongo/replica_set_connection.py
index 0d2db5853..6eb6bc366 100644
--- a/pymongo/replica_set_connection.py
+++ b/pymongo/replica_set_connection.py
@@ -179,7 +179,7 @@ class ReplicaSetConnection(common.BaseObject):
           - `slave_okay` or `slaveOk` (deprecated): Use `read_preference`
             instead.
 
-        .. versionadded:: 2.0.1+
+        .. versionadded:: 2.1
         """
         self.__max_pool_size = max_pool_size
         self.__document_class = document_class