diff options
author | Forrest L Norvell <forrest@npmjs.com> | 2015-04-17 01:12:21 -0700 |
---|---|---|
committer | Chris Dickinson <christopher.s.dickinson@gmail.com> | 2015-04-17 13:26:30 -0700 |
commit | 4870213f9e30e21dcbef19282d04cc40e04035cb (patch) | |
tree | fbf8bd696c4bc40b5c5b81a4bff567b30e864f30 /deps/npm/doc | |
parent | 49bb7ded2c78ea6b714b5e3640584ee37a1f6668 (diff) | |
download | node-new-4870213f9e30e21dcbef19282d04cc40e04035cb.tar.gz |
deps: upgrade npm to 2.8.3
Diffstat (limited to 'deps/npm/doc')
-rw-r--r-- | deps/npm/doc/cli/npm-dist-tag.md | 3 | ||||
-rw-r--r-- | deps/npm/doc/cli/npm-install.md | 42 | ||||
-rw-r--r-- | deps/npm/doc/files/package.json.md | 10 |
3 files changed, 49 insertions, 6 deletions
diff --git a/deps/npm/doc/cli/npm-dist-tag.md b/deps/npm/doc/cli/npm-dist-tag.md index f8e4566ca7..ce4f7ed4d5 100644 --- a/deps/npm/doc/cli/npm-dist-tag.md +++ b/deps/npm/doc/cli/npm-dist-tag.md @@ -33,7 +33,8 @@ When installing dependencies, a preferred tagged version may be specified: This also applies to `npm dedupe`. -Publishing a package always sets the "latest" tag to the published version. +Publishing a package sets the "latest" tag to the published version unless the +`--tag` option is used. For example, `npm publish --tag=beta`. ## PURPOSE diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index acc221d31f..6c732c4f67 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -164,15 +164,51 @@ after packing it up into a tarball (b). npm install mygithubuser/myproject - To reference a package in a git repo that is not on GitHub, see git - remote urls below. + To reference a package in a generic git repo (not on GitHub), see git remote + urls below. + +* `npm install github:<githubname>/<githubrepo>`: + + The same as the above, but explicitly marked as a GitHub dependency. + + Example: + + npm install github:npm/npm + +* `npm install gist:[<githubname>/]<gistID>`: + + 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. + + Example: + + npm install gist:101a11beef + +* `npm install bitbucket:<bitbucketname>/<bitbucketrepo>`: + + Install the package at `https://bitbucket.org/bitbucketname/bitbucketrepo` + by attempting to clone it using `git`. + + Example: + + npm install bitbucket:mybitbucketuser/myproject + +* `npm install gitlab:<gitlabname>/<gitlabrepo>`: + + Install the package at `https://gitlab.com/gitlabname/gitlabrepo` + by attempting to clone it using `git`. + + Example: + + npm install gitlab:mygitlabuser/myproject * `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><separator><path>[#<commit-ish>] `<protocol>` is one of `git`, `git+ssh`, `git+http`, or `git+https`. If no `<commit-ish>` is specified, then `master` is diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md index 18a398b77e..b1c8f210f4 100644 --- a/deps/npm/doc/files/package.json.md +++ b/deps/npm/doc/files/package.json.md @@ -272,11 +272,17 @@ The URL should be a publicly available (perhaps read-only) url that can be hande 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 repositories you can use the same shortcut syntax you use for `npm -install`: +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" property is a dictionary containing script commands that are run |