diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
commit | fdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch) | |
tree | 0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /doc/api/child_process.markdown | |
parent | 6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff) | |
parent | 25f9e92813eda927c3d3eaa56dab3a397afadebe (diff) | |
download | node-merge-test.tar.gz |
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts:
node.gyp
Diffstat (limited to 'doc/api/child_process.markdown')
-rw-r--r-- | doc/api/child_process.markdown | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown index 6a11edebb..0f0e463b5 100644 --- a/doc/api/child_process.markdown +++ b/doc/api/child_process.markdown @@ -535,7 +535,7 @@ amount of data allowed on stdout or stderr - if this value is exceeded then the child process is killed. -## child_process.execFile(file, args, options, callback) +## child_process.execFile(file, [args], [options], [callback]) * `file` {String} The filename of the program to run * `args` {Array} List of string arguments @@ -568,8 +568,10 @@ leaner than `child_process.exec`. It has the same options. * `execPath` {String} Executable used to create the child process * `execArgv` {Array} List of string arguments passed to the executable (Default: `process.execArgv`) - * `silent` {Boolean} If true, prevent stdout and stderr in the spawned node - process from being associated with the parent's (default is false) + * `silent` {Boolean} If true, stdin, stdout, and stderr of the child will be + piped to the parent, otherwise they will be inherited from the parent, see + the "pipe" and "inherit" options for `spawn()`'s `stdio` for more details + (default is false) * Return: ChildProcess object This is a special case of the `spawn()` functionality for spawning Node |