Updated package, history and installation guide

Author: christkv

HISTORY.md

@@ -1,6 +1,12 @@
+2.2.13 2016-12-05
+-----------------
+* Updated mongodb-core to 2.1.0.
+* NODE-889 Fixed issue where legacy killcursor wire protocol messages would not be sent when APM is enabled.
+* Expose parserType as property on topology objects.
+
 2.2.12 2016-11-29
 -----------------
-* Updated mongodb-core to 2.0.14. 
+* Updated mongodb-core to 2.0.14.
   * Updated bson library to 0.5.7.
   * Dont leak connection.workItems elments when killCursor is called (Issue #150, https://github.com/mdlavin).
   * Remove unnecessary errors formatting (Issue #149, https://github.com/akryvomaz).

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

@@ -28,20 +28,27 @@ The MongoDB driver depends on several other packages, including:
 * mongodb-core
 * bson
 * kerberos
+* bson-ext
 * node-gyp
 
-The only native extension is the `kerberos` extension. This is a `peer dependency` for the `mongodb` module. This means that if you need to use `kerberos` you will need to add the `kerberos` module to your module's dependencies.
+The `kerberos` and `bson-ext` extensions are native C++ extension. These are optional extensions and are not required for the driver to function.
 
-If you have **NPM 2.0** or earlier NPM will attempt to download and build the `kerberos` module if you do not have it defined as a dependency in your module. However, from **NPM 3.0** onwards NPM will not attempt to build the `kerberos` module but instead print a warning in your install log that looks something like the following.
+## bson-ext Module
+
+The `bson-ext` module is an alternative **BSON** parser that is written in C++. It delivers better deserialization performance and similar or somewhat better serialization performance to the pure javascript parser.
+
+If you wish to use the `bson-ext` module you will need to add the `bson-ext` module to your module's dependencies.
 
 ```
-npm WARN EPEERINVALID [email protected] requires a peer of kerberos@~0.0 but none was installed.
+npm install bson-ext --save
 ```
 
-This tells you that the driver could not resolve its `peer dependency`. However, don't worry. You only need the `kerberos` module if you intend to use `kerberos`, in which case you can add it to your package.json by doing the following:
+## kerberos Module
+
+If you need to use `kerberos` module you will need to add the `kerberos` module to your module's dependencies.
 
 ```
-npm install kerberos@0.0.x
+npm install kerberos --save
 ```
 
 The `kerberos` package is a C++ extension that requires a build environment to be installed on your system. You must be able to build Node.js itself to be able to compile and install the `kerberos` module. Furthermore the `kerberos` module requires the MIT Kerberos package to correctly compile on UNIX operating systems. Consult your UNIX operating system package manager for what libraries to install.
@@ -109,8 +116,8 @@ This should rebuild the driver successfully if you have everything set up correc
 
 ### Other possible issues
 
-If Python is installed incorrectly, it can cause problems for `gyp`. It's a good idea to test your 
-deployment environment first by trying to build Node.js itself on the server in question, as this should unearth 
+If Python is installed incorrectly, it can cause problems for `gyp`. It's a good idea to test your
+deployment environment first by trying to build Node.js itself on the server in question, as this should unearth
 any issues with broken packages (and there are a lot of broken packages out there).
 
 Another thing is to ensure your user has write permission to wherever the Node.js modules are being installed.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.12",
+  "version": "2.2.13",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,14 +14,14 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "christkv/mongodb-core#1.0-bson-port",
+    "mongodb-core": "2.1.0",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {
     "JSONStream": "^1.0.7",
     "betterbenchmarks": "^0.1.0",
     "bluebird": "3.4.6",
-    "bson": "mongodb/js-bson#1.0-branch",
+    "bson": "1.0.0",
     "cli-table": "^0.3.1",
     "co": "4.6.0",
     "colors": "^1.1.2",