diff --git a/doc/api/buffer.markdown b/doc/api/buffer.markdown index b539953e07fa3d..80941cb466bf36 100644 --- a/doc/api/buffer.markdown +++ b/doc/api/buffer.markdown @@ -364,7 +364,7 @@ region in the same buffer // efghijghijklmnopqrstuvwxyz -### buf.slice([start][, end]) +### buf.slice([start[, end]]) * `start` Number, Optional, Default: 0 * `end` Number, Optional, Default: `buffer.length` diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown index a5ac5fe9b3decf..385add1894a57e 100644 --- a/doc/api/child_process.markdown +++ b/doc/api/child_process.markdown @@ -366,7 +366,8 @@ callback or returning an EventEmitter). * `env` {Object} Environment key-value pairs * `stdio` {Array|String} Child's stdio configuration. (See [below](#child_process_options_stdio)) - * `detached` {Boolean} The child will be a process group leader. (See + * `detached` {Boolean} Prepare child to run independently of it's parent + process. Specific behaviour depends on the platform, see [below](#child_process_options_detached)) * `uid` {Number} Sets the user identity of the process. (See setuid(2).) * `gid` {Number} Sets the group identity of the process. (See setgid(2).) @@ -505,9 +506,14 @@ Example: #### options.detached -If the `detached` option is set, the child process will be made the leader of a -new process group. This makes it possible for the child to continue running -after the parent exits. +On Windows, this makes it possible for the child to continue running after the +parent exits. The child will have a new console window (this cannot be +disabled). + +On non-Windows, if the `detached` option is set, the child process will be made +the leader of a new process group and session. Note that child processes may +continue running after the parent exits whether they are detached or not. See +`setsid(2)` for more information. By default, the parent will wait for the detached child to exit. To prevent the parent from waiting for a given `child`, use the `child.unref()` method, diff --git a/doc/api/net.markdown b/doc/api/net.markdown index f2be29a6b0d2a4..33b6a46871e909 100644 --- a/doc/api/net.markdown +++ b/doc/api/net.markdown @@ -8,7 +8,7 @@ this module with `require('net');`. ## net.createServer([options][, connectionListener]) -Creates a new TCP server. The `connectionListener` argument is +Creates a new server. The `connectionListener` argument is automatically set as a listener for the ['connection'][] event. `options` is an object with the following defaults: