Skip to content
This repository
Browse code

Merge remote branch 'origin/v0.6'

Conflicts:
	Makefile
	configure
	src/node_version.h
  • Loading branch information...
commit 8b28d599a72e717dc00d10f2cc68e64ac6fd5330 2 parents 08a91ac + cc5cea3
ry authored January 09, 2012

Showing 229 changed files with 1,123 additions and 463 deletions. Show diff stats Hide diff stats

  1. 9  AUTHORS
  2. 42  ChangeLog
  3. 47  Makefile
  4. 2  README.md
  5. 17  deps/npm/Makefile
  6. 84  deps/npm/doc/cli/disputes.md
  7. 66  deps/npm/doc/cli/faq.md
  8. 4  deps/npm/doc/cli/index.md
  9. 1  deps/npm/doc/cli/owner.md
  10. 1  deps/npm/doc/cli/registry.md
  11. 2  deps/npm/html/api/bin.html
  12. 2  deps/npm/html/api/bugs.html
  13. 2  deps/npm/html/api/commands.html
  14. 2  deps/npm/html/api/config.html
  15. 2  deps/npm/html/api/deprecate.html
  16. 2  deps/npm/html/api/docs.html
  17. 2  deps/npm/html/api/edit.html
  18. 2  deps/npm/html/api/explore.html
  19. 2  deps/npm/html/api/help-search.html
  20. 2  deps/npm/html/api/init.html
  21. 2  deps/npm/html/api/install.html
  22. 2  deps/npm/html/api/link.html
  23. 2  deps/npm/html/api/load.html
  24. 2  deps/npm/html/api/ls.html
  25. 4  deps/npm/html/api/npm.html
  26. 2  deps/npm/html/api/outdated.html
  27. 2  deps/npm/html/api/owner.html
  28. 2  deps/npm/html/api/pack.html
  29. 2  deps/npm/html/api/prefix.html
  30. 2  deps/npm/html/api/prune.html
  31. 2  deps/npm/html/api/publish.html
  32. 2  deps/npm/html/api/rebuild.html
  33. 2  deps/npm/html/api/restart.html
  34. 2  deps/npm/html/api/root.html
  35. 2  deps/npm/html/api/run-script.html
  36. 2  deps/npm/html/api/search.html
  37. 2  deps/npm/html/api/start.html
  38. 2  deps/npm/html/api/stop.html
  39. 2  deps/npm/html/api/submodule.html
  40. 2  deps/npm/html/api/tag.html
  41. 2  deps/npm/html/api/test.html
  42. 2  deps/npm/html/api/uninstall.html
  43. 2  deps/npm/html/api/unpublish.html
  44. 2  deps/npm/html/api/update.html
  45. 2  deps/npm/html/api/version.html
  46. 2  deps/npm/html/api/view.html
  47. 2  deps/npm/html/api/whoami.html
  48. 2  deps/npm/html/doc/README.html
  49. 2  deps/npm/html/doc/adduser.html
  50. 2  deps/npm/html/doc/bin.html
  51. 2  deps/npm/html/doc/bugs.html
  52. 2  deps/npm/html/doc/build.html
  53. 2  deps/npm/html/doc/bundle.html
  54. 2  deps/npm/html/doc/cache.html
  55. 2  deps/npm/html/doc/changelog.html
  56. 2  deps/npm/html/doc/coding-style.html
  57. 2  deps/npm/html/doc/completion.html
  58. 2  deps/npm/html/doc/config.html
  59. 2  deps/npm/html/doc/deprecate.html
  60. 2  deps/npm/html/doc/developers.html
  61. 115  deps/npm/html/doc/disputes.html
  62. 2  deps/npm/html/doc/docs.html
  63. 2  deps/npm/html/doc/edit.html
  64. 2  deps/npm/html/doc/explore.html
  65. 68  deps/npm/html/doc/faq.html
  66. 2  deps/npm/html/doc/folders.html
  67. 2  deps/npm/html/doc/help-search.html
  68. 2  deps/npm/html/doc/help.html
  69. 6  deps/npm/html/doc/index.html
  70. 2  deps/npm/html/doc/init.html
  71. 2  deps/npm/html/doc/install.html
  72. 2  deps/npm/html/doc/json.html
  73. 2  deps/npm/html/doc/link.html
  74. 2  deps/npm/html/doc/list.html
  75. 4  deps/npm/html/doc/npm.html
  76. 2  deps/npm/html/doc/outdated.html
  77. 4  deps/npm/html/doc/owner.html
  78. 2  deps/npm/html/doc/pack.html
  79. 2  deps/npm/html/doc/prefix.html
  80. 2  deps/npm/html/doc/prune.html
  81. 2  deps/npm/html/doc/publish.html
  82. 2  deps/npm/html/doc/rebuild.html
  83. 4  deps/npm/html/doc/registry.html
  84. 2  deps/npm/html/doc/removing-npm.html
  85. 2  deps/npm/html/doc/restart.html
  86. 2  deps/npm/html/doc/root.html
  87. 2  deps/npm/html/doc/run-script.html
  88. 2  deps/npm/html/doc/scripts.html
  89. 2  deps/npm/html/doc/search.html
  90. 2  deps/npm/html/doc/semver.html
  91. 2  deps/npm/html/doc/star.html
  92. 2  deps/npm/html/doc/start.html
  93. 2  deps/npm/html/doc/stop.html
  94. 2  deps/npm/html/doc/submodule.html
  95. 2  deps/npm/html/doc/tag.html
  96. 2  deps/npm/html/doc/test.html
  97. 2  deps/npm/html/doc/uninstall.html
  98. 2  deps/npm/html/doc/unpublish.html
  99. 2  deps/npm/html/doc/update.html
  100. 2  deps/npm/html/doc/version.html
  101. 2  deps/npm/html/doc/view.html
  102. 2  deps/npm/html/doc/whoami.html
  103. 51  deps/npm/lib/npm.js
  104. 2  deps/npm/lib/utils/cmd-shim.js
  105. 2  deps/npm/lib/utils/fetch.js
  106. 33  deps/npm/lib/utils/ini.js
  107. 4  deps/npm/lib/utils/npm-registry-client/get.js
  108. 17  deps/npm/lib/utils/read-json.js
  109. 2  deps/npm/man/man1/README.1
  110. 2  deps/npm/man/man1/adduser.1
  111. 2  deps/npm/man/man1/bin.1
  112. 2  deps/npm/man/man1/bugs.1
  113. 2  deps/npm/man/man1/build.1
  114. 2  deps/npm/man/man1/bundle.1
  115. 2  deps/npm/man/man1/cache.1
  116. 2  deps/npm/man/man1/changelog.1
  117. 2  deps/npm/man/man1/coding-style.1
  118. 2  deps/npm/man/man1/completion.1
  119. 2  deps/npm/man/man1/config.1
  120. 2  deps/npm/man/man1/deprecate.1
  121. 2  deps/npm/man/man1/developers.1
  122. 124  deps/npm/man/man1/disputes.1
  123. 2  deps/npm/man/man1/docs.1
  124. 2  deps/npm/man/man1/edit.1
  125. 2  deps/npm/man/man1/explore.1
  126. 77  deps/npm/man/man1/faq.1
  127. 2  deps/npm/man/man1/folders.1
  128. 2  deps/npm/man/man1/help-search.1
  129. 2  deps/npm/man/man1/help.1
  130. 5  deps/npm/man/man1/index.1
  131. 2  deps/npm/man/man1/init.1
  132. 2  deps/npm/man/man1/install.1
  133. 2  deps/npm/man/man1/json.1
  134. 2  deps/npm/man/man1/link.1
  135. 2  deps/npm/man/man1/list.1
  136. 4  deps/npm/man/man1/npm.1
  137. 2  deps/npm/man/man1/outdated.1
  138. 5  deps/npm/man/man1/owner.1
  139. 2  deps/npm/man/man1/pack.1
  140. 2  deps/npm/man/man1/prefix.1
  141. 2  deps/npm/man/man1/prune.1
  142. 2  deps/npm/man/man1/publish.1
  143. 2  deps/npm/man/man1/rebuild.1
  144. 5  deps/npm/man/man1/registry.1
  145. 2  deps/npm/man/man1/removing-npm.1
  146. 2  deps/npm/man/man1/restart.1
  147. 2  deps/npm/man/man1/root.1
  148. 2  deps/npm/man/man1/run-script.1
  149. 2  deps/npm/man/man1/scripts.1
  150. 2  deps/npm/man/man1/search.1
  151. 2  deps/npm/man/man1/semver.1
  152. 2  deps/npm/man/man1/star.1
  153. 2  deps/npm/man/man1/start.1
  154. 2  deps/npm/man/man1/stop.1
  155. 2  deps/npm/man/man1/submodule.1
  156. 2  deps/npm/man/man1/tag.1
  157. 2  deps/npm/man/man1/test.1
  158. 2  deps/npm/man/man1/uninstall.1
  159. 2  deps/npm/man/man1/unpublish.1
  160. 2  deps/npm/man/man1/update.1
  161. 2  deps/npm/man/man1/version.1
  162. 2  deps/npm/man/man1/view.1
  163. 2  deps/npm/man/man1/whoami.1
  164. 2  deps/npm/man/man3/bin.3
  165. 2  deps/npm/man/man3/bugs.3
  166. 2  deps/npm/man/man3/commands.3
  167. 2  deps/npm/man/man3/config.3
  168. 2  deps/npm/man/man3/deprecate.3
  169. 2  deps/npm/man/man3/docs.3
  170. 2  deps/npm/man/man3/edit.3
  171. 2  deps/npm/man/man3/explore.3
  172. 2  deps/npm/man/man3/help-search.3
  173. 2  deps/npm/man/man3/init.3
  174. 2  deps/npm/man/man3/install.3
  175. 2  deps/npm/man/man3/link.3
  176. 2  deps/npm/man/man3/load.3
  177. 2  deps/npm/man/man3/ls.3
  178. 4  deps/npm/man/man3/npm.3
  179. 2  deps/npm/man/man3/outdated.3
  180. 2  deps/npm/man/man3/owner.3
  181. 2  deps/npm/man/man3/pack.3
  182. 2  deps/npm/man/man3/prefix.3
  183. 2  deps/npm/man/man3/prune.3
  184. 2  deps/npm/man/man3/publish.3
  185. 2  deps/npm/man/man3/rebuild.3
  186. 2  deps/npm/man/man3/restart.3
  187. 2  deps/npm/man/man3/root.3
  188. 2  deps/npm/man/man3/run-script.3
  189. 2  deps/npm/man/man3/search.3
  190. 2  deps/npm/man/man3/start.3
  191. 2  deps/npm/man/man3/stop.3
  192. 2  deps/npm/man/man3/submodule.3
  193. 2  deps/npm/man/man3/tag.3
  194. 2  deps/npm/man/man3/test.3
  195. 2  deps/npm/man/man3/uninstall.3
  196. 2  deps/npm/man/man3/unpublish.3
  197. 2  deps/npm/man/man3/update.3
  198. 2  deps/npm/man/man3/version.3
  199. 2  deps/npm/man/man3/view.3
  200. 2  deps/npm/man/man3/whoami.3
  201. 1  deps/npm/node_modules/fstream/lib/link-writer.js
  202. 2  deps/npm/node_modules/fstream/package.json
  203. 4  deps/npm/node_modules/tar/lib/pack.js
  204. 2  deps/npm/node_modules/tar/package.json
  205. 2  deps/npm/package.json
  206. 52  deps/npm/scripts/install.sh
  207. 40  deps/npm/scripts/release.sh
  208. 7  deps/npm/test/run.js
  209. 12  deps/uv/src/unix/internal.h
  210. 9  doc/api/http.markdown
  211. 7  doc/api/net.markdown
  212. 2  doc/api/tls.markdown
  213. 8  doc/cla.html
  214. 14  doc/index.html
  215. 2  doc/logos/index.html
  216. 4  doc/template.html
  217. 38  lib/events.js
  218. 38  lib/http.js
  219. 2  node.gyp
  220. 4  src/node.cc
  221. 27  src/node_crypto.cc
  222. 1  src/node_crypto.h
  223. 78  src/node_http_parser.cc
  224. 7  test/simple/test-event-emitter-check-listener-leaks.js
  225. 12  test/simple/test-http-parser-bad-ref.js
  226. 6  test/simple/test-http-parser.js
  227. 14  test/simple/test-http-response-close.js
  228. 30  test/simple/test-sys.js
  229. 10  vcbuild.bat
