diff --git a/README.rst b/README.rst index f0a95f503..2aac7371c 100644 --- a/README.rst +++ b/README.rst @@ -87,7 +87,7 @@ Optional packages: - `backports.pbkdf2 `_, improves authentication performance with SCRAM-SHA-1, the default - authentication mechanism for MongoDB 2.8+. It especially improves + authentication mechanism for MongoDB 3.0+. It especially improves performance on Python older than 2.7.8, or on Python 3 before Python 3.4. - `pykerberos `_ is required for the GSSAPI authentication mechanism. diff --git a/doc/changelog.rst b/doc/changelog.rst index 620189c5e..ceea0524d 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -124,7 +124,7 @@ in this release. Changes in Version 2.8 ---------------------- -Version 2.8 is a major release that provides full support for MongoDB 2.8 and +Version 2.8 is a major release that provides full support for MongoDB 3.0 and fixes a number of bugs. Special thanks to Don Mitchell, Ximing, Can Zhang, Sergey Azovskov, and Heewa @@ -132,7 +132,7 @@ Barfchin for their contributions to this release. Highlights include: -- Support for the SCRAM-SHA-1 authentication mechanism (new in MongoDB 2.8). +- Support for the SCRAM-SHA-1 authentication mechanism (new in MongoDB 3.0). - JSON decoder support for the new $numberLong and $undefined types. - JSON decoder support for the $date type as an ISO-8601 string. - Support passing an index name to :meth:`~pymongo.cursor.Cursor.hint`. diff --git a/doc/examples/authentication.rst b/doc/examples/authentication.rst index f91c72982..ef7dfd895 100644 --- a/doc/examples/authentication.rst +++ b/doc/examples/authentication.rst @@ -24,7 +24,7 @@ SCRAM-SHA-1 (RFC 5802) .. versionadded:: 2.8 SCRAM-SHA-1 is the default authentication mechanism supported by a cluster -configured for authentication with MongoDB 2.8 or later. Authentication is +configured for authentication with MongoDB 3.0 or later. Authentication is per-database and credentials can be specified through the MongoDB URI or passed to the :meth:`~pymongo.database.Database.authenticate` method:: @@ -44,7 +44,7 @@ than 2.7.8, or on Python 3 before Python 3.4. MONGODB-CR ---------- -Before MongoDB 2.8 the default authentication mechanism was MONGODB-CR, +Before MongoDB 3.0 the default authentication mechanism was MONGODB-CR, the "MongoDB Challenge-Response" protocol:: >>> from pymongo import MongoClient @@ -59,7 +59,7 @@ Default Authentication Mechanism -------------------------------- If no mechanism is specified, PyMongo automatically uses MONGODB-CR when -connected to a pre-2.8 version of MongoDB, and SCRAM-SHA-1 when connected to +connected to a pre-3.0 version of MongoDB, and SCRAM-SHA-1 when connected to a recent version. Delegated Authentication diff --git a/doc/installation.rst b/doc/installation.rst index ff73bab78..a4fd73cb4 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -17,7 +17,7 @@ packages: - `backports.pbkdf2 `_, improves authentication performance with SCRAM-SHA-1, the default - authentication mechanism for MongoDB 2.8+. It especially improves + authentication mechanism for MongoDB 3.0+. It especially improves performance on Python older than 2.7.8, or on Python 3 before Python 3.4. - `pykerberos `_ is required for the GSSAPI authentication mechanism. diff --git a/pymongo/database.py b/pymongo/database.py index 06e20c469..42c31a977 100644 --- a/pymongo/database.py +++ b/pymongo/database.py @@ -887,7 +887,7 @@ class Database(common.BaseObject): specified the current database is used. - `mechanism` (optional): See :data:`~pymongo.auth.MECHANISMS` for options. - By default, use SCRAM-SHA-1 with MongoDB 2.8 and later, + By default, use SCRAM-SHA-1 with MongoDB 3.0 and later, MONGODB-CR (MongoDB Challenge Response protocol) for older servers. - `authMechanismProperties` (optional): Used to specify authentication mechanism specific options. To specify the service @@ -895,7 +895,7 @@ class Database(common.BaseObject): authMechanismProperties='SERVICE_NAME:' .. versionadded:: 2.8 - Use SCRAM-SHA-1 with MongoDB 2.8 and later. + Use SCRAM-SHA-1 with MongoDB 3.0 and later. .. versionchanged:: 2.5 Added the `source` and `mechanism` parameters. :meth:`authenticate`