diff options
| author | James M Snell <jasnell@gmail.com> | 2015-06-23 20:42:49 -0700 |
|---|---|---|
| committer | James M Snell <jasnell@gmail.com> | 2015-08-05 08:44:55 -0700 |
| commit | 936c9ffb0fa8e023b40e20882c16aaaef0ba4178 (patch) | |
| tree | f92d3b160166f4726ffd40dec487a15b3c9bf09a /src | |
| parent | d88194d261ddf7f0b4b821158244ad0b4d0f1279 (diff) | |
| download | android-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.tar.gz android-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.tar.bz2 android-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.zip | |
doc: multiple documentation updates cherry picked from v0.12
* doc: improve http.abort description
* doc: mention that mode is ignored if file exists
* docs: Fix default options for fs.createWriteStream()
* Documentation update about Buffer initialization
* doc: add a note about readable in flowing mode
* doc: Document http.request protocol option
* doc, comments: Grammar and spelling fixes
* updated documentation for fs.createReadStream
* Update child_process.markdown, spelling
* doc: Clarified read method with specified size argument.
* docs:events clarify emitter.listener() behavior
* doc: two minor stream doc improvements
* doc: clarify Readable._read and Readable.push
* doc: stream.unshift does not reset reading state
* doc: readable event clarification
* doc: additional refinement to readable event
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noorduis <ben@strongloop.com>
PR-URL: https://github.com/nodejs/io.js/pull/2302
Diffstat (limited to 'src')
| -rw-r--r-- | src/node.cc | 2 | ||||
| -rw-r--r-- | src/node_object_wrap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/node.cc b/src/node.cc index 7c0a80ec31..c272139e55 100644 --- a/src/node.cc +++ b/src/node.cc @@ -2184,7 +2184,7 @@ static void OnFatalError(const char* location, const char* message) { NO_RETURN void FatalError(const char* location, const char* message) { OnFatalError(location, message); - // to supress compiler warning + // to suppress compiler warning abort(); } diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h index d00e1484b7..f022662227 100644 --- a/src/node_object_wrap.h +++ b/src/node_object_wrap.h @@ -80,7 +80,7 @@ class ObjectWrap { * attached to detached state it will be freed. Be careful not to access * the object after making this call as it might be gone! * (A "weak reference" means an object that only has a - * persistant handle.) + * persistent handle.) * * DO NOT CALL THIS FROM DESTRUCTOR */ |