summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKyle Robinson Young <kyle@dontkry.com>2014-06-15 09:04:12 -0700
committerFedor Indutny <fedor@indutny.com>2014-06-24 20:25:26 +0400
commit16ed1946598ed3ae58bcdd362e8dceca0f89d80a (patch)
tree75ea88f96aa00f4948d087b9d45ad003e193e725 /doc
parentad5e8ec3e2845d8d048ac8160f6af0194bc2b7e9 (diff)
downloadandroid-node-v8-16ed1946598ed3ae58bcdd362e8dceca0f89d80a.tar.gz
android-node-v8-16ed1946598ed3ae58bcdd362e8dceca0f89d80a.tar.bz2
android-node-v8-16ed1946598ed3ae58bcdd362e8dceca0f89d80a.zip
doc: typos in child_process
Signed-off-by: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/api/child_process.markdown4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
index 2ca03ed630..c229fc5f09 100644
--- a/doc/api/child_process.markdown
+++ b/doc/api/child_process.markdown
@@ -36,7 +36,7 @@ Emitted when:
2. The process could not be killed, or
3. Sending a message to the child process failed for whatever reason.
-Note that the `exit`-event may or may not fire after an error has occured. If
+Note that the `exit`-event may or may not fire after an error has occurred. If
you are listening on both events to fire a function, remember to guard against
calling your function twice.
@@ -610,7 +610,7 @@ output on this fd is expected to be line delimited JSON objects.
* `stderr` {Buffer|String} The contents of `output[2]`
* `status` {Number} The exit code of the child process
* `signal` {String} The signal used to kill the child process
- * `error` {Error} The error object if the child process failed or timedout
+ * `error` {Error} The error object if the child process failed or timed out
`spawnSync` will not return until the child process has fully closed. When a
timeout has been encountered and `killSignal` is sent, the method won't return