domains: port fix abort on uncaught to v0.12

Port fbff705 and caeb677 from v0.10 to v0.12, original commit messages: fbff705 Add v8::Isolate::SetAbortOnUncaughtException() so the user can be notified when an uncaught exception has bubbled. caeb677 Do not abort the process if an error is thrown from within a domain, an error handler is setup for the domain and --abort-on-uncaught-exception was passed on the command line. However, if an error is thrown from within the top-level domain's error handler and --abort-on-uncaught-exception was passed on the command line, make the process abort. Fixes: #8877 Reviewed-By: Julien Gilli <jgilli@fastmail.fm> PR-URL: https://github.com/joyent/node/pull/25835
comma
2026-04-28 03:01:10 -04:00 · 2015-08-13 11:23:11 -07:00 · 2015-08-13 12:01:49 -04:00 · 2015-08-13 12:01:49 -04:00 · 2015-08-13 12:01:48 -04:00 · 2015-08-13 12:01:48 -04:00
4117 changed files with 521306 additions and 338453 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ node_g
 .benchmark_reports
 /.project
 /.cproject
+icu_config.gypi

 /out

@@ -27,6 +28,7 @@ Release/
 *.suo
 *.vcproj
 *.vcxproj
+!custom_actions.vcxproj
 *.vcxproj.user
 *.vcxproj.filters
 UpgradeLog*.XML
@@ -46,6 +48,9 @@ ipch/
 email.md
 deps/v8-*
 deps/icu
+deps/icu*.zip
+deps/icu*.tgz
+deps/icu-tmp
 ./node_modules
 .svn/

--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,8 @@ Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
 Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
 Alex Kocharin <rlidwka@kocharin.ru>
 Alex Kocharin <rlidwka@kocharin.ru> <alex@kocharin.ru>
+Alexey Kupershtokh <wicked@alawar.com>
+Alexis Campailla <orangemocha@github.com>
 Alexis Sellier <self@cloudhead.net>
 Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
 Arlo Breault <arlolra@gmail.com>
@@ -13,10 +15,12 @@ Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
 Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
+Brandon Cheng <bcheng.gt@gmail.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Chew Choon Keat <choonkeat@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
+Colin Ihrig <cjihrig@gmail.com>
 Daniel Berger <code+node@dpbis.net>
 Daniel Chcouri <333222@gmail.com>
 Daniel Gröber <darklord@darkboxed.org>
@@ -25,6 +29,7 @@ Daniel Pihlström <sciolist.se@gmail.com>
 Dave Pacheco <dap@joyent.com> <dap@cs.brown.edu>
 David Siegel <david@artcom.de> <david.siegel@artcom.de>
 Domenic Denicola <domenic@domenicdenicola.com>
+Doron Pagot <doronpagot@gmail.com>
 Eduard Burtescu <eddy_me08@yahoo.com>
 Einar Otto Stangvik <einaros@gmail.com>
 Elliott Cable <me@ell.io>
@@ -38,6 +43,7 @@ Friedemann Altrock <frodenius@gmail.com>
 Fuji Goro <gfuji@cpan.org>
 Gabriel de Perthuis <g2p.code@gmail.com>
 Gil Pedersen <git@gpost.dk> <github@gpost.dk>
+Guillaume Goussard <guillaume.goussard@mgo.com>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
 Igor Soarez <igorsoarez@gmail.com>
@@ -46,6 +52,7 @@ Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Jake Verbaten <raynos2@gmail.com>
 Jered Schmidt <tr@nslator.jp>
+Jochen Eisinger <jochen@chromium.org>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
@@ -69,6 +76,7 @@ Micheil Smith <micheil@brandedcode.com> <micheil@yettobebranded.net>
 Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
 Nebu Pookins<nebu@nebupookins.net>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
+Nicholas Vavilov <vvnicholas@gmail.com>
 Onne Gorter <onne@onnlucky.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
 Ray Morgan <rmorgan@zappos.com>
@@ -104,8 +112,10 @@ Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Willi Eggeling <email@wje-online.de>
+Yiyu He <dead_horse@qq.com>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yuichiro MASUI <masui@masuidrive.jp>
+Yunsong Guo <eilian.yunsong@gmail.com>
 Zachary Scott <zachary@zacharyscott.net> <zachary.s.scott@gmail.com>
 Zoran Tomicic <ztomicic@gmail.com>

@@ -120,3 +130,5 @@ Michael Starzinger <mstarzinger@chromium.org>
 Toon Verwaest <verwaest@chromium.org>
 Vyacheslav Egorov <vegorov@chromium.org>
 Yang Guo <yangguo@chromium.org>
+Dan Carney <dcarney@chromium.org>
+Sven Panne <svenpanne@chromium.org>
--- a/1250
+++ b/1250
--- a/392
+++ b/392
@@ -1,4 +1,284 @@
-2014.09.24, Version 0.11.14 (Unstable)
+2015.07.09, Version 0.12.7 (Stable)
+
+* openssl: upgrade to 1.0.1p
+
+* npm: upgrade to 2.11.3
+
+* V8: cherry-pick JitCodeEvent patch from upstream (Ben Noordhuis)
+
+* win,msi: create npm folder in AppData directory (Steven Rockarts)
+
+
+2015.07.03, Version 0.12.6 (Stable), 0be9a77bb18ec15b4fb6a1fb0762f313b7351201
+
+* V8: fix out-of-band write in utf8 decoder
+
+
+2015.06.22, Version 0.12.5 (Stable), 61c6abf00898fe00eb7fcf2c23ba0b01cf12034c
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* npm: upgrade to 2.11.2
+
+* uv: upgrade to 1.6.1
+
+* V8: avoid deadlock when profiling is active (Dmitri Melikyan)
+
+* install: fix source path for openssl headers (Oguz Bastemur)
+
+* install: make sure opensslconf.h is overwritten (Oguz Bastemur)
+
+* timers: fix timeout when added in timer's callback (Julien Gilli)
+
+* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
+
+
+2015.05.22, Version 0.12.4 (Stable), 0a604e92e258c5ee2752d763e50721e35053f135
+
+* npm: upgrade to 2.10.1
+
+* V8: revert v8 Array.prototype.values() removal (cjihrig)
+
+* win: bring back xp/2k3 support (Bert Belder)
+
+
+2015.05.13, Version 0.12.3 (Stable), 03431c7d7b4b4a3054ca8ae2cfa8009e3e84a2c7
+
+* V8: update to 3.28.71.19
+
+* uv: upgrade to 1.5.0
+
+* npm: upgrade to 2.9.1
+
+* V8: don't busy loop in v8 cpu profiler thread (Mike Tunnicliffe)
+
+* V8: fix issue with let bindings in for loops (adamk)
+
+* debugger: don't spawn child process in remote mode (Jackson Tian)
+
+* net: do not set V4MAPPED on FreeBSD (Julien Gilli)
+
+* repl: make 'Unexpected token' errors recoverable (Julien Gilli)
+
+* src: backport ignore ENOTCONN on shutdown race (Ben Noordhuis)
+
+* src: fix backport of SIGINT crash fix on FreeBSD (Julien Gilli)
+
+
+2015.03.31, Version 0.12.2 (Stable), 523d445705027438b83b8d5958c9beeb1c8711d9
+
+* uv: Upgrade to 1.4.2
+
+* npm: Upgrade to 2.7.4
+
+* V8: do not add extra newline in log file (Julien Gilli)
+
+* V8: Fix --max_old_space_size=4096 integer overflow (Andrei Sedoi)
+
+* asyncwrap: fix constructor condition for early ret (Trevor Norris)
+
+* buffer: align chunks on 8-byte boundary (Fedor Indutny)
+
+* buffer: fix pool offset adjustment (Trevor Norris)
+
+* build: fix use of strict aliasing (Trevor Norris)
+
+* console: allow Object.prototype fields as labels (Colin Ihrig)
+
+* fs: make F_OK/R_OK/W_OK/X_OK not writable (Jackson Tian)
+
+* fs: properly handle fd passed to truncate() (Bruno Jouhier)
+
+* http: fix assert on data/end after socket error (Fedor Indutny)
+
+* lib: fix max size check in Buffer constructor (Ben Noordhuis)
+
+* lib: fix stdio/ipc sync i/o regression (Ben Noordhuis)
+
+* module: replace NativeModule.require (Herbert Vojčík)
+
+* net: allow port 0 in connect() (cjihrig)
+
+* net: unref timer in parent sockets (Fedor Indutny)
+
+* path: refactor for performance and consistency (Nathan Woltman)
+
+* smalloc: extend user API (Trevor Norris)
+
+* src: fix for SIGINT crash on FreeBSD (Fedor Indutny)
+
+* src: fix builtin modules failing with --use-strict (Julien Gilli)
+
+* watchdog: fix timeout for early polling return (Saúl Ibarra Corretgé)
+
+
+2015.03.23, Version 0.12.1 (Stable), 0034086b49f22cfde765a7e9f55db25f8eb310b6
+
+* openssl: upgrade to 1.0.1m (Addressing multiple CVES)
+
+
+2015.02.06, Version 0.12.0 (Stable), 2b18916ff054309a07408719b62e2b6a4f1e056a
+
+* npm: Upgrade to 2.5.1
+
+* mdb_v8: update for v0.12 (Dave Pacheco)
+
+
+2015.01.29, Version 0.11.16 (Unstable), 8e42e5a0731040075e14cec087eea86729f2dc53
+
+* openssl: Upgrade to 1.0.1l
+
+* npm: Upgrade to 2.3.0
+
+* url: revert support of `path` for url.format" (Julien Gilli)
+
+* assert: use util.inspect() to create error messages (cjihrig)
+
+* net: throw on invalid socket timeouts (cjihrig)
+
+* url: fix parsing of ssh urls (Evan Lucas)
+
+
+2015.01.20, Version 0.11.15 (Unstable), 8a9f263a82089814e69f277f9fecd2888705101b
+
+* v8: Upgrade to 3.28.73
+
+* uv: Upgrade to 1.0.2
+
+* npm: Upgrade to v2.1.6
+
+* uv: float patch to revert tty breakage (Trevor Norris)
+
+* v8: re-implement debugger-agent (Fedor Indutny)
+
+* v8: apply floating irhydra patch (Fedor Indutny)
+
+* v8: fix postmortem-metadata generator (Refael Ackermann)
+
+* debugger: fix unhandled error in setBreakpoint (Miroslav Bajtoš)
+
+* async-wrap: add event hooks (Trevor Norris)
+
+* async-wrap: expose async-wrap as binding (Trevor Norris)
+
+* buffer, doc: misc. fix and cleanup (Trevor Norris)
+
+* buffer: add generic functions for (u)int ops (Yazhong Liu)
+
+* buffer: fix and cleanup fill() (Trevor Norris)
+
+* buffer: mv floating point read/write checks to JS (Trevor Norris)
+
+* build, i18n: improve Intl build, add "--with-intl" (Steven R. Loomis)
+
+* build: add small-icu support for binary packages (Julien Gilli)
+
+* build: do not generate support for libuv's probes (Julien Gilli)
+
+* build: i18n: add icu config options (Steven R. Loomis)
+
+* build: i18n: support little-endian machines (Steven Loomis)
+
+* build: vcbuild fix "The input line is too long." (Alexis Campailla)
+
+* child_process: improve spawn() argument handling (cjihrig)
+
+* cluster: avoid race enabling debugger in worker (Timothy J Fontaine)
+
+* cluster: cluster.disconnect() should check status (Sam Roberts)
+
+* cluster: do not signal children in debug mode (Fedor Indutny)
+
+* cluster: don't assert if worker has no handles (Sam Roberts)
+
+* core: fix usage of uv_cwd (Saúl Ibarra Corretgé)
+
+* core: replace uv_fs_readdir with uv_fs_scandir (Saúl Ibarra Corretgé)
+
+* crypto: createDiffieHellman throw for bad args (Trevor Norris)
+
+* crypto: lower RSS usage for TLSCallbacks (Fedor Indutny)
+
+* crypto: store thread id as pointer-sized (Alexis Campailla)
+
+* dns: propagate domain for c-ares methods (Chris Dickinson)
+
+* fs: fix symlink error message (Vladimir Kurchatkin)
+
+* http: Improve _addHeaderLines method (Jackson Tian)
+
+* http: cleanup setHeader() (Trevor Norris)
+
+* http: rename flush to flushHeaders (Timothy J Fontaine)
+
+* lib,src: fix spawnSync ignoring its 'env' option (Juanjo)
+
+* modules: adding load linked modules feature (Thorsten Lorenz)
+
+* net: Make server.connections un-enumerable (Patrick Mooney)
+
+* net: add pauseOnConnect option to createServer() (cjihrig)
+
+* net: make connect() input validation synchronous (cjihrig)
+
+* node: avoid automatic microtask runs (Vladimir Kurchatkin)
+
+* node: fix throws before timer module is loaded (Trevor Norris)
+
+* openssl: fix keypress requirement in apps on win32 (Fedor Indutny)
+
+* path: added parse() and format() functions (Rory Bradford)
+
+* path: allow calling platform specific methods (Timothy J Fontaine)
+
+* path: don't lower-cases drive letters (Bert Belder)
+
+* path: refactor normalizeArray() (Nathan Woltman)
+
+* process: pid can be a string in process.kill() (Sam Roberts)
+
+* readline: fix performance issue when large line (Jicheng Li)
+
+* readline: should not require an output stream. (Julien Gilli)
+
+* smalloc: check if obj has external data (Vladimir Kurchatkin)
+
+* smalloc: don't allow to dispose typed arrays (Vladimir Kurchatkin)
+
+* smalloc: fix bad assert for zero length data (Trevor Norris)
+
+* smalloc: fix copyOnto optimization (Vladimir Kurchatkin)
+
+* src: all wrap's now use actual FunctionTemplate (Trevor Norris)
+
+* src: fix VC++ warning C4244 (Rasmus Christian Pedersen)
+
+* src: remove Async Listener (Trevor Norris)
+
+* stream: switch _writableState.buffer to queue (Chris Dickinson)
+
+* streams: make setDefaultEncoding() throw (Brian White)
+
+* streams: set default encoding for writable streams (Johnny Ray)
+
+* tls: remove tls.createSecurePair code deprecation (Jackson Tian)
+
+* tls_wrap: ignore ZERO_RETURN after close_notify (Fedor Indutny)
+
+* url: change hostname regex to negate invalid chars (Jonathan Johnson)
+
+* url: fixed encoding for slash switching emulation. (Evan Rutledge Borden)
+
+* url: improve parsing speed (CGavrila)
+
+* url: make query() consistent (Gabriel Wicke)
+
+* url: support `path` for url.format (Yazhong Liu)
+
+* util: add es6 Symbol support for `util.inspect` (gyson)
+
+
+2014.09.24, Version 0.11.14 (Unstable), 902090af5375e497dded310575f19de5328a9bbc

 * uv: Upgrade to v1.0.0-rc1

@@ -787,7 +1067,111 @@
 * console: `console.dir()` bypasses inspect() methods (Nathan Rajlich)


-2014.09.16, Version 0.10.32 (Stable)
+2015.07.09, Version 0.10.40 (Maintenance), 0439a28d519fb6efe228074b0588a59452fc1677
+
+* openssl: upgrade to 1.0.1p
+
+* V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis)
+
+* win,msi: create npm folder in AppData directory (Steven Rockarts)
+
+
+2015.06.18, Version 0.10.39 (Maintenance), 615a35ccd2cb5cba80901862aefe51a940995f44
+
+* openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
+
+* install: fix source path for openssl headers (Oguz Bastemur)
+
+* install: make sure opensslconf.h is overwritten (Oguz Bastemur)
+
+* timers: fix timeout when added in timer's callback (Julien Gilli)
+
+* windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
+
+
+2015.03.23, Version 0.10.38 (Maintenance), 0b5731a63cc40c4fe9275c79158fe0a5dd4d1609
+
+* openssl: upgrade to 1.0.1m (Addressing multiple CVEs)
+
+
+2015.03.11, Version 0.10.37 (Maintenance), 7d6b5b1d5ba726331f9ccaaae59af7cd53eee82e
+
+* uv: update to 0.10.36 (CVE-2015-0278)
+
+* domains: fix stack clearing after error handled (Jonas Dohse)
+
+* buffer: reword Buffer.concat error message (Chris Dickinson)
+
+* console: allow Object.prototype fields as labels (Julien Gilli)
+
+* V8: log version in profiler log file (Ben Noordhuis)
+
+* http: fix performance regression for GET requests (Florin-Cristian Gavrila)
+
+
+2015.01.26, Version 0.10.36 (Stable), 09b482886bdd3d863c3d4e7d71264eac0daaf9e1
+
+* openssl: update to 1.0.1l
+
+* v8: Fix debugger and strict mode regression (Julien Gilli)
+
+* v8: don't busy loop in cpu profiler thread (Ben Noordhuis)
+
+
+2014.12.22, Version 0.10.35 (Stable), a363f61ca839e817eb6853c5dc5af8c3b9b9226b
+
+* tls: re-add 1024-bit SSL certs removed by f9456a2 (Chris Dickinson)
+
+* timers: don't close interval timers when unrefd (Julien Gilli)
+
+* timers: don't mutate unref list while iterating it (Julien Gilli)
+
+
+2014.12.17, Version 0.10.34 (Stable), 52795f8fcc2de77cf997e671ea58614e5e425dfe
+
+* uv: update to v0.10.30
+
+* zlib: upgrade to v1.2.8
+
+* child_process: check execFile args is an array (Sam Roberts)
+
+* child_process: check fork args is an array (Sam Roberts)
+
+* crypto: update root certificates (Ben Noordhuis)
+
+* domains: fix issues with abort on uncaught (Julien Gilli)
+
+* timers: Avoid linear scan in _unrefActive. (Julien Gilli)
+
+* timers: fix unref() memory leak (Trevor Norris)
+
+* v8: add api for aborting on uncaught exception (Julien Gilli)
+
+* debugger: fix when using "use strict" (Julien Gilli)
+
+
+2014.10.20, Version 0.10.33 (Stable), 8d045a30e95602b443eb259a5021d33feb4df079
+
+* openssl: Update to 1.0.1j (Addressing multiple CVEs)
+
+* uv: Update to v0.10.29
+
+* child_process: properly support optional args (cjihrig)
+
+* crypto: Disable autonegotiation for SSLv2/3 by default (Fedor Indutny,
+	Timothy J Fontaine, Alexis Campailla)
+
+	This is a behavior change, by default we will not allow the negotiation to
+	SSLv2 or SSLv3. If you want this behavior, run Node.js with either
+	`--enable-ssl2` or `--enable-ssl3` respectively.
+
+	This does not change the behavior for users specifically requesting
+	`SSLv2_method` or `SSLv3_method`. While this behavior is not advised, it is
+	assumed you know what you're doing since you're specifically asking to use
+	these methods.
+
+
+2014.09.16, Version 0.10.32 (Stable), 0fe0d121551593c23a565db8397f85f17bb0f00e

 * npm: Update to 1.4.28

@@ -839,7 +1223,7 @@

 * deps: backport 4ed5fde4f from v8 upstream (Fedor Indutny)

-* deps: cherry-pick eca441b2 from OpenSSL (Fedor Indutny)
+* 

 * lib: remove and restructure calls to isNaN() (cjihrig)

@@ -2418,7 +2802,7 @@
  - Support for parallel use of the cache folder
  - Retry on registry timeouts or network failures (Trent Mick)
  - Reduce 'engines' failures to a warning
-  - Use new zsh completion if aviailable (Jeremy Cantrell)
+  - Use new zsh completion if available (Jeremy Cantrell)

 * Fix #3577 Un-break require('sys')

--- a/394
+++ b/394
@@ -294,9 +294,9 @@ maintained libraries. The externally maintained libraries used by Node are:
 - Zlib at deps/zlib. zlib's license follows:
  """
    /* zlib.h -- interface of the 'zlib' general purpose compression library
-      version 1.2.4, March 14th, 2010
+      version 1.2.8, April 28th, 2013

-      Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+      Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler

      This software is provided 'as-is', without any express or implied
      warranty.  In no event will the authors be held liable for any damages
@@ -314,9 +314,8 @@ maintained libraries. The externally maintained libraries used by Node are:
         misrepresented as being the original software.
      3. This notice may not be removed or altered from any source distribution.

-      Jean-loup Gailly
-      Mark Adler
-
+      Jean-loup Gailly        Mark Adler
+      jloup@gzip.org          madler@alumni.caltech.edu
    */
  """

@@ -782,3 +781,388 @@ maintained libraries. The externally maintained libraries used by Node are:

       END OF TERMS AND CONDITIONS
  """
+
+- ICU's license follows:
+  From http://source.icu-project.org/repos/icu/icu/trunk/license.html
+  """
+  ICU License - ICU 1.8.1 and later
+
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright (c) 1995-2014 International Business Machines Corporation and others
+
+    All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, and/or sell copies of the
+    Software, and to permit persons to whom the Software is furnished
+    to do so, provided that the above copyright notice(s) and this
+    permission notice appear in all copies of the Software and that
+    both the above copyright notice(s) and this permission notice
+    appear in supporting documentation.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR
+    ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR
+    ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+    TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in this Software without prior written
+    authorization of the copyright holder.
+
+    All trademarks and registered trademarks mentioned herein are the
+    property of their respective owners.
+
+  Third-Party Software Licenses
+
+    This section contains third-party software notices and/or
+    additional terms for licensed third-party software components
+    included within ICU libraries.
+
+  1. Unicode Data Files and Software
+    COPYRIGHT AND PERMISSION NOTICE
+
+    Copyright © 1991-2014 Unicode, Inc. All rights reserved.
+    Distributed under the Terms of Use in
+    http://www.unicode.org/copyright.html.
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of the Unicode data files and any associated documentation
+    (the "Data Files") or Unicode software and any associated documentation
+    (the "Software") to deal in the Data Files or Software
+    without restriction, including without limitation the rights to use,
+    copy, modify, merge, publish, distribute, and/or sell copies of
+    the Data Files or Software, and to permit persons to whom the Data Files
+    or Software are furnished to do so, provided that
+    (a) this copyright and permission notice appear with all copies
+    of the Data Files or Software,
+    (b) this copyright and permission notice appear in associated
+    documentation, and
+    (c) there is clear notice in each modified Data File or in the Software
+    as well as in the documentation associated with the Data File(s) or
+    Software that the data or software has been modified.
+
+    THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+    ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+    WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+    IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+    NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+    DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+    DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+    TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+    Except as contained in this notice, the name of a copyright holder
+    shall not be used in advertising or otherwise to promote the sale,
+    use or other dealings in these Data Files or Software without prior
+    written authorization of the copyright holder.
+
+  2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)
+     #    The Google Chrome software developed by Google is licensed
+     #  under the BSD license. Other software included in this distribution
+     #  is provided under other licenses, as set forth below.
+     #
+     #	The BSD License
+     #	http://opensource.org/licenses/bsd-license.php
+     #	Copyright (C) 2006-2008, Google Inc.
+     #
+     #	All rights reserved.
+     #
+     #	Redistribution and use in source and binary forms, with or
+     #  without modification, are permitted provided that the following
+     #  conditions are met:
+     #
+     #	Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+     #	Redistributions in binary form must reproduce the above
+     #  copyright notice, this list of conditions and the following
+     #  disclaimer in the documentation and/or other materials provided with
+     #  the distribution.
+     #	Neither the name of  Google Inc. nor the names of its
+     #  contributors may be used to endorse or promote products derived from
+     #  this software without specific prior written permission.
+     #
+     #
+     #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+  CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     #
+     #
+     #	The word list in cjdict.txt are generated by combining three
+  word lists listed
+     #	below with further processing for compound word breaking. The
+  frequency is generated
+     #	with an iterative training against Google web corpora.
+     #
+     #	* Libtabe (Chinese)
+     #	  - https://sourceforge.net/project/?group_id=1519
+     #	  - Its license terms and conditions are shown below.
+     #
+     #	* IPADIC (Japanese)
+     #	  - http://chasen.aist-nara.ac.jp/chasen/distribution.html
+     #	  - Its license terms and conditions are shown below.
+     #
+     #	---------COPYING.libtabe ---- BEGIN--------------------
+     #
+     #	/*
+     #	 * Copyrighy (c) 1999 TaBE Project.
+     #	 * Copyright (c) 1999 Pai-Hsiang Hsiao.
+     #	 * All rights reserved.
+     #	 *
+     #	 * Redistribution and use in source and binary forms, with or without
+     #	 * modification, are permitted provided that the following conditions
+     #	 * are met:
+     #	 *
+     #	 * . Redistributions of source code must retain the above copyright
+     #	 *   notice, this list of conditions and the following disclaimer.
+     #	 * . Redistributions in binary form must reproduce the above copyright
+     #	 *   notice, this list of conditions and the following disclaimer in
+     #	 *   the documentation and/or other materials provided with the
+     #	 *   distribution.
+     #	 * . Neither the name of the TaBE Project nor the names of its
+     #	 *   contributors may be used to endorse or promote products derived
+     #	 *   from this software without specific prior written permission.
+     #	 *
+     #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+     #	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+     #	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+     #	 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+     #	 * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+     #	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+     #	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+     #	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+     #	 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+     #	 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     #	 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+     #	 * OF THE POSSIBILITY OF SUCH DAMAGE.
+     #	 */
+     #
+     #	/*
+     #	 * Copyright (c) 1999 Computer Systems and Communication Lab,
+     #	 *                    Institute of Information Science, Academia Sinica.
+     #	 * All rights reserved.
+     #	 *
+     #	 * Redistribution and use in source and binary forms, with or without
+     #	 * modification, are permitted provided that the following conditions
+     #	 * are met:
+     #	 *
+     #	 * . Redistributions of source code must retain the above copyright
+     #	 *   notice, this list of conditions and the following disclaimer.
+     #	 * . Redistributions in binary form must reproduce the above copyright
+     #	 *   notice, this list of conditions and the following disclaimer in
+     #	 *   the documentation and/or other materials provided with the
+     #	 *   distribution.
+     #	 * . Neither the name of the Computer Systems and Communication Lab
+     #	 *   nor the names of its contributors may be used to endorse or
+     #	 *   promote products derived from this software without specific
+     #	 *   prior written permission.
+     #	 *
+     #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+     #	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+     #	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+     #	 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+     #	 * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+     #	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+     #	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+     #	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+     #	 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+     #	 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     #	 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+     #	 * OF THE POSSIBILITY OF SUCH DAMAGE.
+     #	 */
+     #
+     #	Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois
+     #	c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
+     #
+     #	---------------COPYING.libtabe-----END------------------------------------
+     #
+     #
+     #	---------------COPYING.ipadic-----BEGIN------------------------------------
+     #
+     #	Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
+     #	and Technology.  All Rights Reserved.
+     #
+     #	Use, reproduction, and distribution of this software is permitted.
+     #	Any copy of this software, whether in its original form or modified,
+     #	must include both the above copyright notice and the following
+     #	paragraphs.
+     #
+     #	Nara Institute of Science and Technology (NAIST),
+     #	the copyright holders, disclaims all warranties with regard to this
+     #	software, including all implied warranties of merchantability and
+     #	fitness, in no event shall NAIST be liable for
+     #	any special, indirect or consequential damages or any damages
+     #	whatsoever resulting from loss of use, data or profits, whether in an
+     #	action of contract, negligence or other tortuous action, arising out
+     #	of or in connection with the use or performance of this software.
+     #
+     #	A large portion of the dictionary entries
+     #	originate from ICOT Free Software.  The following conditions for ICOT
+     #	Free Software applies to the current dictionary as well.
+     #
+     #	Each User may also freely distribute the Program, whether in its
+     #	original form or modified, to any third party or parties, PROVIDED
+     #	that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
+     #	on, or be attached to, the Program, which is distributed substantially
+     #	in the same form as set out herein and that such intended
+     #	distribution, if actually made, will neither violate or otherwise
+     #	contravene any of the laws and regulations of the countries having
+     #	jurisdiction over the User or the intended distribution itself.
+     #
+     #	NO WARRANTY
+     #
+     #	The program was produced on an experimental basis in the course of the
+     #	research and development conducted during the project and is provided
+     #	to users as so produced on an experimental basis.  Accordingly, the
+     #	program is provided without any warranty whatsoever, whether express,
+     #	implied, statutory or otherwise.  The term "warranty" used herein
+     #	includes, but is not limited to, any warranty of the quality,
+     #	performance, merchantability and fitness for a particular purpose of
+     #	the program and the nonexistence of any infringement or violation of
+     #	any right of any third party.
+     #
+     #	Each user of the program will agree and understand, and be deemed to
+     #	have agreed and understood, that there is no warranty whatsoever for
+     #	the program and, accordingly, the entire risk arising from or
+     #	otherwise connected with the program is assumed by the user.
+     #
+     #	Therefore, neither ICOT, the copyright holder, or any other
+     #	organization that participated in or was otherwise related to the
+     #	development of the program and their respective officials, directors,
+     #	officers and other employees shall be held liable for any and all
+     #	damages, including, without limitation, general, special, incidental
+     #	and consequential damages, arising out of or otherwise in connection
+     #	with the use or inability to use the program or any product, material
+     #	or result produced or otherwise obtained by using the program,
+     #	regardless of whether they have been advised of, or otherwise had
+     #	knowledge of, the possibility of such damages at any time during the
+     #	project or thereafter.  Each user will be deemed to have agreed to the
+     #	foregoing by his or her commencement of use of the program.  The term
+     #	"use" as used herein includes, but is not limited to, the use,
+     #	modification, copying and distribution of the program and the
+     #	production of secondary products from the program.
+     #
+     #	In the case where the program, whether in its original form or
+     #	modified, was distributed or delivered to or received by a user from
+     #	any person, organization or entity other than ICOT, unless it makes or
+     #	grants independently of ICOT any specific warranty to the user in
+     #	writing, such person, organization or entity, will also be exempted
+     #	from and not be held liable to the user for any such damages as noted
+     #	above as far as the program is concerned.
+     #
+     #	---------------COPYING.ipadic-----END------------------------------------
+
+3. Lao Word Break Dictionary Data (laodict.txt)
+     #	Copyright (c) 2013 International Business Machines Corporation
+     #	and others. All Rights Reserved.
+     #
+     #	Project:    http://code.google.com/p/lao-dictionary/
+     #	Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
+     #	License:    http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
+     #	            (copied below)
+     #
+     #	This file is derived from the above dictionary, with slight modifications.
+     #	--------------------------------------------------------------------------------
+     #	Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell.
+     #	All rights reserved.
+     #
+     #	Redistribution and use in source and binary forms, with or without modification,
+     #	are permitted provided that the following conditions are met:
+     #
+     #		Redistributions of source code must retain the above copyright notice, this
+     #		list of conditions and the following disclaimer. Redistributions in binary
+     #		form must reproduce the above copyright notice, this list of conditions and
+     #		the following disclaimer in the documentation and/or other materials
+     #		provided with the distribution.
+     #
+     #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+     #	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     #	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+     #	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+     #	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+     #	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     #	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+     #	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+     #	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+     #	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     #	--------------------------------------------------------------------------------
+
+  4. Burmese Word Break Dictionary Data (burmesedict.txt)
+     #	Copyright (c) 2014 International Business Machines Corporation
+     #	and others. All Rights Reserved.
+     #
+     #	This list is part of a project hosted at:
+     #	  github.com/kanyawtech/myanmar-karen-word-lists
+     #
+     #	--------------------------------------------------------------------------------
+     #	Copyright (c) 2013, LeRoy Benjamin Sharon
+     #	All rights reserved.
+     #
+     #	Redistribution and use in source and binary forms, with or without modification,
+     #	are permitted provided that the following conditions are met:
+     #
+     #	  Redistributions of source code must retain the above copyright notice, this
+     #	  list of conditions and the following disclaimer.
+     #
+     #	  Redistributions in binary form must reproduce the above copyright notice, this
+     #	  list of conditions and the following disclaimer in the documentation and/or
+     #	  other materials provided with the distribution.
+     #
+     #	  Neither the name Myanmar Karen Word Lists, nor the names of its
+     #	  contributors may be used to endorse or promote products derived from
+     #	  this software without specific prior written permission.
+     #
+     #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+     #	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+     #	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+     #	DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+     #	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+     #	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+     #	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+     #	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+     #	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+     #	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     #	--------------------------------------------------------------------------------
+
+    5. Time Zone Database
+    ICU uses the public domain data and code derived from Time Zone
+    Database for its time zone support. The ownership of the TZ
+    database is explained in BCP 175: Procedure for Maintaining the
+    Time Zone Database section 7.
+
+        7.  Database Ownership
+
+       The TZ database itself is not an IETF Contribution or an IETF
+       document.  Rather it is a pre-existing and regularly updated work
+       that is in the public domain, and is intended to remain in the public
+       domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do not apply
+       to the TZ Database or contributions that individuals make to it.
+       Should any claims be made and substantiated against the TZ Database,
+       the organization that is providing the IANA Considerations defined in
+       this RFC, under the memorandum of understanding with the IETF,
+       currently ICANN, may act in accordance with all competent court
+       orders.  No ownership claims will be made by ICANN or the IETF Trust
+       on the database or the code.  Any person making a contribution to the
+       database or code waives all rights to future claims in that
+       contribution or in the TZ Database.
+  """
--- a/68
+++ b/68
@@ -6,6 +6,7 @@ NINJA ?= ninja
 DESTDIR ?=
 SIGN ?=
 PREFIX ?= /usr/local
+FLAKY_TESTS ?= run

 NODE ?= ./node

@@ -78,10 +79,12 @@ clean:

 distclean:
 	-rm -rf out
-	-rm -f config.gypi
+	-rm -f config.gypi icu_config.gypi
 	-rm -f config.mk
 	-rm -rf node node_g blog.html email.md
 	-rm -rf node_modules
+	-rm -rf deps/icu
+	-rm -rf deps/icu4c*.tgz deps/icu4c*.zip deps/icu-tmp

 test: all
 	$(PYTHON) tools/test.py --mode=release simple message
@@ -125,6 +128,9 @@ test-all-http1: test-build
 test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind

+test-ci:
+	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --arch=$(DESTCPU) --flaky-tests=$(FLAKY_TESTS) simple message internet
+
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release

@@ -147,7 +153,20 @@ test-debugger: all
 	$(PYTHON) tools/test.py debugger

 test-npm: node
-	./node deps/npm/test/run.js
+	rm -rf npm-cache npm-tmp npm-prefix
+	mkdir npm-cache npm-tmp npm-prefix
+	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
+	     npm_config_prefix="$(shell pwd)/npm-prefix" \
+	     npm_config_tmp="$(shell pwd)/npm-tmp" \
+	     PATH="../../:${PATH}" node cli.js install
+	cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
+	     npm_config_prefix="$(shell pwd)/npm-prefix" \
+	     npm_config_tmp="$(shell pwd)/npm-tmp" \
+	     PATH="../../:${PATH}" node cli.js run-script test-legacy && \
+	     PATH="../../:${PATH}" node cli.js run-script test && \
+	     PATH="../../:${PATH}" node cli.js prune --prod && \
+	     cd ../.. && \
+	     rm -rf npm-cache npm-tmp npm-prefix

 test-npm-publish: node
 	npm_package_config_publishtest=true ./node deps/npm/test/run.js
@@ -176,6 +195,9 @@ website_files = \

 doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html node

+doc-branch: NODE_DOC_VERSION = v$(shell $(PYTHON) tools/getnodeversion.py | cut -f1,2 -d.)
+doc-branch: doc
+
 $(apidoc_dirs):
 	mkdir -p $@

@@ -189,10 +211,10 @@ out/doc/%: doc/%
 	cp -r $< $@

 out/doc/api/%.json: doc/api/%.markdown node
-	out/Release/node tools/doc/generate.js --format=json $< > $@
+	NODE_DOC_VERSION=$(NODE_DOC_VERSION) out/Release/node tools/doc/generate.js --format=json $< > $@

 out/doc/api/%.html: doc/api/%.markdown node
-	out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
+	NODE_DOC_VERSION=$(NODE_DOC_VERSION) out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@

 email.md: ChangeLog tools/email-footer.md
 	bash tools/changelog-head.sh | sed 's|^\* #|* \\#|g' > $@
@@ -211,14 +233,25 @@ website-upload: doc
    rm -f ~/web/nodejs.org/dist/node-latest.tar.gz &&\
    ln -s $(VERSION)/node-$(VERSION).tar.gz ~/web/nodejs.org/dist/node-latest.tar.gz'

+doc-branch-upload: NODE_DOC_VERSION = v$(shell $(PYTHON) tools/getnodeversion.py | cut -f1,2 -d.)
+doc-branch-upload: doc-branch
+	echo $(NODE_DOC_VERSION)
+	rsync -r out/doc/api/ node@nodejs.org:~/web/nodejs.org/$(NODE_DOC_VERSION)
+
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html

 docclean:
 	-rm -rf out/doc

+run-ci:
+	$(PYTHON) ./configure --without-snapshot $(CONFIG_FLAGS)
+	$(MAKE)
+	$(MAKE) test-ci
+
 RAWVER=$(shell $(PYTHON) tools/getnodeversion.py)
 VERSION=v$(RAWVER)
+NODE_DOC_VERSION=$(VERSION)
 RELEASE=$(shell $(PYTHON) tools/getnodeisrelease.py)
 PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]')
 ifeq ($(findstring x86_64,$(shell uname -m)),x86_64)
@@ -244,7 +277,7 @@ TARBALL=$(TARNAME).tar.gz
 BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 BINARYTAR=$(BINARYNAME).tar.gz
 PKG=out/$(TARNAME).pkg
-packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
+PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker

 PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz
 ifdef NIGHTLY
@@ -282,10 +315,12 @@ pkg: $(PKG)
 $(PKG): release-only
 	rm -rf $(PKGDIR)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --without-snapshot --dest-cpu=ia32 --tag=$(TAG)
+	$(PYTHON) ./configure --download=all --with-intl=small-icu \
+		--without-snapshot --dest-cpu=ia32 --tag=$(TAG)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
+	$(PYTHON) ./configure --download=all --with-intl=small-icu \
+		--without-snapshot --dest-cpu=x64 --tag=$(TAG)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
 	SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
 	lipo $(PKGDIR)/32/usr/local/bin/node \
@@ -294,7 +329,7 @@ $(PKG): release-only
 		-create
 	mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
 	rm -rf $(PKGDIR)/32
-	$(packagemaker) \
+	$(PACKAGEMAKER) \
 		--id "org.nodejs.Node" \
 		--doc tools/osx-pkg.pmdoc \
 		--out $(PKG)
@@ -317,7 +352,8 @@ tar: $(TARBALL)
 $(BINARYTAR): release-only
 	rm -rf $(BINARYNAME)
 	rm -rf out/deps out/Release
-	$(PYTHON) ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
+	$(PYTHON) ./configure --prefix=/ --download=all --with-intl=small-icu \
+		--without-snapshot --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
 	$(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1
 	cp README.md $(BINARYNAME)
 	cp LICENSE $(BINARYNAME)
@@ -330,8 +366,9 @@ binary: $(BINARYTAR)

 $(PKGSRC): release-only
 	rm -rf dist out
-	$(PYTHON) configure --prefix=/ --without-snapshot \
-		--dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS)
+	$(PYTHON) configure --prefix=/ --without-snapshot --download=all \
+		--with-intl=small-icu --dest-cpu=$(DESTCPU) --tag=$(TAG) \
+		$(CONFIG_FLAGS)
 	$(MAKE) install DESTDIR=dist
 	(cd dist; find * -type f | sort) > packlist
 	pkg_info -X pkg_install | \
@@ -398,8 +435,6 @@ jslint:
 	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js

 CPPLINT_EXCLUDE ?=
-CPPLINT_EXCLUDE += src/node_dtrace.cc
-CPPLINT_EXCLUDE += src/node_dtrace.cc
 CPPLINT_EXCLUDE += src/node_root_certs.h
 CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
@@ -413,4 +448,9 @@ cpplint:

 lint: jslint cpplint

-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all staticlib dynamiclib test test-all test-addons build-addons website-upload pkg blog blogclean tar binary release-only bench-http-simple bench-idle bench-all bench bench-misc bench-array bench-buffer bench-net bench-http bench-fs bench-tls
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
+	check uninstall install install-includes install-bin all staticlib \
+	dynamiclib test test-all test-addons build-addons website-upload pkg \
+	blog blogclean tar binary release-only bench-http-simple bench-idle \
+	bench-all bench bench-misc bench-array bench-buffer bench-net \
+	bench-http bench-fs bench-tls run-ci
--- a/README.md
+++ b/README.md
@@ -83,30 +83,103 @@ make doc
 man doc/node.1
 ```

-### To build `Intl` (ECMA-402) support:
+### `Intl` (ECMA-402) support:

-*Note:* more docs, including how to reduce disk footprint, are on
+[Intl](https://github.com/joyent/node/wiki/Intl) support is not
+enabled by default.
+
+#### "small" (English only) support
+
+This option will build with "small" (English only) support, but
+the full `Intl` (ECMA-402) APIs.  With `--download=all` it will
+download the ICU library as needed.
+
+Unix/Macintosh:
+
+```sh
+./configure --with-intl=small-icu --download=all
+```
+
+Windows:
+
+```sh
+vcbuild small-icu download-all
+```
+
+The `small-icu` mode builds
+with English-only data. You can add full data at runtime.
+
+*Note:* more docs are on
 [the wiki](https://github.com/joyent/node/wiki/Intl).

+#### Build with full ICU support (all locales supported by ICU):
+
+With the `--download=all`, this may download ICU if you don't
+have an ICU in `deps/icu`.
+
+Unix/Macintosh:
+
+```sh
+./configure --with-intl=full-icu --download=all
+```
+
+Windows:
+
+```sh
+vcbuild full-icu download-all
+```
+
+#### Build with no Intl support `:-(`
+
+The `Intl` object will not be available.
+This is the default at present, so this option is not normally needed.
+
+Unix/Macintosh:
+
+```sh
+./configure --with-intl=none
+```
+
+Windows:
+
+```sh
+vcbuild intl-none
+```
+
 #### Use existing installed ICU (Unix/Macintosh only):

 ```sh
 pkg-config --modversion icu-i18n && ./configure --with-intl=system-icu
 ```

-#### Build ICU from source:
+#### Build with a specific ICU:

-First: Unpack latest ICU
-  [icu4c-**##.#**-src.tgz](http://icu-project.org/download) (or `.zip`)
-  as `deps/icu` (You'll have: `deps/icu/source/...`)
+You can find other ICU releases at
+[the ICU homepage](http://icu-project.org/download).
+Download the file named something like `icu4c-**##.#**-src.tgz` (or
+`.zip`).

-Unix/Macintosh:
+Unix/Macintosh: from an already-unpacked ICU

 ```sh
-./configure --with-intl=full-icu
+./configure --with-intl=[small-icu,full-icu] --with-icu-source=/path/to/icu
 ```

-Windows:
+Unix/Macintosh: from a local ICU tarball
+
+```sh
+./configure --with-intl=[small-icu,full-icu] --with-icu-source=/path/to/icu.tgz
+```
+
+Unix/Macintosh: from a tarball URL
+
+```sh
+./configure --with-intl=full-icu --with-icu-source=http://url/to/icu.tgz
+```
+
+Windows: first unpack latest ICU to `deps/icu`
+  [icu4c-**##.#**-src.tgz](http://icu-project.org/download) (or `.zip`)
+  as `deps/icu` (You'll have: `deps/icu/source/...`)

 ```sh
 vcbuild full-icu
--- a/common.gypi
+++ b/common.gypi
@@ -135,8 +135,21 @@
      },
      'VCLinkerTool': {
        'conditions': [
+          ['target_arch=="ia32"', {
+            'TargetMachine' : 1, # /MACHINE:X86
+            'target_conditions': [
+              ['_type=="executable"', {
+                'AdditionalOptions': [ '/SubSystem:Console,"5.01"' ],
+              }],
+            ],
+          }],
          ['target_arch=="x64"', {
-            'TargetMachine' : 17 # /MACHINE:X64
+            'TargetMachine' : 17, # /MACHINE:AMD64
+            'target_conditions': [
+              ['_type=="executable"', {
+                'AdditionalOptions': [ '/SubSystem:Console,"5.02"' ],
+              }],
+            ],
          }],
        ],
        'GenerateDebugInformation': 'true',
@@ -144,11 +157,6 @@
        'DataExecutionPrevention': 2, # enable DEP
        'AllowIsolation': 'true',
        'SuppressStartupBanner': 'true',
-        'target_conditions': [
-          ['_type=="executable"', {
-            'SubSystem': 1, # console executable
-          }],
-        ],
      },
    },
    'msvs_disabled_warnings': [4351, 4355, 4800],
--- a/168
+++ b/168
@@ -6,6 +6,8 @@ import re
 import shlex
 import subprocess
 import sys
+import shutil
+import string

 CC = os.environ.get('CC', 'cc')

@@ -13,6 +15,10 @@ root_dir = os.path.dirname(__file__)
 sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))
 from gyp.common import GetFlavor

+# imports in tools/configure.d
+sys.path.insert(0, os.path.join(root_dir, 'tools', 'configure.d'))
+import nodedownload
+
 # parse our options
 parser = optparse.OptionParser()

@@ -236,26 +242,36 @@ parser.add_option('--with-etw',
    dest='with_etw',
    help='build with ETW (default is true on Windows)')

+parser.add_option('--download',
+    action='store',
+    dest='download_list',
+    help=nodedownload.help())
+
 parser.add_option('--with-icu-path',
    action='store',
    dest='with_icu_path',
    help='Path to icu.gyp (ICU i18n, Chromium version only.)')

+parser.add_option('--with-icu-locales',
+    action='store',
+    dest='with_icu_locales',
+    help='Comma-separated list of locales for "small-icu". Default: "root,en". "root" is assumed.')
+
 parser.add_option('--with-intl',
    action='store',
    dest='with_intl',
    help='Intl mode: none, full-icu, small-icu (default is none)')

+parser.add_option('--with-icu-source',
+    action='store',
+    dest='with_icu_source',
+    help='Intl mode: optional local path to icu/ dir, or path/URL of icu source archive.')
+
 parser.add_option('--with-perfctr',
    action='store_true',
    dest='with_perfctr',
    help='build with performance counters (default is true on Windows)')

-parser.add_option('--with-sslv2',
-    action='store_true',
-    dest='with_sslv2',
-    help='enable SSL v2')
-
 parser.add_option('--without-dtrace',
    action='store_true',
    dest='without_dtrace',
@@ -266,6 +282,11 @@ parser.add_option('--without-etw',
    dest='without_etw',
    help='build without ETW')

+parser.add_option('--without-mdb',
+    action='store_true',
+    dest='without_mdb',
+    help='build without mdb')
+
 parser.add_option('--without-npm',
    action='store_true',
    dest='without_npm',
@@ -287,6 +308,16 @@ parser.add_option('--without-ssl',
    dest='without_ssl',
    help='build without SSL')

+parser.add_option('--without-ssl2',
+    action='store_true',
+    dest='ssl2',
+    help='Disable SSL v2')
+
+parser.add_option('--without-ssl3',
+    action='store_true',
+    dest='ssl3',
+    help='Disable SSL v3')
+
 parser.add_option('--xcode',
    action='store_true',
    dest='use_xcode',
@@ -294,6 +325,8 @@ parser.add_option('--xcode',

 (options, args) = parser.parse_args()

+# set up auto-download list
+auto_downloads = nodedownload.parse(options.download_list)

 def b(value):
  """Returns the string 'true' if value is truthy, 'false' otherwise."""
@@ -526,7 +559,7 @@ def configure_node(o):
  # if we're on illumos based systems wrap the helper library into the
  # executable
  if flavor == 'solaris':
-    o['variables']['node_use_mdb'] = 'true'
+    o['variables']['node_use_mdb'] = b(not options.without_mdb)
  else:
    o['variables']['node_use_mdb'] = 'false'

@@ -645,11 +678,12 @@ def configure_openssl(o):
  if options.without_ssl:
    return

-  # OpenSSL uses `#ifndef OPENSSL_NO_SSL2` checks so only define the
-  # macro when we want to _disable_ SSL2.
-  if not options.with_sslv2:
+  if options.ssl2:
    o['defines'] += ['OPENSSL_NO_SSL2=1']

+  if options.ssl3:
+    o['defines'] += ['OPENSSL_NO_SSL3=1']
+
  if options.shared_openssl:
    (libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '')

@@ -712,6 +746,35 @@ def glob_to_var(dir_base, dir_sub):
  return list

 def configure_intl(o):
+  icus = [
+    {
+      'url': 'http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.zip',
+      # from https://ssl.icu-project.org/files/icu4c/54.1/icu4c-src-54_1.md5:
+      'md5': '6b89d60e2f0e140898ae4d7f72323bca',
+    },
+  ]
+  def icu_download(path):
+    # download ICU, if needed
+    for icu in icus:
+      url = icu['url']
+      md5 = icu['md5']
+      local = url.split('/')[-1]
+      targetfile = os.path.join(root_dir, 'deps', local)
+      if not os.path.isfile(targetfile):
+        if nodedownload.candownload(auto_downloads, "icu"):
+          nodedownload.retrievefile(url, targetfile)
+      else:
+        print ' Re-using existing %s' % targetfile
+      if os.path.isfile(targetfile):
+        sys.stdout.write(' Checking file integrity with MD5:\r')
+        gotmd5 = nodedownload.md5sum(targetfile)
+        print ' MD5:      %s  %s' % (gotmd5, targetfile)
+        if (md5 == gotmd5):
+          return targetfile
+        else:
+          print ' Expected: %s      *MISMATCH*' % md5
+          print '\n ** Corrupted ZIP? Delete %s to retry download.\n' % targetfile
+    return None
  icu_config = {
    'variables': {}
  }
@@ -723,11 +786,11 @@ def configure_intl(o):
  write(icu_config_name, do_not_edit +
        pprint.pformat(icu_config, indent=2) + '\n')

-  # small ICU is off by default.
  # always set icu_small, node.gyp depends on it being defined.
  o['variables']['icu_small'] = b(False)

  with_intl = options.with_intl
+  with_icu_source = options.with_icu_source
  have_icu_path = bool(options.with_icu_path)
  if have_icu_path and with_intl:
    print 'Error: Cannot specify both --with-icu-path and --with-intl'
@@ -739,6 +802,13 @@ def configure_intl(o):
    o['variables']['icu_gyp_path'] = options.with_icu_path
    return
  # --with-intl=<with_intl>
+  # set the default
+  if with_intl is None:
+    with_intl = 'none'  # The default mode of Intl
+  # sanity check localelist
+  if options.with_icu_locales and (with_intl != 'small-icu'):
+    print 'Error: --with-icu-locales only makes sense with --with-intl=small-icu'
+    sys.exit(1)
  if with_intl == 'none' or with_intl is None:
    o['variables']['v8_enable_i18n_support'] = 0
    return  # no Intl
@@ -746,6 +816,12 @@ def configure_intl(o):
    # small ICU (English only)
    o['variables']['v8_enable_i18n_support'] = 1
    o['variables']['icu_small'] = b(True)
+    with_icu_locales = options.with_icu_locales
+    if not with_icu_locales:
+      with_icu_locales = 'root,en'
+    locs = set(with_icu_locales.split(','))
+    locs.add('root')  # must have root
+    o['variables']['icu_locales'] = string.join(locs,',')
  elif with_intl == 'full-icu':
    # full ICU
    o['variables']['v8_enable_i18n_support'] = 1
@@ -769,20 +845,78 @@ def configure_intl(o):
  # Note: non-ICU implementations could use other 'with_intl'
  # values.

+  # this is just the 'deps' dir. Used for unpacking.
+  icu_parent_path = os.path.join(root_dir, 'deps')
+
+  # The full path to the ICU source directory.
+  icu_full_path = os.path.join(icu_parent_path, 'icu')
+
+  # icu-tmp is used to download and unpack the ICU tarball.
+  icu_tmp_path = os.path.join(icu_parent_path, 'icu-tmp')
+
+  # --with-icu-source processing
+  # first, check that they didn't pass --with-icu-source=deps/icu
+  if with_icu_source and os.path.abspath(icu_full_path) == os.path.abspath(with_icu_source):
+    print 'Ignoring redundant --with-icu-source=%s' % (with_icu_source)
+    with_icu_source = None
+  # if with_icu_source is still set, try to use it.
+  if with_icu_source:
+    if os.path.isdir(icu_full_path):
+      print 'Deleting old ICU source: %s' % (icu_full_path)
+      shutil.rmtree(icu_full_path)
+    # now, what path was given?
+    if os.path.isdir(with_icu_source):
+      # it's a path. Copy it.
+      print '%s -> %s' % (with_icu_source, icu_full_path)
+      shutil.copytree(with_icu_source, icu_full_path)
+    else:
+      # could be file or URL.
+      # Set up temporary area
+      if os.path.isdir(icu_tmp_path):
+        shutil.rmtree(icu_tmp_path)
+      os.mkdir(icu_tmp_path)
+      icu_tarball = None
+      if os.path.isfile(with_icu_source):
+        # it's a file. Try to unpack it.
+        icu_tarball = with_icu_source
+      else:
+        # Can we download it?
+        local = os.path.join(icu_tmp_path, with_icu_source.split('/')[-1])  # local part
+        icu_tarball = nodedownload.retrievefile(with_icu_source, local)
+      # continue with "icu_tarball"
+      nodedownload.unpack(icu_tarball, icu_tmp_path)
+      # Did it unpack correctly? Should contain 'icu'
+      tmp_icu = os.path.join(icu_tmp_path, 'icu')
+      if os.path.isdir(tmp_icu):
+        os.rename(tmp_icu, icu_full_path)
+        shutil.rmtree(icu_tmp_path)
+      else:
+        print ' Error: --with-icu-source=%s did not result in an "icu" dir.' % with_icu_source
+        shutil.rmtree(icu_tmp_path)
+        sys.exit(1)
+
  # ICU mode. (icu-generic.gyp)
  byteorder = sys.byteorder
  o['variables']['icu_gyp_path'] = 'tools/icu/icu-generic.gyp'
  # ICU source dir relative to root
-  icu_full_path = os.path.join(root_dir, 'deps/icu')
  o['variables']['icu_path'] = icu_full_path
  if not os.path.isdir(icu_full_path):
-    print 'Error: ICU path is not a directory: %s' % (icu_full_path)
+    print '* ECMA-402 (Intl) support didn\'t find ICU in %s..' % (icu_full_path)
+    # can we download (or find) a zipfile?
+    localzip = icu_download(icu_full_path)
+    if localzip:
+      nodedownload.unpack(localzip, icu_parent_path)
+  if not os.path.isdir(icu_full_path):
+    print ' Cannot build Intl without ICU in %s.' % (icu_full_path)
+    print ' (Fix, or disable with "--with-intl=none" )'
    sys.exit(1)
+  else:
+    print '* Using ICU in %s' % (icu_full_path)
  # Now, what version of ICU is it? We just need the "major", such as 54.
  # uvernum.h contains it as a #define.
  uvernum_h = os.path.join(icu_full_path, 'source/common/unicode/uvernum.h')
  if not os.path.isfile(uvernum_h):
-    print 'Error: could not load %s - is ICU installed?' % uvernum_h
+    print ' Error: could not load %s - is ICU installed?' % uvernum_h
    sys.exit(1)
  icu_ver_major = None
  matchVerExp = r'^\s*#define\s+U_ICU_VERSION_SHORT\s+"([^"]*)".*'
@@ -792,7 +926,7 @@ def configure_intl(o):
    if m:
      icu_ver_major = m.group(1)
  if not icu_ver_major:
-    print 'Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h
+    print ' Could not read U_ICU_VERSION_SHORT version from %s' % uvernum_h
    sys.exit(1)
  icu_endianness = sys.byteorder[0];  # TODO(srl295): EBCDIC should be 'e'
  o['variables']['icu_ver_major'] = icu_ver_major
@@ -819,8 +953,8 @@ def configure_intl(o):
  # this is the icudt*.dat file which node will be using (platform endianness)
  o['variables']['icu_data_file'] = icu_data_file
  if not os.path.isfile(icu_data_path):
-    print 'Error: ICU prebuilt data file %s does not exist.' % icu_data_path
-    print 'See the README.md.'
+    print ' Error: ICU prebuilt data file %s does not exist.' % icu_data_path
+    print ' See the README.md.'
    # .. and we're not about to build it from .gyp!
    sys.exit(1)
  # map from variable name to subdirs
@@ -912,4 +1046,4 @@ else:

 gyp_args += args

-subprocess.call(gyp_args)
+sys.exit(subprocess.call(gyp_args))
--- a/deps/debugger-agent/debugger-agent.gyp
+++ b/deps/debugger-agent/debugger-agent.gyp
@@ -17,6 +17,14 @@
        "include",
      ],
    },
+    'conditions': [
+      [ 'gcc_version<=44', {
+        # GCC versions <= 4.4 do not handle the aliasing in the queue
+        # implementation, so disable aliasing on these platforms
+        # to avoid subtle bugs
+        'cflags': [ '-fno-strict-aliasing' ],
+      }],
+    ],
    "sources": [
      "src/agent.cc",
    ],
--- a/deps/mdb_v8/mdb_v8.c
+++ b/deps/mdb_v8/mdb_v8.c
--- a/deps/mdb_v8/mdb_v8.gyp
+++ b/deps/mdb_v8/mdb_v8.gyp
@@ -4,7 +4,7 @@
      'target_name': 'mdb_v8',
      'product_prefix': '',
      'type': 'loadable_module',
-      'cflags': [ '-fPIC' ],
+      'cflags': [ '-fPIC', '-Wno-missing-field-initializers', '-Wno-sign-compare' ],
      'sources': [
        'mdb_v8.c',
        'mdb_v8_cfg.c',
--- a/deps/mdb_v8/v8dbg.h
+++ b/deps/mdb_v8/v8dbg.h
@@ -39,7 +39,10 @@
 * Determine whether a given pointer refers to a SMI, Failure, or HeapObject.
 */
 #define	V8_IS_SMI(ptr)		(((ptr) & V8_SmiTagMask) == V8_SmiTag)
-#define	V8_IS_FAILURE(ptr)	(((ptr) & V8_FailureTagMask) == V8_FailureTag)
+#define	V8_IS_FAILURE(ptr)	(V8_FailureTagMask != -1 && \
+ V8_FailureTagMask != -1 && \
+ ((ptr) & V8_FailureTagMask) == V8_FailureTag)
+
 #define	V8_IS_HEAPOBJECT(ptr)	\
 	(((ptr) & V8_HeapObjectTagMask) == V8_HeapObjectTag)

@@ -48,6 +51,8 @@
 * using the upper 31 bits.
 */
 #define	V8_SMI_VALUE(smi)	((smi) >> (V8_SmiValueShift + V8_SmiShiftSize))
+#define	V8_VALUE_SMI(value)	\
+	((value) << (V8_SmiValueShift + V8_SmiShiftSize))

 /*
 * Determine the encoding and representation of a V8 string.
@@ -77,4 +82,7 @@
 #define	V8_DESC_ISFIELD(x)		\
 	((V8_SMI_VALUE(x) & V8_PROP_TYPE_MASK) == V8_PROP_TYPE_FIELD)

+#define	V8_PROP_FIELDINDEX(value)	\
+	((V8_SMI_VALUE(value) & V8_FIELDINDEX_MASK) >> V8_FIELDINDEX_SHIFT)
+
 #endif /* _V8DBG_H */
--- a/deps/npm/.mailmap
+++ b/deps/npm/.mailmap
@@ -0,0 +1,53 @@
+Alex K. Wolfe <alexkwolfe@gmail.com>
+Andrew Bradley <cspotcode@gmail.com>
+Andrew Lunny <alunny@gmail.com>
+Arlo Breault <arlolra@gmail.com>
+Benjamin Coe <bencoe@gmail.com>
+Benjamin Coe <bencoe@gmail.com> <ben@npmjs.com>
+Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
+Cedric Nelson <cedric.nelson@gmail.com>
+Charlie Robbins <charlie.robbins@gmail.com>
+Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
+Danila Gerasimov <danila.gerasimov@gmail.com>
+David Beitey <david@davidjb.com>
+Domenic Denicola <domenic@domenicdenicola.com>
+Einar Otto Stangvik <einaros@gmail.com>
+Erik Wienhold <git@ewie.name>
+Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
+Evan Lucas <evan@btc.com> <evanlucas@me.com>
+Faiq Raza <faiqrazarizvi@gmail.com>
+Forbes Lindesay <forbes@lindesay.co.uk>
+Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
+Gabriel Barros <descartavel1@gmail.com>
+Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
+Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
+Isaac Z. Schlueter <i@izs.me> isaacs <i@izs.me>
+Jake Verbaten <raynos2@gmail.com>
+James Sanders <jimmyjazz14@gmail.com>
+Jason Smith <jhs@iriscouch.com>
+Jonas Weber <github@jonasw.de>
+Julien Meddah <julien.meddah@deveryware.com>
+Kris Windham <kriswindham@gmail.com>
+Lin Clark <lin.w.clark@gmail.com>
+Luke Arduini <luke.arduini@gmail.com> <luke.arduini@me.com>
+Maciej Małecki <me@mmalecki.com> <maciej.malecki@notimplemented.org>
+Max Goodman <c@chromakode.com>
+Maxim Bogushevich <boga1@mail.ru>
+Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
+Michael Hayes <michael@hayes.io> <mhayes@newrelic.com>
+Nicolas Morel <marsup@gmail.com>
+Olivier Melcher <olivier.melcher@gmail.com>
+Ra'Shaun Stovall <rashaunstovall@gmail.com>
+Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
+Rebecca Turner <me@re-becca.org> <rebecca@npmjs.com>
+Ryan Emery <seebees@gmail.com>
+Sam Mikes <smikes@cubane.com>
+Takaya Kobayashi <jigsaw@live.jp>
+Timo Weiß <timoweiss@Timo-MBP.local>
+Tony <zearin@gonk.net>
+Trent Mick <trentm@gmail.com> <trent.mick@joyent.com>
+Visnu Pitiyanuvath <visnupx@gmail.com>
+Will Elwood <w.elwood08@gmail.com>
+Wout Mertens <Wout.Mertens@gmail.com>
+Yeonghoon Park <sola92@gmail.com>
+Zeke Sikelianos <zeke@sikelianos.com>
--- a/deps/npm/.npmignore
+++ b/deps/npm/.npmignore
@@ -25,3 +25,5 @@ html/*.png
 /npm-*.tgz

 *.pyc
+
+/test/tap/builtin-config
--- a/deps/npm/.travis.yml
+++ b/deps/npm/.travis.yml
@@ -1,11 +1,15 @@
 language: node_js
 node_js:
-  - "0.11"
+  - iojs
+  - "0.12"
  - "0.10"
+  - "0.8"
 env:
  - DEPLOY_VERSION=testing
 before_install:
  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - "npm install -g npm/npm"
  - "sudo mkdir -p /var/run/couchdb"
-script: "npm run-script tap"
+script: "npm run-script test-all"
+notifications:
+    slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -4,8 +4,6 @@ Steve Steiner <ssteinerX@gmail.com>
 Mikeal Rogers <mikeal.rogers@gmail.com>
 Aaron Blohowiak <aaron.blohowiak@gmail.com>
 Martyn Smith <martyn@dollyfish.net.nz>
-Mathias Pettersson <mape@mape.me>
-Brian Hammond <brian@fictorial.com>
 Charlie Robbins <charlie.robbins@gmail.com>
 Francisco Treacy <francisco.treacy@gmail.com>
 Cliffano Subagio <cliffano@gmail.com>
@@ -16,7 +14,6 @@ James Sanders <jimmyjazz14@gmail.com>
 Reid Burke <me@reidburke.com>
 Arlo Breault <arlolra@gmail.com>
 Timo Derstappen <teemow@gmail.com>
-Bradley Meck <bradley.meck@gmail.com>
 Bart Teeuwisse <bart.teeuwisse@thecodemill.biz>
 Ben Noordhuis <info@bnoordhuis.nl>
 Tor Valamo <tor.valamo@gmail.com>
@@ -25,36 +22,42 @@ Olivier Melcher <olivier.melcher@gmail.com>
 Tomaž Muraus <kami@k5-storitve.net>
 Evan Meagher <evan.meagher@gmail.com>
 Orlando Vazquez <ovazquez@gmail.com>
+Kai Chen <kaichenxyz@gmail.com>
 George Miroshnykov <gmiroshnykov@lohika.com>
 Geoff Flarity <geoff.flarity@gmail.com>
+Max Goodman <c@chromakode.com>
 Pete Kruckenberg <pete@kruckenberg.com>
 Laurie Harper <laurie@holoweb.net>
 Chris Wong <chris@chriswongstudio.com>
-Max Goodman <c@chromacode.com>
 Scott Bronson <brons_github@rinspin.com>
 Federico Romero <federomero@gmail.com>
 Visnu Pitiyanuvath <visnupx@gmail.com>
 Irakli Gozalishvili <rfobic@gmail.com>
 Mark Cahill <mark@tiemonster.info>
-Zearin <zearin@gonk.net>
+Tony <zearin@gonk.net>
 Iain Sproat <iainsproat@gmail.com>
 Trent Mick <trentm@gmail.com>
 Felix Geisendörfer <felix@debuggable.com>
-Conny Brunnkvist <cbrunnkvist@gmail.com>
+Jameson Little <t.jameson.little@gmail.com>
+Conny Brunnkvist <conny@fuchsia.se>
 Will Elwood <w.elwood08@gmail.com>
+Dean Landolt <dean@deanlandolt.com>
 Oleg Efimov <efimovov@gmail.com>
 Martin Cooper <mfncooper@gmail.com>
-Jameson Little <t.jameson.little@gmail.com>
-cspotcode <cspotcode@gmail.com>
-Maciej Małecki <maciej.malecki@notimplemented.org>
+Jann Horn <jannhorn@googlemail.com>
+Andrew Bradley <cspotcode@gmail.com>
+Maciej Małecki <me@mmalecki.com>
 Stephen Sugden <glurgle@gmail.com>
+Michael Budde <mbudde@gmail.com>
+Jason Smith <jhs@iriscouch.com>
 Gautham Pai <buzypi@gmail.com>
 David Trejo <david.daniel.trejo@gmail.com>
 Paul Vorbach <paul@vorb.de>
 George Ornbo <george@shapeshed.com>
 Tim Oxley <secoif@gmail.com>
 Tyler Green <tyler.green2@gmail.com>
-atomizer <danila.gerasimov@gmail.com>
+Dave Pacheco <dap@joyent.com>
+Danila Gerasimov <danila.gerasimov@gmail.com>
 Rod Vagg <rod@vagg.org>
 Christian Howe <coderarity@gmail.com>
 Andrew Lunny <alunny@gmail.com>
@@ -63,7 +66,7 @@ Adam Blackburn <regality@gmail.com>
 Kris Windham <kriswindham@gmail.com>
 Jens Grunert <jens.grunert@gmail.com>
 Joost-Wim Boekesteijn <joost-wim@boekesteijn.nl>
-Dalmais Maxence <github@maxired.fr>
+Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
 Marcus Ekwall <marcus.ekwall@gmail.com>
 Aaron Stacy <aaron.r.stacy@gmail.com>
 Phillip Howell <phowell@cothm.org>
@@ -71,88 +74,217 @@ Domenic Denicola <domenic@domenicdenicola.com>
 James Halliday <mail@substack.net>
 Jeremy Cantrell <jmcantrell@gmail.com>
 Ribettes <patlogan29@gmail.com>
-Einar Otto Stangvik <einaros@gmail.com>
 Don Park <donpark@docuverse.com>
+Einar Otto Stangvik <einaros@gmail.com>
 Kei Son <heyacct@gmail.com>
 Nicolas Morel <marsup@gmail.com>
 Mark Dube <markisdee@gmail.com>
 Nathan Rajlich <nathan@tootallnate.net>
 Maxim Bogushevich <boga1@mail.ru>
-Justin Beckwith <justbe@microsoft.com>
 Meaglin <Meaglin.wasabi@gmail.com>
 Ben Evans <ben@bensbit.co.uk>
 Nathan Zadoks <nathan@nathan7.eu>
-Brian White <mscdex@gmail.com>
+Brian White <mscdex@mscdex.net>
 Jed Schmidt <tr@nslator.jp>
 Ian Livingstone <ianl@cs.dal.ca>
 Patrick Pfeiffer <patrick@buzzle.at>
 Paul Miller <paul@paulmillr.com>
-seebees <seebees@gmail.com>
+Ryan Emery <seebees@gmail.com>
 Carl Lange <carl@flax.ie>
 Jan Lehnardt <jan@apache.org>
-Alexey Kreschuk <akrsch@gmail.com>
-Di Wu <dwu@palantir.com>
-Florian Margaine <florian@margaine.com>
-Forbes Lindesay <forbes@lindesay.co.uk>
-Ian Babrou <ibobrik@gmail.com>
-Jaakko Manninen <jaakko@rocketpack.fi>
-Johan Nordberg <its@johan-nordberg.com>
-Johan Sköld <johan@skold.cc>
-Larz Conwell <larz@larz-laptop.(none)>
-Luke Arduini <luke.arduini@gmail.com>
-Marcel Klehr <mklehr@gmx.net>
-Mathias Bynens <mathias@qiwi.be>
-Matt Lunn <matt@mattlunn.me.uk>
-Matt McClure <matt.mcclure@mapmyfitness.com>
-Nirk Niggler <nirk.niggler@gmail.com>
-Paolo Fragomeni <paolo@async.ly>
-Jake Verbaten (Raynos) <raynos2@gmail.com>
-Robert Kowalski <rok@kowalski.gd>
-Schabse Laks <Dev@SLaks.net>
-Stuart Knightley <stuart@stuartk.com>
 Stuart P. Bentley <stuart@testtrack4.com>
+Johan Sköld <johan@skold.cc>
+Stuart Knightley <stuart@stuartk.com>
+Niggler <nirk.niggler@gmail.com>
+Paolo Fragomeni <paolo@async.ly>
+Jaakko Manninen <jaakko@rocketpack.fi>
+Luke Arduini <luke.arduini@gmail.com>
+Larz Conwell <larz@larz-laptop.(none)>
+Marcel Klehr <mklehr@gmx.net>
+Robert Kowalski <rok@kowalski.gd>
+Forbes Lindesay <forbes@lindesay.co.uk>
 Vaz Allen <vaz@tryptid.com>
-elisee <elisee@sparklin.org>
-Evan You <yyx990803@gmail.com>
-Wil Moore III <wil.moore@wilmoore.com>
-Dylan Greene <dylang@gmail.com>
-zeke <zeke@sikelianos.com>
-Andrew Horton <andrew.j.horton@gmail.com>
-Denis Gladkikh <outcoldman@gmail.com>
-Daniel Santiago <daniel.santiago@highlevelwebs.com>
-Alex Kocharin <alex@kocharin.ru>
-Evan Lucas <evanlucas@me.com>
-Steve Mason <stevem@brandwatch.com>
-Quinn Slack <qslack@qslack.com>
-Sébastien Santoro <dereckson@espace-win.org>
-CamilleM <camille.moulin@alterway.fr>
-Tom Huang <hzlhu.dargon@gmail.com>
-Sergey Belov <peimei@ya.ru>
-Younghoon Park <sola92@gmail.com>
-Yazhong Liu <yorkiefixer@gmail.com>
-Mikola Lysenko <mikolalysenko@gmail.com>
-Rafael de Oleza <rafa@spotify.com>
-Yeonghoon Park <sola92@gmail.com>
-Franck Cuny <franck.cuny@gmail.com>
-Alan Shaw <alan@freestyle-developments.co.uk>
-Alex Rodionov <p0deje@gmail.com>
-Alexej Yaroshevich <alex@qfox.ru>
-Elan Shanker <elan.shanker@gmail.com>
-François Frisch <francoisfrisch@gmail.com>
-Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
-Jason Diamond <jason@diamond.name>
-Jess Martin <jessmartin@gmail.com>
-Jon Spencer <jon@jonspencer.ca>
-Matt Colyer <matt@colyer.name>
+Jake Verbaten <raynos2@gmail.com>
+Schabse Laks <Dev@SLaks.net>
+Florian Margaine <florian@margaine.com>
+Johan Nordberg <its@johan-nordberg.com>
+Ian Babrou <ibobrik@gmail.com>
+Di Wu <dwu@palantir.com>
+Mathias Bynens <mathias@qiwi.be>
 Matt McClure <matt.mcclure@mapmyfitness.com>
-Maximilian Antoni <maximilian.antoni@juliusbaer.com>
+Matt Lunn <matt@mattlunn.me.uk>
+Alexey Kreschuk <akrsch@gmail.com>
+elisee <elisee@sparklin.org>
+Robert Gieseke <robert.gieseke@gmail.com>
+François Frisch <francoisfrisch@gmail.com>
+Trevor Burnham <tburnham@hubspot.com>
+Alan Shaw <alan@freestyle-developments.co.uk>
+TJ Holowaychuk <tj@vision-media.ca>
 Nicholas Kinsey <pyro@feisty.io>
 Paulo Cesar <pauloc062@gmail.com>
-Quim Calpe <quim@kalpe.com>
-Robert Gieseke <robert.gieseke@gmail.com>
-Spain Train <michael.spainhower@opower.com>
-TJ Holowaychuk <tj@vision-media.ca>
+Elan Shanker <elan.shanker@gmail.com>
+Jon Spencer <jon@jonspencer.ca>
+Jason Diamond <jason@diamond.name>
+Maximilian Antoni <mail@maxantoni.de>
 Thom Blake <tblake@brightroll.com>
-Trevor Burnham <tburnham@hubspot.com>
+Jess Martin <jessmartin@gmail.com>
+Spain Train <michael.spainhower@opower.com>
+Alex Rodionov <p0deje@gmail.com>
+Matt Colyer <matt@colyer.name>
+Evan You <yyx990803@gmail.com>
 bitspill <bitspill+github@bitspill.net>
+Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
+Alexej Yaroshevich <alex@qfox.ru>
+Quim Calpe <quim@kalpe.com>
+Steve Mason <stevem@brandwatch.com>
+Wil Moore III <wil.moore@wilmoore.com>
+Sergey Belov <peimei@ya.ru>
+Tom Huang <hzlhu.dargon@gmail.com>
+CamilleM <camille.moulin@alterway.fr>
+Sébastien Santoro <dereckson@espace-win.org>
+Evan Lucas <evan@btc.com>
+Quinn Slack <qslack@qslack.com>
+Alex Kocharin <alex@kocharin.ru>
+Daniel Santiago <daniel.santiago@highlevelwebs.com>
+Denis Gladkikh <outcoldman@gmail.com>
+Andrew Horton <andrew.j.horton@gmail.com>
+Zeke Sikelianos <zeke@sikelianos.com>
+Dylan Greene <dylang@gmail.com>
+Franck Cuny <franck.cuny@gmail.com>
+Yeonghoon Park <sola92@gmail.com>
+Rafael de Oleza <rafa@spotify.com>
+Mikola Lysenko <mikolalysenko@gmail.com>
+Yazhong Liu <yorkiefixer@gmail.com>
 Neil Gentleman <ngentleman@gmail.com>
+Kris Kowal <kris.kowal@cixar.com>
+Alex Gorbatchev <alex.gorbatchev@gmail.com>
+Shawn Wildermuth <shawn@wildermuth.com>
+Wesley de Souza <wesleywex@gmail.com>
+yoyoyogi <yogesh.k@gmail.com>
+J. Tangelder <j.tangelder@gmail.com>
+Jean Lauliac <jean@lauliac.com>
+Andrey Kislyuk <kislyuk@gmail.com>
+Thorsten Lorenz <thlorenz@gmx.de>
+Julian Gruber <julian@juliangruber.com>
+Benjamin Coe <bencoe@gmail.com>
+Alex Ford <Alex.Ford@CodeTunnel.com>
+Matt Hickford <matt.hickford@gmail.com>
+Sean McGivern <sean.mcgivern@rightscale.com>
+C J Silverio <ceejceej@gmail.com>
+Robin Tweedie <robin@songkick.com>
+Miroslav Bajtoš <miroslav@strongloop.com>
+David Glasser <glasser@davidglasser.net>
+Gianluca Casati <casati_gianluca@yahoo.it>
+Forrest L Norvell <ogd@aoaioxxysz.net>
+Karsten Tinnefeld <k.tinnefeld@googlemail.com>
+Bryan Burgers <bryan@burgers.io>
+David Beitey <david@davidjb.com>
+Evan You <yyou@google.com>
+Zach Pomerantz <zmp@umich.edu>
+Chris Williams <cwilliams88@gmail.com>
+sudodoki <smd.deluzion@gmail.com>
+Mick Thompson <dthompson@gmail.com>
+Felix Rabe <felix@rabe.io>
+Michael Hayes <michael@hayes.io>
+Chris Dickinson <christopher.s.dickinson@gmail.com>
+Bradley Meck <bradley.meck@gmail.com>
+GeJ <geraud@gcu.info>
+Andrew Terris <atterris@gmail.com>
+Michael Nisi <michael.nisi@gmail.com>
+fengmk2 <fengmk2@gmail.com>
+Adam Meadows <adam.meadows@gmail.com>
+Chulki Lee <chulki.lee@gmail.com>
+不四 <busi.hyy@taobao.com>
+dead_horse <dead_horse@qq.com>
+Kenan Yildirim <kenan@kenany.me>
+Laurie Voss <git@seldo.com>
+Rebecca Turner <me@re-becca.org>
+Hunter Loftis <hunter@hunterloftis.com>
+Peter Richardson <github@zoomy.net>
+Jussi Kalliokoski <jussi.kalliokoski@gmail.com>
+Filip Weiss <me@fiws.net>
+Timo Weiß <timoweiss@Timo-MBP.local>
+Christopher Hiller <chiller@badwing.com>
+Jérémy Lal <kapouer@melix.org>
+Anders Janmyr <anders@janmyr.com>
+Chris Meyers <chris.meyers.fsu@gmail.com>
+Ludwig Magnusson <ludwig@mediatool.com>
+Wout Mertens <Wout.Mertens@gmail.com>
+Nick Santos <nick@medium.com>
+Terin Stock <terinjokes@gmail.com>
+Faiq Raza <faiqrazarizvi@gmail.com>
+Thomas Torp <thomas@erupt.no>
+Sam Mikes <smikes@cubane.com>
+Mat Tyndall <mat.tyndall@gmail.com>
+Tauren Mills <tauren@sportzing.com>
+Ron Martinez <ramartin.net@gmail.com>
+Kazuhito Hokamura <k.hokamura@gmail.com>
+Tristan Davies <github@tristan.io>
+David Volm <david@volminator.com>
+Lin Clark <lin.w.clark@gmail.com>
+Ben Page <bpage@dewalch.com>
+Jeff Jo <jeffjo@squareup.com>
+martinvd <martinvdpub@gmail.com>
+Mark J. Titorenko <nospam-github.com@titorenko.net>
+Oddur Sigurdsson <oddurs@gmail.com>
+Eric Mill <eric@konklone.com>
+Gabriel Barros <descartavel1@gmail.com>
+KevinSheedy <kevinsheedy@gmail.com>
+Aleksey Smolenchuk <aleksey@uber.com>
+Ed Morley <emorley@mozilla.com>
+Blaine Bublitz <blaine@iceddev.com>
+Andrey Fedorov <anfedorov@gmail.com>
+Daijiro Wachi <daijiro.wachi@gmail.com>
+Luc Thevenard <lucthevenard@gmail.com>
+Aria Stewart <aredridel@nbtsc.org>
+Charlie Rudolph <charles.w.rudolph@gmail.com>
+Vladimir Rutsky <rutsky@users.noreply.github.com>
+Isaac Murchie <isaac@saucelabs.com>
+Marcin Wosinek <marcin.wosinek@gmail.com>
+David Marr <davemarr@gmail.com>
+Bryan English <bryan@bryanenglish.com>
+Anthony Zotti <amZotti@users.noreply.github.com>
+Karl Horky <karl.horky@gmail.com>
+Jordan Harband <ljharb@gmail.com>
+Guðlaugur Stefán Egilsson <gulli@kolibri.is>
+Helge Skogly Holm <helge.holm@gmail.com>
+Peter A. Shevtsov <petr.shevtsov@gmail.com>
+Alain Kalker <a.c.kalker@gmail.com>
+Bryant Williams <b.n.williams@gmail.com>
+Jonas Weber <github@jonasw.de>
+Tim Whidden <twhid@twhid.com>
+Andreas <functino@users.noreply.github.com>
+Karolis Narkevicius <karolis.n@gmail.com>
+Adrian Lynch <adi_ady_ade@hotmail.com>
+Richard Littauer <richard.littauer@gmail.com>
+Oli Evans <oli@zilla.org.uk>
+Matt Brennan <mattyb1000@gmail.com>
+Jeff Barczewski <jeff.barczewski@gmail.com>
+Danny Fritz <dannyfritz@gmail.com>
+Takaya Kobayashi <jigsaw@live.jp>
+Ra'Shaun Stovall <rashaunstovall@gmail.com>
+Julien Meddah <julien.meddah@deveryware.com>
+Michiel Sikma <michiel@wedemandhtml.com>
+Jakob Krigovsky <jakob.krigovsky@gmail.com>
+Charmander <~@charmander.me>
+Erik Wienhold <git@ewie.name>
+James Butler <james.butler@sandfox.co.uk>
+Kevin Kragenbrink <kevin@gaikai.com>
+Arnaud Rinquin <rinquin.arnaud@gmail.com>
+Mike MacCana <mike.maccana@gmail.com>
+Antti Mattila <anttti@fastmail.fm>
+laiso <laiso@lai.so>
+Matt Zorn <zornme@gmail.com>
+Kyle Mitchell <kyle@kemitchell.com>
+Jeremiah Senkpiel <fishrock123@rocketmail.com>
+Michael Klein <mischkl@users.noreply.github.com>
+Simen Bekkhus <sbekkhus91@gmail.com>
+Victor <victor.shih@gmail.com>
+thefourtheye <thechargingvolcano@gmail.com>
+Clay Carpenter <claycarpenter@gmail.com>
+bangbang93 <bangbang93@163.com>
+Nick Malaguti <nmalaguti@palantir.com>
+Cedric Nelson <cedric.nelson@gmail.com>
+Kat Marchán <kzm@sykosomatic.org>
+Andrew <talktome@aboutandrew.co.uk>
+Eduardo Pinho <enet4mikeenet@gmail.com>
--- a/deps/npm/CHANGELOG.md
+++ b/deps/npm/CHANGELOG.md
--- a/deps/npm/CONTRIBUTING.md
+++ b/deps/npm/CONTRIBUTING.md
@@ -7,3 +7,6 @@
  issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
 * Ensure your new issue conforms to the [Contributing
  Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).
+
+Participation in this open source project is subject to the [npm Code
+of Conduct](http://www.npmjs.com/policies/conduct).
--- a/deps/npm/Makefile
+++ b/deps/npm/Makefile
@@ -31,6 +31,28 @@ misc_mandocs = $(shell find doc/misc -name '*.md' \
               |sed 's|doc/misc/|man/man7/|g' ) \
               man/man7/npm-index.7

+
+cli_partdocs = $(shell find doc/cli -name '*.md' \
+                |sed 's|.md|.html|g' \
+                |sed 's|doc/cli/|html/partial/doc/cli/|g' ) \
+                html/partial/doc/README.html
+
+api_partdocs = $(shell find doc/api -name '*.md' \
+                |sed 's|.md|.html|g' \
+                |sed 's|doc/api/|html/partial/doc/api/|g' )
+
+files_partdocs = $(shell find doc/files -name '*.md' \
+                  |sed 's|.md|.html|g' \
+                  |sed 's|doc/files/|html/partial/doc/files/|g' ) \
+                  html/partial/doc/files/npm-json.html \
+                  html/partial/doc/files/npm-global.html
+
+misc_partdocs = $(shell find doc/misc -name '*.md' \
+                 |sed 's|.md|.html|g' \
+                 |sed 's|doc/misc/|html/partial/doc/misc/|g' ) \
+                 html/partial/doc/index.html
+
+
 cli_htmldocs = $(shell find doc/cli -name '*.md' \
                |sed 's|.md|.html|g' \
                |sed 's|doc/cli/|html/doc/cli/|g' ) \
@@ -53,6 +75,8 @@ misc_htmldocs = $(shell find doc/misc -name '*.md' \

 mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs)

+partdocs = $(api_partdocs) $(cli_partdocs) $(files_partdocs) $(misc_partdocs)
+
 htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)

 all: doc
@@ -61,10 +85,10 @@ latest:
 	@echo "Installing latest published npm"
 	@echo "Use 'make install' or 'make link' to install the code"
 	@echo "in this folder that you're looking at right now."
-	node cli.js install -g -f npm
+	node cli.js install -g -f npm ${NPMOPTS}

-install: docclean all
-	node cli.js install -g -f
+install: all
+	node cli.js install -g -f ${NPMOPTS}

 # backwards compat
 dev: install
@@ -79,7 +103,7 @@ clean: markedclean marked-manclean doc-clean uninstall
 uninstall:
 	node cli.js rm npm -g -f

-doc: $(mandocs) $(htmldocs)
+doc: $(mandocs) $(htmldocs) $(partdocs)

 markedclean:
 	rm -rf node_modules/marked node_modules/.bin/marked .building_marked
@@ -119,43 +143,73 @@ man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json
 	@[ -d man/man5 ] || mkdir -p man/man5
 	scripts/doc-build.sh $< $@

-doc/misc/npm-index.md: scripts/index-build.js package.json
-	node scripts/index-build.js > $@
-
-html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
-	@[ -d html/doc ] || mkdir -p html/doc
-	scripts/doc-build.sh $< $@
-
 man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
 	@[ -d man/man7 ] || mkdir -p man/man7
 	scripts/doc-build.sh $< $@

-html/doc/README.html: README.md $(html_docdeps)
+
+doc/misc/npm-index.md: scripts/index-build.js package.json
+	node scripts/index-build.js > $@
+
+
+# html/doc depends on html/partial/doc
+html/doc/%.html: html/partial/doc/%.html
 	@[ -d html/doc ] || mkdir -p html/doc
 	scripts/doc-build.sh $< $@

-html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
+html/doc/README.html: html/partial/doc/README.html
+	@[ -d html/doc ] || mkdir -p html/doc
+	scripts/doc-build.sh $< $@
+
+html/doc/cli/%.html: html/partial/doc/cli/%.html
 	@[ -d html/doc/cli ] || mkdir -p html/doc/cli
 	scripts/doc-build.sh $< $@

-html/doc/api/%.html: doc/api/%.md $(html_docdeps)
-	@[ -d html/doc/api ] || mkdir -p html/doc/api
+html/doc/misc/%.html: html/partial/doc/misc/%.html
+	@[ -d html/doc/misc ] || mkdir -p html/doc/misc
 	scripts/doc-build.sh $< $@

-html/doc/files/npm-json.html: html/doc/files/package.json.html
-	cp $< $@
-html/doc/files/npm-global.html: html/doc/files/npm-folders.html
-	cp $< $@
-
-html/doc/files/%.html: doc/files/%.md $(html_docdeps)
+html/doc/files/%.html: html/partial/doc/files/%.html
 	@[ -d html/doc/files ] || mkdir -p html/doc/files
 	scripts/doc-build.sh $< $@

-html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
-	@[ -d html/doc/misc ] || mkdir -p html/doc/misc
+html/doc/api/%.html: html/partial/doc/api/%.html
+	@[ -d html/doc/api ] || mkdir -p html/doc/api
 	scripts/doc-build.sh $< $@


+html/partial/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
+	@[ -d html/partial/doc ] || mkdir -p html/partial/doc
+	scripts/doc-build.sh $< $@
+
+html/partial/doc/README.html: README.md $(html_docdeps)
+	@[ -d html/partial/doc ] || mkdir -p html/partial/doc
+	scripts/doc-build.sh $< $@
+
+html/partial/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
+	@[ -d html/partial/doc/cli ] || mkdir -p html/partial/doc/cli
+	scripts/doc-build.sh $< $@
+
+html/partial/doc/api/%.html: doc/api/%.md $(html_docdeps)
+	@[ -d html/partial/doc/api ] || mkdir -p html/partial/doc/api
+	scripts/doc-build.sh $< $@
+
+html/partial/doc/files/npm-json.html: html/partial/doc/files/package.json.html
+	cp $< $@
+html/partial/doc/files/npm-global.html: html/partial/doc/files/npm-folders.html
+	cp $< $@
+
+html/partial/doc/files/%.html: doc/files/%.md $(html_docdeps)
+	@[ -d html/partial/doc/files ] || mkdir -p html/partial/doc/files
+	scripts/doc-build.sh $< $@
+
+html/partial/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
+	@[ -d html/partial/doc/misc ] || mkdir -p html/partial/doc/misc
+	scripts/doc-build.sh $< $@
+
+
+
+
 marked: node_modules/.bin/marked

 node_modules/.bin/marked:
--- a/deps/npm/README.md
+++ b/deps/npm/README.md
@@ -1,4 +1,4 @@
-npm(1) -- node package manager
+npm(1) -- a JavaScript package manager
 ==============================
 [![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm)
 ## SYNOPSIS
@@ -36,21 +36,27 @@ paths, etc.) then read on.
 ## Fancy Install (Unix)

 There's a pretty robust install script at
-<https://www.npmjs.org/install.sh>.  You can download that and run it.
+<https://www.npmjs.com/install.sh>.  You can download that and run it.

 Here's an example using curl:

-    curl -L https://npmjs.org/install.sh | sh
+```sh
+curl -L https://www.npmjs.com/install.sh | sh
+```

 ### Slightly Fancier

 You can set any npm configuration params with that script:

-    npm_config_prefix=/some/path sh install.sh
+```sh
+npm_config_prefix=/some/path sh install.sh
+```

 Or, you can run it in uber-debuggery mode:

-    npm_debug=1 sh install.sh
+```sh
+npm_debug=1 sh install.sh
+```

 ### Even Fancier

@@ -62,10 +68,15 @@ arbitrary config keys using the `./configure --key=val ...`, and then
 run npm commands by doing `node cli.js <cmd> <args>`.  (This is helpful
 for testing, or running stuff without actually installing npm itself.)

-## Fancy Windows Install
+## Windows Install or Upgrade

-You can download a zip file from <https://npmjs.org/dist/>, and unpack it
-in the same folder where node.exe lives.
+You can download a zip file from <https://github.com/npm/npm/releases>, and
+unpack it in the `node_modules\npm\` folder inside node's installation folder.
+
+To upgrade to npm 2, follow the Windows upgrade instructions in
+the npm Troubleshooting Guide:
+
+<https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows>

 If that's not fancy enough for you, then you can fetch the code with
 git, and mess with it directly.
@@ -74,40 +85,18 @@ git, and mess with it directly.

 No.

-## Permissions when Using npm to Install Other Stuff
-
-**tl;dr**
-
-* Use `sudo` for greater safety.  Or don't, if you prefer not to.
-* npm will downgrade permissions if it's root before running any build
-  scripts that package authors specified.
-
-### More details...
-
-As of version 0.3, it is recommended to run npm as root.
-This allows npm to change the user identifier to the `nobody` user prior
-to running any package build or test commands.
-
-If you are not the root user, or if you are on a platform that does not
-support uid switching, then npm will not attempt to change the userid.
-
-If you would like to ensure that npm **always** runs scripts as the
-"nobody" user, and have it fail if it cannot downgrade permissions, then
-set the following configuration param:
-
-    npm config set unsafe-perm false
-
-This will prevent running in unsafe mode, even as non-root users.
-
 ## Uninstalling

 So sad to see you go.

-    sudo npm uninstall npm -g
-
+```sh
+sudo npm uninstall npm -g
+```
 Or, if that fails,

-    sudo make uninstall
+```sh
+sudo make uninstall
+```

 ## More Severe Uninstalling

@@ -121,13 +110,17 @@ remove them.
 To remove cruft left behind by npm 0.x, you can use the included
 `clean-old.sh` script file.  You can run it conveniently like this:

-    npm explore npm -g -- sh scripts/clean-old.sh
+```sh
+npm explore npm -g -- sh scripts/clean-old.sh
+```

 npm uses two configuration files, one for per-user configs, and another
 for global (every-user) configs.  You can view them by doing:

-    npm config get userconfig   # defaults to ~/.npmrc
-    npm config get globalconfig # defaults to /usr/local/etc/npmrc
+```sh
+npm config get userconfig   # defaults to ~/.npmrc
+npm config get globalconfig # defaults to /usr/local/etc/npmrc
+```

 Uninstalling npm does not remove configuration files by default.  You
 must remove them yourself manually if you want them gone.  Note that
@@ -136,26 +129,35 @@ you have chosen.

 ## Using npm Programmatically

-If you would like to use npm programmatically, you can do that.
-It's not very well documented, but it *is* rather simple.
+Although npm can be used programmatically, its API is meant for use by the CLI
+*only*, and no guarantees are made regarding its fitness for any other purpose.
+If you want to use npm to reliably perform some task, the safest thing to do is
+to invoke the desired `npm` command with appropriate arguments.

-Most of the time, unless you actually want to do all the things that
-npm does, you should try using one of npm's dependencies rather than
-using npm itself, if possible.
+The semantic version of npm refers to the CLI itself, rather than the
+underlying API. _The internal API is not guaranteed to remain stable even when
+npm's version indicates no breaking changes have been made according to
+semver._

-Eventually, npm will be just a thin cli wrapper around the modules
-that it depends on, but for now, there are some things that you must
-use npm itself to do.
+If you _still_ would like to use npm programmatically, it's _possible_. The API
+isn't very well documented, but it _is_ rather simple.

-    var npm = require("npm")
-    npm.load(myConfigObject, function (er) {
-      if (er) return handlError(er)
-      npm.commands.install(["some", "args"], function (er, data) {
-        if (er) return commandFailed(er)
-        // command succeeded, and data might have some info
-      })
-      npm.on("log", function (message) { .... })
-    })
+Eventually, npm will be just a thin CLI wrapper around the modules that it
+depends on, but for now, there are some things that only the CLI can do. You
+should try using one of npm's dependencies first, and only use the API if what
+you're trying to do is only supported by npm itself.
+
+```javascript
+var npm = require("npm")
+npm.load(myConfigObject, function (er) {
+  if (er) return handlError(er)
+  npm.commands.install(["some", "args"], function (er, data) {
+    if (er) return commandFailed(er)
+    // command succeeded, and data might have some info
+  })
+  npm.registry.log.on("log", function (message) { .... })
+})
+```

 The `load` function takes an object hash of the command-line configs.
 The various `npm.commands.<cmd>` functions take an **array** of
@@ -173,13 +175,13 @@ help config` to learn about all the options you can set there.

 ## More Docs

-Check out the [docs](https://www.npmjs.org/doc/),
-especially the [faq](https://www.npmjs.org/doc/faq.html).
+Check out the [docs](https://docs.npmjs.com/),
+especially the [faq](https://docs.npmjs.com/misc/faq).

 You can use the `npm help` command to read any of them.

 If you're a developer, and you want to use npm to publish your program,
-you should [read this](https://www.npmjs.org/doc/developers.html)
+you should [read this](https://docs.npmjs.com/misc/developers)

 ## Legal Stuff

@@ -193,13 +195,13 @@ npm, Inc. or the Node.js project.

 Data published to the npm registry is not part of npm itself, and is
 the sole property of the publisher.  While every effort is made to
-ensure accountability, there is absolutely no guarantee, warrantee, or
+ensure accountability, there is absolutely no guarantee, warranty, or
 assertion expressed or implied as to the quality, fitness for a
 specific purpose, or lack of malice in any given npm package.

 If you have a complaint about a package in the public npm registry,
 and cannot [resolve it with the package
-owner](https://www.npmjs.org/doc/misc/npm-disputes.html), please email
+owner](https://docs.npmjs.com/misc/disputes), please email
 <support@npmjs.com> and explain the situation.

 Any data published to The npm Registry (including user account
@@ -228,8 +230,6 @@ When you find issues, please report them:

 * web:
  <https://github.com/npm/npm/issues>
-* email:
-  <npm-@googlegroups.com>

 Be sure to include *all* of the output from the npm command that didn't work
 as expected.  The `npm-debug.log` file is also helpful to provide.
--- a/deps/npm/bin/node-gyp-bin/node-gyp
+++ b/deps/npm/bin/node-gyp-bin/node-gyp
@@ -1,2 +1,6 @@
 #!/usr/bin/env sh
-node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
+if [ "x$npm_config_node_gyp" = "x" ]; then
+  node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
+else
+  "$npm_config_node_gyp" "$@"
+fi
--- a/deps/npm/bin/node-gyp-bin/node-gyp.cmd
+++ b/deps/npm/bin/node-gyp-bin/node-gyp.cmd
@@ -1 +1,5 @@
-node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
+if not defined npm_config_node_gyp (
+  node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*
+) else (
+  node %npm_config_node_gyp% %*
+)
--- a/deps/npm/bin/npm-cli.js
+++ b/deps/npm/bin/npm-cli.js
@@ -21,7 +21,7 @@ log.info("it worked if it ends with", "ok")

 var path = require("path")
  , npm = require("../lib/npm.js")
-  , npmconf = require("npmconf")
+  , npmconf = require("../lib/config/core.js")
  , errorHandler = require("../lib/utils/error-handler.js")

  , configDefs = npmconf.defs
--- a/deps/npm/doc/api/npm-bin.md
+++ b/deps/npm/doc/api/npm-bin.md
@@ -10,4 +10,4 @@ npm-bin(3) -- Display npm bin folder
 Print the folder where npm will install executables.

 This function should not be used programmatically.  Instead, just refer
-to the `npm.bin` member.
+to the `npm.bin` property.
--- a/deps/npm/doc/api/npm-help-search.md
+++ b/deps/npm/doc/api/npm-help-search.md
@@ -27,4 +27,4 @@ array of results is returned. Each result is an object with these properties:
 * file:
  Name of the file that matched

-The silent parameter is not neccessary not used, but it may in the future.
+The silent parameter is not necessary not used, but it may in the future.
--- a/deps/npm/doc/api/npm-load.md
+++ b/deps/npm/doc/api/npm-load.md
@@ -10,9 +10,9 @@ npm-load(3) -- Load config settings
 npm.load() must be called before any other function call.  Both parameters are
 optional, but the second is recommended.

-The first parameter is an object hash of command-line config params, and the
-second parameter is a callback that will be called when npm is loaded and
-ready to serve.
+The first parameter is an object containing command-line config params, and the
+second parameter is a callback that will be called when npm is loaded and ready
+to serve.

 The first parameter should follow a similar structure as the package.json
 config object.
--- a/deps/npm/doc/api/npm-ls.md
+++ b/deps/npm/doc/api/npm-ls.md
@@ -52,5 +52,5 @@ List packages in the global install prefix instead of in the current
 project.

 Note, if parseable is set or long isn't set, then duplicates will be trimmed.
-This means that if a submodule a same dependency as a parent module, then the
+This means that if a submodule has the same dependency as a parent module, then the
 dependency will only be output once.
--- a/deps/npm/doc/api/npm-restart.md
+++ b/deps/npm/doc/api/npm-restart.md
@@ -1,5 +1,5 @@
-npm-restart(3) -- Start a package
-=================================
+npm-restart(3) -- Restart a package
+===================================

 ## SYNOPSIS

@@ -7,14 +7,33 @@ npm-restart(3) -- Start a package

 ## DESCRIPTION

-This runs a package's "restart" script, if one was provided.
-Otherwise it runs package's "stop" script, if one was provided, and then
-the "start" script.
+This restarts a package (or multiple packages).
+
+This runs a package's "stop", "restart", and "start" scripts, and associated
+pre- and post- scripts, in the order given below:
+
+1. prerestart
+2. prestop
+3. stop
+4. poststop
+5. restart
+6. prestart
+7. start
+8. poststart
+9. postrestart

 If no version is specified, then it restarts the "active" version.

-npm can run tests on multiple packages. Just specify multiple packages
-in the `packages` parameter.
+npm can restart multiple packages. Just specify multiple packages in
+the `packages` parameter.
+
+## NOTE
+
+Note that the "restart" script is run **in addition to** the "stop"
+and "start" scripts, not instead of them.
+
+This is the behavior as of `npm` major version 2.  A change in this
+behavior will be accompanied by an increase in major version number

 ## SEE ALSO

--- a/deps/npm/doc/api/npm-start.md
+++ b/deps/npm/doc/api/npm-start.md
@@ -9,5 +9,5 @@ npm-start(3) -- Start a package

 This runs a package's "start" script, if one was provided.

-npm can run tests on multiple packages. Just specify multiple packages
-in the `packages` parameter.
+npm can start multiple packages. Just specify multiple packages in the
+`packages` parameter.
--- a/deps/npm/doc/api/npm-submodule.md
+++ b/deps/npm/doc/api/npm-submodule.md
@@ -1,28 +0,0 @@
-npm-submodule(3) -- Add a package as a git submodule
-====================================================
-
-## SYNOPSIS
-
-    npm.commands.submodule(packages, callback)
-
-## DESCRIPTION
-
-For each package specified, npm will check if it has a git repository url
-in its package.json description then add it as a git submodule at
-`node_modules/<pkg name>`.
-
-This is a convenience only.  From then on, it's up to you to manage
-updates by using the appropriate git commands.  npm will stubbornly
-refuse to update, modify, or remove anything with a `.git` subfolder
-in it.
-
-This command also does not install missing dependencies, if the package
-does not include them in its git repository.  If `npm ls` reports that
-things are missing, you can either install, link, or submodule them yourself,
-or you can do `npm explore <pkgname> -- npm install` to install the
-dependencies into the submodule folder.
-
-## SEE ALSO
-
-* npm help json
-* git help submodule
--- a/deps/npm/doc/api/npm-tag.md
+++ b/deps/npm/doc/api/npm-tag.md
@@ -18,6 +18,6 @@ is the package name and version is the version number (much like installing a
 specific version).

 The second element is the name of the tag to tag this version with. If this
-parameter is missing or falsey (empty), the default froom the config will be
+parameter is missing or falsey (empty), the default from the config will be
 used. For more information about how to set this config, check
 `man 3 npm-config` for programmatic usage or `man npm-config` for cli usage.
--- a/deps/npm/doc/api/npm-update.md
+++ b/deps/npm/doc/api/npm-update.md
@@ -2,10 +2,17 @@ npm-update(3) -- Update a package
 =================================

 ## SYNOPSIS
+
    npm.commands.update(packages, callback)

 # DESCRIPTION

-Updates a package, upgrading it to the latest version. It also installs any missing packages.
+Updates a package, upgrading it to the latest version. It also installs any
+missing packages.

-The 'packages' argument is an array of packages to update. The 'callback' parameter will be called when done or when an error occurs.
+The `packages` argument is an array of packages to update. The `callback`
+parameter will be called when done or when an error occurs.
+
+## SEE ALSO
+
+* npm-update(1)
--- a/deps/npm/doc/api/npm.md
+++ b/deps/npm/doc/api/npm.md
@@ -1,5 +1,5 @@
-npm(3) -- node package manager
-==============================
+npm(3) -- javascript package manager
+====================================

 ## SYNOPSIS

@@ -25,13 +25,12 @@ This is the API documentation for npm.
 To find documentation of the command line
 client, see `npm(1)`.

-Prior to using npm's commands, `npm.load()` must be called.
-If you provide `configObject` as an object hash of top-level
-configs, they override the values stored in the various config
-locations. In the npm command line client, this set of configs
-is parsed from the command line options. Additional configuration
-params are loaded from two configuration files. See `npm-config(1)`,
-`npm-config(7)`, and `npmrc(5)` for more information.
+Prior to using npm's commands, `npm.load()` must be called.  If you provide
+`configObject` as an object map of top-level configs, they override the values
+stored in the various config locations. In the npm command line client, this
+set of configs is parsed from the command line options. Additional
+configuration params are loaded from two configuration files. See
+`npm-config(1)`, `npm-config(7)`, and `npmrc(5)` for more information.

 After that, each of the functions are accessible in the
 commands object: `npm.commands.<cmd>`.  See `npm-index(7)` for a list of
@@ -88,9 +87,9 @@ command.

 ## MAGIC

-For each of the methods in the `npm.commands` hash, a method is added to
-the npm object, which takes a set of positional string arguments rather
-than an array and a callback.
+For each of the methods in the `npm.commands` object, a method is added to the
+npm object, which takes a set of positional string arguments rather than an
+array and a callback.

 If the last argument is a callback, then it will use the supplied
 callback.  However, if no callback is provided, then it will print out
--- a/deps/npm/doc/cli/npm-access.md
+++ b/deps/npm/doc/cli/npm-access.md
@@ -0,0 +1,63 @@
+npm-access(1) -- Set access level on published packages
+=======================================================
+
+## SYNOPSIS
+
+    npm access public [<package>]
+    npm access restricted [<package>]
+
+    npm access add <read-only|read-write> <entity> [<package>]
+    npm access rm <entity> [<package>]
+
+    npm access ls [<package>]
+    npm access edit [<package>]
+
+## DESCRIPTION
+
+Used to set access controls on private packages.
+
+For all of the subcommands, `npm access` will perform actions on the packages
+in the current working directory if no package name is passed to the
+subcommand.
+
+* public / restricted:
+  Set a package to be either publicly accessible or restricted.
+
+* add / rm:
+  Add or remove the ability of users and teams to have read-only or read-write
+  access to a package.
+
+* ls:
+  Show all of the access privileges for a package. Will only show permissions
+  for packages to which you have at least read access.
+
+* edit:
+  Set the access privileges for a package at once using `$EDITOR`.
+
+## DETAILS
+
+`npm access` always operates directly on the current registry, configurable
+from the command line using `--registry=<registry url>`.
+
+Unscoped packages are *always public*.
+
+Scoped packages *default to restricted*, but you can either publish them as
+public using `npm publish --access=public`, or set their access as public using
+`npm access public` after the initial publish.
+
+You must have privileges to set the access of a package:
+
+* You are an owner of an unscoped or scoped package.
+* You are a member of the team that owns a scope.
+* You have been given read-write privileges for a package, either as a member
+  of a team or directly as an owner.
+
+If your account is not paid, then attempts to publish scoped packages will fail
+with an HTTP 402 status code (logically enough), unless you use
+`--access=public`.
+
+## SEE ALSO
+
+* npm-publish(1)
+* npm-config(7)
+* npm-registry(7)
--- a/deps/npm/doc/cli/npm-adduser.md
+++ b/deps/npm/doc/cli/npm-adduser.md
@@ -3,7 +3,7 @@ npm-adduser(1) -- Add a registry user account

 ## SYNOPSIS

-    npm adduser [--registry=url] [--scope=@orgname]
+    npm adduser [--registry=url] [--scope=@orgname] [--always-auth]

 ## DESCRIPTION

@@ -13,13 +13,14 @@ the default registry will be used (see `npm-config(7)`).

 The username, password, and email are read in from prompts.

-You may use this command to change your email address, but not username
-or password.
+To reset your password, go to <https://www.npmjs.com/forgot>

-To reset your password, go to <https://www.npmjs.org/forgot>
+To change your email address, go to <https://www.npmjs.com/email-edit>

 You may use this command multiple times with the same user account to
-authorize on a new machine.
+authorize on a new machine.  When authenticating on a new machine,
+the username, password and email address must all match with
+your existing record.

 `npm login` is an alias to `adduser` and behaves exactly the same way.

@@ -45,6 +46,21 @@ e.g.
 This will set a registry for the given scope and login or create a user for
 that registry at the same time.

+### always-auth
+
+Default: false
+
+If specified, save configuration indicating that all requests to the given
+registry should include authorization information. Useful for private
+registries. Can be used with `--registry` and / or `--scope`, e.g.
+
+    npm adduser --registry=http://private-registry.example.com --always-auth
+
+This will ensure that all requests to that registry (including for tarballs)
+include an authorization header. See `always-auth` in `npm-config(7)` for more
+details on always-auth. Registry-specific configuration of `always-auth` takes
+precedence over any global configuration.
+
 ## SEE ALSO

 * npm-registry(7)
--- a/deps/npm/doc/cli/npm-build.md
+++ b/deps/npm/doc/cli/npm-build.md
@@ -12,7 +12,10 @@ npm-build(1) -- Build a package

 This is the plumbing command called by `npm link` and `npm install`.

-It should generally not be called directly.
+It should generally be called during installation, but if you need to run it
+directly, run:
+
+    npm run-script build

 ## SEE ALSO

--- a/deps/npm/doc/cli/npm-dist-tag.md
+++ b/deps/npm/doc/cli/npm-dist-tag.md
@@ -0,0 +1,73 @@
+npm-dist-tag(1) -- Modify package distribution tags
+===================================================
+
+## SYNOPSIS
+
+    npm dist-tag add <pkg>@<version> [<tag>]
+    npm dist-tag rm <pkg> <tag>
+    npm dist-tag ls [<pkg>]
+
+## DESCRIPTION
+
+Add, remove, and enumerate distribution tags on a package:
+
+* add:
+  Tags the specified version of the package with the specified tag, or the
+  `--tag` config if not specified.
+
+* rm:
+  Clear a tag that is no longer in use from the package.
+
+* ls:
+  Show all of the dist-tags for a package, defaulting to the package in
+  the current prefix.
+
+A tag can be used when installing packages as a reference to a version instead
+of using a specific version number:
+
+    npm install <name>@<tag>
+
+When installing dependencies, a preferred tagged version may be specified:
+
+    npm install --tag <tag>
+
+This also applies to `npm dedupe`.
+
+Publishing a package sets the "latest" tag to the published version unless the
+`--tag` option is used. For example, `npm publish --tag=beta`.
+
+## PURPOSE
+
+Tags can be used to provide an alias instead of version numbers.  For
+example, `npm` currently uses the tag "next" to identify the upcoming
+version, and the tag "latest" to identify the current version.
+
+A project might choose to have multiple streams of development, e.g.,
+"stable", "canary".
+
+## CAVEATS
+
+This command used to be known as `npm tag`, which only created new tags, and so
+had a different syntax.
+
+Tags must share a namespace with version numbers, because they are specified in
+the same slot: `npm install <pkg>@<version>` vs `npm install <pkg>@<tag>`.
+
+Tags that can be interpreted as valid semver ranges will be rejected. For
+example, `v1.4` cannot be used as a tag, because it is interpreted by semver as
+`>=1.4.0 <1.5.0`.  See <https://github.com/npm/npm/issues/6082>.
+
+The simplest way to avoid semver problems with tags is to use tags that do not
+begin with a number or the letter `v`.
+
+## SEE ALSO
+
+* npm-tag(1)
+* npm-publish(1)
+* npm-install(1)
+* npm-dedupe(1)
+* npm-registry(7)
+* npm-config(1)
+* npm-config(7)
+* npm-tag(3)
+* npmrc(5)
--- a/deps/npm/doc/cli/npm-explore.md
+++ b/deps/npm/doc/cli/npm-explore.md
@@ -32,7 +32,6 @@ The shell to run for the `npm explore` command.

 ## SEE ALSO

-* npm-submodule(1)
 * npm-folders(5)
 * npm-edit(1)
 * npm-rebuild(1)
--- a/deps/npm/doc/cli/npm-init.md
+++ b/deps/npm/doc/cli/npm-init.md
@@ -3,7 +3,7 @@ npm-init(1) -- Interactively create a package.json file

 ## SYNOPSIS

-    npm init
+    npm init [-f|--force|-y|--yes]

 ## DESCRIPTION

@@ -18,8 +18,21 @@ the options in there.
 It is strictly additive, so it does not delete options from your package.json
 without a really good reason to do so.

+If you invoke it with `-f`, `--force`, `-y`, or `--yes`, it will use only
+defaults and not prompt you for any options.
+
+## CONFIGURATION
+
+### scope
+
+* Default: none
+* Type: String
+
+The scope under which the new module should be created.
+
 ## SEE ALSO

 * <https://github.com/isaacs/init-package-json>
 * package.json(5)
 * npm-version(1)
+* npm-scope(7)
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@@ -43,9 +43,10 @@ after packing it up into a tarball (b).
    it installs the current package context (ie, the current working
    directory) as a global package.

-    By default, `npm install` will install all modules listed as
-    dependencies. With the `--production` flag,
-    npm will not install modules listed in `devDependencies`.
+    By default, `npm install` will install all modules listed as dependencies.
+    With the `--production` flag (or when the `NODE_ENV` environment variable
+    is set to `production`), npm will not install modules listed in
+    `devDependencies`.

 * `npm install <folder>`:

@@ -154,24 +155,12 @@ after packing it up into a tarball (b).
          npm install sax@">=0.1.0 <0.2.0"
          npm install @myorg/privatepackage@">=0.1.0 <0.2.0"

-* `npm install <githubname>/<githubrepo>`:
-
-    Install the package at `https://github.com/githubname/githubrepo" by
-    attempting to clone it using `git`.
-
-    Example:
-
-          npm install mygithubuser/myproject
-
-   To reference a package in a git repo that is not on GitHub, see git
-   remote urls below.
-
 * `npm install <git remote url>`:

    Install a package by cloning a git remote url.  The format of the git
    url is:

-          <protocol>://[<user>@]<hostname><separator><path>[#<commit-ish>]
+          <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:/]<path>[#<commit-ish>]

    `<protocol>` is one of `git`, `git+ssh`, `git+http`, or
    `git+https`.  If no `<commit-ish>` is specified, then `master` is
@@ -183,6 +172,53 @@ after packing it up into a tarball (b).
          git+https://isaacs@github.com/npm/npm.git
          git://github.com/npm/npm.git#v1.0.27

+* `npm install <githubname>/<githubrepo>[#<commit-ish>]`:
+* `npm install github:<githubname>/<githubrepo>[#<commit-ish>]`:
+
+    Install the package at `https://github.com/githubname/githubrepo` by
+    attempting to clone it using `git`.
+
+    If you don't specify a *commit-ish* then `master` will be used.
+
+    Examples:
+
+          npm install mygithubuser/myproject
+          npm install github:mygithubuser/myproject
+
+* `npm install gist:[<githubname>/]<gistID>[#<commit-ish>]`:
+
+    Install the package at `https://gist.github.com/gistID` by attempting to
+    clone it using `git`. The GitHub username associated with the gist is
+    optional and will not be saved in `package.json` if `--save` is used.
+
+    If you don't specify a *commit-ish* then `master` will be used.
+
+    Example:
+
+          npm install gist:101a11beef
+
+* `npm install bitbucket:<bitbucketname>/<bitbucketrepo>[#<commit-ish>]`:
+
+    Install the package at `https://bitbucket.org/bitbucketname/bitbucketrepo`
+    by attempting to clone it using `git`.
+
+    If you don't specify a *commit-ish* then `master` will be used.
+
+    Example:
+
+          npm install bitbucket:mybitbucketuser/myproject
+
+* `npm install gitlab:<gitlabname>/<gitlabrepo>[#<commit-ish>]`:
+
+    Install the package at `https://gitlab.com/gitlabname/gitlabrepo`
+    by attempting to clone it using `git`.
+
+    If you don't specify a *commit-ish* then `master` will be used.
+
+    Example:
+
+          npm install gitlab:mygitlabuser/myproject
+
 You may combine multiple arguments, and even multiple types of arguments.
 For example:

--- a/deps/npm/doc/cli/npm-link.md
+++ b/deps/npm/doc/cli/npm-link.md
@@ -22,7 +22,7 @@ Note that `package-name` is taken from `package.json`,
 not from directory name.

 The package name can be optionally prefixed with a scope. See `npm-scope(7)`.
-The scope must by preceded by an @-symbol and followed by a slash.
+The scope must be preceded by an @-symbol and followed by a slash.

 When creating tarballs for `npm publish`, the linked packages are
 "snapshotted" to their current state by resolving the symbolic links.
@@ -38,7 +38,8 @@ For example:
    npm link redis              # link-install the package

 Now, any changes to ~/projects/node-redis will be reflected in
-~/projects/node-bloggy/node_modules/redis/
+~/projects/node-bloggy/node_modules/node-redis/. Note that the link should
+be to the package name, not the directory name for that package. 

 You may also shortcut the two steps in one.  For example, to do the
 above use-case in a shorter way:
@@ -49,7 +50,7 @@ above use-case in a shorter way:
 The second line is the equivalent of doing:

    (cd ../node-redis; npm link)
-    npm link redis
+    npm link node-redis

 That is, it first creates a global link, and then links the global
 installation target into your project's `node_modules` folder.
--- a/deps/npm/doc/cli/npm-logout.md
+++ b/deps/npm/doc/cli/npm-logout.md
@@ -0,0 +1,50 @@
+npm-logout(1) -- Log out of the registry
+========================================
+
+## SYNOPSIS
+
+    npm logout [--registry=url] [--scope=@orgname]
+
+## DESCRIPTION
+
+When logged into a registry that supports token-based authentication, tell the
+server to end this token's session. This will invalidate the token everywhere
+you're using it, not just for the current environment.
+
+When logged into a legacy registry that uses username and password authentication, this will
+clear the credentials in your user configuration. In this case, it will _only_ affect
+the current environment.
+
+If `--scope` is provided, this will find the credentials for the registry
+connected to that scope, if set.
+
+## CONFIGURATION
+
+### registry
+
+Default: http://registry.npmjs.org/
+
+The base URL of the npm package registry. If `scope` is also specified,
+it takes precedence.
+
+### scope
+
+Default: none
+
+If specified, the user and login credentials given will be associated
+with the specified scope. See `npm-scope(7)`. You can use both at the same time,
+e.g.
+
+    npm adduser --registry=http://myregistry.example.com --scope=@myco
+
+This will set a registry for the given scope and login or create a user for
+that registry at the same time.
+
+## SEE ALSO
+
+* npm-adduser(1)
+* npm-registry(7)
+* npm-config(1)
+* npm-config(7)
+* npmrc(5)
+* npm-whoami(1)
--- a/deps/npm/doc/cli/npm-ls.md
+++ b/deps/npm/doc/cli/npm-ls.md
@@ -67,6 +67,20 @@ project.

 Max display depth of the dependency tree.

+### prod / production
+
+* Type: Boolean
+* Default: false
+
+Display only the dependency tree for packages in `dependencies`.
+
+### dev
+
+* Type: Boolean
+* Default: false
+
+Display only the dependency tree for packages in `devDependencies`.
+
 ## SEE ALSO

 * npm-config(1)
--- a/deps/npm/doc/cli/npm-prune.md
+++ b/deps/npm/doc/cli/npm-prune.md
@@ -15,8 +15,10 @@ removed.
 Extraneous packages are packages that are not listed on the parent
 package's dependencies list.

-If the `--production` flag is specified, this command will remove the
-packages specified in your `devDependencies`.
+If the `--production` flag is specified or the `NODE_ENV` environment
+variable is set to `production`, this command will remove the packages
+specified in your `devDependencies`. Setting `--production=false` will
+negate `NODE_ENV` being set to `production`.

 ## SEE ALSO

--- a/deps/npm/doc/cli/npm-publish.md
+++ b/deps/npm/doc/cli/npm-publish.md
@@ -4,12 +4,14 @@ npm-publish(1) -- Publish a package

 ## SYNOPSIS

-    npm publish <tarball> [--tag <tag>]
-    npm publish <folder> [--tag <tag>]
+    npm publish <tarball> [--tag <tag>] [--access <public|restricted>]
+    npm publish <folder> [--tag <tag>] [--access <public|restricted>]

 ## DESCRIPTION

-Publishes a package to the registry so that it can be installed by name.
+Publishes a package to the registry so that it can be installed by name. See
+`npm-developers(7)` for details on what's included in the published package, as
+well as details on how the package is built.

 By default npm will publish to the public registry. This can be overridden by
 specifying a different default registry or using a `npm-scope(7)` in the name
@@ -27,6 +29,12 @@ specifying a different default registry or using a `npm-scope(7)` in the name
  <name>@<tag>` will install this version.  By default, `npm publish` updates
  and `npm install` installs the `latest` tag.

+* `[--access <public|restricted>]`
+  Tells the registry whether this package should be published as public or
+  restricted. Only applies to scoped packages, which default to `restricted`.
+  If you don't have a paid account, you must publish with `--access public`
+  to publish scoped packages.
+
 Fails if the package name and version combination already exists in
 the specified registry.

@@ -37,6 +45,7 @@ it is removed with npm-unpublish(1).
 ## SEE ALSO

 * npm-registry(7)
+* npm-scope(7)
 * npm-adduser(1)
 * npm-owner(1)
 * npm-deprecate(1)
--- a/deps/npm/doc/cli/npm-restart.md
+++ b/deps/npm/doc/cli/npm-restart.md
@@ -1,5 +1,5 @@
-npm-restart(1) -- Start a package
-=================================
+npm-restart(1) -- Restart a package
+===================================

 ## SYNOPSIS

@@ -7,11 +7,28 @@ npm-restart(1) -- Start a package

 ## DESCRIPTION

-This runs a package's "restart" script, if one was provided.
-Otherwise it runs package's "stop" script, if one was provided, and then
-the "start" script.
+This restarts a package.

-If no version is specified, then it restarts the "active" version.
+This runs a package's "stop", "restart", and "start" scripts, and associated
+pre- and post- scripts, in the order given below:
+
+1. prerestart
+2. prestop
+3. stop
+4. poststop
+5. restart
+6. prestart
+7. start
+8. poststart
+9. postrestart
+
+## NOTE
+
+Note that the "restart" script is run **in addition to** the "stop"
+and "start" scripts, not instead of them.
+
+This is the behavior as of `npm` major version 2.  A change in this
+behavior will be accompanied by an increase in major version number

 ## SEE ALSO

@@ -20,3 +37,4 @@ If no version is specified, then it restarts the "active" version.
 * npm-test(1)
 * npm-start(1)
 * npm-stop(1)
+* npm-restart(3)
--- a/deps/npm/doc/cli/npm-run-script.md
+++ b/deps/npm/doc/cli/npm-run-script.md
@@ -8,13 +8,33 @@ npm-run-script(1) -- Run arbitrary package scripts

 ## DESCRIPTION

-This runs an arbitrary command from a package's `"scripts"` object.
-If no package name is provided, it will search for a `package.json`
-in the current folder and use its `"scripts"` object. If no `"command"`
-is provided, it will list the available top level scripts.
+This runs an arbitrary command from a package's `"scripts"` object.  If no
+`"command"` is provided, it will list the available scripts.  `run[-script]` is
+used by the test, start, restart, and stop commands, but can be called
+directly, as well. When the scripts in the package are printed out, they're
+separated into lifecycle (test, start, restart) and directly-run scripts.

-It is used by the test, start, restart, and stop commands, but can be
-called directly, as well.
+As of [`npm@2.0.0`](http://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
+use custom arguments when executing scripts. The special option `--` is used by
+[getopt](http://goo.gl/KxMmtG) to delimit the end of the options. npm will pass
+all the arguments after the `--` directly to your script:
+
+    npm run test -- --grep="pattern"
+
+The arguments will only be passed to the script specified after ```npm run```
+and not to any pre or post script.
+
+The `env` script is a special built-in command that can be used to list
+environment variables that will be available to the script at runtime. If an
+"env" command is defined in your package it will take precedence over the
+built-in.
+
+In addition to the shell's pre-existing `PATH`, `npm run` adds
+`node_modules/.bin` to the `PATH` provided to scripts. Any binaries provided by
+locally-installed dependencies can be used without the `node_modules/.bin`
+prefix. For example, if there is a `devDependency` on `tap` in your package,
+you should write `"scripts": {"test": "tap test/\*.js"}` instead of `"scripts":
+{"test": "node_modules/.bin/tap test/\*.js"}` to run your tests.

 ## SEE ALSO

--- a/deps/npm/doc/cli/npm-shrinkwrap.md
+++ b/deps/npm/doc/cli/npm-shrinkwrap.md
@@ -9,18 +9,18 @@ npm-shrinkwrap(1) -- Lock down dependency versions

 This command locks down the versions of a package's dependencies so
 that you can control exactly which versions of each dependency will be
-used when your package is installed. The "package.json" file is still
-required if you want to use "npm install".
+used when your package is installed. The `package.json` file is still
+required if you want to use `npm install`.

-By default, "npm install" recursively installs the target's
-dependencies (as specified in package.json), choosing the latest
+By default, `npm install` recursively installs the target's
+dependencies (as specified in `package.json`), choosing the latest
 available version that satisfies the dependency's semver pattern. In
 some situations, particularly when shipping software where each change
 is tightly managed, it's desirable to fully specify each version of
 each dependency recursively so that subsequent builds and deploys do
 not inadvertently pick up newer versions of a dependency that satisfy
 the semver pattern. Specifying specific semver patterns in each
-dependency's package.json would facilitate this, but that's not always
+dependency's `package.json` would facilitate this, but that's not always
 possible or desirable, as when another author owns the npm package.
 It's also possible to check dependencies directly into source control,
 but that may be undesirable for other reasons.
@@ -48,18 +48,18 @@ package B:
 and package C:

    {
-      "name": "C,
+      "name": "C",
      "version": "0.0.1"
    }

 If these are the only versions of A, B, and C available in the
-registry, then a normal "npm install A" will install:
+registry, then a normal `npm install A` will install:

    A@0.1.0
    `-- B@0.0.1
        `-- C@0.0.1

-However, if B@0.0.2 is published, then a fresh "npm install A" will
+However, if B@0.0.2 is published, then a fresh `npm install A` will
 install:

    A@0.1.0
@@ -78,7 +78,7 @@ In this case, A's author can run

    npm shrinkwrap

-This generates npm-shrinkwrap.json, which will look something like this:
+This generates `npm-shrinkwrap.json`, which will look something like this:

    {
      "name": "A",
@@ -88,7 +88,7 @@ This generates npm-shrinkwrap.json, which will look something like this:
          "version": "0.0.1",
          "dependencies": {
            "C": {
-              "version": "0.1.0"
+              "version": "0.0.1"
            }
          }
        }
@@ -96,44 +96,44 @@ This generates npm-shrinkwrap.json, which will look something like this:
    }

 The shrinkwrap command has locked down the dependencies based on
-what's currently installed in node_modules.  When "npm install"
-installs a package with a npm-shrinkwrap.json file in the package
-root, the shrinkwrap file (rather than package.json files) completely
+what's currently installed in node_modules.  When `npm install`
+installs a package with an `npm-shrinkwrap.json` in the package
+root, the shrinkwrap file (rather than `package.json` files) completely
 drives the installation of that package and all of its dependencies
 (recursively).  So now the author publishes A@0.1.0, and subsequent
-installs of this package will use B@0.0.1 and C@0.1.0, regardless the
-dependencies and versions listed in A's, B's, and C's package.json
+installs of this package will use B@0.0.1 and C@0.0.1, regardless the
+dependencies and versions listed in A's, B's, and C's `package.json`
 files.


 ### Using shrinkwrapped packages

 Using a shrinkwrapped package is no different than using any other
-package: you can "npm install" it by hand, or add a dependency to your
-package.json file and "npm install" it.
+package: you can `npm install` it by hand, or add a dependency to your
+`package.json` file and `npm install` it.

 ### Building shrinkwrapped packages

 To shrinkwrap an existing package:

-1. Run "npm install" in the package root to install the current
+1. Run `npm install` in the package root to install the current
   versions of all dependencies.
 2. Validate that the package works as expected with these versions.
-3. Run "npm shrinkwrap", add npm-shrinkwrap.json to git, and publish
+3. Run `npm shrinkwrap`, add `npm-shrinkwrap.json` to git, and publish
   your package.

 To add or update a dependency in a shrinkwrapped package:

-1. Run "npm install" in the package root to install the current
+1. Run `npm install` in the package root to install the current
   versions of all dependencies.
-2. Add or update dependencies. "npm install" each new or updated
-   package individually and then update package.json.  Note that they
+2. Add or update dependencies. `npm install` each new or updated
+   package individually and then update `package.json`.  Note that they
   must be explicitly named in order to be installed: running `npm
   install` with no arguments will merely reproduce the existing
   shrinkwrap.
 3. Validate that the package works as expected with the new
   dependencies.
-4. Run "npm shrinkwrap", commit the new npm-shrinkwrap.json, and
+4. Run `npm shrinkwrap`, commit the new `npm-shrinkwrap.json`, and
   publish your package.

 You can use npm-outdated(1) to view dependencies with newer versions
@@ -141,14 +141,14 @@ available.

 ### Other Notes

-A shrinkwrap file must be consistent with the package's package.json
-file. "npm shrinkwrap" will fail if required dependencies are not
+A shrinkwrap file must be consistent with the package's `package.json`
+file. `npm shrinkwrap` will fail if required dependencies are not
 already installed, since that would result in a shrinkwrap that
 wouldn't actually work. Similarly, the command will fail if there are
-extraneous packages (not referenced by package.json), since that would
-indicate that package.json is not correct.
+extraneous packages (not referenced by `package.json`), since that would
+indicate that `package.json` is not correct.

-Since "npm shrinkwrap" is intended to lock down your dependencies for
+Since `npm shrinkwrap` is intended to lock down your dependencies for
 production use, `devDependencies` will not be included unless you
 explicitly set the `--dev` flag when you run `npm shrinkwrap`.  If
 installed `devDependencies` are excluded, then npm will print a
--- a/deps/npm/doc/cli/npm-submodule.md
+++ b/deps/npm/doc/cli/npm-submodule.md
@@ -1,28 +0,0 @@
-npm-submodule(1) -- Add a package as a git submodule
-====================================================
-
-## SYNOPSIS
-
-    npm submodule <pkg>
-
-## DESCRIPTION
-
-If the specified package has a git repository url in its package.json
-description, then this command will add it as a git submodule at
-`node_modules/<pkg name>`.
-
-This is a convenience only.  From then on, it's up to you to manage
-updates by using the appropriate git commands.  npm will stubbornly
-refuse to update, modify, or remove anything with a `.git` subfolder
-in it.
-
-This command also does not install missing dependencies, if the package
-does not include them in its git repository.  If `npm ls` reports that
-things are missing, you can either install, link, or submodule them yourself,
-or you can do `npm explore <pkgname> -- npm install` to install the
-dependencies into the submodule folder.
-
-## SEE ALSO
-
-* package.json(5)
-* git help submodule
--- a/deps/npm/doc/cli/npm-tag.md
+++ b/deps/npm/doc/cli/npm-tag.md
@@ -7,6 +7,8 @@ npm-tag(1) -- Tag a published version

 ## DESCRIPTION

+THIS COMMAND IS DEPRECATED. See npm-dist-tag(1) for details.
+
 Tags the specified version of the package with the specified tag, or the
 `--tag` config if not specified.

@@ -23,6 +25,29 @@ This also applies to `npm dedupe`.

 Publishing a package always sets the "latest" tag to the published version.

+## PURPOSE
+
+Tags can be used to provide an alias instead of version numbers.  For
+example, `npm` currently uses the tag "next" to identify the upcoming
+version, and the tag "latest" to identify the current version.
+
+A project might choose to have multiple streams of development, e.g.,
+"stable", "canary".
+
+## CAVEATS
+
+Tags must share a namespace with version numbers, because they are
+specified in the same slot: `npm install <pkg>@<version>` vs `npm
+install <pkg>@<tag>`.
+
+Tags that can be interpreted as valid semver ranges will be
+rejected. For example, `v1.4` cannot be used as a tag, because it is
+interpreted by semver as `>=1.4.0 <1.5.0`.  See
+<https://github.com/npm/npm/issues/6082>.
+
+The simplest way to avoid semver problems with tags is to use tags
+that do not begin with a number or the letter `v`.
+
 ## SEE ALSO

 * npm-publish(1)
@@ -31,4 +56,5 @@ Publishing a package always sets the "latest" tag to the published version.
 * npm-registry(7)
 * npm-config(1)
 * npm-config(7)
+* npm-tag(3)
 * npmrc(5)
--- a/deps/npm/doc/cli/npm-update.md
+++ b/deps/npm/doc/cli/npm-update.md
@@ -8,9 +8,11 @@ npm-update(1) -- Update a package
 ## DESCRIPTION

 This command will update all the packages listed to the latest version
-(specified by the `tag` config).
+(specified by the `tag` config), respecting semver.

-It will also install missing packages.
+It will also install missing packages. As with all commands that install
+packages, the `--dev` flag will cause `devDependencies` to be processed
+as well.

 If the `-g` flag is specified, this command will update globally installed
 packages.
@@ -18,10 +20,135 @@ packages.
 If no package name is specified, all packages in the specified location (global
 or local) will be updated.

+As of `npm@2.6.1`, the `npm update` will only inspect top-level packages.
+Prior versions of `npm` would also recursively inspect all dependencies.
+To get the old behavior, use `npm --depth 9999 update`, but be warned that
+simultaneous asynchronous update of all packages, including `npm` itself
+and packages that `npm` depends on, often causes problems up to and including
+the uninstallation of `npm` itself.
+
+To restore a missing `npm`, use the command:
+
+```
+curl -L https://npmjs.com/install.sh | sh
+```
+
+## EXAMPLES
+
+IMPORTANT VERSION NOTE: these examples assume `npm@2.6.1` or later.  For
+older versions of `npm`, you must specify `--depth 0` to get the behavior
+described below.
+
+For the examples below, assume that the current package is `app` and it depends
+on dependencies, `dep1` (`dep2`, .. etc.).  The published versions of `dep1` are:
+
+```
+{
+  dist-tags: { latest: "1.2.2" },
+  versions: { "1.2.2",
+              "1.2.1",
+              "1.2.0",
+              "1.1.2",
+              "1.1.1",
+              "1.0.0",
+              "0.4.1",
+              "0.4.0",
+              "0.2.0"
+  }
+}
+```
+
+### Caret Dependencies
+
+If `app`'s `package.json` contains:
+
+```
+dependencies: {
+  dep1: "^1.1.1"
+}
+```
+
+Then `npm update` will install `dep1@1.2.2`, because `1.2.2` is `latest` and
+`1.2.2` satisfies `^1.1.1`.
+
+### Tilde Dependencies
+
+However, if `app`'s `package.json` contains:
+
+```
+dependencies: {
+  dep1: "~1.1.1"
+}
+```
+
+In this case, running `npm update` will install `dep1@1.1.2`.  Even though the `latest`
+tag points to `1.2.2`, this version does not satisfy `~1.1.1`, which is equivalent
+to `>=1.1.1 <1.2.0`.  So the highest-sorting version that satisfies `~1.1.1` is used,
+which is `1.1.2`.
+
+### Caret Dependencies below 1.0.0
+
+Suppose `app` has a caret dependency on a version below `1.0.0`, for example:
+
+```
+dependencies: {
+  dep1: "^0.2.0"
+}
+```
+
+`npm update` will install `dep1@0.2.0`, because there are no other
+versions which satisfy `^0.2.0`.
+
+If the dependence were on `^0.4.0`:
+
+```
+dependencies: {
+  dep1: "^0.4.0"
+}
+```
+
+Then `npm update` will install `dep1@0.4.1`, because that is the highest-sorting
+version that satisfies `^0.4.0` (`>= 0.4.0 <0.5.0`)
+
+### Recording Updates with `--save`
+
+When you want to update a package and save the new version as
+the minimum required dependency in `package.json`, you can use
+`npm update --save`.  For example if `package.json` contains
+
+```
+dependencies: {
+  dep1: "^1.1.1"
+}
+```
+
+Then `npm update --save` will install `dep1@1.2.2` (i.e., `latest`),
+and `package.json` will be modified:
+
+```
+dependencies: {
+  dep1: "^1.2.2"
+}
+```
+
+Note that `npm` will only write an updated version to `package.json`
+if it installs a new package.
+
+### Updating Globally-Installed Packages
+
+`npm update -g` will apply the `update` action to each globally- installed
+package that is `outdated` -- that is, has a version that is different from
+`latest`.
+
+NOTE: If a package has been upgraded to a version newer than `latest`, it will
+be _downgraded_.
+
+
 ## SEE ALSO

 * npm-install(1)
 * npm-outdated(1)
+* npm-shrinkwrap(1)
 * npm-registry(7)
 * npm-folders(5)
 * npm-ls(1)
--- a/deps/npm/doc/cli/npm-version.md
+++ b/deps/npm/doc/cli/npm-version.md
@@ -8,15 +8,17 @@ npm-version(1) -- Bump a package version
 ## DESCRIPTION

 Run this in a package directory to bump the version and write the new
-data back to the package.json file.
+data back to `package.json` and, if present, `npm-shrinkwrap.json`.

 The `newversion` argument should be a valid semver string, *or* a
 valid second argument to semver.inc (one of "patch", "minor", "major",
 "prepatch", "preminor", "premajor", "prerelease"). In the second case,
 the existing version will be incremented by 1 in the specified field.

-If run in a git repo, it will also create a version commit and tag, and
-fail if the repo is not clean.
+If run in a git repo, it will also create a version commit and tag, and fail if
+the repo is not clean.  This behavior is controlled by `git-tag-version` (see
+below), and can be disabled on the command line by running `npm
+--no-git-tag-version version`

 If supplied with `--message` (shorthand: `-m`) config option, npm will
 use it as a commit message when creating a version commit.  If the
@@ -38,8 +40,28 @@ in your git config for this to work properly.  For example:

    Enter passphrase:

+If "preversion", "version", "postversion" in the "scripts" property of
+the package.json, it will execute by running `npm version`. preversion
+and version ware executed before bump the package version, postversion
+was executed after bump the package version. For example to run `npm version`
+after passed all test:
+
+    "scripts": { "preversion": "npm test" }
+
+## CONFIGURATION
+
+### git-tag-version
+
+* Default: true
+* Type: Boolean
+
+Commit and tag the version change.
+
 ## SEE ALSO

 * npm-init(1)
+* npm-run-script(1)
+* npm-scripts(7)
 * package.json(5)
 * semver(7)
+* config(7)
--- a/deps/npm/doc/cli/npm-view.md
+++ b/deps/npm/doc/cli/npm-view.md
@@ -24,7 +24,7 @@ For example, to show the dependencies of the `ronn` package at version

    npm view ronn@0.3.5 dependencies

-You can view child field by separating them with a period.
+You can view child fields by separating them with a period.
 To view the git repository URL for the latest version of npm, you could
 do this:

--- a/deps/npm/doc/cli/npm.md
+++ b/deps/npm/doc/cli/npm.md
@@ -1,5 +1,5 @@
-npm(1) -- node package manager
-==============================
+npm(1) -- javascript package manager
+====================================

 ## SYNOPSIS

--- a/deps/npm/doc/files/npmrc.md
+++ b/deps/npm/doc/files/npmrc.md
@@ -17,7 +17,7 @@ The four relevant files are:

 * per-project config file (/path/to/my/project/.npmrc)
 * per-user config file (~/.npmrc)
-* global config file ($PREFIX/npmrc)
+* global config file ($PREFIX/etc/npmrc)
 * npm builtin config file (/path/to/npm/npmrc)

 All npm config files are an ini-formatted list of `key = value`
@@ -30,6 +30,17 @@ Each of these files is loaded, and config options are resolved in
 priority order.  For example, a setting in the userconfig file would
 override the setting in the globalconfig file.

+Array values are specified by adding "[]" after the key name. For
+example:
+
+    key[] = "first value"
+    key[] = "second value"
+
+**NOTE:** Because local (per-project or per-user) `.npmrc` files can contain
+sensitive credentials, they must be readable and writable _only_ by your user
+account (i.e. must have a mode of `0600`), otherwise they _will be ignored by
+npm!_
+
 ### Per-project config file

 When working locally in a project, a `.npmrc` file in the root of the
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@@ -17,18 +17,27 @@ them.  The name and version together form an identifier that is assumed
 to be completely unique.  Changes to the package should come along with
 changes to the version.

-The name is what your thing is called.  Some tips:
+The name is what your thing is called.

+Some rules:
+
+* The name must be shorter than 214 characters. This includes the scope for
+  scoped packages.
+* The name can't start with a dot or an underscore.
+* New packages must not have uppercase letters in the name.
+* The name ends up being part of a URL, an argument on the command line, and a
+  folder name. Therefore, the name can't contain any non-URL-safe characters.
+
+Some tips:
+
+* Don't use the same name as a core Node module.
 * Don't put "js" or "node" in the name.  It's assumed that it's js, since you're
  writing a package.json file, and you can specify the engine using the "engines"
  field.  (See below.)
-* The name ends up being part of a URL, an argument on the command line, and a
-  folder name. Any name with non-url-safe characters will be rejected.
-  Also, it can't start with a dot or an underscore.
 * The name will probably be passed as an argument to require(), so it should
  be something short, but also reasonably descriptive.
 * You may want to check the npm registry to see if there's something by that name
-  already, before you get too attached to it.  http://registry.npmjs.org/
+  already, before you get too attached to it. <https://www.npmjs.com/>

 A name can be optionally prefixed by a scope, e.g. `@myorg/mypackage`. See
 `npm-scope(7)` for more detail.
@@ -75,7 +84,7 @@ with your package.

 It should look like this:

-    { "url" : "http://github.com/owner/project/issues"
+    { "url" : "https://github.com/owner/project/issues"
    , "email" : "project@hostname.com"
    }

@@ -89,9 +98,8 @@ If a url is provided, it will be used by the `npm bugs` command.
 You should specify a license for your package so that people know how they are
 permitted to use it, and any restrictions you're placing on it.

-The simplest way, assuming you're using a common license such as BSD-3-Clause
-or MIT, is to just specify the standard SPDX ID of the license you're using,
-like this:
+If you're using a common license such as BSD-2-Clause or MIT, add a
+current SPDX license identifier for the license you're using, like this:

    { "license" : "BSD-3-Clause" }

@@ -99,8 +107,45 @@ You can check [the full list of SPDX license IDs](https://spdx.org/licenses/).
 Ideally you should pick one that is
 [OSI](http://opensource.org/licenses/alphabetical) approved.

-It's also a good idea to include a LICENSE file at the top level in
-your package.
+If your package is licensed under multiple common licenses, use an [SPDX license
+expression syntax version 2.0 string](http://npmjs.com/package/spdx), like this:
+
+    { "license" : "(ISC OR GPL-3.0)" }
+
+If you are using a license that hasn't been assigned an SPDX identifier, or if
+you are using a custom license, use the following valid SPDX expression:
+
+    { "license" : "LicenseRef-LICENSE" }
+
+Then include a LICENSE file at the top level of the package.
+
+Some old packages used license objects or a "licenses" property containing an
+array of license objects:
+
+    // Not valid metadata
+    { "license" :
+      { "type" : "ISC"
+      , "url" : "http://opensource.org/licenses/ISC"
+      }
+    }
+
+    // Not valid metadata
+    { "licenses" :
+      [
+        { "type": "MIT"
+        , "url": "http://www.opensource.org/licenses/mit-license.php"
+        }
+      , { "type": "Apache-2.0"
+        , "url": "http://opensource.org/licenses/apache2.0.php"
+        }
+      ]
+    }
+
+Those styles are now deprecated. Instead, use SPDX expressions, like this:
+
+    { "license": "ISC" }
+
+    { "license": "(MIT OR Apache-2.0)" }

 ## people fields: author, contributors

@@ -114,7 +159,7 @@ is an object with a "name" field and optionally "url" and "email", like this:

 Or you can shorten that all into a single string, and npm will parse it for you:

-    "Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)
+    "Barney Rubble <b@rubble.com> (http://barnyrubble.tumblr.com/)"

 Both email and url are optional either way.

@@ -154,12 +199,12 @@ command name to local file name. On install, npm will symlink that file into
 installs.


-For example, npm has this:
+For example, myapp could have this:

-    { "bin" : { "npm" : "./cli.js" } }
+    { "bin" : { "myapp" : "./cli.js" } }

-So, when you install npm, it'll create a symlink from the `cli.js` script to
-`/usr/local/bin/npm`.
+So, when you install myapp, it'll create a symlink from the `cli.js` script to
+`/usr/local/bin/myapp`.

 If you have a single executable, and its name should be the name
 of the package, then you can just supply it as a string.  For example:
@@ -219,7 +264,7 @@ will create entries for `man foo` and `man 2 foo`

 The CommonJS [Packages](http://wiki.commonjs.org/wiki/Packages/1.0) spec details a
 few ways that you can indicate the structure of your package using a `directories`
-hash. If you look at [npm's package.json](http://registry.npmjs.org/npm/latest),
+object. If you look at [npm's package.json](https://registry.npmjs.org/npm/latest),
 you'll see that it has directories for doc, lib, and man.

 In the future, this information may be used in other creative ways.
@@ -231,10 +276,10 @@ with the lib folder in any way, but it's useful meta info.

 ### directories.bin

-If you specify a "bin" directory, then all the files in that folder will
-be used as the "bin" hash.
+If you specify a `bin` directory, then all the files in that folder will
+be added as children of the `bin` path.

-If you have a "bin" hash already, then this has no effect.
+If you have a `bin` path already, then this has no effect.

 ### directories.man

@@ -253,28 +298,39 @@ Put example scripts in here.  Someday, it might be exposed in some clever way.
 ## repository

 Specify the place where your code lives. This is helpful for people who
-want to contribute.  If the git repo is on github, then the `npm docs`
+want to contribute.  If the git repo is on GitHub, then the `npm docs`
 command will be able to find you.

 Do it like this:

    "repository" :
      { "type" : "git"
-      , "url" : "http://github.com/npm/npm.git"
+      , "url" : "https://github.com/npm/npm.git"
      }

    "repository" :
      { "type" : "svn"
-      , "url" : "http://v8.googlecode.com/svn/trunk/"
+      , "url" : "https://v8.googlecode.com/svn/trunk/"
      }

 The URL should be a publicly available (perhaps read-only) url that can be handed
 directly to a VCS program without any modification.  It should not be a url to an
 html project page that you put in your browser.  It's for computers.

+For GitHub, GitHub gist, Bitbucket, or GitLab repositories you can use the same
+shortcut syntax you use for `npm install`:
+
+    "repository": "npm/npm"
+
+    "repository": "gist:11081aaa281"
+
+    "repository": "bitbucket:example/repo"
+
+    "repository": "gitlab:another/repo"
+
 ## scripts

-The "scripts" member is an object hash of script commands that are run
+The "scripts" property is a dictionary containing script commands that are run
 at various times in the lifecycle of your package.  The key is the lifecycle
 event, and the value is the command to run at that point.

@@ -282,9 +338,9 @@ See `npm-scripts(7)` to find out more about writing package scripts.

 ## config

-A "config" hash can be used to set configuration
-parameters used in package scripts that persist across upgrades.  For
-instance, if a package had the following:
+A "config" object can be used to set configuration parameters used in package
+scripts that persist across upgrades.  For instance, if a package had the
+following:

    { "name" : "foo"
    , "config" : { "port" : "8080" } }
@@ -298,13 +354,13 @@ configs.

 ## dependencies

-Dependencies are specified with a simple hash of package name to
+Dependencies are specified in a simple object that maps a package name to a
 version range. The version range is a string which has one or more
-space-separated descriptors.  Dependencies can also be identified with
-a tarball or git URL.
+space-separated descriptors.  Dependencies can also be identified with a
+tarball or git URL.

 **Please do not put test harnesses or transpilers in your
-`dependencies` hash.**  See `devDependencies`, below.
+`dependencies` object.**  See `devDependencies`, below.

 See semver(7) for more details about specifying version ranges.

@@ -340,7 +396,7 @@ For example, these are all valid:
      , "two" : "2.x"
      , "thr" : "3.3.x"
      , "lat" : "latest"
-      , "dyl" : "~/projects/dyl"
+      , "dyl" : "file:../dyl"
      }
    }

@@ -366,26 +422,40 @@ an argument to `git checkout`.  The default is `master`.

 ## GitHub URLs

-As of version 1.1.65, you can refer to GitHub urls as just "foo": "user/foo-project". For example:
+As of version 1.1.65, you can refer to GitHub urls as just "foo":
+"user/foo-project".  Just as with git URLs, a `commit-ish` suffix can be
+included.  For example:

    {
      "name": "foo",
      "version": "0.0.0",
      "dependencies": {
-        "express": "visionmedia/express"
+        "express": "visionmedia/express",
+        "mocha": "visionmedia/mocha#4727d357ea"
      }
    }

 ## Local Paths

-As of version 2.0.0 you can provide a path to a local directory that
-contains a package. Local paths can be in the form:
+As of version 2.0.0 you can provide a path to a local directory that contains a
+package. Local paths can be saved using `npm install --save`, using any of
+these forms:

    ../foo/bar
    ~/foo/bar
    ./foo/bar
    /foo/bar

+in which case they will be normalized to a relative path and added to your
+`package.json`. For example:
+
+    {
+      "name": "baz",
+      "dependencies": {
+        "bar": "file:../foo/bar"
+      }
+    }
+
 This feature is helpful for local offline development and creating
 tests that require npm installing where you don't want to hit an
 external server, but should not be used when publishing packages
@@ -397,8 +467,8 @@ If someone is planning on downloading and using your module in their
 program, then they probably don't want or need to download and build
 the external test or documentation framework that you use.

-In this case, it's best to list these additional items in a
-`devDependencies` hash.
+In this case, it's best to map these additional items in a `devDependencies`
+object.

 These things will be installed when doing `npm link` or `npm install`
 from the root of a package, and can be managed like any other npm
@@ -429,29 +499,35 @@ run this script as well, so that you can test it easily.

 ## peerDependencies

-In some cases, you want to express the compatibility of your package with an
+In some cases, you want to express the compatibility of your package with a
 host tool or library, while not necessarily doing a `require` of this host.
-This is usually refered to as a *plugin*. Notably, your module may be exposing
+This is usually referred to as a *plugin*. Notably, your module may be exposing
 a specific interface, expected and specified by the host documentation.

 For example:

    {
      "name": "tea-latte",
-      "version": "1.3.5"
+      "version": "1.3.5",
      "peerDependencies": {
        "tea": "2.x"
      }
    }

 This ensures your package `tea-latte` can be installed *along* with the second
-major version of the host package `tea` only. The host package is automatically
-installed if needed. `npm install tea-latte` could possibly yield the following
-dependency graph:
+major version of the host package `tea` only. `npm install tea-latte` could
+possibly yield the following dependency graph:

    ├── tea-latte@1.3.5
    └── tea@2.2.0

+**NOTE: npm versions 1 and 2 will automatically install `peerDependencies` if
+they are not explicitly depended upon higher in the dependency tree. In the
+next major version of npm (npm@3), this will no longer be the case. You will
+receive a warning that the peerDependency is not installed instead.** The
+behavior in npms 1 & 2 was frequently confusing and could easily put you into
+dependency hell, a situation that npm is designed to avoid as much as possible.
+
 Trying to install another plugin with a conflicting requirement will cause an
 error. For this reason, make sure your plugin requirement is as broad as
 possible, and not to lock it down to specific patch versions.
@@ -469,11 +545,11 @@ If this is spelled `"bundleDependencies"`, then that is also honorable.

 ## optionalDependencies

-If a dependency can be used, but you would like npm to proceed if it
-cannot be found or fails to install, then you may put it in the
-`optionalDependencies` hash.  This is a map of package name to version
-or url, just like the `dependencies` hash.  The difference is that
-failure is tolerated.
+If a dependency can be used, but you would like npm to proceed if it cannot be
+found or fails to install, then you may put it in the `optionalDependencies`
+object.  This is a map of package name to version or url, just like the
+`dependencies` object.  The difference is that build failures do not cause
+installation to fail.

 It is still your program's responsibility to handle the lack of the
 dependency.  For example, something like this:
@@ -520,16 +596,17 @@ field is advisory only.

 ## engineStrict

+**NOTE: This feature is deprecated and will be removed in npm 3.0.0.**
+
 If you are sure that your module will *definitely not* run properly on
-versions of Node/npm other than those specified in the `engines` hash,
+versions of Node/npm other than those specified in the `engines` object,
 then you can set `"engineStrict": true` in your package.json file.
 This will override the user's `engine-strict` config setting.

 Please do not do this unless you are really very very sure.  If your
-engines hash is something overly restrictive, you can quite easily and
+engines object is something overly restrictive, you can quite easily and
 inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node.  Consider this choice carefully.  If
-people abuse it, it will be removed in a future version of npm.
+updating to new versions of Node.  Consider this choice carefully.

 ## os

@@ -575,11 +652,11 @@ does help prevent some confusion if it doesn't work as expected.
 If you set `"private": true` in your package.json, then npm will refuse
 to publish it.

-This is a way to prevent accidental publication of private repositories.
-If you would like to ensure that a given package is only ever published
-to a specific registry (for example, an internal registry),
-then use the `publishConfig` hash described below
-to override the `registry` config param at publish-time.
+This is a way to prevent accidental publication of private repositories.  If
+you would like to ensure that a given package is only ever published to a
+specific registry (for example, an internal registry), then use the
+`publishConfig` dictionary described below to override the `registry` config
+param at publish-time.

 ## publishConfig

--- a/deps/npm/doc/misc/npm-coding-style.md
+++ b/deps/npm/doc/misc/npm-coding-style.md
@@ -10,7 +10,7 @@ designed to reduce visual clutter and make bugs more apparent.
 If you want to contribute to npm (which is very encouraged), you should
 make your code conform to npm's style.

-Note: this concerns npm's code not the specific packages at npmjs.org
+Note: this concerns npm's code not the specific packages that you can download from the npm registry.

 ## Line Length

@@ -21,7 +21,7 @@ statements onto multiple lines.
 ## Indentation

 Two-spaces.  Tabs are better, but they look like hell in web browsers
-(and on github), and node uses 2 spaces, so that's that.
+(and on GitHub), and node uses 2 spaces, so that's that.

 Configure your editor appropriately.

@@ -147,7 +147,7 @@ Use appropriate log levels.  See `npm-config(7)` and search for
 ## Case, naming, etc.

 Use `lowerCamelCase` for multiword identifiers when they refer to objects,
-functions, methods, members, or anything not specified in this section.
+functions, methods, properties, or anything not specified in this section.

 Use `UpperCamelCase` for class names (things that you'd pass to "new").

--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@@ -3,7 +3,7 @@ npm-config(7) -- More than you probably want to know about npm configuration

 ## DESCRIPTION

-npm gets its configuration values from 6 sources, in this priority:
+npm gets its configuration values from the following sources, sorted by priority:

 ### Command Line Flags

@@ -55,7 +55,6 @@ The following shorthands are parsed on the command-line:
 * `-m`: `--message`
 * `-p`, `--porcelain`: `--parseable`
 * `-reg`: `--registry`
-* `-v`: `--version`
 * `-f`: `--force`
 * `-desc`: `--description`
 * `-S`: `--save`
@@ -107,6 +106,16 @@ See package.json(5) for more information.

 ## Config Settings

+### access
+
+* Default: `restricted`
+* Type: Access
+
+When publishing scoped packages, the access level defaults to `restricted`.  If
+you want your scoped package to be publicly viewable (and installable) set
+`--access=public`. The only valid values for `access` are `public` and
+`restricted`. Unscoped packages _always_ have an access level of `public`.
+
 ### always-auth

 * Default: false
@@ -137,14 +146,22 @@ The browser that is called by the `npm docs` command to open websites.
 ### ca

 * Default: The npm CA certificate
-* Type: String or null
+* Type: String, Array or null

 The Certificate Authority signing certificate that is trusted for SSL
-connections to the registry.
+connections to the registry. Values should be in PEM format with newlines
+replaced by the string "\n". For example:
+
+    ca="-----BEGIN CERTIFICATE-----\nXXXX\nXXXX\n-----END CERTIFICATE-----"

 Set to `null` to only allow "known" registrars, or to a specific CA cert
 to trust only that specific signing authority.

+Multiple CAs can be trusted by specifying an array of certificates:
+
+    ca[]="..."
+    ca[]="..."
+
 See also the `strict-ssl` config.

 ### cafile
@@ -226,8 +243,13 @@ If true, then only prints color codes for tty file descriptors.
 * Default: Infinity
 * Type: Number

-The depth to go when recursing directories for `npm ls` and
-`npm cache ls`.
+The depth to go when recursing directories for `npm ls`,
+`npm cache ls`, and `npm outdated`.
+
+For `npm outdated`, a setting of `Infinity` will be treated as `0`
+since that gives more useful information.  To show the outdated status
+of all packages and dependents, use a large integer value,
+e.g., `npm outdated --depth 9999`

 ### description

@@ -361,11 +383,23 @@ The string that starts all the debugging log output.

 ### https-proxy

-* Default: the `HTTPS_PROXY` or `https_proxy` or `HTTP_PROXY` or
-  `http_proxy` environment variables.
+* Default: null
 * Type: url

-A proxy to use for outgoing https requests.
+A proxy to use for outgoing https requests. If the `HTTPS_PROXY` or
+`https_proxy` or `HTTP_PROXY` or `http_proxy` environment variables are set,
+proxy settings will be honored by the underlying `request` library.
+
+### if-present
+
+* Default: false
+* Type: Boolean
+
+If true, npm will not exit with an error code when `run-script` is invoked for
+a script that isn't defined in the `scripts` section of `package.json`. This
+option can be used when it's desirable to optionally run a script when it's
+present and fail if the script fails. This is useful, for example, when running
+scripts that may only apply for some builds in an otherwise generic CI setup.

 ### ignore-scripts

@@ -384,37 +418,37 @@ documentation for the
 [init-package-json](https://github.com/isaacs/init-package-json) module
 for more information, or npm-init(1).

-### init.author.name
+### init-author-name

 * Default: ""
 * Type: String

 The value `npm init` should use by default for the package author's name.

-### init.author.email
+### init-author-email

 * Default: ""
 * Type: String

 The value `npm init` should use by default for the package author's email.

-### init.author.url
+### init-author-url

 * Default: ""
 * Type: String

 The value `npm init` should use by default for the package author's homepage.

-### init.license
+### init-license

 * Default: "ISC"
 * Type: String

 The value `npm init` should use by default for the package license.

-### init.version
+### init-version

-* Default: "0.0.0"
+* Default: "1.0.0"
 * Type: semver

 The value that `npm init` should use by default for the package
@@ -464,7 +498,7 @@ to the npm registry.  Must be IPv4 in versions of Node prior to 0.12.

 ### loglevel

-* Default: "http"
+* Default: "warn"
 * Type: String
 * Values: "silent", "error", "warn", "http", "info", "verbose", "silly"

@@ -472,7 +506,7 @@ What level of logs to report.  On failure, *all* logs are written to
 `npm-debug.log` in the current working directory.

 Any logs of a higher level than the setting are shown.
-The default is "http", which shows http, warn, and error output.
+The default is "warn", which shows warn and error output.

 ### logstream

@@ -510,7 +544,7 @@ Any "%s" in the message will be replaced with the version number.
 * Default: process.version
 * Type: semver or false

-The node version to use when checking package's "engines" hash.
+The node version to use when checking a package's `engines` map.

 ### npat

@@ -532,7 +566,7 @@ usage.
 * Default: true
 * Type: Boolean

-Attempt to install packages in the `optionalDependencies` hash.  Note
+Attempt to install packages in the `optionalDependencies` object.  Note
 that if these packages fail to install, the overall installation
 process is not aborted.

@@ -577,10 +611,12 @@ this as true.

 ### proxy

-* Default: `HTTP_PROXY` or `http_proxy` environment variable, or null
+* Default: null
 * Type: url

-A proxy to use for outgoing http requests.
+A proxy to use for outgoing http requests. If the `HTTP_PROXY` or
+`http_proxy` environment variables are set, proxy settings will be
+honored by the underlying `request` library.

 ### rebuild-bundle

@@ -610,8 +646,8 @@ Remove failed installs.

 Save installed packages to a package.json file as dependencies.

-When used with the `npm rm` command, it removes it from the dependencies
-hash.
+When used with the `npm rm` command, it removes it from the `dependencies`
+object.

 Only works if there is already a package.json file present.

@@ -632,10 +668,10 @@ bundledDependencies list.
 * Default: false
 * Type: Boolean

-Save installed packages to a package.json file as devDependencies.
+Save installed packages to a package.json file as `devDependencies`.

 When used with the `npm rm` command, it removes it from the
-devDependencies hash.
+`devDependencies` object.

 Only works if there is already a package.json file present.

@@ -657,7 +693,7 @@ Save installed packages to a package.json file as
 optionalDependencies.

 When used with the `npm rm` command, it removes it from the
-devDependencies hash.
+`devDependencies` object.

 Only works if there is already a package.json file present.

@@ -669,7 +705,7 @@ Only works if there is already a package.json file present.
 Configure how versions of packages installed to a package.json file via
 `--save` or `--save-dev` get prefixed.

-For example if a package has version `1.2.3`, by default it's version is
+For example if a package has version `1.2.3`, by default its version is
 set to `^1.2.3` which allows minor upgrades for that package, but after
 `npm config set save-prefix='~'` it would be set to `~1.2.3` which only allows
 patch upgrades.
@@ -768,6 +804,19 @@ it will install the specified tag.
 Also the tag that is added to the package@version specified by the `npm
 tag` command, if no explicit tag is given.

+### tag-version-prefix
+
+* Default: `"v"`
+* Type: String
+
+If set, alters the prefix used when tagging a new version when performing a
+version increment using  `npm-version`. To remove the prefix altogether, set it
+to the empty string: `""`.
+
+Because other tools may rely on the convention that npm version tags look like
+`v1.0.0`, _only use this property if it is absolutely necessary_. In
+particular, use care when overriding this setting for public packages.
+
 ### tmp

 * Default: TMPDIR environment variable, or "/tmp"
@@ -818,7 +867,7 @@ The location of user-level configuration settings.
 ### umask

 * Default: 022
-* Type: Octal numeric string
+* Type: Octal numeric string in range 0000..0777 (0..511)

 The "umask" value to use when setting the file creation mode on files
 and folders.
@@ -848,8 +897,8 @@ Only relevant when specified explicitly on the command line.
 * Default: false
 * Type: boolean

-If true, output the npm version as well as node's `process.versions`
-hash, and exit successfully.
+If true, output the npm version as well as node's `process.versions` map, and
+exit successfully.

 Only relevant when specified explicitly on the command line.

@@ -865,7 +914,6 @@ Set to `"browser"` to view html help content in the default web browser.
 ## SEE ALSO

 * npm-config(1)
-* npm-config(7)
 * npmrc(5)
 * npm-scripts(7)
 * npm-folders(5)
--- a/deps/npm/doc/misc/npm-developers.md
+++ b/deps/npm/doc/misc/npm-developers.md
@@ -76,7 +76,7 @@ least, you need:

 * scripts:
  If you have a special compilation or installation script, then you
-  should put it in the `scripts` hash.  You should definitely have at
+  should put it in the `scripts` object.  You should definitely have at
  least a basic smoke-test command as the "scripts.test" field.
  See npm-scripts(7).

@@ -86,8 +86,8 @@ least, you need:
  then you need to specify that in the "main" field.

 * directories:
-  This is a hash of folders.  The best ones to include are "lib" and
-  "doc", but if you specify a folder full of man pages in "man", then
+  This is an object mapping names to folders.  The best ones to include are
+  "lib" and "doc", but if you use "man" to specify a folder full of man pages,
  they'll get installed just like these ones.

 You can use `npm init` in the root of your package in order to get you
@@ -102,6 +102,14 @@ ignore the stuff matched by the `.gitignore` file.  If you *want* to
 include something that is excluded by your `.gitignore` file, you can
 create an empty `.npmignore` file to override it.

+`.npmignore` files follow the [same pattern rules](http://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files)
+as `.gitignore` files:
+
+* Blank lines or lines starting with `#` are ignored.
+* Standard glob patterns work.
+* You can end patterns with a forward slash `/` to specify a directory.
+* You can negate a pattern by starting it with an exclamation point `!`.
+
 By default, the following paths and files are ignored, so there's no
 need to add them to `.npmignore` explicitly:

--- a/deps/npm/doc/misc/npm-faq.md
+++ b/deps/npm/doc/misc/npm-faq.md
@@ -3,7 +3,7 @@ npm-faq(7) -- Frequently Asked Questions

 ## Where can I find these docs in HTML?

-<https://www.npmjs.org/doc/>, or run:
+<https://docs.npmjs.com/>, or run:

    npm config set viewer browser

@@ -80,7 +80,7 @@ Usually, no. Allow npm to resolve dependencies for your packages.
 For packages you **deploy**, such as websites and apps,
 you should use npm shrinkwrap to lock down your full dependency tree:

-https://www.npmjs.org/doc/cli/npm-shrinkwrap.html
+<https://docs.npmjs.com/cli/shrinkwrap>

 If you are paranoid about depending on the npm ecosystem,
 you should run a private npm mirror or a private cache.
@@ -135,7 +135,7 @@ Arguments are greps.  `npm search jsdom` shows jsdom packages.

 ## How do I update npm?

-    npm update npm -g
+    npm install npm -g

 You can also update all outdated local packages by doing `npm update` without
 any arguments, or global packages by doing `npm update -g`.
@@ -147,7 +147,7 @@ command.)

 In those cases, you can do this:

-    curl https://www.npmjs.org/install.sh | sh
+    curl https://www.npmjs.com/install.sh | sh

 ## What is a `package`?

@@ -307,7 +307,7 @@ See `npm-registry(7)`.

 ## I forgot my password, and can't publish.  How do I reset it?

-Go to <https://npmjs.org/forgot>.
+Go to <https://npmjs.com/forgot>.

 ## I get ECONNREFUSED a lot.  What's up?

@@ -327,13 +327,38 @@ on Freenode IRC.

 ## Why no namespaces?

-Please see this discussion: <https://github.com/npm/npm/issues/798>
+npm has only one global namespace.  If you want to namespace your own packages,
+you may: simply use the `-` character to separate the names or use scoped
+packages.  npm is a mostly anarchic system.  There is not sufficient need to
+impose namespace rules on everyone.

-tl;dr - It doesn't actually make things better, and can make them worse.
+As of 2.0, npm supports scoped packages, which allow you to publish a group of
+related modules without worrying about name collisions.

-If you want to namespace your own packages, you may: simply use the
-`-` character to separate the names.  npm is a mostly anarchic system.
-There is not sufficient need to impose namespace rules on everyone.
+Every npm user owns the scope associated with their username.  For example, the
+user named `npm` owns the scope `@npm`.  Scoped packages are published inside a
+scope by naming them as if they were files under the scope directory, e.g., by
+setting `name` in `package.json` to `@npm/npm`.
+
+Scoped packages are supported by the public npm registry. The npm client is
+backwards-compatible with un-scoped registries, so it can be used to work with
+scoped and un-scoped registries at the same time.
+
+Unscoped packages can only depend on other unscoped packages. Scoped packages
+can depend on packages from their own scope, a different scope, or the public
+registry (unscoped).
+
+For the current documentation of scoped packages, see
+<https://docs.npmjs.com/misc/scope>
+
+References:
+
+1. For the reasoning behind the "one global namespace", please see  this
+   discussion: <https://github.com/npm/npm/issues/798> (TL;DR: It doesn't
+   actually make things better, and can make them worse.)
+
+2. For the pre-implementation discussion of the scoped package feature, see
+   this discussion: <https://github.com/npm/npm/issues/5239>

 ## Who does npm?

@@ -341,7 +366,7 @@ npm was originally written by Isaac Z. Schlueter, and many others have
 contributed to it, some of them quite substantially.

 The npm open source project, The npm Registry, and [the community
-website](https://www.npmjs.org) are maintained and operated by the
+website](https://www.npmjs.com) are maintained and operated by the
 good folks at [npm, Inc.](http://www.npmjs.com)

 ## I have a question or request not addressed here. Where should I put it?
--- a/deps/npm/doc/misc/npm-index.md
+++ b/deps/npm/doc/misc/npm-index.md
@@ -3,7 +3,7 @@ npm-index(7) -- Index of all npm documentation

 ### README(1)

-node package manager
+a JavaScript package manager

 ## Command Line Documentation

@@ -11,7 +11,11 @@ Using npm on the command line

 ### npm(1)

-node package manager
+javascript package manager
+
+### npm-access(1)
+
+Set access level on published packages

 ### npm-adduser(1)

@@ -53,6 +57,10 @@ Reduce duplication

 Deprecate a version of a package

+### npm-dist-tag(1)
+
+Modify package distribution tags
+
 ### npm-docs(1)

 Docs for a package in a web browser maybe
@@ -85,6 +93,10 @@ Install a package

 Symlink a package folder

+### npm-logout(1)
+
+Log out of the registry
+
 ### npm-ls(1)

 List installed packages
@@ -123,7 +135,7 @@ Open package repository page in the browser

 ### npm-restart(1)

-Start a package
+Restart a package

 ### npm-rm(1)

@@ -161,10 +173,6 @@ Start a package

 Stop a package

-### npm-submodule(1)
-
-Add a package as a git submodule
-
 ### npm-tag(1)

 Tag a published version
@@ -203,7 +211,7 @@ Using npm in your Node programs

 ### npm(3)

-node package manager
+javascript package manager

 ### npm-bin(3)

@@ -299,7 +307,7 @@ Open package repository page in the browser

 ### npm-restart(3)

-Start a package
+Restart a package

 ### npm-root(3)

@@ -325,10 +333,6 @@ Start a package

 Stop a package

-### npm-submodule(3)
-
-Add a package as a git submodule
-
 ### npm-tag(3)

 Tag a published version
--- a/deps/npm/doc/misc/npm-registry.md
+++ b/deps/npm/doc/misc/npm-registry.md
@@ -31,9 +31,10 @@ similar) design doc to implement the APIs.
 If you set up continuous replication from the official CouchDB, and then
 set your internal CouchDB as the registry config, then you'll be able
 to read any published packages, in addition to your private ones, and by
-default will only publish internally.  If you then want to publish a
-package for the whole world to see, you can simply override the
-`--registry` config for that command.
+default will only publish internally. 
+
+If you then want to publish a package for the whole world to see, you can
+simply override the `--registry` option for that `publish` command.

 ## I don't want my package published in the official registry. It's private.

@@ -57,7 +58,7 @@ effectively implement the entire CouchDB API anyway.

 ## Is there a website or something to see package docs and such?

-Yes, head over to <https://npmjs.org/>
+Yes, head over to <https://npmjs.com/>

 ## SEE ALSO

--- a/deps/npm/doc/misc/npm-scope.md
+++ b/deps/npm/doc/misc/npm-scope.md
@@ -13,9 +13,9 @@ followed by a slash, e.g.
 Scopes are a way of grouping related packages together, and also affect a few
 things about the way npm treats the package.

-**As of 2014-09-03, scoped packages are not supported by the public npm registry**.
-However, the npm client is backwards-compatible with un-scoped registries, so
-it can be used to work with scoped and un-scoped registries at the same time.
+Scoped packages are supported by the public npm registry.  The npm
+client is backwards-compatible with un-scoped registries, so it can be
+used to work with scoped and un-scoped registries at the same time.

 ## Installing scoped packages

@@ -25,8 +25,8 @@ scoped modules will be in `node_modules/@myorg/packagename`. The scope folder
 (`@myorg`) is simply the name of the scope preceded by an @-symbol, and can
 contain any number of scoped packages.

-A scoped package is install by referencing it by name, preceded by an @-symbol,
-in `npm install`:
+A scoped package is installed by referencing it by name, preceded by an
+@-symbol, in `npm install`:

    npm install @myorg/mypackage

@@ -51,10 +51,29 @@ just specifying to require the module `mypackage` in the folder called `@myorg`.

 ## Publishing scoped packages

-Scoped packages can be published to any registry that supports them.
-*As of 2014-09-03, the public npm registry does not support scoped packages*,
-so attempting to publish a scoped package to the registry will fail unless
-you have associated that scope with a different registry, see below.
+Scoped packages can be published to any registry that supports them, including
+the public npm registry.
+
+(As of 2015-04-19, the public npm registry **does** support scoped packages)
+
+If you wish, you may associate a scope with a registry; see below.
+
+### Publishing public scoped packages to the public npm registry
+
+To publish a public scoped package, you must specify `--access public` with
+the initial publication.  This will publish the package and set access
+to `public` as if you had run `npm access public` after publishing.
+
+### Publishing private scoped packages to the npm registry
+
+To publish a private scoped package to the npm registry, you must have
+an [npm Private Modules](https://www.npmjs.com/private-modules)
+account.
+
+You can then publish the module with `npm publish` or `npm publish
+--access restricted`, and it will be present in the npm registry, with
+restricted access.  You can then change the access permissions, if
+desired, with `npm access` or on the npmjs.com website.

 ## Associating a scope with a registry

@@ -81,4 +100,5 @@ that registry instead.
 ## SEE ALSO

 * npm-install(1)
-* npm-publish(1)
+* npm-publish(1)
+* npm-access(1)
--- a/deps/npm/doc/misc/npm-scripts.md
+++ b/deps/npm/doc/misc/npm-scripts.md
@@ -3,7 +3,7 @@ npm-scripts(7) -- How npm handles the "scripts" field

 ## DESCRIPTION

-npm supports the "scripts" member of the package.json script, for the
+npm supports the "scripts" property of the package.json script, for the
 following scripts:

 * prepublish:
@@ -19,10 +19,10 @@ following scripts:
  Run BEFORE the package is uninstalled.
 * postuninstall:
  Run AFTER the package is uninstalled.
-* preupdate:
-  Run BEFORE the package is updated with the update command.
-* update, postupdate:
-  Run AFTER the package is updated with the update command.
+* preversion, version:
+  Run BEFORE bump the package version.
+* postversion:
+  Run AFTER bump the package version.
 * pretest, test, posttest:
  Run by the `npm test` command.
 * prestop, stop, poststop:
@@ -33,50 +33,29 @@ following scripts:
  Run by the `npm restart` command. Note: `npm restart` will run the
  stop and start scripts if no `restart` script is provided.

-Additionally, arbitrary scripts can be executed by running `npm run-script
-<pkg> <stage>`. *Pre* and *post* commands with matching names will be run for
-those as well (e.g. `premyscript`, `myscript`, `postmyscript`).
+Additionally, arbitrary scripts can be executed by running `npm
+run-script <pkg> <stage>`. *Pre* and *post* commands with matching
+names will be run for those as well (e.g. `premyscript`, `myscript`,
+`postmyscript`).

-## NOTE: INSTALL SCRIPTS ARE AN ANTIPATTERN
+## COMMON USES

-**tl;dr** Don't use `install`.  Use a `.gyp` file for compilation, and
-`prepublish` for anything else.
-
-You should almost never have to explicitly set a `preinstall` or
-`install` script.  If you are doing this, please consider if there is
-another option.
-
-The only valid use of `install` or `preinstall` scripts is for
-compilation which must be done on the target architecture.  In early
-versions of node, this was often done using the `node-waf` scripts, or
-a standalone `Makefile`, and early versions of npm required that it be
-explicitly set in package.json.  This was not portable, and harder to
-do properly.
-
-In the current version of node, the standard way to do this is using a
-`.gyp` file.  If you have a file with a `.gyp` extension in the root
-of your package, then npm will run the appropriate `node-gyp` commands
-automatically at install time.  This is the only officially supported
-method for compiling binary addons, and does not require that you add
-anything to your package.json file.
-
-If you have to do other things before your package is used, in a way
+If you need to perform operations on your package before it is used, in a way
 that is not dependent on the operating system or architecture of the
-target system, then use a `prepublish` script instead.  This includes
+target system, use a `prepublish` script.  This includes
 tasks such as:

-* Compile CoffeeScript source code into JavaScript.
-* Create minified versions of JavaScript source code.
+* Compiling CoffeeScript source code into JavaScript.
+* Creating minified versions of JavaScript source code.
 * Fetching remote resources that your package will use.

-The advantage of doing these things at `prepublish` time instead of
-`preinstall` or `install` time is that they can be done once, in a
-single place, and thus greatly reduce complexity and variability.
+The advantage of doing these things at `prepublish` time is that they can be done once, in a
+single place, thus reducing complexity and variability.
 Additionally, this means that:

 * You can depend on `coffee-script` as a `devDependency`, and thus
  your users don't need to have it installed.
-* You don't need to include the minifiers in your package, reducing
+* You don't need to include minifiers in your package, reducing
  the size for your users.
 * You don't need to rely on your users having `curl` or `wget` or
  other system tools on the target machines.
@@ -136,7 +115,7 @@ Configuration parameters are put in the environment with the
 `npm_config_` prefix. For instance, you can view the effective `root`
 config by checking the `npm_config_root` environment variable.

-### Special: package.json "config" hash
+### Special: package.json "config" object

 The package.json "config" keys are overwritten in the environment if
 there is a config param of `<name>[@<version>]:<key>`.  For example,
@@ -237,6 +216,11 @@ above.
 * Don't prefix your script commands with "sudo".  If root permissions
  are required for some reason, then it'll fail with that error, and
  the user will sudo the npm command in question.
+* Don't use `install`. Use a `.gyp` file for compilation, and `prepublish`
+  for anything else. You should almost never have to explicitly set a
+  preinstall or install script. If you are doing this, please consider if
+  there is another option. The only valid use of `install` or `preinstall`
+  scripts is for compilation which must be done on the target architecture.

 ## SEE ALSO

--- a/deps/npm/doc/misc/semver.md
+++ b/deps/npm/doc/misc/semver.md
@@ -16,12 +16,12 @@ As a command-line utility:

    $ semver -h

-    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | -d <dec>]
+    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid <identifier> | -l | -rv]
    Test if version(s) satisfy the supplied range(s), and sort them.

    Multiple versions or ranges may be supplied, unless increment
-    or decrement options are specified.  In that case, only a single
-    version may be used, and it is incremented by the specified level
+    option is specified.  In that case, only a single version may
+    be used, and it is incremented by the specified level

    Program exits successfully if any valid version satisfies
    all supplied ranges, and prints all satisfying versions.
@@ -101,6 +101,30 @@ the user is indicating that they are aware of the risk.  However, it
 is still not appropriate to assume that they have opted into taking a
 similar risk on the *next* set of prerelease versions.

+#### Prerelease Identifiers
+
+The method `.inc` takes an additional `identifier` string argument that
+will append the value of the string as a prerelease identifier:
+
+```javascript
+> semver.inc('1.2.3', 'pre', 'beta')
+'1.2.4-beta.0'
+```
+
+command-line example:
+
+```shell
+$ semver 1.2.3 -i prerelease --preid beta
+1.2.4-beta.0
+```
+
+Which then can be used to increment further:
+
+```shell
+$ semver 1.2.4-beta.0 -i prerelease
+1.2.4-beta.1
+```
+
 ### Advanced Range Syntax

 Advanced range syntax desugars to primitive comparators in
@@ -140,7 +164,7 @@ numeric values in the `[major, minor, patch]` tuple.
 A partial version range is treated as an X-Range, so the special
 character is in fact optional.

-* `` (empty string) := `*` := `>=0.0.0`
+* `""` (empty string) := `*` := `>=0.0.0`
 * `1` := `1.x.x` := `>=1.0.0 <2.0.0`
 * `1.2` := `1.2.x` := `>=1.2.0 <1.3.0`

@@ -161,8 +185,6 @@ comparator.  Allows minor-level changes if not.
  `1.2.4-beta.2` would not, because it is a prerelease of a
  different `[major, minor, patch]` tuple.

-Note: this is the same as the `~>` operator in rubygems.
-
 #### Caret Ranges `^1.2.3` `^0.2.5` `^0.0.4`

 Allows changes that do not modify the left-most non-zero digit in the
@@ -226,6 +248,9 @@ strings that they parse.
    same as `prepatch`. It increments the patch version, then makes a
    prerelease. If the input version is already a prerelease it simply
    increments it.
+* `major(v)`: Return the major version number.
+* `minor(v)`: Return the minor version number.
+* `patch(v)`: Return the patch version number.

 ### Comparison

@@ -245,6 +270,9 @@ strings that they parse.
  `v2` is greater.  Sorts in ascending order if passed to `Array.sort()`.
 * `rcompare(v1, v2)`: The reverse of compare.  Sorts an array of versions
  in descending order when passed to `Array.sort()`.
+* `diff(v1, v2)`: Returns difference between two versions by the release type
+  (`major`, `premajor`, `minor`, `preminor`, `patch`, `prepatch`, or `prerelease`),
+  or null if the versions are the same.


 ### Ranges
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -9,7 +9,7 @@
  <body>
    <div id="wrapper">

-<h1><a href="cli/npm.html">npm</a></h1> <p>node package manager</p>
+<h1><a href="cli/npm.html">npm</a></h1> <p>a JavaScript package manager</p>
 <p><a href="https://travis-ci.org/npm/npm"><img src="https://img.shields.io/travis/npm/npm/master.svg" alt="Build Status"></a></p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <p>This is just enough info to get you up and running.</p>
@@ -30,52 +30,42 @@ and prior, clone the git repo and dig through the old tags and branches.</p>
 paths, etc.) then read on.</p>
 <h2 id="fancy-install-unix-">Fancy Install (Unix)</h2>
 <p>There&#39;s a pretty robust install script at
-<a href="https://www.npmjs.org/install.sh">https://www.npmjs.org/install.sh</a>.  You can download that and run it.</p>
+<a href="https://www.npmjs.com/install.sh">https://www.npmjs.com/install.sh</a>.  You can download that and run it.</p>
 <p>Here&#39;s an example using curl:</p>
-<pre><code>curl -L https://npmjs.org/install.sh | sh
-</code></pre><h3 id="slightly-fancier">Slightly Fancier</h3>
+<pre><code class="lang-sh">curl -L https://www.npmjs.com/install.sh | sh
+</code></pre>
+<h3 id="slightly-fancier">Slightly Fancier</h3>
 <p>You can set any npm configuration params with that script:</p>
-<pre><code>npm_config_prefix=/some/path sh install.sh
-</code></pre><p>Or, you can run it in uber-debuggery mode:</p>
-<pre><code>npm_debug=1 sh install.sh
-</code></pre><h3 id="even-fancier">Even Fancier</h3>
+<pre><code class="lang-sh">npm_config_prefix=/some/path sh install.sh
+</code></pre>
+<p>Or, you can run it in uber-debuggery mode:</p>
+<pre><code class="lang-sh">npm_debug=1 sh install.sh
+</code></pre>
+<h3 id="even-fancier">Even Fancier</h3>
 <p>Get the code with git.  Use <code>make</code> to build the docs and do other stuff.
 If you plan on hacking on npm, <code>make link</code> is your friend.</p>
 <p>If you&#39;ve got the npm source code, you can also semi-permanently set
 arbitrary config keys using the <code>./configure --key=val ...</code>, and then
 run npm commands by doing <code>node cli.js &lt;cmd&gt; &lt;args&gt;</code>.  (This is helpful
 for testing, or running stuff without actually installing npm itself.)</p>
-<h2 id="fancy-windows-install">Fancy Windows Install</h2>
-<p>You can download a zip file from <a href="https://npmjs.org/dist/">https://npmjs.org/dist/</a>, and unpack it
-in the same folder where node.exe lives.</p>
+<h2 id="windows-install-or-upgrade">Windows Install or Upgrade</h2>
+<p>You can download a zip file from <a href="https://github.com/npm/npm/releases">https://github.com/npm/npm/releases</a>, and
+unpack it in the <code>node_modules\npm\</code> folder inside node&#39;s installation folder.</p>
+<p>To upgrade to npm 2, follow the Windows upgrade instructions in
+the npm Troubleshooting Guide:</p>
+<p><a href="https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows">https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows</a></p>
 <p>If that&#39;s not fancy enough for you, then you can fetch the code with
 git, and mess with it directly.</p>
 <h2 id="installing-on-cygwin">Installing on Cygwin</h2>
 <p>No.</p>
-<h2 id="permissions-when-using-npm-to-install-other-stuff">Permissions when Using npm to Install Other Stuff</h2>
-<p><strong>tl;dr</strong></p>
-<ul>
-<li>Use <code>sudo</code> for greater safety.  Or don&#39;t, if you prefer not to.</li>
-<li>npm will downgrade permissions if it&#39;s root before running any build
-scripts that package authors specified.</li>
-</ul>
-<h3 id="more-details-">More details...</h3>
-<p>As of version 0.3, it is recommended to run npm as root.
-This allows npm to change the user identifier to the <code>nobody</code> user prior
-to running any package build or test commands.</p>
-<p>If you are not the root user, or if you are on a platform that does not
-support uid switching, then npm will not attempt to change the userid.</p>
-<p>If you would like to ensure that npm <strong>always</strong> runs scripts as the
-&quot;nobody&quot; user, and have it fail if it cannot downgrade permissions, then
-set the following configuration param:</p>
-<pre><code>npm config set unsafe-perm false
-</code></pre><p>This will prevent running in unsafe mode, even as non-root users.</p>
 <h2 id="uninstalling">Uninstalling</h2>
 <p>So sad to see you go.</p>
-<pre><code>sudo npm uninstall npm -g
-</code></pre><p>Or, if that fails,</p>
-<pre><code>sudo make uninstall
-</code></pre><h2 id="more-severe-uninstalling">More Severe Uninstalling</h2>
+<pre><code class="lang-sh">sudo npm uninstall npm -g
+</code></pre>
+<p>Or, if that fails,</p>
+<pre><code class="lang-sh">sudo make uninstall
+</code></pre>
+<h2 id="more-severe-uninstalling">More Severe Uninstalling</h2>
 <p>Usually, the above instructions are sufficient.  That will remove
 npm, but leave behind anything you&#39;ve installed.</p>
 <p>If you would like to remove all the packages that you have installed,
@@ -83,34 +73,43 @@ then you can use the <code>npm ls</code> command to find them, and then <code>np
 remove them.</p>
 <p>To remove cruft left behind by npm 0.x, you can use the included
 <code>clean-old.sh</code> script file.  You can run it conveniently like this:</p>
-<pre><code>npm explore npm -g -- sh scripts/clean-old.sh
-</code></pre><p>npm uses two configuration files, one for per-user configs, and another
+<pre><code class="lang-sh">npm explore npm -g -- sh scripts/clean-old.sh
+</code></pre>
+<p>npm uses two configuration files, one for per-user configs, and another
 for global (every-user) configs.  You can view them by doing:</p>
-<pre><code>npm config get userconfig   # defaults to ~/.npmrc
+<pre><code class="lang-sh">npm config get userconfig   # defaults to ~/.npmrc
 npm config get globalconfig # defaults to /usr/local/etc/npmrc
-</code></pre><p>Uninstalling npm does not remove configuration files by default.  You
+</code></pre>
+<p>Uninstalling npm does not remove configuration files by default.  You
 must remove them yourself manually if you want them gone.  Note that
 this means that future npm installs will not remember the settings that
 you have chosen.</p>
 <h2 id="using-npm-programmatically">Using npm Programmatically</h2>
-<p>If you would like to use npm programmatically, you can do that.
-It&#39;s not very well documented, but it <em>is</em> rather simple.</p>
-<p>Most of the time, unless you actually want to do all the things that
-npm does, you should try using one of npm&#39;s dependencies rather than
-using npm itself, if possible.</p>
-<p>Eventually, npm will be just a thin cli wrapper around the modules
-that it depends on, but for now, there are some things that you must
-use npm itself to do.</p>
-<pre><code>var npm = require(&quot;npm&quot;)
+<p>Although npm can be used programmatically, its API is meant for use by the CLI
+<em>only</em>, and no guarantees are made regarding its fitness for any other purpose.
+If you want to use npm to reliably perform some task, the safest thing to do is
+to invoke the desired <code>npm</code> command with appropriate arguments.</p>
+<p>The semantic version of npm refers to the CLI itself, rather than the
+underlying API. <em>The internal API is not guaranteed to remain stable even when
+npm&#39;s version indicates no breaking changes have been made according to
+semver.</em></p>
+<p>If you <em>still</em> would like to use npm programmatically, it&#39;s <em>possible</em>. The API
+isn&#39;t very well documented, but it <em>is</em> rather simple.</p>
+<p>Eventually, npm will be just a thin CLI wrapper around the modules that it
+depends on, but for now, there are some things that only the CLI can do. You
+should try using one of npm&#39;s dependencies first, and only use the API if what
+you&#39;re trying to do is only supported by npm itself.</p>
+<pre><code class="lang-javascript">var npm = require(&quot;npm&quot;)
 npm.load(myConfigObject, function (er) {
  if (er) return handlError(er)
  npm.commands.install([&quot;some&quot;, &quot;args&quot;], function (er, data) {
    if (er) return commandFailed(er)
    // command succeeded, and data might have some info
  })
-  npm.on(&quot;log&quot;, function (message) { .... })
+  npm.registry.log.on(&quot;log&quot;, function (message) { .... })
 })
-</code></pre><p>The <code>load</code> function takes an object hash of the command-line configs.
+</code></pre>
+<p>The <code>load</code> function takes an object hash of the command-line configs.
 The various <code>npm.commands.&lt;cmd&gt;</code> functions take an <strong>array</strong> of
 positional argument <strong>strings</strong>.  The last argument to any
 <code>npm.commands.&lt;cmd&gt;</code> function is a callback.  Some commands take other
@@ -122,11 +121,11 @@ change the value for <em>all</em> npm commands in that process.</p>
 command line arguments using nopt.  You may also want to check out <code>npm
 help config</code> to learn about all the options you can set there.</p>
 <h2 id="more-docs">More Docs</h2>
-<p>Check out the <a href="https://www.npmjs.org/doc/">docs</a>,
-especially the <a href="https://www.npmjs.org/doc/faq.html">faq</a>.</p>
+<p>Check out the <a href="https://docs.npmjs.com/">docs</a>,
+especially the <a href="https://docs.npmjs.com/misc/faq">faq</a>.</p>
 <p>You can use the <code>npm help</code> command to read any of them.</p>
 <p>If you&#39;re a developer, and you want to use npm to publish your program,
-you should <a href="https://www.npmjs.org/doc/developers.html">read this</a></p>
+you should <a href="https://docs.npmjs.com/misc/developers">read this</a></p>
 <h2 id="legal-stuff">Legal Stuff</h2>
 <p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
 All rights reserved.  See the included LICENSE file for more details.</p>
@@ -135,13 +134,13 @@ All rights reserved.  See the included LICENSE file for more details.</p>
 npm, Inc. or the Node.js project.</p>
 <p>Data published to the npm registry is not part of npm itself, and is
 the sole property of the publisher.  While every effort is made to
-ensure accountability, there is absolutely no guarantee, warrantee, or
+ensure accountability, there is absolutely no guarantee, warranty, or
 assertion expressed or implied as to the quality, fitness for a
 specific purpose, or lack of malice in any given npm package.</p>
 <p>If you have a complaint about a package in the public npm registry,
-and cannot <a href="https://www.npmjs.org/doc/misc/npm-disputes.html">resolve it with the package
+and cannot <a href="https://docs.npmjs.com/misc/disputes">resolve it with the package
 owner</a>, please email
-<a href="&#x6d;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#x73;&#117;&#112;&#x70;&#x6f;&#114;&#x74;&#x40;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#x63;&#111;&#x6d;">&#x73;&#117;&#112;&#x70;&#x6f;&#114;&#x74;&#x40;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#x63;&#111;&#x6d;</a> and explain the situation.</p>
+<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#x6d;">&#115;&#x75;&#112;&#x70;&#x6f;&#114;&#116;&#64;&#110;&#x70;&#109;&#106;&#115;&#x2e;&#x63;&#111;&#x6d;</a> and explain the situation.</p>
 <p>Any data published to The npm Registry (including user account
 information) may be removed or modified at the sole discretion of the
 npm server administrators.</p>
@@ -160,8 +159,6 @@ ban your account in extreme cases.  So don&#39;t do that.</p>
 <ul>
 <li>web:
 <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li>
-<li>email:
-<a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#110;&#112;&#109;&#45;&#x40;&#x67;&#111;&#111;&#103;&#108;&#x65;&#x67;&#x72;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#x6f;&#109;">&#110;&#112;&#109;&#45;&#x40;&#x67;&#111;&#111;&#103;&#108;&#x65;&#x67;&#x72;&#111;&#117;&#112;&#115;&#x2e;&#x63;&#x6f;&#109;</a></li>
 </ul>
 <p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
 as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p>
@@ -169,10 +166,10 @@ as expected.  The <code>npm-debug.log</code> file is also helpful to provide.</p
 will no doubt tell you to put the output in a gist or email.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="cli/npm.html">npm(1)</a></li>
-<li><a href="misc/npm-faq.html">npm-faq(7)</a></li>
-<li><a href="cli/npm-help.html">npm-help(1)</a></li>
-<li><a href="misc/npm-index.html">npm-index(7)</a></li>
+<li><a href="cli/npm.html"><a href="cli/npm.html">npm(1)</a></a></li>
+<li><a href="misc/npm-faq.html"><a href="misc/npm-faq.html">npm-faq(7)</a></a></li>
+<li><a href="cli/npm-help.html"><a href="cli/npm-help.html">npm-help(1)</a></a></li>
+<li><a href="misc/npm-index.html"><a href="misc/npm-index.html">npm-index(7)</a></a></li>
 </ul>

 </div>
@@ -186,5 +183,5 @@ will no doubt tell you to put the output in a gist or email.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@2.0.0</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-bin.html
+++ b/deps/npm/html/doc/api/npm-bin.html
@@ -15,7 +15,7 @@
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>Print the folder where npm will install executables.</p>
 <p>This function should not be used programmatically.  Instead, just refer
-to the <code>npm.bin</code> member.</p>
+to the <code>npm.bin</code> property.</p>

 </div>

@@ -28,5 +28,5 @@ to the <code>npm.bin</code> member.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@2.0.0</p>
+<p id="footer">npm-bin &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-bugs.html
+++ b/deps/npm/html/doc/api/npm-bugs.html
@@ -33,5 +33,5 @@ friendly for programmatic use.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@2.0.0</p>
+<p id="footer">npm-bugs &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-cache.html
+++ b/deps/npm/html/doc/api/npm-cache.html
@@ -18,7 +18,7 @@ npm.commands.cache.clean([args], callback)
 npm.commands.cache.add([args], callback)
 npm.commands.cache.read(name, version, forceBypass, callback)
 </code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This acts much the same ways as the <a href="../cli/npm-cache.html">npm-cache(1)</a> command line
+<p>This acts much the same ways as the <a href="../cli/npm-cache.html"><a href="../cli/npm-cache.html">npm-cache(1)</a></a> command line
 functionality.</p>
 <p>The callback is called with the package.json data of the thing that is
 eventually added to or read from the cache.</p>
@@ -42,5 +42,5 @@ incrementation.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-cache &mdash; npm@2.0.0</p>
+<p id="footer">npm-cache &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-commands.html
+++ b/deps/npm/html/doc/api/npm-commands.html
@@ -22,7 +22,7 @@ commands are special and take other optional arguments.</p>
 usage, or <code>man 3 npm-&lt;command&gt;</code> for programmatic usage.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../misc/npm-index.html">npm-index(7)</a></li>
+<li><a href="../misc/npm-index.html"><a href="../misc/npm-index.html">npm-index(7)</a></a></li>
 </ul>

 </div>
@@ -36,5 +36,5 @@ usage, or <code>man 3 npm-&lt;command&gt;</code> for programmatic usage.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-commands &mdash; npm@2.0.0</p>
+<p id="footer">npm-commands &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-config.html
+++ b/deps/npm/html/doc/api/npm-config.html
@@ -43,7 +43,7 @@ the duration of a program, use the <code>npm.config.set</code> and <code>npm.con
 functions instead.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../api/npm.html">npm(3)</a></li>
+<li><a href="../api/npm.html"><a href="../api/npm.html">npm(3)</a></a></li>
 </ul>

 </div>
@@ -57,5 +57,5 @@ functions instead.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@2.0.0</p>
+<p id="footer">npm-config &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-deprecate.html
+++ b/deps/npm/html/doc/api/npm-deprecate.html
@@ -31,9 +31,9 @@ a deprecation warning to all who attempt to install it.</p>
 <p>To un-deprecate a package, specify an empty string (<code>&quot;&quot;</code>) for the <code>message</code> argument.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../api/npm-publish.html">npm-publish(3)</a></li>
-<li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
+<li><a href="../api/npm-publish.html"><a href="../api/npm-publish.html">npm-publish(3)</a></a></li>
+<li><a href="../api/npm-unpublish.html"><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></a></li>
+<li><a href="../misc/npm-registry.html"><a href="../misc/npm-registry.html">npm-registry(7)</a></a></li>
 </ul>

 </div>
@@ -47,5 +47,5 @@ a deprecation warning to all who attempt to install it.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@2.0.0</p>
+<p id="footer">npm-deprecate &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-docs.html
+++ b/deps/npm/html/doc/api/npm-docs.html
@@ -33,5 +33,5 @@ friendly for programmatic use.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@2.0.0</p>
+<p id="footer">npm-docs &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-edit.html
+++ b/deps/npm/html/doc/api/npm-edit.html
@@ -36,5 +36,5 @@ and how this is used.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@2.0.0</p>
+<p id="footer">npm-edit &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-explore.html
+++ b/deps/npm/html/doc/api/npm-explore.html
@@ -31,5 +31,5 @@ sure to use <code>npm rebuild &lt;pkg&gt;</code> if you make any changes.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@2.0.0</p>
+<p id="footer">npm-explore &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-help-search.html
+++ b/deps/npm/html/doc/api/npm-help-search.html
@@ -31,7 +31,7 @@ An array of all matching lines (and some adjacent lines).</li>
 <li>file:
 Name of the file that matched</li>
 </ul>
-<p>The silent parameter is not neccessary not used, but it may in the future.</p>
+<p>The silent parameter is not necessary not used, but it may in the future.</p>

 </div>

@@ -44,5 +44,5 @@ Name of the file that matched</li>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@2.0.0</p>
+<p id="footer">npm-help-search &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-init.html
+++ b/deps/npm/html/doc/api/npm-init.html
@@ -26,7 +26,7 @@ JavaScript makes it stupid simple to output formatted JSON, that is the
 preferred method. If you&#39;re sure you want to handle command-line prompting,
 then go ahead and use this programmatically.</p>
 <h2 id="see-also">SEE ALSO</h2>
-<p><a href="../files/package.json.html">package.json(5)</a></p>
+<p><a href="../files/package.json.html"><a href="../files/package.json.html">package.json(5)</a></a></p>

 </div>

@@ -39,5 +39,5 @@ then go ahead and use this programmatically.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@2.0.0</p>
+<p id="footer">npm-init &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-install.html
+++ b/deps/npm/html/doc/api/npm-install.html
@@ -32,5 +32,5 @@ installed or when an error has been encountered.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@2.0.0</p>
+<p id="footer">npm-install &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-link.html
+++ b/deps/npm/html/doc/api/npm-link.html
@@ -42,5 +42,5 @@ the package in the current working directory</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@2.0.0</p>
+<p id="footer">npm-link &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-load.html
+++ b/deps/npm/html/doc/api/npm-load.html
@@ -15,9 +15,9 @@
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>npm.load() must be called before any other function call.  Both parameters are
 optional, but the second is recommended.</p>
-<p>The first parameter is an object hash of command-line config params, and the
-second parameter is a callback that will be called when npm is loaded and
-ready to serve.</p>
+<p>The first parameter is an object containing command-line config params, and the
+second parameter is a callback that will be called when npm is loaded and ready
+to serve.</p>
 <p>The first parameter should follow a similar structure as the package.json
 config object.</p>
 <p>For example, to emulate the --dev flag, pass an object that looks like this:</p>
@@ -37,5 +37,5 @@ config object.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-load &mdash; npm@2.0.0</p>
+<p id="footer">npm-load &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-ls.html
+++ b/deps/npm/html/doc/api/npm-ls.html
@@ -49,7 +49,7 @@ taken if it is serialized to JSON.</p>
 <p>List packages in the global install prefix instead of in the current
 project.</p>
 <p>Note, if parseable is set or long isn&#39;t set, then duplicates will be trimmed.
-This means that if a submodule a same dependency as a parent module, then the
+This means that if a submodule has the same dependency as a parent module, then the
 dependency will only be output once.</p>

 </div>
@@ -63,5 +63,5 @@ dependency will only be output once.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-ls &mdash; npm@2.0.0</p>
+<p id="footer">npm-ls &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-outdated.html
+++ b/deps/npm/html/doc/api/npm-outdated.html
@@ -28,5 +28,5 @@ currently outdated.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-outdated &mdash; npm@2.0.0</p>
+<p id="footer">npm-outdated &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-owner.html
+++ b/deps/npm/html/doc/api/npm-owner.html
@@ -32,8 +32,8 @@ or you can&#39;t.  Future versions may contain more fine-grained access levels,
 that is not implemented at this time.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../api/npm-publish.html">npm-publish(3)</a></li>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
+<li><a href="../api/npm-publish.html"><a href="../api/npm-publish.html">npm-publish(3)</a></a></li>
+<li><a href="../misc/npm-registry.html"><a href="../misc/npm-registry.html">npm-registry(7)</a></a></li>
 </ul>

 </div>
@@ -47,5 +47,5 @@ that is not implemented at this time.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-owner &mdash; npm@2.0.0</p>
+<p id="footer">npm-owner &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-pack.html
+++ b/deps/npm/html/doc/api/npm-pack.html
@@ -33,5 +33,5 @@ overwritten the second time.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-pack &mdash; npm@2.0.0</p>
+<p id="footer">npm-pack &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-prefix.html
+++ b/deps/npm/html/doc/api/npm-prefix.html
@@ -29,5 +29,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prefix &mdash; npm@2.0.0</p>
+<p id="footer">npm-prefix &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-prune.html
+++ b/deps/npm/html/doc/api/npm-prune.html
@@ -30,5 +30,5 @@ package&#39;s dependencies list.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-prune &mdash; npm@2.0.0</p>
+<p id="footer">npm-prune &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-publish.html
+++ b/deps/npm/html/doc/api/npm-publish.html
@@ -30,9 +30,9 @@ current working directory.</p>
 the registry.  Overwrites when the &quot;force&quot; environment variable is set.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../misc/npm-registry.html">npm-registry(7)</a></li>
-<li><a href="../cli/npm-adduser.html">npm-adduser(1)</a></li>
-<li><a href="../api/npm-owner.html">npm-owner(3)</a></li>
+<li><a href="../misc/npm-registry.html"><a href="../misc/npm-registry.html">npm-registry(7)</a></a></li>
+<li><a href="../cli/npm-adduser.html"><a href="../cli/npm-adduser.html">npm-adduser(1)</a></a></li>
+<li><a href="../api/npm-owner.html"><a href="../api/npm-owner.html">npm-owner(3)</a></a></li>
 </ul>

 </div>
@@ -46,5 +46,5 @@ the registry.  Overwrites when the &quot;force&quot; environment variable is set
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-publish &mdash; npm@2.0.0</p>
+<p id="footer">npm-publish &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-rebuild.html
+++ b/deps/npm/html/doc/api/npm-rebuild.html
@@ -30,5 +30,5 @@ the new binary. If no &#39;packages&#39; parameter is specify, every package wil
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-rebuild &mdash; npm@2.0.0</p>
+<p id="footer">npm-rebuild &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-repo.html
+++ b/deps/npm/html/doc/api/npm-repo.html
@@ -33,5 +33,5 @@ friendly for programmatic use.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-repo &mdash; npm@2.0.0</p>
+<p id="footer">npm-repo &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-restart.html
+++ b/deps/npm/html/doc/api/npm-restart.html
@@ -9,20 +9,36 @@
  <body>
    <div id="wrapper">

-<h1><a href="../api/npm-restart.html">npm-restart</a></h1> <p>Start a package</p>
+<h1><a href="../api/npm-restart.html">npm-restart</a></h1> <p>Restart a package</p>
 <h2 id="synopsis">SYNOPSIS</h2>
 <pre><code>npm.commands.restart(packages, callback)
 </code></pre><h2 id="description">DESCRIPTION</h2>
-<p>This runs a package&#39;s &quot;restart&quot; script, if one was provided.
-Otherwise it runs package&#39;s &quot;stop&quot; script, if one was provided, and then
-the &quot;start&quot; script.</p>
+<p>This restarts a package (or multiple packages).</p>
+<p>This runs a package&#39;s &quot;stop&quot;, &quot;restart&quot;, and &quot;start&quot; scripts, and associated
+pre- and post- scripts, in the order given below:</p>
+<ol>
+<li>prerestart</li>
+<li>prestop</li>
+<li>stop</li>
+<li>poststop</li>
+<li>restart</li>
+<li>prestart</li>
+<li>start</li>
+<li>poststart</li>
+<li>postrestart</li>
+</ol>
 <p>If no version is specified, then it restarts the &quot;active&quot; version.</p>
-<p>npm can run tests on multiple packages. Just specify multiple packages
-in the <code>packages</code> parameter.</p>
+<p>npm can restart multiple packages. Just specify multiple packages in
+the <code>packages</code> parameter.</p>
+<h2 id="note">NOTE</h2>
+<p>Note that the &quot;restart&quot; script is run <strong>in addition to</strong> the &quot;stop&quot;
+and &quot;start&quot; scripts, not instead of them.</p>
+<p>This is the behavior as of <code>npm</code> major version 2.  A change in this
+behavior will be accompanied by an increase in major version number</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../api/npm-start.html">npm-start(3)</a></li>
-<li><a href="../api/npm-stop.html">npm-stop(3)</a></li>
+<li><a href="../api/npm-start.html"><a href="../api/npm-start.html">npm-start(3)</a></a></li>
+<li><a href="../api/npm-stop.html"><a href="../api/npm-stop.html">npm-stop(3)</a></a></li>
 </ul>

 </div>
@@ -36,5 +52,5 @@ in the <code>packages</code> parameter.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-restart &mdash; npm@2.0.0</p>
+<p id="footer">npm-restart &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-root.html
+++ b/deps/npm/html/doc/api/npm-root.html
@@ -29,5 +29,5 @@
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-root &mdash; npm@2.0.0</p>
+<p id="footer">npm-root &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-run-script.html
+++ b/deps/npm/html/doc/api/npm-run-script.html
@@ -23,11 +23,11 @@ one element, then the first is assumed to be the package and the second is
 assumed to be the command to run. All other elements are ignored.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
-<li><a href="../misc/npm-scripts.html">npm-scripts(7)</a></li>
-<li><a href="../api/npm-test.html">npm-test(3)</a></li>
-<li><a href="../api/npm-start.html">npm-start(3)</a></li>
-<li><a href="../api/npm-restart.html">npm-restart(3)</a></li>
-<li><a href="../api/npm-stop.html">npm-stop(3)</a></li>
+<li><a href="../misc/npm-scripts.html"><a href="../misc/npm-scripts.html">npm-scripts(7)</a></a></li>
+<li><a href="../api/npm-test.html"><a href="../api/npm-test.html">npm-test(3)</a></a></li>
+<li><a href="../api/npm-start.html"><a href="../api/npm-start.html">npm-start(3)</a></a></li>
+<li><a href="../api/npm-restart.html"><a href="../api/npm-restart.html">npm-restart(3)</a></a></li>
+<li><a href="../api/npm-stop.html"><a href="../api/npm-stop.html">npm-stop(3)</a></a></li>
 </ul>

 </div>
@@ -41,5 +41,5 @@ assumed to be the command to run. All other elements are ignored.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-run-script &mdash; npm@2.0.0</p>
+<p id="footer">npm-run-script &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-search.html
+++ b/deps/npm/html/doc/api/npm-search.html
@@ -53,5 +53,5 @@ like).</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-search &mdash; npm@2.0.0</p>
+<p id="footer">npm-search &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-shrinkwrap.html
+++ b/deps/npm/html/doc/api/npm-shrinkwrap.html
@@ -33,5 +33,5 @@ been saved.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-shrinkwrap &mdash; npm@2.0.0</p>
+<p id="footer">npm-shrinkwrap &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-start.html
+++ b/deps/npm/html/doc/api/npm-start.html
@@ -14,8 +14,8 @@
 <pre><code>npm.commands.start(packages, callback)
 </code></pre><h2 id="description">DESCRIPTION</h2>
 <p>This runs a package&#39;s &quot;start&quot; script, if one was provided.</p>
-<p>npm can run tests on multiple packages. Just specify multiple packages
-in the <code>packages</code> parameter.</p>
+<p>npm can start multiple packages. Just specify multiple packages in the
+<code>packages</code> parameter.</p>

 </div>

@@ -28,5 +28,5 @@ in the <code>packages</code> parameter.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-start &mdash; npm@2.0.0</p>
+<p id="footer">npm-start &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-stop.html
+++ b/deps/npm/html/doc/api/npm-stop.html
@@ -28,5 +28,5 @@ in the <code>packages</code> parameter.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-stop &mdash; npm@2.0.0</p>
+<p id="footer">npm-stop &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-submodule.html
+++ b/deps/npm/html/doc/api/npm-submodule.html
@@ -42,5 +42,4 @@ dependencies into the submodule folder.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-submodule &mdash; npm@2.0.0</p>
-
+<p id="footer">npm-submodule &mdash; npm@1.4.28</p>
--- a/deps/npm/html/doc/api/npm-tag.html
+++ b/deps/npm/html/doc/api/npm-tag.html
@@ -21,7 +21,7 @@ currently used.</p>
 is the package name and version is the version number (much like installing a
 specific version).</p>
 <p>The second element is the name of the tag to tag this version with. If this
-parameter is missing or falsey (empty), the default froom the config will be
+parameter is missing or falsey (empty), the default from the config will be
 used. For more information about how to set this config, check
 <code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p>

@@ -36,5 +36,5 @@ used. For more information about how to set this config, check
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-tag &mdash; npm@2.0.0</p>
+<p id="footer">npm-tag &mdash; npm@2.11.3</p>

--- a/deps/npm/html/doc/api/npm-test.html
+++ b/deps/npm/html/doc/api/npm-test.html
@@ -30,5 +30,5 @@ in the <code>packages</code> parameter.</p>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-test &mdash; npm@2.0.0</p>
+<p id="footer">npm-test &mdash; npm@2.11.3</p>

--- a/Show More
+++ b/Show More