Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	lib/net.js
	node.gyp
	src/node_version.h

8 files changed, 28 insertions, 84 deletions

diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index 62d410c0b..375001f37 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -9,9 +9,9 @@
 .SH "SYNOPSIS"
 .
 .nf
-npm docs <pkgname>
+npm docs [<pkgname> [<pkgname> \.\.\.]]
 npm docs (with no args in a package dir)
-npm home <pkgname>
+npm home [<pkgname> [<pkgname> \.\.\.]]
 npm home (with no args in a package dir)
 .
 .fi
@@ -19,8 +19,9 @@ npm home (with no args in a package dir)
 .SH "DESCRIPTION"
 This command tries to guess at the likely location of a package\'s
 documentation URL, and then tries to open it using the \fB\-\-browser\fR
-config param\. If no package name is provided, it will search for
-a \fBpackage\.json\fR in the current folder and use the \fBname\fR property\.
+config param\. You can pass multiple package names at once\. If no
+package name is provided, it will search for a \fBpackage\.json\fR in
+the current folder and use the \fBname\fR property\.
 .
 .SH "CONFIGURATION"
 .
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index f94070564..9c2a910e5 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -29,7 +29,7 @@ For example, running \fBnpm ls promzard\fR in npm\'s source tree will show:
 .IP "" 4
 .
 .nf
-npm@1.3.23 /path/to/npm
+npm@1.3.25 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index 9407e561f..bba9e0d42 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -9,7 +9,7 @@
 .SH "SYNOPSIS"
 .
 .nf
-npm search [search terms \.\.\.]
+npm search [\-\-long] [search terms \.\.\.]
 npm s [search terms \.\.\.]
 npm se [search terms \.\.\.]
 .
@@ -23,6 +23,24 @@ If a term starts with \fB/\fR, then it\'s interpreted as a regular expression\.
 A trailing \fB/\fR will be ignored in this case\.  (Note that many regular
 expression characters must be escaped or quoted in most shells\.)
 .
+.SH "CONFIGURATION"
+.
+.SS "long"
+.
+.IP "\(bu" 4
+Default: false
+.
+.IP "\(bu" 4
+Type: Boolean
+.
+.IP "" 0
+.
+.P
+Display full package descriptions and other long text across multiple
+lines\. When disabled (default) search results are truncated to fit
+neatly on a single line\. Modules with extremely long names will
+fall on multiple lines\.
+.
 .SH "SEE ALSO"
 .
 .IP "\(bu" 4
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 2114ecea9..e40aed2b9 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -14,7 +14,7 @@ npm <command> [args]
 .fi
 .
 .SH "VERSION"
-1.3.23
+1.3.25
 .
 .SH "DESCRIPTION"
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man1/repo.1 b/deps/npm/man/man1/repo.1
deleted file mode 100644
index 1c3b8eb97..000000000
--- a/deps/npm/man/man1/repo.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\" Generated with Ronnjs 0.3.8
-.\" http://github.com/kapouer/ronnjs/
-.
-.TH "NPM\-REPO" "1" "December 2013" "" ""
-.
-.SH "NAME"
-\fBnpm-repo\fR \-\- Open package repository page in the browser
-.
-.SH "SYNOPSIS"
-.
-.nf
-npm repo <pkgname>
-npm repo (with no args in a package dir)
-.
-.fi
-.
-.SH "DESCRIPTION"
-This command tries to guess at the likely location of a package\'s
-repository URL, and then tries to open it using the \fB\-\-browser\fR
-config param\. If no package name is provided, it will search for
-a \fBpackage\.json\fR in the current folder and use the \fBname\fR property\.
-.
-.SH "CONFIGURATION"
-.
-.SS "browser"
-.
-.IP "\(bu" 4
-Default: OS X: \fB"open"\fR, Windows: \fB"start"\fR, Others: \fB"xdg\-open"\fR
-.
-.IP "\(bu" 4
-Type: String
-.
-.IP "" 0
-.
-.P
-The browser that is called by the \fBnpm repo\fR command to open websites\.
-.
-.SH "SEE ALSO"
-.
-.IP "\(bu" 4
-npm help docs
-.
-.IP "\(bu" 4
-npm help config
-.
-.IP "" 0
-
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index 8e2a7421f..68923abe4 100644
--- a/deps/npm/man/man3/npm.3
+++ b/deps/npm/man/man3/npm.3
@@ -21,7 +21,7 @@ npm\.load([configObject], function (er, npm) {
 .fi
 .
 .SH "VERSION"
-1.3.23
+1.3.25
 .
 .SH "DESCRIPTION"
 This is the API documentation for npm\.
diff --git a/deps/npm/man/man3/repo.3 b/deps/npm/man/man3/repo.3
deleted file mode 100644
index ee15118b5..000000000
--- a/deps/npm/man/man3/repo.3
+++ /dev/null
@@ -1,28 +0,0 @@
-.\" Generated with Ronnjs 0.3.8
-.\" http://github.com/kapouer/ronnjs/
-.
-.TH "NPM\-REPO" "3" "December 2013" "" ""
-.
-.SH "NAME"
-\fBnpm-repo\fR \-\- Open package repository page in the browser
-.
-.SH "SYNOPSIS"
-.
-.nf
-npm\.commands\.repo(package, callback)
-.
-.fi
-.
-.SH "DESCRIPTION"
-This command tries to guess at the likely location of a package\'s
-repository URL, and then tries to open it using the \fB\-\-browser\fR
-config param\.
-.
-.P
-Like other commands, the first parameter is an array\. This command only
-uses the first element, which is expected to be a package name with an
-optional version number\.
-.
-.P
-This command will launch a browser, so this command may not be the most
-friendly for programmatic use\.
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index a1970bb83..f2ce0db1f 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -848,7 +848,7 @@ Type: Boolean
 .IP "" 0
 .
 .P
-Show extended information in \fBnpm ls\fR
+Show extended information in \fBnpm ls\fR and \fBnpm search\fR\|\.
 .
 .SS "message"
 .