From db273818f6cafeab443746f128ef7522c0dedb90 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 1 Dec 2011 18:19:17 -0800 Subject: [PATCH] s/NPM/npm/ http://npmjs.org/doc/faq.html#If-npm-is-an-acronym-why-is-it-never-capitalized --- LICENSE | 6 +++--- doc/v0.4_announcement.html | 2 +- lib/net.js | 2 +- tools/osx-pkg.pmdoc/index.xml | 4 ++-- wscript | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 204ff4b93dd279..c655cbaf9cb8c8 100644 --- a/LICENSE +++ b/LICENSE @@ -79,8 +79,8 @@ 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 - Isaac Z. Schlueter and licensed under MIT. NPM includes several + - deps/npm npm is a package manager program copyright 2009, 2010, 2011 + 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 + information. npm is included in the Node .msi and .pkg distributions but not in the Node binary itself. diff --git a/doc/v0.4_announcement.html b/doc/v0.4_announcement.html index 8ecda802cc1177..7d68376bcdca90 100644 --- a/doc/v0.4_announcement.html +++ b/doc/v0.4_announcement.html @@ -43,7 +43,7 @@

Second Stable Branch of Node released

  • With a good amount of experience now, some modifications to the module loading system were made to better support package managers. - In particular, NPM was forced to resort to deep symlinks and "shim" + In particular, npm was forced to resort to deep symlinks and "shim" modules to work around missing features in require(). The main changes are:
      diff --git a/lib/net.js b/lib/net.js index b06a78d2551fb8..13b33a45b761ad 100644 --- a/lib/net.js +++ b/lib/net.js @@ -101,7 +101,7 @@ function Socket(options) { if (typeof options == 'number') { // Legacy interface. - // Must support legacy interface. NPM depends on it. + // Must support legacy interface. Old versions of npm depend on it. // https://github.com/isaacs/npm/blob/c7824f412f0cb59d6f55cf0bc220253c39e6029f/lib/utils/output.js#L110 var fd = options; diff --git a/tools/osx-pkg.pmdoc/index.xml b/tools/osx-pkg.pmdoc/index.xml index d805747fcfdd0e..4ba2725c19cbb1 100644 --- a/tools/osx-pkg.pmdoc/index.xml +++ b/tools/osx-pkg.pmdoc/index.xml @@ -12,8 +12,8 @@ \ /usr/local/bin/node\ \ -NPM was installed at\ +npm was installed at\ \ /usr/local/bin/npm\ \ -Make sure that /usr/local/bin is in your $PATH.}]]>01local.xml02npm.xmlproperties.titleproperties.userDomainproperties.anywhereDomainproperties.systemDomain \ No newline at end of file +Make sure that /usr/local/bin is in your $PATH.}]]>01local.xml02npm.xmlproperties.titleproperties.userDomainproperties.anywhereDomainproperties.systemDomain diff --git a/wscript b/wscript index 52c5edceeb2a1c..0d922e6632ddd0 100644 --- a/wscript +++ b/wscript @@ -980,7 +980,7 @@ def install_npm(bld): start_dir = bld.path.find_dir('deps/npm') # The chmod=-1 is a Node hack. We changed WAF so that when chmod was set to # -1 that the same permission in this tree are used. Necessary to get - # npm-cli.js to be executable without having to list every file in NPM. + # npm-cli.js to be executable without having to list every file in npm. bld.install_files('${LIBDIR}/node_modules/npm', start_dir.ant_glob('**/*'), cwd=start_dir,