summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-01-28 18:20:39 -0800
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-02-01 10:43:35 -0500
commit18c12bb925e42c9af7977a1496ef3c4d547af283 (patch)
tree13abfb1c66870470e395b2c3939ecec79aab18cb /LICENSE
parent76cb81b354de8447898427619c66c86c59b22b3d (diff)
downloadandroid-node-v8-18c12bb925e42c9af7977a1496ef3c4d547af283.tar.gz
android-node-v8-18c12bb925e42c9af7977a1496ef3c4d547af283.tar.bz2
android-node-v8-18c12bb925e42c9af7977a1496ef3c4d547af283.zip
doc: update npm LICENSE using license-builder.sh
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 'LICENSE')
-rw-r--r--LICENSE73
1 files changed, 23 insertions, 50 deletions
diff --git a/LICENSE b/LICENSE
index 0bef536034..f527a1c8b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -672,14 +672,32 @@ The externally maintained libraries used by Node.js are:
- npm, located at deps/npm, is licensed as follows:
"""
+ The npm application
Copyright (c) npm, Inc. and Contributors
- All rights reserved.
+ Licensed on the terms of The Artistic License 2.0
+
+ Node package dependencies of the npm application
+ Copyright (c) their respective copyright owners
+ Licensed on their respective license 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.
- npm is released under the Artistic License 2.0, subject to additional terms
- that are listed below.
+ The Node.js application
+ Project of Node Foundation, https://nodejs.org
- The text of the npm License follows and the text of the additional terms
- follows the Artistic License 2.0 terms:
+ The npm Logo
+ Copyright (c) Mathias Pettersson and Brian Hammond
+
+ "Gubblebum Blocky" typeface
+ Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
+ Used with permission
--------
@@ -879,51 +897,6 @@ The externally maintained libraries used by Node.js are:
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.
"""
- GYP, located at tools/gyp, is licensed as follows: