summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorisaacs <i@izs.me>2012-03-05 10:59:14 -0800
committerisaacs <i@izs.me>2012-03-05 10:59:14 -0800
commit33f9074a621f5f62dea018e61968a2617397f738 (patch)
treefdbb967613ab03d4d6cc8c404d9fd5c295b1742c /LICENSE
parent8258bd467a178297096f409e305f0d04abc765a7 (diff)
downloadnode-33f9074a621f5f62dea018e61968a2617397f738.tar.gz
Mention marked, and add license to doc generator
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE7
1 files changed, 6 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index c655cbaf9..82838211a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -79,8 +79,13 @@ The externally maintained libraries used by Node are:
licensed under a permissive free software license. See
deps/zlib/LICENSE.
- - deps/npm npm is a package manager program copyright 2009, 2010, 2011
+ - deps/npm npm is a package manager program copyright 2009 - 2012
Isaac Z. Schlueter and licensed under MIT. npm includes several
subpackages MIT or Apache licenses, see deps/npm/LICENSE for more
information. npm is included in the Node .msi and .pkg distributions
but not in the Node binary itself.
+
+ - tools/doc/node_modules/marked Marked is a Markdown parser Copyright
+ (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/). Marked
+ is used in the generation of node documentation, but not distributed in
+ any node binaries.