diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-02-06 01:14:25 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-06 18:38:36 +0100 |
| commit | af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6 (patch) | |
| tree | c9b3218b9df65485edca5f150bef4ba0263c8e28 /deps/npm/doc | |
| parent | 9dc9ec3ce6ba6f3dd4020e00f5863e207fa08a75 (diff) | |
| download | node-new-af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6.tar.gz | |
deps: upgrade npm to 2.5.1
PR-URL: https://github.com/iojs/io.js/pull/738
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/npm/doc')
| -rw-r--r-- | deps/npm/doc/cli/npm-shrinkwrap.md | 4 | ||||
| -rw-r--r-- | deps/npm/doc/files/package.json.md | 2 | ||||
| -rw-r--r-- | deps/npm/doc/misc/npm-config.md | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md index 05637f21db..e17afcd259 100644 --- a/deps/npm/doc/cli/npm-shrinkwrap.md +++ b/deps/npm/doc/cli/npm-shrinkwrap.md @@ -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" } } } @@ -101,7 +101,7 @@ installs a package with a npm-shrinkwrap.json file 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 +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. diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 1a54ec06b3..933c23a64a 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -452,7 +452,7 @@ For example: { "name": "tea-latte", - "version": "1.3.5" + "version": "1.3.5", "peerDependencies": { "tea": "2.x" } diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index 1772b34ec1..96dda6b9f5 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -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` @@ -433,7 +432,7 @@ The value `npm init` should use by default for the package license. ### init-version -* Default: "0.0.0" +* Default: "1.0.0" * Type: semver The value that `npm init` should use by default for the package @@ -690,7 +689,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. @@ -886,7 +885,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) |