summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsreepurnajasti <sreepurna.jasti@gmail.com>2017-12-29 10:25:31 +0530
committerTobias Nießen <tniessen@tnie.de>2017-12-30 17:59:05 +0100
commit27470e4ec719bd773742b2ac9e1ccc03a67ae0b9 (patch)
tree490bc131200807c28080b8e958581e19f475d006
parent166a2ceeb7d5cf338e4e22fe5a67fae9ec957c56 (diff)
downloadandroid-node-v8-27470e4ec719bd773742b2ac9e1ccc03a67ae0b9.tar.gz
android-node-v8-27470e4ec719bd773742b2ac9e1ccc03a67ae0b9.tar.bz2
android-node-v8-27470e4ec719bd773742b2ac9e1ccc03a67ae0b9.zip
doc: correct spelling
PR-URL: https://github.com/nodejs/node/pull/17911 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Weijia Wang <starkwang@126.com>
-rw-r--r--doc/api/errors.md8
-rw-r--r--doc/api/http2.md16
2 files changed, 12 insertions, 12 deletions
diff --git a/doc/api/errors.md b/doc/api/errors.md
index f0d7da3aea..e0ec395776 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -938,7 +938,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.
@@ -964,7 +964,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
@@ -1297,11 +1297,11 @@ A failure occurred resolving imports in an [ES6 module][].
<a id="ERR_MULTIPLE_CALLBACK"></a>
### ERR_MULTIPLE_CALLBACK
-A callback was called more then once.
+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 then once.
+would be possible by calling a callback more than once.
<a id="ERR_NAPI_CONS_FUNCTION"></a>
### ERR_NAPI_CONS_FUNCTION
diff --git a/doc/api/http2.md b/doc/api/http2.md
index f49c1152b2..a2328feea0 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.
@@ -327,7 +327,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
@@ -371,7 +371,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.
@@ -393,12 +393,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
@@ -534,8 +534,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
@@ -746,7 +746,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'