Merge branch 'patch-5' of https://github.com/vkarpov15/node-mongodb-native into 2.2

Author: christkv

docs/reference/content/index.md

@@ -9,7 +9,7 @@ type = "index"
 Welcome to the MongoDB Node.js 2.x driver documentation.
 
 
-## What's New in 2.1
+## What's New
 
 The [What's New]({{< relref "upgrade-migration/index.md" >}}) guide explains the major new features of the driver.
 

docs/reference/content/installation-guide/index.md

@@ -3,7 +3,7 @@ date = "2015-03-17T15:36:56Z"
 title = "Installation Guide"
 [menu.main]
   identifier = "Installation Guide"
-  weight = 15
+  weight = 10
   pre = "<i class='fa fa-puzzle-piece'></i>"
 +++
 

docs/reference/content/quick-start/index.md

@@ -3,7 +3,7 @@ date = "2015-03-17T15:36:56Z"
 title = "Quick Start"
 [menu.main]
   identifier = "Quick Start"
-  weight = 10
+  weight = 15
   pre = "<i class='fa fa-road'></i>"
 +++
 

docs/reference/content/tutorials/aggregation.md

@@ -4,7 +4,7 @@ title = "Aggregation"
 [menu.main]
   parent = "Tutorials"
   identifier = "Aggregation"
-  weight = 70
+  weight = 46
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/collections.md

@@ -4,7 +4,7 @@ title = "Collections"
 [menu.main]
   parent = "Tutorials"
   identifier = "Collections"
-  weight = 45
+  weight = 30
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/commands.md

@@ -4,7 +4,7 @@ title = "Database Commands"
 [menu.main]
   parent = "Tutorials"
   identifier = "Database Commands"
-  weight = 50
+  weight = 70
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/crud.md

@@ -4,7 +4,7 @@ title = "CRUD Operations"
 [menu.main]
   parent = "Tutorials"
   identifier = "CRUD Operations"
-  weight = 30
+  weight = 40
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/geospatial-search.md

@@ -4,7 +4,7 @@ title = "Geospatial Search"
 [menu.main]
   parent = "Tutorials"
   identifier = "Geospatial Search"
-  weight = 45
+  weight = 55
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/index.md

@@ -14,21 +14,21 @@ The tutorials in this section provide examples of some frequently used operation
 
 [Connect to MongoDB]({{< relref "tutorials/connect/index.md" >}})
 
-[CRUD Operations]({{< relref "tutorials/crud.md" >}})
-
 [Collections]({{< relref "tutorials/collections.md" >}})
 
+[Create Indexes]({{< relref "tutorials/create-indexes.md" >}})
+
+[CRUD Operations]({{< relref "tutorials/crud.md" >}})
+
 [Projections]({{< relref "tutorials/projections.md" >}})
 
 [Aggregation]({{< relref "tutorials/aggregation.md" >}})
 
-[Create Indexes]({{< relref "tutorials/create-indexes.md" >}})
-
 [Text Search]({{< relref "tutorials/text-search.md" >}})
 
 [Geospatial Search]({{< relref "tutorials/geospatial-search.md" >}})
 
-[GridFS]({{< relref "tutorials/gridfs/index.md" >}})
-
 [Database Commands]({{< relref "tutorials/commands.md" >}})
 
+[GridFS]({{< relref "tutorials/gridfs/index.md" >}})
+

docs/reference/content/tutorials/projections.md

@@ -4,7 +4,7 @@ title = "Projections"
 [menu.main]
   parent = "Tutorials"
   identifier = "Projections"
-  weight = 30
+  weight = 45
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/tutorials/text-search.md

@@ -4,7 +4,7 @@ title = "Text Search"
 [menu.main]
   parent = "Tutorials"
   identifier = "Text Search"
-  weight = 40
+  weight = 50
   pre = "<i class='fa'></i>"
 +++
 

docs/reference/content/upgrade-migration/index.md

@@ -9,7 +9,7 @@ title = "Upgrade Guide"
 
 # What's New in 2.2
 
-Key features of the 2.1 driver include:
+Key features of the 2.2 driver include:
 
 - Redesigned Connection Pool.
 - Connection close will drain any outstanding operations.

docs/reference/content/upgrade-migration/upgrading.md

@@ -1,14 +1,14 @@
 +++
 date = "2015-03-19T12:53:39-04:00"
-title = "Upgrading to 2.0"
+title = "Upgrading to 2.x"
 [menu.main]
   parent = "Upgrade Guide"
-  identifier = "Upgrading to 2.0"
+  identifier = "Upgrading to 2.x"
   weight = 40
   pre = "<i class='fa fa-wrench'></i>"
 +++
 
-# Migrating Your Application To 2.0
+# Migrating Your Application To 2.x
 
 There are some key changes in the driver that you should be aware of before migrating your application from version 1.x to 2.x.
 Some APIs are cleaned up, and some 1.x features have been deprecated.

docs/reference/themes/mongodb/layouts/partials/header/main.html

@@ -6,11 +6,12 @@
     </div>
     <!--logo start-->
     <div class="logo pull-left">
-      <a href="{{ .Site.BaseURL}}/../">
-        <img src="{{.Site.BaseURL}}/img/logo-mongodb-header.png", alt="MongoDB.org" />
+      <a href="https://www.mongodb.com/">
+        <img src="http://mongodb.github.io/node-mongodb-native/img/logo-mongodb-header.png", alt="MongoDB.com" />
       </a>
     </div>
     <!--logo end-->
     {{ partial "header/topRight.html" . }}
   </div>
 </header>
+

lib/collection.js

@@ -3092,7 +3092,7 @@ define.classMethod('group', {callback: true, promise:true});
  * @ignore
  */
 function processScope (scope) {
-  if(!isObject(scope)) {
+  if(!isObject(scope) || scope instanceof ObjectID) {
     return scope;
   }