Merge branch 'v0.6'

Conflicts:
	deps/uv/include/uv-private/uv-unix.h
	deps/uv/include/uv-private/uv-win.h
	deps/uv/src/uv-common.c
	deps/uv/src/win/fs.c
	src/process_wrap.cc

3 files changed, 11 insertions, 12 deletions

diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 489b072f7..4dc156255 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -329,10 +329,6 @@ leaner than `child_process.exec`. It has the same options.
   * `setsid` {Boolean}
   * `encoding` {String} (Default: 'utf8')
   * `timeout` {Number} (Default: 0)
-* `callback` {Function} called with the output when process terminates
-  * `code` {Integer} Exit code
-  * `stdout` {Buffer}
-  * `stderr` {Buffer}
 * Return: ChildProcess object
 
 This is a special case of the `spawn()` functionality for spawning Node
diff --git a/doc/index.html b/doc/index.html
index 98187f7c7..9f61fd1ff 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -32,6 +32,8 @@
         <a href="#download" class="button" id="downloadbutton">Download</a>
         <a href="api/" class="button" id="docsbutton">Docs</a>
         <p class="version">__VERSION__</p> 
+
+        <a href="http://github.com/joyent/node"><img class="forkme" src="https://a248.e.akamai.net/camo.github.com/abad93f42020b733148435e2cd92ce15c542d320/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677265656e5f3030373230302e706e67" alt="Fork me on GitHub"></a>
     </div>
     <div id="quotes" class="clearfix">
         <h2>Node.js in the Industry</h2>
diff --git a/doc/pipe.css b/doc/pipe.css
index 5c1ce79b0..286c1a6fc 100644
--- a/doc/pipe.css
+++ b/doc/pipe.css
@@ -99,10 +99,19 @@ h1 a, h2 a, h3 a, h4 a
   border-radius: 4px;
   margin: 0 1px;
   color: #46483e;
+  background-color: #9a9f8b;
+}
+
+#intro .forkme {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: 0;
 }
 
 #intro .button:hover {
   text-decoration: none;
+  background-color: #aab293;
 }
 
 #intro #downloadbutton {
@@ -113,14 +122,6 @@ h1 a, h2 a, h3 a, h4 a
   background-color: #73a53e;
 }
 
-#intro #docsbutton {
-  background-color: #9a9f8b;
-}
-
-#intro #docsbutton:hover {
-  background-color: #aab293;
-}
-
 #quotes {
     text-align: center;
     width: 100%;