Skip to content

Commit bc6766d

Browse files
committed
doc: update npm license in main LICENSE file
PR-URL: #10352
1 parent 830584c commit bc6766d

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed

LICENSE

+25-28
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,32 @@ maintained libraries. The externally maintained libraries used by Node are:
322322
- npm is a package manager program located at deps/npm.
323323
npm's license follows:
324324
"""
325-
Copyright (c) Isaac Z. Schlueter
326-
All rights reserved.
325+
The npm application
326+
Copyright (c) npm, Inc. and Contributors
327+
Licensed on the terms of The Artistic License 2.0
328+
329+
Node package dependencies of the npm application
330+
Copyright (c) their respective copyright owners
331+
Licensed on their respective license terms
332+
333+
The npm public registry at https://registry.npmjs.org
334+
and the npm website at https://www.npmjs.com
335+
Operated by npm, Inc.
336+
Use governed by terms published on https://www.npmjs.com
337+
338+
"Node.js"
339+
Trademark Joyent, Inc., https://joyent.com
340+
Neither npm nor npm, Inc. are affiliated with Joyent, Inc.
327341

328-
npm is released under the Artistic 2.0 License.
329-
The text of the License follows:
342+
The Node.js application
343+
Project of Node Foundation, https://nodejs.org
344+
345+
The npm Logo
346+
Copyright (c) Mathias Pettersson and Brian Hammond
347+
348+
"Gubblebum Blocky" typeface
349+
Copyright (c) Tjarda Koster, https://jelloween.deviantart.com
350+
Used with permission
330351

331352

332353
--------
@@ -533,30 +554,6 @@ maintained libraries. The externally maintained libraries used by Node are:
533554
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
534555
DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
535556
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
536-
537-
538-
--------
539-
540-
541-
"Node.js" and "node" trademark Joyent, Inc. npm is not officially
542-
part of the Node.js project, and is neither owned by nor
543-
officially affiliated with Joyent, Inc.
544-
545-
Packages published in the npm registry (other than the Software and
546-
its included dependencies) are not part of npm itself, are the sole
547-
property of their respective maintainers, and are not covered by
548-
this license.
549-
550-
"npm Logo" created by Mathias Pettersson and Brian Hammond,
551-
used with permission.
552-
553-
"Gubblebum Blocky" font
554-
Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com
555-
included for use in the npm website and documentation,
556-
used with permission.
557-
558-
This program uses several Node modules contained in the node_modules/
559-
subdirectory, according to the terms of their respective licenses.
560557
"""
561558

562559
- tools/doc/node_modules/marked. Marked is a Markdown parser. Marked's

0 commit comments

Comments
 (0)