diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-01-02 15:29:39 +0400 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-01-02 15:29:39 +0400 |
| commit | c123ac05dc37311d3dfb37ed6f22baef58280379 (patch) | |
| tree | f1c49f60d3affab2148d50af7df46c0fe2238c4d /doc | |
| parent | 4b3824b6826db3487d7490283d3d7f396720f337 (diff) | |
| parent | 6f8839d2ac362ced42235a34a023af5e2c656501 (diff) | |
Merge remote-tracking branch 'origin/v0.6'
Conflicts:
src/udp_wrap.cc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/http.markdown | 2 | ||||
| -rw-r--r-- | doc/community/index.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/api/http.markdown b/doc/api/http.markdown index 8dd9935a1ee..57f13a48ad2 100644 --- a/doc/api/http.markdown +++ b/doc/api/http.markdown @@ -647,7 +647,7 @@ A client server pair that show you how to listen for the `upgrade` event using ` ### Event: 'continue' -`function ()` +`function () { }` Emitted when the server sends a '100 Continue' HTTP response, usually because the request contained 'Expect: 100-continue'. This is an instruction that diff --git a/doc/community/index.html b/doc/community/index.html index 9c427624b59..dec8b58b900 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -73,7 +73,7 @@ should be reported to <a href="https://github.com/joyent/node/issues">https://github.com/joyent/node/issues</a>. Fixes to the code are welcome! Please see our <a - href="https://github.com/joyent/node/wiki/Contributing">contirbuting + href="https://github.com/joyent/node/wiki/Contributing">contributing guidelines</a> for information on how to submit a patch.</p> @@ -159,4 +159,4 @@ } catch(err) {} </script> </body> -</html>
\ No newline at end of file +</html> |