From 18c12bb925e42c9af7977a1496ef3c4d547af283 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 28 Jan 2016 18:20:39 -0800 Subject: [PATCH] doc: update npm LICENSE using license-builder.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/4958 Reviewed-By: Myles Borins Reviewed-By: Kat Marchán Reviewed-By: James M Snell Reviewed-By: Jeremiah Senkpiel --- LICENSE | 73 ++++++++++++++++++--------------------------------------- 1 file changed, 23 insertions(+), 50 deletions(-) diff --git a/LICENSE b/LICENSE index 0bef5360342..f527a1c8b23 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 - 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 -------- @@ -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: