Merge branch '2.2' of github.com:mongodb/node-mongodb-native into 2.2

mongodb · Feb 13, 2017 · 671f286 · 671f286
2 parents 2603748 + 941417e
commit 671f286
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/docs/reference/content/quick-start/index.md b/docs/reference/content/quick-start/index.md
@@ -246,7 +246,7 @@ Remove the document where the field **a** is equal to **3**.
 var removeDocument = function(db, callback) {
   // Get the documents collection
   var collection = db.collection('documents');
-  // Insert some documents
+  // Delete document where a is 3
   collection.deleteOne({ a : 3 }, function(err, result) {
     assert.equal(err, null);
     assert.equal(1, result.result.n);

diff --git a/docs/reference/content/tutorials/connect/authenticating.md b/docs/reference/content/tutorials/connect/authenticating.md
@@ -38,11 +38,10 @@ var MongoClient = require('mongodb').MongoClient,
 var user = encodeURIComponent('dave');
 var password = encodeURIComponent('abc123');
 var authMechanism = 'DEFAULT';
-var authSource = 'myproject';
 
 // Connection URL
-var url = f('mongodb://%s:%s@localhost:27017?authMechanism=%s&authSource=',
-  user, password, authMechanism, authSource);
+var url = f('mongodb://%s:%s@localhost:27017/myproject?authMechanism=%s',
+  user, password, authMechanism);
 
 // Use connect method to connect to the Server
 MongoClient.connect(url, function(err, db) {

diff --git a/docs/reference/content/tutorials/create-indexes.md b/docs/reference/content/tutorials/create-indexes.md
@@ -43,7 +43,7 @@ var createAscendingIndex = function(db, callback) {
 
 ## Create a Descending Index
 
-For an ascending index type, specify ``-1`` for ``<type>``.
+For an descending index type, specify ``-1`` for ``<type>``.
 
 The following example specifies a descending index key on the
 ``lastName`` field: