Skip to content

Commit 8653c42

Browse files
TimothyGutargos
authored andcommitted
doc: rename HTTP2 to HTTP/2
Previously, "HTTP/2" was strictly used to describe the protocol, and HTTP2 the module. This distinction is deemed unnecessary, and consistency between the two terms is enforced. PR-URL: #19603 Reviewed-By: Vse Mozhet Byt <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Chen Gang <[email protected]> Reviewed-By: Shingo Inoue <[email protected]>
1 parent b70ac0a commit 8653c42

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

doc/api/http2.md

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# HTTP2
1+
# HTTP/2
22

33
<!--introduced_in=v8.4.0-->
44

@@ -229,7 +229,7 @@ added: v8.4.0
229229

230230
The `'stream'` event is emitted when a new `Http2Stream` is created. When
231231
invoked, the handler function will receive a reference to the `Http2Stream`
232-
object, a [HTTP2 Headers Object][], and numeric flags associated with the
232+
object, a [HTTP/2 Headers Object][], and numeric flags associated with the
233233
creation of the stream.
234234

235235
```js
@@ -381,7 +381,7 @@ Transmits a `GOAWAY` frame to the connected peer *without* shutting down the
381381
added: v8.4.0
382382
-->
383383

384-
* Value: {HTTP2 Settings Object}
384+
* Value: {HTTP/2 Settings Object}
385385

386386
A prototype-less object describing the current local settings of this
387387
`Http2Session`. The local settings are local to *this* `Http2Session` instance.
@@ -460,7 +460,7 @@ instance's underlying [`net.Socket`].
460460
added: v8.4.0
461461
-->
462462

463-
* Value: {HTTP2 Settings Object}
463+
* Value: {HTTP/2 Settings Object}
464464

465465
A prototype-less object describing the current remote settings of this
466466
`Http2Session`. The remote settings are set by the *connected* HTTP/2 peer.
@@ -530,7 +530,7 @@ An object describing the current status of this `Http2Session`.
530530
added: v8.4.0
531531
-->
532532

533-
* `settings` {HTTP2 Settings Object}
533+
* `settings` {HTTP/2 Settings Object}
534534

535535
Updates the current local settings for this `Http2Session` and sends a new
536536
`SETTINGS` frame to the connected HTTP/2 peer.
@@ -669,7 +669,7 @@ client.on('altsvc', (alt, origin, streamId) => {
669669
added: v8.4.0
670670
-->
671671

672-
* `headers` {HTTP2 Headers Object}
672+
* `headers` {HTTP/2 Headers Object}
673673
* `options` {Object}
674674
* `endStream` {boolean} `true` if the `Http2Stream` *writable* side should
675675
be closed initially, such as when sending a `GET` request that should not
@@ -855,7 +855,7 @@ added: v8.4.0
855855

856856
The `'trailers'` event is emitted when a block of headers associated with
857857
trailing header fields is received. The listener callback is passed the
858-
[HTTP2 Headers Object][] and flags associated with the headers.
858+
[HTTP/2 Headers Object][] and flags associated with the headers.
859859

860860
```js
861861
stream.on('trailers', (headers, flags) => {
@@ -952,7 +952,7 @@ calling `http2stream.close()`, or `http2stream.destroy()`. Will be
952952
added: v9.5.0
953953
-->
954954

955-
* Value: {HTTP2 Headers Object}
955+
* Value: {HTTP/2 Headers Object}
956956

957957
An object containing the outbound headers sent for this `Http2Stream`.
958958

@@ -961,7 +961,7 @@ An object containing the outbound headers sent for this `Http2Stream`.
961961
added: v9.5.0
962962
-->
963963

964-
* Value: {HTTP2 Headers Object[]}
964+
* Value: {HTTP/2 Headers Object[]}
965965

966966
An array of objects containing the outbound informational (additional) headers
967967
sent for this `Http2Stream`.
@@ -971,7 +971,7 @@ sent for this `Http2Stream`.
971971
added: v9.5.0
972972
-->
973973

974-
* Value: {HTTP2 Headers Object}
974+
* Value: {HTTP/2 Headers Object}
975975

976976
An object containing the outbound trailers sent for this this `HttpStream`.
977977

@@ -1053,7 +1053,7 @@ added: v8.4.0
10531053

10541054
The `'headers'` event is emitted when an additional block of headers is received
10551055
for a stream, such as when a block of `1xx` informational headers is received.
1056-
The listener callback is passed the [HTTP2 Headers Object][] and flags
1056+
The listener callback is passed the [HTTP/2 Headers Object][] and flags
10571057
associated with the headers.
10581058

10591059
```js
@@ -1068,7 +1068,7 @@ added: v8.4.0
10681068
-->
10691069

10701070
The `'push'` event is emitted when response headers for a Server Push stream
1071-
are received. The listener callback is passed the [HTTP2 Headers Object][] and
1071+
are received. The listener callback is passed the [HTTP/2 Headers Object][] and
10721072
flags associated with the headers.
10731073

10741074
```js
@@ -1085,7 +1085,7 @@ added: v8.4.0
10851085
The `'response'` event is emitted when a response `HEADERS` frame has been
10861086
received for this stream from the connected HTTP/2 server. The listener is
10871087
invoked with two arguments: an Object containing the received
1088-
[HTTP2 Headers Object][], and flags associated with the headers.
1088+
[HTTP/2 Headers Object][], and flags associated with the headers.
10891089

10901090
```js
10911091
const http2 = require('http2');
@@ -1113,7 +1113,7 @@ provide additional methods such as `http2stream.pushStream()` and
11131113
added: v8.4.0
11141114
-->
11151115

1116-
* `headers` {HTTP2 Headers Object}
1116+
* `headers` {HTTP/2 Headers Object}
11171117

11181118
Sends an additional informational `HEADERS` frame to the connected HTTP/2 peer.
11191119

@@ -1143,7 +1143,7 @@ accepts push streams, `false` otherwise. Settings are the same for every
11431143
added: v8.4.0
11441144
-->
11451145

1146-
* `headers` {HTTP2 Headers Object}
1146+
* `headers` {HTTP/2 Headers Object}
11471147
* `options` {Object}
11481148
* `exclusive` {boolean} When `true` and `parent` identifies a parent Stream,
11491149
the created stream is made the sole direct dependency of the parent, with
@@ -1155,7 +1155,7 @@ added: v8.4.0
11551155
initiated.
11561156
* `err` {Error}
11571157
* `pushStream` {ServerHttp2Stream} The returned pushStream object.
1158-
* `headers` {HTTP2 Headers Object} Headers object the pushStream was
1158+
* `headers` {HTTP/2 Headers Object} Headers object the pushStream was
11591159
initiated with.
11601160

11611161
Initiates a push stream. The callback is invoked with the new `Http2Stream`
@@ -1185,7 +1185,7 @@ a `weight` value to `http2stream.priority` with the `silent` option set to
11851185
added: v8.4.0
11861186
-->
11871187

1188-
* `headers` {HTTP2 Headers Object}
1188+
* `headers` {HTTP/2 Headers Object}
11891189
* `options` {Object}
11901190
* `endStream` {boolean} Set to `true` to indicate that the response will not
11911191
include payload data.
@@ -1229,7 +1229,7 @@ added: v8.4.0
12291229
-->
12301230

12311231
* `fd` {number} A readable file descriptor.
1232-
* `headers` {HTTP2 Headers Object}
1232+
* `headers` {HTTP/2 Headers Object}
12331233
* `options` {Object}
12341234
* `statCheck` {Function}
12351235
* `getTrailers` {Function} Callback function invoked to collect trailer
@@ -1319,7 +1319,7 @@ added: v8.4.0
13191319
-->
13201320

13211321
* `path` {string|Buffer|URL}
1322-
* `headers` {HTTP2 Headers Object}
1322+
* `headers` {HTTP/2 Headers Object}
13231323
* `options` {Object}
13241324
* `statCheck` {Function}
13251325
* `onError` {Function} Callback function invoked in the case of an
@@ -1698,7 +1698,7 @@ changes:
16981698
* `selectPadding` {Function} When `options.paddingStrategy` is equal to
16991699
`http2.constants.PADDING_STRATEGY_CALLBACK`, provides the callback function
17001700
used to determine the padding. See [Using options.selectPadding][].
1701-
* `settings` {HTTP2 Settings Object} The initial settings to send to the
1701+
* `settings` {HTTP/2 Settings Object} The initial settings to send to the
17021702
remote peer upon connection.
17031703
* `Http1IncomingMessage` {http.IncomingMessage} Specifies the IncomingMessage
17041704
class to used for HTTP/1 fallback. Useful for extending the original
@@ -1807,7 +1807,7 @@ changes:
18071807
* `selectPadding` {Function} When `options.paddingStrategy` is equal to
18081808
`http2.constants.PADDING_STRATEGY_CALLBACK`, provides the callback function
18091809
used to determine the padding. See [Using options.selectPadding][].
1810-
* `settings` {HTTP2 Settings Object} The initial settings to send to the
1810+
* `settings` {HTTP/2 Settings Object} The initial settings to send to the
18111811
remote peer upon connection.
18121812
* ...: Any [`tls.createServer()`][] options can be provided. For
18131813
servers, the identity options (`pfx` or `key`/`cert`) are usually required.
@@ -1903,7 +1903,7 @@ changes:
19031903
* `selectPadding` {Function} When `options.paddingStrategy` is equal to
19041904
`http2.constants.PADDING_STRATEGY_CALLBACK`, provides the callback function
19051905
used to determine the padding. See [Using options.selectPadding][].
1906-
* `settings` {HTTP2 Settings Object} The initial settings to send to the
1906+
* `settings` {HTTP/2 Settings Object} The initial settings to send to the
19071907
remote peer upon connection.
19081908
* `createConnection` {Function} An optional callback that receives the `URL`
19091909
instance passed to `connect` and the `options` object, and returns any
@@ -1956,7 +1956,7 @@ a given number of milliseconds set using `http2server.setTimeout()`.
19561956
added: v8.4.0
19571957
-->
19581958

1959-
* Returns: {HTTP2 Settings Object}
1959+
* Returns: {HTTP/2 Settings Object}
19601960

19611961
Returns an object containing the default settings for an `Http2Session`
19621962
instance. This method returns a new object instance every time it is called
@@ -1967,7 +1967,7 @@ so instances returned may be safely modified for use.
19671967
added: v8.4.0
19681968
-->
19691969

1970-
* `settings` {HTTP2 Settings Object}
1970+
* `settings` {HTTP/2 Settings Object}
19711971
* Returns: {Buffer}
19721972

19731973
Returns a `Buffer` instance containing serialized representation of the given
@@ -1989,9 +1989,9 @@ added: v8.4.0
19891989
-->
19901990

19911991
* `buf` {Buffer|Uint8Array} The packed settings.
1992-
* Returns: {HTTP2 Settings Object}
1992+
* Returns: {HTTP/2 Settings Object}
19931993

1994-
Returns a [HTTP2 Settings Object][] containing the deserialized settings from
1994+
Returns a [HTTP/2 Settings Object][] containing the deserialized settings from
19951995
the given `Buffer` as generated by `http2.getPackedSettings()`.
19961996

19971997
### Headers Object
@@ -2253,7 +2253,7 @@ In order to create a mixed [HTTPS][] and HTTP/2 server, refer to the
22532253
[ALPN negotiation][] section.
22542254
Upgrading from non-tls HTTP/1 servers is not supported.
22552255

2256-
The HTTP2 compatibility API is composed of [`Http2ServerRequest`]() and
2256+
The HTTP/2 compatibility API is composed of [`Http2ServerRequest`]() and
22572257
[`Http2ServerResponse`](). They aim at API compatibility with HTTP/1, but
22582258
they do not hide the differences between the protocols. As an example,
22592259
the status message for HTTP codes is ignored.
@@ -2361,7 +2361,7 @@ Example:
23612361
console.log(request.headers);
23622362
```
23632363

2364-
See [HTTP2 Headers Object][].
2364+
See [HTTP/2 Headers Object][].
23652365

23662366
In HTTP/2, the request path, hostname, protocol, and method are represented as
23672367
special headers prefixed with the `:` character (e.g. `':path'`). These special
@@ -3083,8 +3083,8 @@ following additional properties:
30833083
[HTTP/1]: http.html
30843084
[HTTP/2]: https://tools.ietf.org/html/rfc7540
30853085
[HTTP/2 Unencrypted]: https://http2.github.io/faq/#does-http2-require-encryption
3086-
[HTTP2 Headers Object]: #http2_headers_object
3087-
[HTTP2 Settings Object]: #http2_settings_object
3086+
[HTTP/2 Headers Object]: #http2_headers_object
3087+
[HTTP/2 Settings Object]: #http2_settings_object
30883088
[HTTPS]: https.html
30893089
[Http2Session and Sockets]: #http2_http2session_and_sockets
30903090
[Performance Observer]: perf_hooks.html

tools/doc/type-parser.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ const typeMap = {
5454
'http.ServerResponse': 'http.html#http_class_http_serverresponse',
5555

5656
'ClientHttp2Stream': 'http2.html#http2_class_clienthttp2stream',
57-
'HTTP2 Headers Object': 'http2.html#http2_headers_object',
58-
'HTTP2 Settings Object': 'http2.html#http2_settings_object',
57+
'HTTP/2 Headers Object': 'http2.html#http2_headers_object',
58+
'HTTP/2 Settings Object': 'http2.html#http2_settings_object',
5959
'http2.Http2ServerRequest': 'http2.html#http2_class_http2_http2serverrequest',
6060
'http2.Http2ServerResponse':
6161
'http2.html#http2_class_http2_http2serverresponse',

0 commit comments

Comments
 (0)