9  AUTHORS
@@ -244,3 +244,12 @@ Kyle Robinson Young <kyle@dontkry.com>
244 244
 Tim Oxley <secoif@gmail.com>
245 245
 Ingmar Runge <ingmar@irsoft.de>
246 246
 Russ Bradberry <rbradberry@gmail.com>
  247
+Andreas Madsen <amwebdk@gmail.com>
  248
+Adam Malcontenti-Wilson <adman.com@gmail.com>
  249
+James Hartig <james.hartig@grooveshark.com>
  250
+Shannen Saez <shannenlaptop@gmail.com>
  251
+Seong-Rak Choi <ragiragi@hanmail.net>
  252
+Dave Irvine <davman99@gmail.com>
  253
+Ju-yeong Park <interruptz@gmail.com>
  254
+Phil Sung <psung@dnanexus.com>
  255
+Damon Oehlman <damon.oehlman@sidelab.com>
42  ChangeLog
... ...
@@ -1,4 +1,44 @@
1  
-2011.12.14, Version 0.6.6 (stable)
  1
+2012.01.06, Version 0.6.7 (stable)
  2
+
  3
+* V8 hash collision fix (Breaks MIPS) (Bert Belder, Erik Corry)
  4
+
  5
+* Upgrade V8 to 3.6.6.15
  6
