MIT +no-false-attribs

1 files changed, 24 insertions, 7 deletions

diff --git a/LICENSE b/LICENSE
index 74127bd1e..414ca3d31 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,9 +1,7 @@
-Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
+Copyright 2009, 2010, 2011 Isaac Z. Schlueter (the "Author")
 All rights reserved.
 
-Unless otherwise noted, this license applies to npm and any
-bundled modules that are authored by Isaac Z. Schlueter, when
-distributed as part of the npm program.
+MIT +no-false-attribs License
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -17,6 +15,15 @@ conditions:
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
 
+Distributions of all or part of the Software intended to be used
+by the recipients as they would use the unmodified Software,
+containing modifications that substantially alter, remove, or
+disable functionality of the Software, outside of the documented
+configuration mechanisms provided by the Software, shall be
+modified such that the Author's bug reporting email addresses and
+urls are removed, and replaced with the contact information of
+the parties responsible for the changes.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -27,18 +34,28 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
 
+Except where noted, this license applies to any and all software
+programs and associated documentation files created by the
+Author, when distributed with the Software.
+
 "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 are not part of npm
-itself, and are the sole property of their respective
-maintainers.
+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.
 
 This program includes a BSDTar/LibArchive version 2.8.3-1 binary,
 originally distributed as part of the MinGW suite, compiled for
-Win32, used according to the terms of the BSD license.
+Win32, according to the terms of the BSD license.
 See deps/basic-bsdtar-2.8.3-1-ming32-bin/basic-bsdtar.LICENSE.
+
+This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
+according to the terms of the MIT license.
+
+This program uses "request", Copyright (c) 2011 Mikeal Rogers,
+according to the terms of the Apache license.