Skip to content

Commit c3ec5d0

Browse files
zkatrvagg
authored andcommitted
deps: Updated node LICENSE file with new npm license
PR-URL: #4110 Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 7c528b7 commit c3ec5d0

File tree

1 file changed

+61
-15
lines changed

1 file changed

+61
-15
lines changed

LICENSE

+61-15
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,32 @@ The externally maintained libraries used by Node.js are:
338338
- npm is a package manager program located at deps/npm.
339339
npm's license follows:
340340
"""
341-
Copyright (c) Isaac Z. Schlueter
342-
All rights reserved.
341+
The npm application
342+
Copyright (c) npm, Inc. and Contributors
343+
Licensed on the terms of The Artistic License 2.0
344+
345+
Node package dependencies of the npm application
346+
Copyright (c) their respective copyright owners
347+
Licensed on their respective license terms
348+
349+
The npm public registry at https://registry.npmjs.com
350+
and the npm website at https://www.npmjs.com
351+
Operated by npm, Inc.
352+
Use governed by terms published on https://www.npmjs.com
353+
354+
"Node.js"
355+
Trademark Joyent, Inc., https://joyent.com
356+
Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
343357

344-
npm is released under the Artistic 2.0 License.
345-
The text of the License follows:
358+
The Node.js application
359+
Project of Node Foundation, https://nodejs.org
360+
361+
The npm Logo
362+
Copyright (c) Mathias Pettersson and Brian Hammond
363+
364+
"Gubblebum Blocky" typeface
365+
Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
366+
Used with permission
346367

347368

348369
--------
@@ -554,24 +575,49 @@ The externally maintained libraries used by Node.js are:
554575
--------
555576

556577

557-
"Node.js" and "node" trademark Joyent, Inc. npm is not officially
558-
part of the Node.js project, and is neither owned by nor
559-
officially affiliated with Joyent, Inc.
578+
The following additional terms shall apply to use of the npm software, the npm
579+
website, the npm repository and any other services or products offered by npm,
580+
Inc.:
560581

561-
Packages published in the npm registry (other than the Software and
562-
its included dependencies) are not part of npm itself, are the sole
563-
property of their respective maintainers, and are not covered by
564-
this license.
582+
"Node.js" trademark Joyent, Inc. npm is not officially part of the Node.js
583+
project, and is neither owned by nor affiliated with Joyent, Inc.
565584

566-
"npm Logo" created by Mathias Pettersson and Brian Hammond,
567-
used with permission.
585+
"npm" and "The npm Registry" are owned by npm, Inc. All rights reserved.
586+
587+
Modules published on the npm registry are not officially endorsed by npm, Inc.
588+
or the Node.js project.
589+
590+
Data published to the npm registry is not part of npm itself, and is the sole
591+
property of the publisher. While every effort is made to ensure accountability,
592+
there is absolutely no guarantee, warrantee, or assertion expressed or implied
593+
as to the quality, fitness for a specific purpose, or lack of malice in any
594+
given npm package. Packages downloaded through the npm registry are
595+
independently licensed and are not covered by this license.
596+
597+
Additional policies relating to, and restrictions on use of, npm products and
598+
services are available on the npm website. All such policies and restrictions,
599+
as updated from time to time, are hereby incorporated into this license
600+
agreement. By using npm, you acknowledge your agreement to all such policies
601+
and restrictions.
602+
603+
If you have a complaint about a package in the public npm registry, and cannot
604+
resolve it with the package owner, please email [email protected] and explain
605+
the situation. See the [npm Dispute Resolution
606+
policy](https://github.com/npm/policies/blob/master/disputes.md) for more
607+
details.
608+
609+
Any data published to The npm Registry (including user account information) may
610+
be removed or modified at the sole discretion of the npm server administrators.
611+
612+
"npm Logo" contributed by Mathias Pettersson and Brian Hammond,
613+
use is subject to https://www.npmjs.com/policies/trademark
568614

569615
"Gubblebum Blocky" font
570-
Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
616+
Copyright (c) by Tjarda Koster, https://jelloween.deviantart.com
571617
included for use in the npm website and documentation,
572618
used with permission.
573619

574-
This program uses several Node.js modules contained in the node_modules/
620+
This program uses several Node modules contained in the node_modules/
575621
subdirectory, according to the terms of their respective licenses.
576622
"""
577623

0 commit comments

Comments
 (0)