From: isaacs
Date: Wed, 11 Dec 2013 18:20:26 +0000 (-0800)
Subject: npm: Upgrade to 1.3.17
X-Git-Tag: v0.10.23~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a22de4f7eed04f14e590fdc5c8739d2ee17753e5;p=platform%2Fupstream%2Fnodejs.git
npm: Upgrade to 1.3.17
---
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index f159ffa..890b29f 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -113,3 +113,5 @@ Stuart Knightley
Stuart P. Bentley
Vaz Allen
elisee
+Evan You
+Wil Moore III
diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md
index 4cbb112..618ebab 100644
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@@ -173,6 +173,9 @@ local space in some cases.
The `--no-bin-links` argument will prevent npm from creating symlinks for
any binaries the package might contain.
+The `--no-optional` argument will prevent optional dependencies from
+being installed.
+
The `--no-shrinkwrap` argument, which will ignore an available
shrinkwrap file and use the package.json instead.
diff --git a/deps/npm/doc/cli/npm-version.md b/deps/npm/doc/cli/npm-version.md
index 18aaf74..870bd49 100644
--- a/deps/npm/doc/cli/npm-version.md
+++ b/deps/npm/doc/cli/npm-version.md
@@ -3,7 +3,7 @@ npm-version(1) -- Bump a package version
## SYNOPSIS
- npm version [ | major | minor | patch | build]
+ npm version [ | major | minor | patch]
## DESCRIPTION
@@ -11,7 +11,7 @@ Run this in a package directory to bump the version and write the new
data back to the package.json file.
The `newversion` argument should be a valid semver string, *or* a valid
-second argument to semver.inc (one of "build", "patch", "minor", or
+second argument to semver.inc (one of "patch", "minor", or
"major"). In the second case, the existing version will be incremented
by 1 in the specified field.
diff --git a/deps/npm/doc/cli/repo.md b/deps/npm/doc/cli/repo.md
index 5c281c2..12085c1 100644
--- a/deps/npm/doc/cli/repo.md
+++ b/deps/npm/doc/cli/repo.md
@@ -4,12 +4,15 @@ npm-repo(1) -- Open package repository page in the browser
## SYNOPSIS
npm repo
+ npm repo (with no args in a package dir)
## DESCRIPTION
This command tries to guess at the likely location of a package's
repository URL, and then tries to open it using the `--browser`
-config param.
+config param. If no package name is provided, it will search for
+a `package.json` in the current folder and try to use the property
+of the name field.
## CONFIGURATION
diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md
index 5bb966a..86eb925 100644
--- a/deps/npm/doc/files/package.json.md
+++ b/deps/npm/doc/files/package.json.md
@@ -112,10 +112,15 @@ 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 or MIT, is
-to just specify the name of the license you're using, like this:
+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:
- { "license" : "BSD" }
+ { "license" : "BSD-3-Clause" }
+
+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.
If you have more complex licensing terms, or you want to provide more detail
in your package.json file, you can use the more verbose plural form, like this:
diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
index 750b809..97822c1 100644
--- a/deps/npm/doc/misc/npm-config.md
+++ b/deps/npm/doc/misc/npm-config.md
@@ -406,6 +406,13 @@ The value `npm init` should use by default for the package author's email.
The value `npm init` should use by default for the package author's homepage.
+### init.license
+
+* Default: "BSD-2-Clause"
+* Type: String
+
+The value `npm init` should use by default for the package license.
+
### json
* Default: false
diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md
index 32493d3..d27c7e7 100644
--- a/deps/npm/doc/misc/npm-faq.md
+++ b/deps/npm/doc/misc/npm-faq.md
@@ -277,6 +277,7 @@ Windows:
*
*
+*
## How can I use npm for development?
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index 9a34b83..bf2a273 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -239,7 +239,7 @@ will no doubt tell you to put the output in a gist or email.
-
+