license: Cleaned up legalese with actual lawyer

1 files changed, 35 insertions, 6 deletions

diff --git a/LICENSE b/LICENSE
index 9505fc119..b6e3548d1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,11 @@
 Copyright (c) npm, Inc. and Contributors
 All rights reserved.
 
-npm is released under the Artistic License 2.0.
-The text of the License follows:
+npm is released under the Artistic License 2.0, subject to additional terms
+that are listed below.
+
+The text of the npm License follows and the text of the additional terms
+follows the Artistic License 2.0 terms:
 
 
 --------
@@ -214,13 +217,39 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------
 
 
+The following additional terms shall apply to use of the npm software, the npm
+website, the npm repository and any other services or products offered by npm,
+Inc.:
+
 "Node.js" trademark Joyent, Inc.  npm is not officially part of the Node.js
 project, and is neither owned by nor 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" and "The npm Registry" are owned by npm, Inc. All rights reserved.
+
+Modules published on the npm registry are not officially endorsed by npm, Inc.
+or the Node.js project.
+
+Data published to the npm registry is not part of npm itself, and is the sole
+property of the publisher. While every effort is made to ensure accountability,
+there is absolutely no guarantee, warrantee, or assertion expressed or implied
+as to the quality, fitness for a specific purpose, or lack of malice in any
+given npm package.  Packages downloaded through the npm registry are
+independently licensed and are not covered by this license.
+
+Additional policies relating to, and restrictions on use of, npm products and
+services are available on the npm website.  All such policies and restrictions,
+as updated from time to time, are hereby incorporated into this license
+agreement.  By using npm, you acknowledge your agreement to all such policies
+and restrictions.
+
+If you have a complaint about a package in the public npm registry, and cannot
+resolve it with the package owner, please email support@npmjs.com and explain
+the situation.  See the [npm Dispute Resolution
+policy](https://github.com/npm/policies/blob/master/disputes.md) for more
+details.
+
+Any data published to The npm Registry (including user account information) may
+be removed or modified at the sole discretion of the npm server administrators.
 
 "npm Logo" created by Mathias Pettersson and Brian Hammond,
 used with permission.