+
  7
+* Upgrade npm to 1.1.0-beta-10 (isaacs)
  8
+
  9
+* many doc updates (Ben Noordhuis, Jeremy Martin, koichik, Dave Irvine,
  10
+  Seong-Rak Choi, Shannen, Adam Malcontenti-Wilson, koichik)
  11
+
  12
+* Fix segfault in node_http_parser.cc
  13
+
  14
+* dgram, timers: fix memory leaks (Ben Noordhuis, Yoshihiro Kikuchi)
  15
+
  16
+* repl: fix repl.start not passing the `ignoreUndefined` arg (Damon Oehlman)
  17
+
  18
+* #1980: Socket.pause null reference when called on a closed Stream (koichik)
  19
+
  20
+* #2263: XMLHttpRequest piped in a writable file stream hang (koichik)
  21
+
  22
+* #2069: http resource leak (koichik)
  23
+
  24
+* buffer.readInt global pollution fix (Phil Sung)
  25
+
  26
+* timers: fix performance regression (Ben Noordhuis)
  27
+
  28
+* #2308, #2246: node swallows openssl error on request (koichik)
  29
+
  30
+* #2114: timers: remove _idleTimeout from item in .unenroll() (James Hartig)
  31
+
  32
+* #2379: debugger: Request backtrace w/o refs (Fedor Indutny)
  33
+
  34
+* simple DTrace ustack helper (Dave Pacheco)
  35
+
  36
+* crypto: rewrite HexDecode without snprintf (Roman Shtylman)
  37
+
  38
+* crypto: don't ignore DH init errors (Ben Noordhuis)
  39
+
  40
+
  41
+2011.12.14, Version 0.6.6
2 42
 
3 43
 * npm update to 1.1.0-beta-4 (Isaac Z. Schlueter)
4 44
 
47  Makefile
... ...
@@ -1,4 +1,5 @@
1 1
 BUILDTYPE ?= Release
  2
+PYTHON ?= python
2 3
 
3 4
 ifeq ($(BUILDTYPE),Release)
4 5
 all: out/Makefile node
@@ -38,41 +39,41 @@ distclean:
38 39
 	-rm config.gypi
39 40
 
40 41
 test: all
41  
-	python tools/test.py --mode=release simple message
  42
+	$(PYTHON) tools/test.py --mode=release simple message
42 43
 
43 44
 test-http1: all
44  
-	python tools/test.py --mode=release --use-http1 simple message
  45
+	$(PYTHON) tools/test.py --mode=release --use-http1 simple message
45 46
 
46 47
 test-valgrind: all
47  
-	python tools/test.py --mode=release --valgrind simple message
  48
+	$(PYTHON) tools/test.py --mode=release --valgrind simple message
48 49
 
49 50
 test-all: all
50 51
 	python tools/test.py --mode=debug,release
51 52
 	$(MAKE) test-npm
52 53
 
53 54
 test-all-http1: all
54  
-	python tools/test.py --mode=debug,release --use-http1
  55
+	$(PYTHON) tools/test.py --mode=debug,release --use-http1
55 56
 
56 57
 test-all-valgrind: all
57  
-	python tools/test.py --mode=debug,release --valgrind
  58
+	$(PYTHON) tools/test.py --mode=debug,release --valgrind
58 59
 
59 60
 test-release: all
60  
-	python tools/test.py --mode=release
  61
+	$(PYTHON) tools/test.py --mode=release
61 62
 
62 63
 test-debug: all
63  
-	python tools/test.py --mode=debug
  64
+	$(PYTHON) tools/test.py --mode=debug
64 65
 
65 66
 test-message: all
66  
-	python tools/test.py message
  67
+	$(PYTHON) tools/test.py message
67 68
 
68 69
 test-simple: all
69  
-	python tools/test.py simple
  70
+	$(PYTHON) tools/test.py simple
70 71
 
71 72
 test-pummel: all
72  
-	python tools/test.py pummel
  73
+	$(PYTHON) tools/test.py pummel
73 74
 
74 75
 test-internet: all
75  
-	python tools/test.py internet
  76
+	$(PYTHON) tools/test.py internet
76 77
 
77 78
 test-npm: node
78 79
 	./node deps/npm/test/run.js
@@ -138,11 +139,25 @@ docopen: out/doc/api/all.html
138 139
 docclean:
139 140
 	-rm -rf out/doc
140 141
 
141  
-VERSION=$(shell git describe)
  142
+VERSION=v$(shell $(PYTHON) tools/getnodeversion.py)
142 143
 TARNAME=node-$(VERSION)
143 144
 
144  
-#dist: doc/node.1 doc/api
145  
-dist: doc
  145
+dist: $(TARBALL) $(PKG)
  146
+
  147
+PKGDIR=out/dist-osx
  148
+
  149
+pkg: $(PKG)
  150
+
  151
+$(PKG):
  152
+	-rm -rf $(PKGDIR)
  153
+	$(WAF) configure --prefix=/usr/local --without-snapshot
  154
+	DESTDIR=$(PKGDIR) $(WAF) install
  155
+	$(packagemaker) \
  156
+		--id "org.nodejs.NodeJS-$(VERSION)" \
  157
+		--doc tools/osx-pkg.pmdoc \
  158
+		--out $(PKG)
  159
+
  160
+$(TARBALL): out/doc
146 161
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
147 162
 	mkdir -p $(TARNAME)/doc
148 163
 	cp doc/node.1 $(TARNAME)/doc/node.1
@@ -162,10 +177,10 @@ bench-idle:
162 177
 	./node benchmark/idle_clients.js &
163 178
 
164 179
 jslint:
165  
-	PYTHONPATH=tools/closure_linter/ python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/
  180
+	PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/
166 181
 
167 182
 cpplint:
168  
-	@python tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c)
  183
+	@$(PYTHON) tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c)
169 184
 
170 185
 lint: jslint cpplint
171 186
 
