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

Author: christkv

docs/reference/content/reference/ecmascript6/index.md

@@ -20,5 +20,5 @@ This section exposes how to use the MongoDB Node.js driver with ECMAScript 6, le
 For more information about ECMAScript 6 see the [ECMAScript 6 features](http://es6-features.org/).
 {{% /note %}}
 
-- [Connecting]({{<relref "reference/ecmascript6/connecting.md">}}): how to connect leveraging ECMASdcript 6.
+- [Connecting]({{<relref "reference/ecmascript6/connecting.md">}}): how to connect leveraging ECMAScript 6.
 - [CRUD]({{<relref "reference/ecmascript6/crud.md">}}): perform CRUD operations leveraging ECMAScript 6.

lib/bulk/unordered.js

@@ -203,6 +203,7 @@ var addToOperationsList = function(_self, docType, document) {
 /**
  * Create a new UnorderedBulkOperation instance (INTERNAL TYPE, do not instantiate directly)
  * @class
+ * @property {number} length Get the number of operations in the bulk.
  * @return {UnorderedBulkOperation} a UnorderedBulkOperation instance.
  */
 var UnorderedBulkOperation = function(topology, collection, options) {

lib/collection.js

@@ -1576,7 +1576,7 @@ define.classMethod('isCapped', {callback: true, promise:true});
  * @param {number} [options.max=null] For geospatial indexes set the high bound for the co-ordinates.
  * @param {number} [options.v=null] Specify the format version of the indexes.
  * @param {number} [options.expireAfterSeconds=null] Allows you to expire data on indexes applied to a data (MongoDB 2.2 or higher)
- * @param {number} [options.name=null] Override the autogenerated index name (useful if the resulting name is larger than 128 bytes)
+ * @param {string} [options.name=null] Override the autogenerated index name (useful if the resulting name is larger than 128 bytes)
  * @param {object} [options.partialFilterExpression=null] Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
  * @param {object} [options.collation=null] Specify collation (MongoDB 3.4 or higher) settings for update operation (see 3.4 documentation for available fields).
  * @param {Collection~resultCallback} [callback] The command result callback