Skip to content

Commit

Permalink
doc: correct spelling
Browse files Browse the repository at this point in the history
Backport-PR-URL: #18050
Backport-PR-URL: #20456
PR-URL: #17911
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Weijia Wang <[email protected]>
  • Loading branch information
sreepurnajasti authored and MylesBorins committed May 2, 2018
1 parent 46d1b33 commit 0205b3f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
15 changes: 12 additions & 3 deletions doc/api/errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -796,7 +796,7 @@ forbidden.
<a id="ERR_HTTP2_PING_CANCEL"></a>
### ERR_HTTP2_PING_CANCEL

An HTTP/2 ping was cancelled.
An HTTP/2 ping was canceled.

<a id="ERR_HTTP2_PING_LENGTH"></a>
### ERR_HTTP2_PING_LENGTH
Expand Down Expand Up @@ -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][].

<a id="ERR_MULTIPLE_CALLBACK"></a>
### 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.

<a id="ERR_NAPI_CONS_FUNCTION"></a>
### ERR_NAPI_CONS_FUNCTION
Expand Down
16 changes: 8 additions & 8 deletions doc/api/http2.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit 0205b3f

Please sign in to comment.