diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index 3702d8a05..c0f51a741 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author") +Copyright (c) Isaac Z. Schlueter (the "Original Author") All rights reserved. MIT +no-false-attribs License @@ -42,23 +42,24 @@ Original Author, when distributed with the Software. 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, are the sole property of their respective maintainers, -and are not covered by this license. +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) 2007 by Tjarda Koster, http://jelloween.deviantart.com +Copyright (c) by Tjarda Koster, http://jelloween.deviantart.com included for use in the npm website and documentation, used with permission. -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, +This program uses "request", Copyright (c) Mikeal Rogers, according to the terms of the Apache license. -This program uses "mkdirp", Copyright (c) 2010 James Halliday, +This program uses "mkdirp", Copyright (c) James Halliday, according to the terms of the MIT/X11 license. + +This program uses "opener", Copyright (c) Domenic Denicola, +according to the terms of the DWTFPL2 license. diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 8a856e9fa..6ee80d57b 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -120,10 +120,10 @@ doc-publish: doc html/api/ \ node@npmjs.org:/home/node/npm-www/api rsync -vazu --stats --no-implied-dirs --delete \ - html/webfonts/ \ + html/static/webfonts/ \ node@npmjs.org:/home/node/npm-www/static/webfonts rsync -vazu --stats --no-implied-dirs --delete \ - html/style.css \ + html/static/style.css \ node@npmjs.org:/home/node/npm-www/static/ zip-publish: release diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index 01c4871ba..93a6261c8 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@
This function should not be used programmatically. Instead, just refer
to the npm.bin member.