diff options
author | Rebecca Turner <me@re-becca.org> | 2016-01-28 18:11:35 -0800 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2016-02-01 10:43:34 -0500 |
commit | 76cb81b354de8447898427619c66c86c59b22b3d (patch) | |
tree | 0c0826bed77086fb38cda8dc680d4fb10d2cff25 /deps/npm/LICENSE | |
parent | d5d301f3032a0723f5a29cfbe0d95ac4ad205d42 (diff) | |
download | node-new-76cb81b354de8447898427619c66c86c59b22b3d.tar.gz |
deps: upgrade npm to 3.6.0
PR-URL: https://github.com/nodejs/node/pull/4958
Reviewed-By: Myles Borins <mborins@us.ibm.com>
Reviewed-By: Kat Marchán <kzm@sykosomatic.org>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/LICENSE')
-rw-r--r-- | deps/npm/LICENSE | 74 |
1 files changed, 23 insertions, 51 deletions
diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index ab28d1e223..0b6c228745 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,11 +1,29 @@ +The npm application Copyright (c) npm, Inc. and Contributors -All rights reserved. +Licensed on the terms of The Artistic License 2.0 -npm is released under the Artistic License 2.0, subject to additional terms -that are listed below. +Node package dependencies of the npm application +Copyright (c) their respective copyright owners +Licensed on their respective license terms -The text of the npm License follows and the text of the additional terms -follows the Artistic License 2.0 terms: +The npm public registry at https://registry.npmjs.org +and the npm website at https://www.npmjs.com +Operated by npm, Inc. +Use governed by terms published on https://www.npmjs.com + +"Node.js" +Trademark Joyent, Inc., https://joyent.com +Neither npm nor npm, Inc. are affiliated with Joyent, Inc. + +The Node.js application +Project of Node Foundation, https://nodejs.org + +The npm Logo +Copyright (c) Mathias Pettersson and Brian Hammond + +"Gubblebum Blocky" typeface +Copyright (c) Tjarda Koster, https://jelloween.deviantart.com +Used with permission -------- @@ -215,49 +233,3 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------- - - -The following additional terms shall apply to use of the npm software, the npm -website, the npm repository and any other services or products offered by npm, -Inc.: - -"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js -project, and is neither owned by nor affiliated with Joyent, Inc. - -"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved. - -Modules published on the npm registry are not officially endorsed by 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 assertion expressed or implied -as to the quality, fitness for a specific purpose, or lack of malice in any -given npm package. Packages downloaded through the npm registry are -independently licensed and are not covered by this license. - -Additional policies relating to, and restrictions on use of, npm products and -services are available on the npm website. All such policies and restrictions, -as updated from time to time, are hereby incorporated into this license -agreement. By using npm, you acknowledge your agreement to all such policies -and restrictions. - -If you have a complaint about a package in the public npm registry, and cannot -resolve it with the package owner, please email support@npmjs.com and explain -the situation. See the [npm Dispute Resolution -policy](https://github.com/npm/policies/blob/master/disputes.md) for more -details. - -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. - -"npm Logo" contributed by Mathias Pettersson and Brian Hammond, -use is subject to https://www.npmjs.com/policies/trademark - -"Gubblebum Blocky" font -Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com -included for use in the npm website and documentation, -used with permission. - -This program uses several Node modules contained in the node_modules/ -subdirectory, according to the terms of their respective licenses. |