From 5fe065bbf9fa8b1d5febd11e0b322c8f9e6c8623 Mon Sep 17 00:00:00 2001 From: sreepurnajasti Date: Fri, 29 Dec 2017 10:25:31 +0530 Subject: [PATCH] doc: correct spelling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport-PR-URL: https://github.com/nodejs/node/pull/18050 PR-URL: https://github.com/nodejs/node/pull/17911 Reviewed-By: James M Snell Reviewed-By: Rich Trott Reviewed-By: Daniel Bevenius Reviewed-By: Luigi Pinca Reviewed-By: Gibson Fahnestock Reviewed-By: Tobias Nießen Reviewed-By: Colin Ihrig Reviewed-By: Ruben Bridgewater Reviewed-By: Gireesh Punathil Reviewed-By: Weijia Wang --- doc/api/errors.md | 15 ++++++++++++--- doc/api/http2.md | 16 ++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/doc/api/errors.md b/doc/api/errors.md index 12650d55f6349d..a540de4c1bce5c 100755 --- a/doc/api/errors.md +++ b/doc/api/errors.md @@ -770,7 +770,7 @@ An operation was performed on a stream that had already been destroyed. ### ERR_HTTP2_MAX_PENDING_SETTINGS_ACK Whenever an HTTP/2 `SETTINGS` frame is sent to a connected peer, the peer is -required to send an acknowledgement that it has received and applied the new +required to send an acknowledgment that it has received and applied the new `SETTINGS`. By default, a maximum number of unacknowledged `SETTINGS` frames may be sent at any given time. This error code is used when that limit has been reached. @@ -796,7 +796,7 @@ forbidden. ### ERR_HTTP2_PING_CANCEL -An HTTP/2 ping was cancelled. +An HTTP/2 ping was canceled. ### ERR_HTTP2_PING_LENGTH @@ -1028,7 +1028,16 @@ Used when an [ES6 module][] cannot be resolved. > Stability: 1 - Experimental -Used when a failure occurs resolving imports in an [ES6 module][]. +Used when a failure occurred resolving imports in an [ES6 module][]. + + +### ERR_MULTIPLE_CALLBACK + +A callback was called more than once. + +*Note*: A callback is almost always meant to only be called once as the query +can either be fulfilled or rejected but not both at the same time. The latter +would be possible by calling a callback more than once. ### ERR_NAPI_CONS_FUNCTION diff --git a/doc/api/http2.md b/doc/api/http2.md index b0b692c492fe64..8b3e33723b4c7d 100644 --- a/doc/api/http2.md +++ b/doc/api/http2.md @@ -191,7 +191,7 @@ the handler function will receive three arguments: added: v8.4.0 --> -The `'localSettings'` event is emitted when an acknowledgement SETTINGS frame +The `'localSettings'` event is emitted when an acknowledgment SETTINGS frame has been received. When invoked, the handler function will receive a copy of the local settings. @@ -339,7 +339,7 @@ Once destroyed, the `Http2Session` will emit the `'close'` event. If `error` is not undefined, an `'error'` event will be emitted immediately after the `'close'` event. -If there are any remaining open `Http2Streams` associatd with the +If there are any remaining open `Http2Streams` associated with the `Http2Session`, those will also be destroyed. #### http2session.destroyed @@ -406,7 +406,7 @@ added: v8.4.0 * Value: {boolean} Indicates whether or not the `Http2Session` is currently waiting for an -acknowledgement for a sent SETTINGS frame. Will be `true` after calling the +acknowledgment for a sent SETTINGS frame. Will be `true` after calling the `http2session.settings()` method. Will be `false` once all sent SETTINGS frames have been acknowledged. @@ -428,12 +428,12 @@ The maximum number of outstanding (unacknowledged) pings is determined by the If provided, the `payload` must be a `Buffer`, `TypedArray`, or `DataView` containing 8 bytes of data that will be transmitted with the `PING` and -returned with the ping acknowledgement. +returned with the ping acknowledgment. The callback will be invoked with three arguments: an error argument that will be `null` if the `PING` was successfully acknowledged, a `duration` argument that reports the number of milliseconds elapsed since the ping was sent and the -acknowledgement was received, and a `Buffer` containing the 8-byte `PING` +acknowledgment was received, and a `Buffer` containing the 8-byte `PING` payload. ```js @@ -581,8 +581,8 @@ while the session is waiting for the remote peer to acknowledge the new settings. *Note*: The new settings will not become effective until the SETTINGS -acknowledgement is received and the `'localSettings'` event is emitted. It -is possible to send multiple SETTINGS frames while acknowledgement is still +acknowledgment is received and the `'localSettings'` event is emitted. It +is possible to send multiple SETTINGS frames while acknowledgment is still pending. #### http2session.type @@ -885,7 +885,7 @@ added: v8.4.0 --> The `'timeout'` event is emitted after no activity is received for this -`'Http2Stream'` within the number of millseconds set using +`'Http2Stream'` within the number of milliseconds set using `http2stream.setTimeout()`. #### Event: 'trailers'