From 66a6f76f78b67f0767f5f196bcfa5ef770d225b1 Mon Sep 17 00:00:00 2001 From: Laurent Fortin Date: Thu, 17 Sep 2015 20:29:14 -0400 Subject: [PATCH 1/2] doc: make execFileSync in line with execFile make execFileSync API docs in line with execFile API docs --- doc/api/child_process.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown index 9399eac00e8203..fdd9fce559cb4b 100644 --- a/doc/api/child_process.markdown +++ b/doc/api/child_process.markdown @@ -704,9 +704,9 @@ until the process has completely exited. That is to say, if the process handles the `SIGTERM` signal and doesn't exit, your process will wait until the child process has exited. -### child_process.execFileSync(command[, args][, options]) +### child_process.execFileSync(file[, args][, options]) -* `command` {String} The command to run +* `file` {String} The filename of the program to run * `args` {Array} List of string arguments * `options` {Object} * `cwd` {String} Current working directory of the child process From 0134d9cd1d84fd9dad70224c29bb89fc1858429f Mon Sep 17 00:00:00 2001 From: Laurent Fortin Date: Tue, 22 Sep 2015 15:01:23 -0400 Subject: [PATCH 2/2] doc: rearrange execSync, execFileSync in line with exec, execFile rearrange execSync, execFileSync API docs to be in line with exec, execFile API docs --- doc/api/child_process.markdown | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown index fdd9fce559cb4b..ab911acf22a5aa 100644 --- a/doc/api/child_process.markdown +++ b/doc/api/child_process.markdown @@ -704,10 +704,9 @@ until the process has completely exited. That is to say, if the process handles the `SIGTERM` signal and doesn't exit, your process will wait until the child process has exited. -### child_process.execFileSync(file[, args][, options]) +### child_process.execSync(command[, options]) -* `file` {String} The filename of the program to run -* `args` {Array} List of string arguments +* `command` {String} The command to run * `options` {Object} * `cwd` {String} Current working directory of the child process * `input` {String|Buffer} The value which will be passed as stdin to the spawned process @@ -725,7 +724,7 @@ process has exited. * `encoding` {String} The encoding used for all stdio inputs and outputs. (Default: 'buffer') * return: {Buffer|String} The stdout from the command -`execFileSync` will not return until the child process has fully closed. When a +`execSync` 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 until the process has completely exited. That is to say, if the process handles the `SIGTERM` signal and doesn't exit, your process will wait until the child @@ -735,10 +734,10 @@ If the process times out, or has a non-zero exit code, this method ***will*** throw. The `Error` object will contain the entire result from [`child_process.spawnSync`](#child_process_child_process_spawnsync_command_args_options) +### child_process.execFileSync(file[, args][, options]) -### child_process.execSync(command[, options]) - -* `command` {String} The command to run +* `file` {String} The filename of the program to run +* `args` {Array} List of string arguments * `options` {Object} * `cwd` {String} Current working directory of the child process * `input` {String|Buffer} The value which will be passed as stdin to the spawned process @@ -756,7 +755,7 @@ throw. The `Error` object will contain the entire result from * `encoding` {String} The encoding used for all stdio inputs and outputs. (Default: 'buffer') * return: {Buffer|String} The stdout from the command -`execSync` will not return until the child process has fully closed. When a +`execFileSync` 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 until the process has completely exited. That is to say, if the process handles the `SIGTERM` signal and doesn't exit, your process will wait until the child