From 2c8e2372644e38a9a84176e8f41b2aa6bb6aa5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Tue, 4 Oct 2016 13:29:19 -0400 Subject: [PATCH] doc: update npm LICENSE using license-builder.sh PR-URL: https://github.com/nodejs/node/pull/8928 Reviewed-By: Myles Borins Reviewed-By: Jeremiah Senkpiel --- LICENSE | 47 +---------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/LICENSE b/LICENSE index f6e6f5555a8e3b..05d34922dd1782 100644 --- a/LICENSE +++ b/LICENSE @@ -897,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: @@ -977,7 +932,7 @@ The externally maintained libraries used by Node.js are: - marked, located at tools/doc/node_modules/marked, is licensed as follows: """ - Copyright (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/) + Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal