Skip to content

Commit

Permalink
doc: update npm license in main LICENSE file
Browse files Browse the repository at this point in the history
PR-URL: #10352
  • Loading branch information
rvagg committed Dec 21, 2016
1 parent 830584c commit bc6766d
Showing 1 changed file with 25 additions and 28 deletions.
53 changes: 25 additions & 28 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,32 @@ maintained libraries. The externally maintained libraries used by Node are:
- npm is a package manager program located at deps/npm.
npm's license follows:
"""
Copyright (c) Isaac Z. Schlueter
All rights reserved.
The npm application
Copyright (c) npm, Inc. and Contributors
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 2.0 License.
The text of the License follows:
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


--------
Expand Down Expand Up @@ -533,30 +554,6 @@ maintained libraries. The externally maintained libraries used by Node are:
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------


"Node.js" and "node" trademark Joyent, Inc. npm is not officially
part of the Node.js project, and is neither owned by nor
officially affiliated with Joyent, Inc.

Packages published in the npm registry (other than the Software and
its included dependencies) are not part of npm itself, are the sole
property of their respective maintainers, and are not covered by
this license.

"npm Logo" created by Mathias Pettersson and Brian Hammond,
used with permission.

"Gubblebum Blocky" font
Copyright (c) by Tjarda Koster, http://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.
"""

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

0 comments on commit bc6766d

Please sign in to comment.