From 2fc57a2c93c12b9d3ba0cfaecaa1cd8494b64676 Mon Sep 17 00:00:00 2001 From: sartrey Date: Wed, 22 Jun 2016 14:55:21 +0800 Subject: [PATCH 1/3] fix doc about child_process exec & execFile --- doc/api/child_process.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/api/child_process.md b/doc/api/child_process.md index a196f99b282b8d..a2b45a58b30834 100644 --- a/doc/api/child_process.md +++ b/doc/api/child_process.md @@ -164,7 +164,7 @@ The `stdout` and `stderr` arguments passed to the callback will contain the stdout and stderr output of the child process. By default, Node.js will decode the output as UTF-8 and pass strings to the callback. The `encoding` option can be used to specify the character encoding used to decode the stdout and -stderr output. If `encoding` is `'buffer'`, `Buffer` objects will be passed to +stderr output. If `encoding` is `'buffer'` (or not a valid Buffer encoding), `Buffer` objects will be passed to the callback instead. The `options` argument may be passed as the second argument to customize how @@ -233,7 +233,7 @@ The `stdout` and `stderr` arguments passed to the callback will contain the stdout and stderr output of the child process. By default, Node.js will decode the output as UTF-8 and pass strings to the callback. The `encoding` option can be used to specify the character encoding used to decode the stdout and -stderr output. If `encoding` is `'buffer'`, `Buffer` objects will be passed to +stderr output. If `encoding` is `'buffer'` (or not a valid Buffer encoding), `Buffer` objects will be passed to the callback instead. ### child_process.fork(modulePath[, args][, options]) From 9e7ed79c8b875bad74d6a2e59b618b6d63a39711 Mon Sep 17 00:00:00 2001 From: sartrey Date: Thu, 23 Jun 2016 09:57:21 +0800 Subject: [PATCH 2/3] fix words & wrap lines at almost 80 charaters --- doc/api/child_process.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/api/child_process.md b/doc/api/child_process.md index a2b45a58b30834..1389347b2a2114 100644 --- a/doc/api/child_process.md +++ b/doc/api/child_process.md @@ -164,8 +164,8 @@ The `stdout` and `stderr` arguments passed to the callback will contain the stdout and stderr output of the child process. By default, Node.js will decode the output as UTF-8 and pass strings to the callback. The `encoding` option can be used to specify the character encoding used to decode the stdout and -stderr output. If `encoding` is `'buffer'` (or not a valid Buffer encoding), `Buffer` objects will be passed to -the callback instead. +stderr output. If `encoding` is `'buffer'`, or an unrecognized character encoding, +`Buffer` objects will be passed to the callback instead. The `options` argument may be passed as the second argument to customize how the process is spawned. The default options are: @@ -233,8 +233,8 @@ The `stdout` and `stderr` arguments passed to the callback will contain the stdout and stderr output of the child process. By default, Node.js will decode the output as UTF-8 and pass strings to the callback. The `encoding` option can be used to specify the character encoding used to decode the stdout and -stderr output. If `encoding` is `'buffer'` (or not a valid Buffer encoding), `Buffer` objects will be passed to -the callback instead. +stderr output. If `encoding` is `'buffer'`, or an unrecognized character encoding, +`Buffer` objects will be passed to the callback instead. ### child_process.fork(modulePath[, args][, options])