2  README.md
Source Rendered
@@ -3,7 +3,7 @@ Evented I/O for V8 javascript. [![Build Status](https://secure.travis-ci.org/joy
3 3
 
4 4
 ### To build:
5 5
 
6  
-Unix/Macintosh (requires python >= 2.5.2):
  6
+Unix/Macintosh (requires python 2.6 or 2.7):
7 7
 
8 8
     ./configure
9 9
     make
17  deps/npm/Makefile
@@ -108,18 +108,29 @@ version: link
108 108
 	git add package.json &&\
109 109
 	git ci -m v$(shell npm -v)
110 110
 
111  
-publish: link
  111
+publish: link doc
  112
+	git tag -d v$(shell npm -v) || true
  113
+	git push origin :v$(shell npm -v) || true
  114
+	npm unpublish npm@$(shell npm -v) || true
112 115
 	git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\
113 116
 	git push origin --tags &&\
114 117
 	npm publish &&\
115  
-	make doc-publish
  118
+	npm tag npm@$(shell npm -v) $(shell npm -v | awk -F. '{print $$1 "." $$2}') &&\
  119
+	make doc-publish &&\
  120
+	make zip-publish
116 121
 
117 122
 docpublish: doc-publish
118 123
 doc-publish: doc
119 124
 	rsync -vazu --stats --no-implied-dirs --delete html/doc/ npmjs.org:/var/www/npmjs.org/public/doc
120 125
 	rsync -vazu --stats --no-implied-dirs --delete html/api/ npmjs.org:/var/www/npmjs.org/public/api
121 126
 
  127
+zip-publish: release
  128
+	scp release/*.zip npmjs.org:/var/www/npmjs.org/public/dist/
  129
+
  130
+release:
  131
+	@bash scripts/release.sh
  132
+
122 133
 sandwich:
123 134
 	@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || echo "make it yourself"
124 135
 
125  
-.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish
  136
+.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish release zip-publish
84  deps/npm/doc/cli/disputes.md
Source Rendered
... ...
@@ -0,0 +1,84 @@
  1
+npm-disputes(1) -- Handling Module Name Disputes
  2
+================================================
  3
+
  4
+## SYNOPSIS
  5
+
  6
+1. Get the author email with `npm owner ls <pkgname>`
  7
+1. Email the author, CC <i@izs.me>.
  8
+2. After a few weeks, if there's no resolution, we'll sort it out.
  9
+
  10
+## DESCRIPTION
  11
+
  12
+There sometimes arise cases where a user publishes a module, and then
  13
+later, some other user wants to use that name.  Here are some common
  14
+ways that happens (each of these is based on actual events.)
  15
+
  16
+1. Bob writes a JavaScript module `foo`, which is not node-specific.
  17
+   Bob doesn't use node at all.  Joe wants to use `foo` in node, so he
  18
+   wraps it in an npm module.  Some time later, Bob starts using node,
  19
+   and wants to take over management of his program.
  20
+2. Bob writes an npm module `foo`, and publishes it.  Perhaps much
  21
+   later, Joe finds a bug in `foo`, and fixes it.  He sends a pull
  22
+   request to Bob, but Bob doesn't have the time to deal with it,
  23
+   because he has a new job and a new baby and is focused on his new
  24
+   erlang project, and kind of not involved with node any more.  Joe
  25
+   would like to publish a new `foo`, but can't, because the name is
  26
+   taken.
  27
+3. Bob writes a 10-line flow-control library, and calls it `foo`, and
  28
+   publishes it to the npm registry.  Being a simple little thing, it
  29
+   never really has to be updated.  Joe works for Foo Inc, the makers
  30
+   of the critically acclaimed and widely-marketed `foo` JavaScript
  31
+   toolkit framework.  They publish it to npm as `foojs`, but people are
  32
+   routinely confused when `npm install foo` is some different thing.
  33
+4. Bob writes a parser for the widely-known `foo` file format, because
  34
+   he needs it for work.  Then, he gets a new job, and never updates the
  35
+   prototype.  Later on, Joe writes a much more complete `foo` parser,
  36
+   but can't publish, because Bob's `foo` is in the way.
  37
+
  38
+The validity of Joe's claim in each situation can be debated.  However,
  39
+Joe's appropriate course of action in each case is the same.
  40
+
  41
+1. `npm owner ls foo`.  This will tell Joe the email address of the
  42
+   owner (Bob).
  43
+2. Joe emails Bob, explaining the situation **as respecfully as possible**,
  44
+   and what he would like to do with the module name.  He adds
  45
+   isaacs <i@izs.me> to the CC list of the email.  Mention in the email
  46
+   that Bob can run `npm owner add joe foo` to add Joe as an owner of
  47
+   the `foo` package.
  48
+3. After a reasonable amount of time, if Bob has not responded, or if
  49
+   Bob and Joe can't come to any sort of resolution, email isaacs
  50
+   <i@izs.me> and we'll sort it out.
  51
+
  52
+## REASONING
  53
+
  54
+In almost every case so far, the parties involved have been able to reach
  55
+an amicable resolution without any major intervention.  Most people
  56
+really do want to be reasonable, and are probably not even aware that
  57
+they're in your way.
  58
+
  59
+Module ecosystems are most vibrant and powerful when they are as
  60
+self-directed as possible.  If an admin one day deletes something you
  61
+had worked on, then that is going to make most people quite upset,
  62
+regardless of the justification.  When humans solve their problems by
  63
+talking to other humans with respect, everyone has the chance to end up
  64
+feeling good about the interaction.
  65
+
  66
+## EXCEPTIONS
  67
+
  68
+Some things are not allowed, and will be removed without discussion if
  69
+they are brought to the attention of the npm registry admins, including
  70
+but not limited to:
  71
+
  72
+1. Malware (that is, a module designed to exploit or harm the machine on
  73
+   which it is installed)
  74
+2. Violations of copyright or licenses (for example, cloning an
  75
+   MIT-licensed program, and then removing or changing the copyright and
  76
+   license statement)
  77
+3. Illegal content.
  78
+
  79
+If you see bad behavior like this, please report it right away.
  80
+
  81
+## SEE ALSO
  82
+
  83
+* npm-registry(1)
  84
+* npm-owner(1)
66  deps/npm/doc/cli/faq.md
Source Rendered
@@ -32,35 +32,65 @@ tl;dr:
32 32
   something with the `-g` flag, then its executables go in `npm bin -g`
33 33
   and its modules go in `npm root -g`.
34 34
 
35  
-## How do I install something everywhere?
  35
+## How do I install something on my computer in a central location?
36 36
 
37  
-Install it globally by tacking `-g` or `--global` to the command.
  37
+Install it globally by tacking `-g` or `--global` to the command.  (This
  38
+is especially important for command line utilities that need to add
  39
+their bins to the global system `PATH`.)
38 40
 
39 41
 ## I installed something globally, but I can't `require()` it
40 42
 
41 43
 Install it locally.
42 44
 
43  
-## I don't wanna.
  45
+The global install location is a place for command-line utilities
  46
+to put their bins in the system `PATH`.  It's not for use with `require()`.
44 47
 
45  
-Check out `npm link`.  You might like it.
  48
+If you `require()` a module in your code, then that means it's a
  49
+dependency, and a part of your program.  You need to install it locally
  50
+in your program.
46 51
 
47  
-## No, I really want 0.x style 'everything global' style.
  52
+## Why can't npm just put everything in one place, like other package managers?
48 53
 
49  
-Ok, fine.  Do this:
  54
+Not every change is an improvement, but every improvement is a change.
  55
+This would be like asking git to do network IO for every commit.  It's
  56
+not going to happen, because it's a terrible idea that causes more
  57
+problems than it solves.
50 58
 
51  
-    echo 'export NODE_PATH="'$(npm root -g)'"' >> ~/.bashrc
52  
-    . ~/.bashrc
53  
-    npm config set global true
  59
+It is much harder to avoid dependency conflicts without nesting
  60
+dependencies.  This is fundamental to the way that npm works, and has
  61
+proven to be an extremely successful approach.  See `npm-folders(1)` for
  62
+more details.
54 63
 
55  
-This is not recommended.
  64
+If you want a package to be installed in one place, and have all your
  65
+programs reference the same copy of it, then use the `npm link` command.
  66
+That's what it's for.  Install it globally, then link it into each
  67
+program that uses it.
56 68
 
57  
-Many things **will not work** if you do this.  Make sure you read and
58  
-understand `npm-config(1)` and `npm-global(1)` before you complain
59  
-about things being broken.
  69
+## Whatever, I really want the old style 'everything global' style.
60 70
 
61  
-When you realize what a mistake it was, do this to switch back:
  71
+Write your own package manager, then.  It's not that hard.
62 72
 
63  
-    npm config delete global --local
  73
+npm will not help you do something that is known to be a bad idea.
  74
+
  75
+## Should I check my `node_modules` folder into git?
  76
+
  77
+Mikeal Rogers answered this question very well:
  78
+
  79
+<http://www.mikealrogers.com/posts/nodemodules-in-git.html>
  80
+
  81
+tl;dr
  82
+
  83
+* Check `node_modules` into git for things you **deploy**, such as
  84
+  websites and apps.
  85
+* Do not check `node_modules` into git for libraries and modules
  86
+  intended to be reused.
  87
+* Use npm to manage dependencies in your dev environment, but not in
  88
+  your deployment scripts.
  89
+
  90
+## Is it 'npm' or 'NPM' or 'Npm'?
  91
+
  92
+npm should never be capitalized unless it is being displayed in a
  93
+location that is customarily all-caps (such as the title of man pages.)
64 94
 
65 95
 ## If 'npm' is an acronym, why is it never capitalized?
66 96
 
@@ -73,7 +103,7 @@ acronym, and thus incorrectly named.)
73 103
 National Association of Pastoral Musicians.  You can learn more
74 104
 about them at <http://npm.org/>.
75 105
 
76  
-In software, "NPM" is a non-parametric mapping utility written by
  106
+In software, "NPM" is a Non-Parametric Mapping utility written by
77 107
 Chris Rorden.  You can analyze pictures of brains with it.  Learn more
78 108
 about the (capitalized) NPM program at <http://www.cabiatl.com/mricro/npm/>.
79 109
 
@@ -186,11 +216,9 @@ Go to <http://admin.npmjs.org/reset>.
186 216
 ## I get ECONNREFUSED a lot.  What's up?
187 217
 
188 218
 Either the registry is down, or node's DNS isn't able to reach out.
189  
-This happens a lot if you don't follow *all* the steps in the Cygwin
190  
-setup doc.
191 219
 
192 220
 To check if the registry is down, open up
193  
-<http://registry.npmjs.org/-/short>
  221
+<http://registry.npmjs.org/>
194 222
 in a web browser.  This will also tell you if you are just unable to
195 223
 access the internet for some reason.
196 224
 
4  deps/npm/doc/cli/index.md
Source Rendered
@@ -54,6 +54,10 @@ npm-index(1) -- Index of all npm documentation
54 54
 
55 55
  Developer Guide
56 56
 
  57
+## npm-disputes(1)
  58
+
  59
+ Handling Module Name Disputes
  60
+
57 61
 ## npm-docs(1)
58 62
 
59 63
  Docs for a package in a web browser maybe
1  deps/npm/doc/cli/owner.md
Source Rendered
@@ -30,3 +30,4 @@ that is not implemented at this time.
30 30
 * npm-publish(1)
31 31
 * npm-registry(1)
32 32
 * npm-adduser(1)
  33
+* npm-disputes(1)
1  deps/npm/doc/cli/registry.md
Source Rendered
@@ -90,3 +90,4 @@ Stay tuned!
90 90
 
91 91
 * npm-config(1)
92 92
 * npm-developers(1)
  93
+* npm-disputes(1)
2  deps/npm/html/api/bin.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
19 19
 <p>This function should not be used programmatically.  Instead, just refer
20 20
 to the <code>npm.bin</code> member.</p>
21 21
 </div>
22  
-<p id="footer">bin &mdash; npm@1.1.0-beta-7</p>
  22
+<p id="footer">bin &mdash; npm@1.1.0-beta-10</p>
23 23
 <script>
24 24
 ;(function () {
25 25
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/bugs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
25 25
 <p>This command will launch a browser, so this command may not be the most
26 26
 friendly for programmatic use.</p>
27 27
 </div>
28  
-<p id="footer">bugs &mdash; npm@1.1.0-beta-7</p>
  28
+<p id="footer">bugs &mdash; npm@1.1.0-beta-10</p>
29 29
 <script>
30 30
 ;(function () {
31 31
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/commands.html
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
28 28
 
29 29
 <ul><li><a href="../doc/index.html">index(1)</a></li></ul>
30 30
 </div>
31  
-<p id="footer">commands &mdash; npm@1.1.0-beta-7</p>
  31
+<p id="footer">commands &mdash; npm@1.1.0-beta-10</p>
32 32
 <script>
33 33
 ;(function () {
34 34
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/config.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
33 33
 
34 34
 <ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
35 35
 </div>
36  
-<p id="footer">config &mdash; npm@1.1.0-beta-7</p>
  36
+<p id="footer">config &mdash; npm@1.1.0-beta-10</p>
37 37
 <script>
38 38
 ;(function () {
39 39
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/deprecate.html
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
30 30
 
31 31
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
32 32
 </div>
33  
-<p id="footer">deprecate &mdash; npm@1.1.0-beta-7</p>
  33
+<p id="footer">deprecate &mdash; npm@1.1.0-beta-10</p>
34 34
 <script>
35 35
 ;(function () {
36 36
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/docs.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
25 25
 <p>This command will launch a browser, so this command may not be the most
26 26
 friendly for programmatic use.</p>
27 27
 </div>
28  
-<p id="footer">docs &mdash; npm@1.1.0-beta-7</p>
  28
+<p id="footer">docs &mdash; npm@1.1.0-beta-10</p>
29 29
 <script>
30 30
 ;(function () {
31 31
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/edit.html
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
30 30
 <p>Since this command opens an editor in a new process, be careful about where
31 31
 and how this is used.</p>
32 32
 </div>
33  
-<p id="footer">edit &mdash; npm@1.1.0-beta-7</p>
  33
+<p id="footer">edit &mdash; npm@1.1.0-beta-10</p>
34 34
 <script>
35 35
 ;(function () {
36 36
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/explore.html
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
24 24
 
25 25
 <p>The first element in the 'args' parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
26 26
 </div>
27  
-<p id="footer">explore &mdash; npm@1.1.0-beta-7</p>
  27
+<p id="footer">explore &mdash; npm@1.1.0-beta-10</p>
28 28
 <script>
29 29
 ;(function () {
30 30
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/help-search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
32 32
 
33 33
 <p>The silent parameter is not neccessary not used, but it may in the future.</p>
34 34
 </div>
35  
-<p id="footer">help-search &mdash; npm@1.1.0-beta-7</p>
  35
+<p id="footer">help-search &mdash; npm@1.1.0-beta-10</p>
36 36
 <script>
37 37
 ;(function () {
38 38
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/init.html
@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
35 35
 
36 36
 <p><a href="../doc/json.html">json(1)</a></p>
37 37
 </div>
38  
-<p id="footer">init &mdash; npm@1.1.0-beta-7</p>
  38
+<p id="footer">init &mdash; npm@1.1.0-beta-10</p>
39 39
 <script>
40 40
 ;(function () {
41 41
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/install.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
25 25
 <p>Finally, 'callback' is a function that will be called when all packages have been
26 26
 installed or when an error has been encountered.</p>
27 27
 </div>
28  
-<p id="footer">install &mdash; npm@1.1.0-beta-7</p>
  28
+<p id="footer">install &mdash; npm@1.1.0-beta-10</p>
29 29
 <script>
30 30
 ;(function () {
31 31
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/link.html
@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2  deps/npm/html/api/load.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
32 32
 
33 33
 <p>For a list of all the available command-line configs, see <code>npm help config</code></p>
34 34
 </div>
35  
-<p id="footer">load &mdash; npm@1.1.0-beta-7</p>
  35
+<p id="footer">load &mdash; npm@1.1.0-beta-10</p>
36 36
 <script>
37 37
 ;(function () {
38 38
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/ls.html
@@ -53,7 +53,7 @@ <h3 id="global">global</h3>
53 53
 This means that if a submodule a same dependency as a parent module, then the
54 54
 dependency will only be output once.</p>
55 55
 </div>
56  
-<p id="footer">ls &mdash; npm@1.1.0-beta-7</p>
  56
+<p id="footer">ls &mdash; npm@1.1.0-beta-10</p>
57 57
 <script>
58 58
 ;(function () {
59 59
 var wrapper = document.getElementById("wrapper")
4  deps/npm/html/api/npm.html
@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
24 24
 
25 25
 <h2 id="VERSION">VERSION</h2>
26 26
 
27  
-<p>1.1.0-beta-7</p>
  27
+<p>1.1.0-beta-10</p>
28 28
 
29 29
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
30 30
 
@@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
91 91
 
92 92
 <pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre>
93 93
 </div>
94  
-<p id="footer">npm &mdash; npm@1.1.0-beta-7</p>
  94
+<p id="footer">npm &mdash; npm@1.1.0-beta-10</p>
95 95
 <script>
96 96
 ;(function () {
97 97
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/outdated.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
19 19
 
20 20
 <p>If the 'packages' parameter is left out, npm will check all packages.</p>
21 21
 </div>
22  
-<p id="footer">outdated &mdash; npm@1.1.0-beta-7</p>
  22
+<p id="footer">outdated &mdash; npm@1.1.0-beta-10</p>
23 23
 <script>
24 24
 ;(function () {
25 25
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/owner.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
34 34
 
35 35
 <ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
36 36
 </div>
37  
-<p id="footer">owner &mdash; npm@1.1.0-beta-7</p>
  37
+<p id="footer">owner &mdash; npm@1.1.0-beta-10</p>
38 38
 <script>
39 39
 ;(function () {
40 40
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/pack.html
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
25 25
 
26 26
 <p>If no arguments are supplied, then npm packs the current package folder.</p>
27 27
 </div>
28  
-<p id="footer">pack &mdash; npm@1.1.0-beta-7</p>
  28
+<p id="footer">pack &mdash; npm@1.1.0-beta-10</p>
29 29
 <script>
30 30
 ;(function () {
31 31
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/prefix.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
21 21
 
22 22
 <p>This function is not useful programmatically</p>
23 23
 </div>
24  
-<p id="footer">prefix &mdash; npm@1.1.0-beta-7</p>
  24
+<p id="footer">prefix &mdash; npm@1.1.0-beta-10</p>
25 25
 <script>
26 26
 ;(function () {
27 27
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/prune.html
@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
23 23
 <p>Extraneous packages are packages that are not listed on the parent
24 24
 package's dependencies list.</p>
25 25
 </div>
26  
-<p id="footer">prune &mdash; npm@1.1.0-beta-7</p>
  26
+<p id="footer">prune &mdash; npm@1.1.0-beta-10</p>
27 27
 <script>
28 28
 ;(function () {
29 29
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/publish.html
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
32 32
 
33 33
 <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
34 34
 </div>
35  
-<p id="footer">publish &mdash; npm@1.1.0-beta-7</p>
  35
+<p id="footer">publish &mdash; npm@1.1.0-beta-10</p>
36 36
 <script>
37 37
 ;(function () {
38 38
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/rebuild.html
@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
22 22
 
23 23
 <p>See <code>npm help build</code></p>
24 24
 </div>
25  
-<p id="footer">rebuild &mdash; npm@1.1.0-beta-7</p>
  25
+<p id="footer">rebuild &mdash; npm@1.1.0-beta-10</p>
26 26
 <script>
27 27
 ;(function () {
28 28
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/restart.html
@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
27 27
 
28 28
 <ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
29 29
 </div>
30  
-<p id="footer">restart &mdash; npm@1.1.0-beta-7</p>
  30
+<p id="footer">restart &mdash; npm@1.1.0-beta-10</p>
31 31
 <script>
32 32
 ;(function () {
33 33
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/root.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
21 21
 
22 22
 <p>This function is not useful programmatically.</p>
23 23
 </div>
24  
-<p id="footer">root &mdash; npm@1.1.0-beta-7</p>
  24
+<p id="footer">root &mdash; npm@1.1.0-beta-10</p>
25 25
 <script>
26 26
 ;(function () {
27 27
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/run-script.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
29 29
 
30 30
 <ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
31 31
 </div>
32  
-<p id="footer">run-script &mdash; npm@1.1.0-beta-7</p>
  32
+<p id="footer">run-script &mdash; npm@1.1.0-beta-10</p>
33 33
 <script>
34 34
 ;(function () {
35 35
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/search.html
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
32 32
 and doesn't try to read your mind (it doesn't do any verb tense matching or the
33 33
 like).</p>
34 34
 </div>
35  
-<p id="footer">search &mdash; npm@1.1.0-beta-7</p>
  35
+<p id="footer">search &mdash; npm@1.1.0-beta-10</p>
36 36
 <script>
37 37
 ;(function () {
38 38
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/start.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
19 19
 <p>npm can run tests on multiple packages. Just specify multiple packages
20 20
 in the <code>packages</code> parameter.</p>
21 21
 </div>
22  
-<p id="footer">start &mdash; npm@1.1.0-beta-7</p>
  22
+<p id="footer">start &mdash; npm@1.1.0-beta-10</p>
23 23
 <script>
24 24
 ;(function () {
25 25
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/stop.html
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
19 19
 <p>npm can run stop on multiple packages. Just specify multiple packages
20 20
 in the <code>packages</code> parameter.</p>
21 21
 </div>
22  
-<p id="footer">stop &mdash; npm@1.1.0-beta-7</p>
  22
+<p id="footer">stop &mdash; npm@1.1.0-beta-10</p>
23 23
 <script>
24 24
 ;(function () {
25 25
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/submodule.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
33 33
 
34 34
 <ul><li>npm help json</li><li>git help submodule</li></ul>
35 35
 </div>
36  
-<p id="footer">submodule &mdash; npm@1.1.0-beta-7</p>
  36
+<p id="footer">submodule &mdash; npm@1.1.0-beta-10</p>
37 37
 <script>
38 38
 ;(function () {
39 39
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/tag.html
@@ -29,7 +29,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
29 29
 used. For more information about how to set this config, check
30 30
 <code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p>
31 31
 </div>
32  
-<p id="footer">tag &mdash; npm@1.1.0-beta-7</p>
  32
+<p id="footer">tag &mdash; npm@1.1.0-beta-10</p>
33 33
 <script>
34 34
 ;(function () {
35 35
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/test.html
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
22 22
 <p>npm can run tests on multiple packages. Just specify multiple packages
23 23
 in the <code>packages</code> parameter.</p>
24 24
 </div>
25  
-<p id="footer">test &mdash; npm@1.1.0-beta-7</p>
  25
+<p id="footer">test &mdash; npm@1.1.0-beta-10</p>
26 26
 <script>
27 27
 ;(function () {
28 28
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/uninstall.html
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
22 22
 <p>Finally, 'callback' is a function that will be called when all packages have been
23 23
 uninstalled or when an error has been encountered.</p>
24 24
 </div>
25  
-<p id="footer">uninstall &mdash; npm@1.1.0-beta-7</p>
  25
+<p id="footer">uninstall &mdash; npm@1.1.0-beta-10</p>
26 26
 <script>
27 27
 ;(function () {
28 28
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/unpublish.html
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
26 26
 <p>If no version is specified, or if all versions are removed then
27 27
 the root package entry is removed from the registry entirely.</p>
28 28
 </div>
29  
-<p id="footer">unpublish &mdash; npm@1.1.0-beta-7</p>
  29
+<p id="footer">unpublish &mdash; npm@1.1.0-beta-10</p>
30 30
 <script>
31 31
 ;(function () {
32 32
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/update.html
@@ -18,7 +18,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
18 18
 
19 19
 <p>The 'packages' argument is an array of packages to update. The 'callback' parameter will be called when done or when an error occurs.</p>
20 20
 </div>
21  
-<p id="footer">update &mdash; npm@1.1.0-beta-7</p>
  21
+<p id="footer">update &mdash; npm@1.1.0-beta-10</p>
22 22
 <script>
23 23
 ;(function () {
24 24
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/version.html
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
24 24
 parameter. The difference, however, is this function will fail if it does
25 25
 not have exactly one element. The only element should be a version number.</p>
26 26
 </div>
27  
-<p id="footer">version &mdash; npm@1.1.0-beta-7</p>
  27
+<p id="footer">version &mdash; npm@1.1.0-beta-10</p>
28 28
 <script>
29 29
 ;(function () {
30 30
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/view.html
@@ -99,7 +99,7 @@ <h2 id="RETURN-VALUE">RETURN VALUE</h2>
99 99
 
100 100
 <p>corresponding to the list of fields selected.</p>
101 101
 </div>
102  
-<p id="footer">view &mdash; npm@1.1.0-beta-7</p>
  102
+<p id="footer">view &mdash; npm@1.1.0-beta-10</p>
103 103
 <script>
104 104
 ;(function () {
105 105
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/api/whoami.html
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
21 21
 
22 22
 <p>This function is not useful programmatically</p>
23 23
 </div>
24  
-<p id="footer">whoami &mdash; npm@1.1.0-beta-7</p>
  24
+<p id="footer">whoami &mdash; npm@1.1.0-beta-10</p>
25 25
 <script>
26 26
 ;(function () {
27 27
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/README.html
@@ -267,7 +267,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
267 267
 
268 268
 <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/help.html">help(1)</a></li><li><a href="../doc/index.html">index(1)</a></li></ul>
269 269
 </div>
270  
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.1.0-beta-7</p>
  270
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.1.0-beta-10</p>
271 271
 <script>
272 272
 ;(function () {
273 273
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/adduser.html
@@ -39,7 +39,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
39 39
 
40 40
 <ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/owner.html">owner(1)</a></li><li><a href="../doc/whoami.html">whoami(1)</a></li></ul>
41 41
 </div>
42  
-<p id="footer">adduser &mdash; npm@1.1.0-beta-7</p>
  42
+<p id="footer">adduser &mdash; npm@1.1.0-beta-10</p>
43 43
 <script>
44 44
 ;(function () {
45 45
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/bin.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
20 20
 
21 21
 <ul><li><a href="../doc/prefix.html">prefix(1)</a></li><li><a href="../doc/root.html">root(1)</a></li><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li></ul>
22 22
 </div>
23  
-<p id="footer">bin &mdash; npm@1.1.0-beta-7</p>
  23
+<p id="footer">bin &mdash; npm@1.1.0-beta-10</p>
24 24
 <script>
25 25
 ;(function () {
26 26
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/bugs.html
@@ -36,7 +36,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
36 36
 
37 37
 <ul><li><a href="../doc/docs.html">docs(1)</a></li><li><a href="../doc/view.html">view(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul>
38 38
 </div>
39  
-<p id="footer">bugs &mdash; npm@1.1.0-beta-7</p>
  39
+<p id="footer">bugs &mdash; npm@1.1.0-beta-10</p>
40 40
 <script>
41 41
 ;(function () {
42 42
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/build.html
@@ -25,7 +25,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
25 25
 
26 26
 <ul><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/link.html">link(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/json.html">json(1)</a></li></ul>
27 27
 </div>
28  
-<p id="footer">build &mdash; npm@1.1.0-beta-7</p>
  28
+<p id="footer">build &mdash; npm@1.1.0-beta-10</p>
29 29
 <script>
30 30
 ;(function () {
31 31
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/bundle.html
@@ -20,7 +20,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
20 20
 
21 21
 <ul><li><a href="../doc/install.html">install(1)</a></li></ul>
22 22
 </div>
23  
-<p id="footer">bundle &mdash; npm@1.1.0-beta-7</p>
  23
+<p id="footer">bundle &mdash; npm@1.1.0-beta-10</p>
24 24
 <script>
25 25
 ;(function () {
26 26
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/cache.html
@@ -66,7 +66,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
66 66
 
67 67
 <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/config.html">config(1)</a></li><li><a href="../doc/install.html">install(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/pack.html">pack(1)</a></li></ul>
68 68
 </div>
69  
-<p id="footer">cache &mdash; npm@1.1.0-beta-7</p>
  69
+<p id="footer">cache &mdash; npm@1.1.0-beta-10</p>
70 70
 <script>
71 71
 ;(function () {
72 72
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/changelog.html
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
34 34
 
35 35
 <ul><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li></ul>
36 36
 </div>
37  
-<p id="footer">changelog &mdash; npm@1.1.0-beta-7</p>
  37
+<p id="footer">changelog &mdash; npm@1.1.0-beta-10</p>
38 38
 <script>
39 39
 ;(function () {
40 40
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/coding-style.html
@@ -191,7 +191,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
191 191
 
192 192
 <ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
193 193
 </div>
194  
-<p id="footer">coding-style &mdash; npm@1.1.0-beta-7</p>
  194
+<p id="footer">coding-style &mdash; npm@1.1.0-beta-10</p>
195 195
 <script>
196 196
 ;(function () {
197 197
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/completion.html
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
33 33
 
34 34
 <ul><li><a href="../doc/developers.html">developers(1)</a></li><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
35 35
 </div>
36  
-<p id="footer">completion &mdash; npm@1.1.0-beta-7</p>
  36
+<p id="footer">completion &mdash; npm@1.1.0-beta-10</p>
37 37
 <script>
38 38
 ;(function () {
39 39
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/config.html
@@ -615,7 +615,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
615 615
 
616 616
 <ul><li><a href="../doc/folders.html">folders(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li></ul>
617 617
 </div>
618  
-<p id="footer">config &mdash; npm@1.1.0-beta-7</p>
  618
+<p id="footer">config &mdash; npm@1.1.0-beta-10</p>
619 619
 <script>
620 620
 ;(function () {
621 621
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/deprecate.html
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
29 29
 
30 30
 <ul><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
31 31
 </div>
32  
-<p id="footer">deprecate &mdash; npm@1.1.0-beta-7</p>
  32
+<p id="footer">deprecate &mdash; npm@1.1.0-beta-10</p>
33 33
 <script>
34 34
 ;(function () {
35 35
 var wrapper = document.getElementById("wrapper")
2  deps/npm/html/doc/developers.html
@@ -150,7 +150,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
150 150
 
151 151
 <ul><li><a href="../doc/faq.html">faq(1)</a></li><li><a href="../doc/npm.html">npm(1)</a></li><li><a href="../doc/init.html">init(1)</a></li><li><a href="../doc/json.html">json(1)</a></li><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../doc/publish.html">publish(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
152 152
 </div>
153  
-<p id="footer">developers &mdash; npm@1.1.0-beta-7</p>
  153
+<p id="footer">developers &mdash; npm@1.1.0-beta-10</p>
154 154
 <script>
155 155
 ;(function () {
156 156
 var wrapper = document.getElementById("wrapper")
115  deps/npm/html/doc/disputes.html
... ...
@@ -0,0 +1,115 @@
  1
+<!doctype html>
  2
+<html>
  3
+  <title>disputes</title>
  4
+  <meta http-equiv="content-type" value="text/html;utf-8">
  5
+  <link rel="stylesheet" type="text/css" href="./style.css">
  6
+
  7
+  <body>
  8
+    <div id="wrapper">
  9
+<h1><a href="../doc/disputes.html">disputes</a></h1> <p>Handling Module Name Disputes</p>
  10
+
  11
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
  12
+
  13
+<ol><li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li><li>Email the author, CC <a href="mailto:i@izs.me">i@izs.me</a>.</li><li>After a few weeks, if there's no resolution, we'll sort it out.</li></ol>
  14
+
  15
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
  16
+
  17
+<p>There sometimes arise cases where a user publishes a module, and then
  18
+later, some other user wants to use that name.  Here are some common
  19
+ways that happens (each of these is based on actual events.)</p>
  20
+
  21
+<ol><li>Bob writes a JavaScript module <code>foo</code>, which is not node-specific.
  22
+Bob doesn't use node at all.  Joe wants to use <code>foo</code> in node, so he
  23
+wraps it in an npm module.  Some time later, Bob starts using node,
  24
+and wants to take over management of his program.</li><li>Bob writes an npm module <code>foo</code>, and publishes it.  Perhaps much
  25
+later, Joe finds a bug in <code>foo</code>, and fixes it.  He sends a pull
  26
+request to Bob, but Bob doesn't have the time to deal with it,
  27
+because he has a new job and a new baby and is focused on his new
  28
+erlang project, and kind of not involved with node any more.  Joe
  29
+would like to publish a new <code>foo</code>, but can't, because the name is
  30
+taken.</li><li>Bob writes a 10-line flow-control library, and calls it <code>foo</code>, and
  31
+publishes it to the npm registry.  Being a simple little thing, it
  32
+never really has to be updated.  Joe works for Foo Inc, the makers
  33
+of the critically acclaimed and widely-marketed <code>foo</code> JavaScript
  34
+toolkit framework.  They publish it to npm as <code>foojs</code>, but people are
  35
+routinely confused when <code>npm install foo</code> is some different thing.</li><li>Bob writes a parser for the widely-known <code>foo</code> file format, because