Merge remote branch 'origin/v0.6'

Conflicts:
	Makefile
	configure
	src/node_version.h

7 files changed, 27 insertions, 19 deletions

diff --git a/doc/api/http.markdown b/doc/api/http.markdown
index c9a2dc0dd62..35978986723 100644
--- a/doc/api/http.markdown
+++ b/doc/api/http.markdown
@@ -267,6 +267,13 @@ authentication details.
 This object is created internally by a HTTP server--not by the user. It is
 passed as the second parameter to the `'request'` event. It is a `Writable Stream`.
 
+### Event: 'close'
+
+`function () { }`
+
+Indicates that the underlaying connection was terminated before
+`response.end()` was called or able to flush.
+
 ### response.writeContinue()
 
 Sends a HTTP/1.1 100 Continue message to the client, indicating that
@@ -832,7 +839,7 @@ The response trailers object. Only populated after the 'end' event.
 
 Set the encoding for the response body. Either `'utf8'`, `'ascii'`, or
 `'base64'`. Defaults to `null`, which means that the `'data'` event will emit
-a `Buffer` object..
+a `Buffer` object.
 
 ### response.pause()
 
diff --git a/doc/api/net.markdown b/doc/api/net.markdown
index e3e319529aa..ad078a52e01 100644
--- a/doc/api/net.markdown
+++ b/doc/api/net.markdown
@@ -151,9 +151,10 @@ would be to wait a second and then try again. This can be done with
 
 Start a UNIX socket server listening for connections on the given `path`.
 
-This function is asynchronous. The last parameter `listeningListener` will be
-called when the server has been bound.
-See also ['listening'](#event_listening_) event.
+This function is asynchronous.  When the server has been bound,
+['listening'](#event_listening_) event will be emitted.
+the last parameter `listeningListener` will be added as an listener for the
+['listening'](#event_listening_) event.
 
 #### server.pause(msecs)
 
diff --git a/doc/api/tls.markdown b/doc/api/tls.markdown
index 8cbfb7d7caf..df8f5f122ea 100644
--- a/doc/api/tls.markdown
+++ b/doc/api/tls.markdown
@@ -251,7 +251,7 @@ server, you unauthorized connections may be accepted.
 SNI.
 
 
-### Event: 'clientError'
+#### Event: 'clientError'
 
 `function (exception) { }`
 
diff --git a/doc/cla.html b/doc/cla.html
index a117595a382..ed5660b7bb5 100644
--- a/doc/cla.html
+++ b/doc/cla.html
@@ -58,18 +58,18 @@ Contributions and send us an original signed Agreement at
 
 <p>
 Joyent, Inc <br/>
-345 California Street, Suite 2000 <br/>
-San Francisco, CA 94104 <br/>
+One Embarcadero Center, 9th Floor<br/>
+San Francisco, CA 94111<br/>
 U.S.A.
 
 <p>
 Scanned agreements may also be emailed in PDF format to
-ryan@joyent.com. You should also keep a copy for your own
+emily@joyent.com. You should also keep a copy for your own
 records.
 
 <p>
 If you have questions about these terms, please contact us
-at ryan@joyent.com.
+at emily@joyent.com.
 
 
 <pre>
diff --git a/doc/index.html b/doc/index.html
index fab47811bbd..151273b2c9a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -76,15 +76,15 @@
         <a href="#" id="download-close">X</a>
         <img id="download-logo" src="download-logo.png" alt="node.js">
         <ul id="installers" class="clearfix">
-            <li><a href="http://nodejs.org/dist/v0.6.6/node-v0.6.6.msi">Windows Installer</a><br>node-v0.6.6.msi</li>
-            <li><a href="http://nodejs.org/dist/v0.6.6/node-v0.6.6.pkg">Macintosh Installer</a><br>node-v0.6.6.pkg</li>
-            <li id="source"><a href="http://nodejs.org/dist/v0.6.6/node-v0.6.6.tar.gz">Source Code</a><br>node-v0.6.6.tar.gz</li>
+            <li><a href="http://nodejs.org/dist/v0.6.7/node-v0.6.7.msi">Windows Installer</a><br>node-v0.6.7.msi</li>
+            <li><a href="http://nodejs.org/dist/v0.6.7/node-v0.6.7.pkg">Macintosh Installer</a><br>node-v0.6.7.pkg</li>
+            <li id="source"><a href="http://nodejs.org/dist/v0.6.7/node-v0.6.7.tar.gz">Source Code</a><br>node-v0.6.7.tar.gz</li>
         </ul>
         <ul id="documentation">
-            <li><a href="https://raw.github.com/joyent/node/v0.6.6/ChangeLog">Change Log</a></li>
-            <li><a href="http://nodejs.org/docs/v0.6.6/api/index.html">Documentation</a></li>
-            <li><a href="http://nodejs.org/dist/v0.6.6">Other release files</a></li>
-            <li><a href="https://raw.github.com/joyent/node/v0.6.6/LICENSE">License</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.7/ChangeLog">Change Log</a></li>
+            <li><a href="http://nodejs.org/docs/v0.6.7/api/index.html">Documentation</a></li>
+            <li><a href="http://nodejs.org/dist/v0.6.7">Other release files</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.6.7/LICENSE">License</a></li>
             <li><a href="https://github.com/joyent/node">Git Repository</a></li>
             <li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
             with a Package Manager</a>
diff --git a/doc/logos/index.html b/doc/logos/index.html
index a2a2320f5da..403abe2da0e 100644
--- a/doc/logos/index.html
+++ b/doc/logos/index.html
@@ -60,7 +60,7 @@
     </div>
 </div>
     <div id="footer">
-        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.6/LICENSE">View License</a></p>
+        <p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.7/LICENSE">View License</a></p>
     </div>
 
 
diff --git a/doc/template.html b/doc/template.html
index 0f65b366f12..4eae50ea79e 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>{{section}}Node.js v0.6.6 Manual &amp; Documentation</title>
+  <title>{{section}}Node.js v0.6.7 Manual &amp; Documentation</title>
   <link rel="stylesheet" href="assets/style.css">
   <link rel="stylesheet" href="assets/sh.css">
   <link rel="canonical" href="http://nodejs.org/docs/latest/api/{{filename}}.html">
@@ -10,7 +10,7 @@
 <body>
   <div id="container">
     <header>
-      <h1>Node.js v0.6.6 Manual &amp; Documentation</h1>
+      <h1>Node.js v0.6.7 Manual &amp; Documentation</h1>
       <div id="gtoc">
         <p><a href="index.html">Index</a> | <a href="all.html">View on single page</a></p>
       </div>