From a2e644f364d432537618d9c6e49042dc0065eeef Mon Sep 17 00:00:00 2001
From: Alexey Orlenko <eaglexrlnk@gmail.com>
Date: Sat, 20 May 2017 23:15:58 +0300
Subject: [PATCH] doc: make the style of notes consistent

Make the style of "Note:" paragraphs consistent and document the
guidelines in `doc/STYLE_GUIDE.md`.

Fixes: https://github.com/nodejs/node/issues/13131
---
 doc/STYLE_GUIDE.md       |  4 ++
 doc/api/addons.md        |  4 +-
 doc/api/buffer.md        | 16 +++----
 doc/api/child_process.md | 48 +++++++++++----------
 doc/api/cli.md           | 14 +++----
 doc/api/cluster.md       |  2 +-
 doc/api/console.md       |  8 ++--
 doc/api/crypto.md        |  2 +-
 doc/api/deprecations.md  | 12 +++---
 doc/api/domain.md        |  2 +-
 doc/api/events.md        |  2 +-
 doc/api/fs.md            | 50 +++++++++++-----------
 doc/api/http.md          | 16 +++----
 doc/api/modules.md       | 21 +++++-----
 doc/api/n-api.md         |  2 +-
 doc/api/net.md           | 15 ++++---
 doc/api/os.md            | 17 ++++----
 doc/api/path.md          |  2 +-
 doc/api/process.md       | 90 ++++++++++++++++++++--------------------
 doc/api/punycode.md      |  2 +-
 doc/api/querystring.md   |  2 +-
 doc/api/readline.md      | 10 ++---
 doc/api/stream.md        | 52 +++++++++++------------
 doc/api/timers.md        | 10 ++---
 doc/api/tls.md           | 75 ++++++++++++++++-----------------
 doc/api/url.md           |  8 ++--
 doc/api/util.md          |  6 +--
 doc/api/v8.md            |  4 +-
 doc/api/vm.md            |  8 ++--
 doc/api/zlib.md          |  8 ++--
 doc/releases.md          |  5 ++-
 31 files changed, 264 insertions(+), 253 deletions(-)

diff --git a/doc/STYLE_GUIDE.md b/doc/STYLE_GUIDE.md
index b535d2babcdd24..e1c51f74bc4929 100644
--- a/doc/STYLE_GUIDE.md
+++ b/doc/STYLE_GUIDE.md
@@ -61,6 +61,10 @@
 * References to constructor instances should use camelCase.
 * References to methods should be used with parentheses: for example,
   `socket.end()` instead of `socket.end`.
+* To draw special attention to a note, adhere to the following guidelines:
+  * Make the "Note:" label bold, i.e. `**Note:**`.
+  * Use a capital letter after the "Note:" label.
+  * Preferably, make the note a new paragraph for better visual distinction.
 
 [plugin]: http://editorconfig.org/#download
 [Oxford comma]: https://en.wikipedia.org/wiki/Serial_comma
diff --git a/doc/api/addons.md b/doc/api/addons.md
index 772c3c77645869..2b8bf57b049aa5 100644
--- a/doc/api/addons.md
+++ b/doc/api/addons.md
@@ -113,13 +113,13 @@ specifically to compile Node.js Addons.
 }
 ```
 
-*Note: A version of the `node-gyp` utility is bundled and distributed with
+**Note:** A version of the `node-gyp` utility is bundled and distributed with
 Node.js as part of `npm`. This version is not made directly available for
 developers to use and is intended only to support the ability to use the
 `npm install` command to compile and install Addons. Developers who wish to
 use `node-gyp` directly can install it using the command
 `npm install -g node-gyp`. See the `node-gyp` [installation instructions][] for
-more information, including platform-specific requirements.*
+more information, including platform-specific requirements.
 
 Once the `binding.gyp` file has been created, use `node-gyp configure` to
 generate the appropriate project build files for the current platform. This
diff --git a/doc/api/buffer.md b/doc/api/buffer.md
index 9b3f3f8b4b751b..b545db2fb67b2b 100644
--- a/doc/api/buffer.md
+++ b/doc/api/buffer.md
@@ -193,11 +193,11 @@ The character encodings currently supported by Node.js include:
 
 * `'hex'` - Encode each byte as two hexadecimal characters.
 
-_Note_: Today's browsers follow the [WHATWG spec] which aliases both 'latin1' and
-ISO-8859-1 to win-1252. This means that while doing something like `http.get()`,
-if the returned charset is one of those listed in the WHATWG spec it's possible
-that the server actually returned win-1252-encoded data, and using `'latin1'`
-encoding may incorrectly decode the characters.
+**Note:** Today's browsers follow the [WHATWG spec] which aliases both 'latin1'
+and ISO-8859-1 to win-1252. This means that while doing something like
+`http.get()`, if the returned charset is one of those listed in the WHATWG spec
+it's possible that the server actually returned win-1252-encoded data, and
+using `'latin1'` encoding may incorrectly decode the characters.
 
 ## Buffers and TypedArray
 <!-- YAML
@@ -686,7 +686,7 @@ Returns the actual byte length of a string. This is not the same as
 [`String.prototype.length`] since that returns the number of *characters* in
 a string.
 
-*Note* that for `'base64'` and `'hex'`, this function assumes valid input. For
+**Note:** For `'base64'` and `'hex'`, this function assumes valid input. For
 strings that contain non-Base64/Hex-encoded data (e.g. whitespace), the return
 value might be greater than the length of a `Buffer` created from the string.
 
@@ -1868,8 +1868,8 @@ changes:
 Returns a new `Buffer` that references the same memory as the original, but
 offset and cropped by the `start` and `end` indices.
 
-**Note that modifying the new `Buffer` slice will modify the memory in the
-original `Buffer` because the allocated memory of the two objects overlap.**
+**Note:** Modifying the new `Buffer` slice will modify the memory in the
+original `Buffer` because the allocated memory of the two objects overlap.
 
 Example: Create a `Buffer` with the ASCII alphabet, take a slice, and then modify
 one byte from the original `Buffer`
diff --git a/doc/api/child_process.md b/doc/api/child_process.md
index 7bc523f64661c2..9a412a39077b86 100644
--- a/doc/api/child_process.md
+++ b/doc/api/child_process.md
@@ -163,9 +163,9 @@ exec('echo "The \\$HOME variable is $HOME"');
 //The $HOME variable is escaped in the first instance, but not in the second
 ```
 
-**Note: Never pass unsanitised user input to this function. Any input
+**Note:** Never pass unsanitised user input to this function. Any input
 containing shell metacharacters may be used to trigger arbitrary command
-execution.**
+execution.
 
 ```js
 const exec = require('child_process').exec;
@@ -211,8 +211,8 @@ If `timeout` is greater than `0`, the parent will send the signal
 identified by the `killSignal` property (the default is `'SIGTERM'`) if the
 child runs longer than `timeout` milliseconds.
 
-*Note: Unlike the exec(3) POSIX system call, `child_process.exec()` does not
-replace the existing process and uses a shell to execute the command.*
+**Note:** Unlike the exec(3) POSIX system call, `child_process.exec()` does not
+replace the existing process and uses a shell to execute the command.
 
 If this method is invoked as its [`util.promisify()`][]ed version, it returns
 a Promise for an object with `stdout` and `stderr` properties.
@@ -348,8 +348,8 @@ parent process using the file descriptor (fd) identified using the
 environment variable `NODE_CHANNEL_FD` on the child process. The input and
 output on this fd is expected to be line delimited JSON objects.
 
-*Note: Unlike the fork(2) POSIX system call, `child_process.fork()` does
-not clone the current process.*
+**Note:** Unlike the fork(2) POSIX system call, `child_process.fork()` does
+not clone the current process.
 
 ### child_process.spawn(command[, args][, options])
 <!-- YAML
@@ -387,9 +387,9 @@ The `child_process.spawn()` method spawns a new process using the given
 `command`, with command line arguments in `args`. If omitted, `args` defaults
 to an empty array.
 
-**Note: If the `shell` option is enabled, do not pass unsanitised user input to
+**Note:** If the `shell` option is enabled, do not pass unsanitised user input to
 this function. Any input containing shell metacharacters may be used to
-trigger arbitrary command execution.**
+trigger arbitrary command execution.
 
 A third argument may be used to specify additional options, with these defaults:
 
@@ -476,13 +476,13 @@ child.on('error', (err) => {
 });
 ```
 
-*Note: Certain platforms (macOS, Linux) will use the value of `argv[0]` for the
-process title while others (Windows, SunOS) will use `command`.*
+**Note:** Certain platforms (macOS, Linux) will use the value of `argv[0]` for
+the process title while others (Windows, SunOS) will use `command`.
 
-*Note: Node.js currently overwrites `argv[0]` with `process.execPath` on
+**Note:** Node.js currently overwrites `argv[0]` with `process.execPath` on
 startup, so `process.argv[0]` in a Node.js child process will not match the
 `argv0` parameter passed to `spawn` from the parent, retrieve it with the
-`process.argv0` property instead.*
+`process.argv0` property instead.
 
 #### options.detached
 <!-- YAML
@@ -673,9 +673,11 @@ The `child_process.execFileSync()` method is generally identical to
 [`child_process.execFile()`][] with the exception that the method will not return
 until the child process has fully closed. When a timeout has been encountered
 and `killSignal` is sent, the method won't return until the process has
-completely exited. *Note that if the child process intercepts and handles
-the `SIGTERM` signal and does not exit, the parent process will still wait
-until the child process has exited.*
+completely exited.
+
+**Note:** If the child process intercepts and handles the `SIGTERM` signal and
+does not exit, the parent process will still wait until the child process has
+exited.
 
 If the process times out, or has a non-zero exit code, this method ***will***
 throw.  The [`Error`][] object will contain the entire result from
@@ -729,9 +731,9 @@ If the process times out, or has a non-zero exit code, this method ***will***
 throw.  The [`Error`][] object will contain the entire result from
 [`child_process.spawnSync()`][]
 
-**Note: Never pass unsanitised user input to this function. Any input
+**Note:** Never pass unsanitised user input to this function. Any input
 containing shell metacharacters may be used to trigger arbitrary command
-execution.**
+execution.
 
 ### child_process.spawnSync(command[, args][, options])
 <!-- YAML
@@ -789,9 +791,9 @@ completely exited. Note that if the process intercepts and handles the
 `SIGTERM` signal and doesn't exit, the parent process will wait until the child
 process has exited.
 
-**Note: If the `shell` option is enabled, do not pass unsanitised user input to
-this function. Any input containing shell metacharacters may be used to
-trigger arbitrary command execution.**
+**Note:** If the `shell` option is enabled, do not pass unsanitised user input
+to this function. Any input containing shell metacharacters may be used to
+trigger arbitrary command execution.
 
 ## Class: ChildProcess
 <!-- YAML
@@ -838,7 +840,7 @@ The `'error'` event is emitted whenever:
 2. The process could not be killed, or
 3. Sending a message to the child process failed.
 
-*Note*: The `'exit'` event may or may not fire after an error has occurred.
+**Note:** The `'exit'` event may or may not fire after an error has occurred.
 When listening to both the `'exit'` and `'error'` events, it is important
 to guard against accidentally invoking handler functions multiple times.
 
@@ -1166,8 +1168,8 @@ tracking when the socket is destroyed. To indicate this, the `.connections`
 property becomes `null`. It is recommended not to use `.maxConnections` when
 this occurs.
 
-*Note: this function uses [`JSON.stringify()`][] internally to serialize the
-`message`.*
+**Note:** This function uses [`JSON.stringify()`][] internally to serialize the
+`message`.
 
 ### child.stderr
 <!-- YAML
diff --git a/doc/api/cli.md b/doc/api/cli.md
index f6589f6264ff63..1f041a4d351220 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -144,7 +144,7 @@ added: REPLACEME
 
 Emit pending deprecation warnings.
 
-*Note*: Pending deprecations are generally identical to a runtime deprecation
+**Note:** Pending deprecations are generally identical to a runtime deprecation
 with the notable exception that they are turned *off* by default and will not
 be emitted unless either the `--pending-deprecation` command line flag, or the
 `NODE_PENDING_DEPRECATION=1` environment variable, is set. Pending deprecations
@@ -278,8 +278,8 @@ added: v0.1.3
 
 Print v8 command line options.
 
-Note: v8 options allow words to be separated by both dashes (`-`) or underscores
-(`_`).
+**Note:** V8 options allow words to be separated by both dashes (`-`) or
+underscores (`_`).
 
 For example, `--stack-trace-limit` is equivalent to `--stack_trace_limit`.
 
@@ -382,7 +382,7 @@ added: v0.1.32
 
 `':'`-separated list of directories prefixed to the module search path.
 
-_Note: on Windows, this is a `';'`-separated list instead._
+**Note:** On Windows, this is a `';'`-separated list instead.
 
 
 ### `NODE_DISABLE_COLORS=1`
@@ -453,7 +453,7 @@ added: REPLACEME
 
 When set to `1`, emit pending deprecation warnings.
 
-*Note*: Pending deprecations are generally identical to a runtime deprecation
+**Note:** Pending deprecations are generally identical to a runtime deprecation
 with the notable exception that they are turned *off* by default and will not
 be emitted unless either the `--pending-deprecation` command line flag, or the
 `NODE_PENDING_DEPRECATION=1` environment variable, is set. Pending deprecations
@@ -512,7 +512,7 @@ added: v7.7.0
 If `--use-openssl-ca` is enabled, this overrides and sets OpenSSL's directory
 containing trusted certificates.
 
-Note: Be aware that unless the child environment is explicitly set, this
+**Note:** Be aware that unless the child environment is explicitly set, this
 evironment variable will be inherited by any child processes, and if they use
 OpenSSL, it may cause them to trust the same CAs as node.
 
@@ -524,7 +524,7 @@ added: v7.7.0
 If `--use-openssl-ca` is enabled, this overrides and sets OpenSSL's file
 containing trusted certificates.
 
-Note: Be aware that unless the child environment is explicitly set, this
+**Note:** Be aware that unless the child environment is explicitly set, this
 evironment variable will be inherited by any child processes, and if they use
 OpenSSL, it may cause them to trust the same CAs as node.
 
diff --git a/doc/api/cluster.md b/doc/api/cluster.md
index c7d8359ac0ce93..cb2dd2c6a454c9 100644
--- a/doc/api/cluster.md
+++ b/doc/api/cluster.md
@@ -95,7 +95,7 @@ Node.js process and a cluster worker differs:
    port is random the first time, but predictable thereafter. To listen
    on a unique port, generate a port number based on the cluster worker ID.
 
-*Note*: Node.js does not provide routing logic. It is, therefore important to
+**Note:** Node.js does not provide routing logic. It is, therefore important to
 design an application such that it does not rely too heavily on in-memory data
 objects for things like sessions and login.
 
diff --git a/doc/api/console.md b/doc/api/console.md
index ca4ff637d9e1df..a272bdd6efd15b 100644
--- a/doc/api/console.md
+++ b/doc/api/console.md
@@ -121,8 +121,8 @@ console.assert(false, 'Whoops %s', 'didn\'t work');
 // AssertionError: Whoops didn't work
 ```
 
-*Note: the `console.assert()` method is implemented differently in Node.js
-than the `console.assert()` method [available in browsers][web-api-assert].*
+**Note:** The `console.assert()` method is implemented differently in Node.js
+than the `console.assert()` method [available in browsers][web-api-assert].
 
 Specifically, in browsers, calling `console.assert()` with a falsy
 assertion will cause the `message` to be printed to the console without
@@ -282,10 +282,10 @@ console.timeEnd('100-elements');
 // prints 100-elements: 225.438ms
 ```
 
-*Note: As of Node.js v6.0.0, `console.timeEnd()` deletes the timer to avoid
+**Note:** As of Node.js v6.0.0, `console.timeEnd()` deletes the timer to avoid
 leaking it. On older versions, the timer persisted. This allowed
 `console.timeEnd()` to be called multiple times for the same label. This
-functionality was unintended and is no longer supported.*
+functionality was unintended and is no longer supported.
 
 ### console.trace([message][, ...args])
 <!-- YAML
diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index b217c655d0b048..e7c0f24c88b0af 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -1820,7 +1820,7 @@ comparing HMAC digests or secret values like authentication cookies or
 `a` and `b` must both be `Buffer`s, `TypedArray`s, or `DataView`s, and they
 must have the same length.
 
-**Note**: Use of `crypto.timingSafeEqual` does not guarantee that the
+**Note:** Use of `crypto.timingSafeEqual` does not guarantee that the
 *surrounding* code is timing-safe. Care should be taken to ensure that the
 surrounding code does not introduce timing vulnerabilities.
 
diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
index 96e9f927d34b7a..45e7dd6d0f13b3 100644
--- a/doc/api/deprecations.md
+++ b/doc/api/deprecations.md
@@ -531,8 +531,8 @@ Type: Documentation-only
 The `http` module `ServerResponse.prototype.writeHeader()` API has been
 deprecated. Please use `ServerResponse.prototype.writeHead()` instead.
 
-*Note*: The `ServerResponse.prototype.writeHeader()` method was never documented
-as an officially supported API.
+**Note:** The `ServerResponse.prototype.writeHeader()` method was never
+documented as an officially supported API.
 
 <a id="DEP0064"></a>
 ### DEP0064: tls.createSecurePair()
@@ -568,8 +568,8 @@ properties have been deprecated. Please instead use one of the public methods
 `outgoingMessage.removeHeader()`, `outgoingMessage.setHeader()`) for working
 with outgoing headers.
 
-*Note*: `outgoingMessage._headers` and `outgoingMessage._headerNames` were never
-documented as officially supported properties.
+**Note:** `outgoingMessage._headers` and `outgoingMessage._headerNames` were
+never documented as officially supported properties.
 
 <a id="DEP0067"></a>
 ### DEP0067: OutgoingMessage.prototype.\_renderHeaders
@@ -579,7 +579,7 @@ Type: Documentation-only
 The `http` module `OutgoingMessage.prototype._renderHeaders()` API has been
 deprecated.
 
-*Note*: `OutgoingMessage.prototype._renderHeaders` was never documented as
+**Note:** `OutgoingMessage.prototype._renderHeaders` was never documented as
 an officially supported API.
 
 <a id="DEP0068"></a>
@@ -598,7 +598,7 @@ Type: Documentation-only
 The DebugContext will be removed in V8 soon and will not be available in Node
 10+.
 
-*Note*: DebugContext was an experimental API.
+**Note:** DebugContext was an experimental API.
 
 [`Buffer.allocUnsafeSlow(size)`]: buffer.html#buffer_class_method_buffer_allocunsafeslow_size
 [`Buffer.from(array)`]: buffer.html#buffer_class_method_buffer_from_array
diff --git a/doc/api/domain.md b/doc/api/domain.md
index d495275164766b..957a32af151614 100644
--- a/doc/api/domain.md
+++ b/doc/api/domain.md
@@ -115,7 +115,7 @@ if (cluster.isMaster) {
     d.on('error', (er) => {
       console.error(`error ${er.stack}`);
 
-      // Note: we're in dangerous territory!
+      // Note: We're in dangerous territory!
       // By definition, something unexpected occurred,
       // which we probably didn't want.
       // Anything can happen now!  Be very careful!
diff --git a/doc/api/events.md b/doc/api/events.md
index da13a118c70f3b..ff6fbe9bb9affb 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -142,7 +142,7 @@ myEmitter.emit('error', new Error('whoops!'));
 
 To guard against crashing the Node.js process, a listener can be registered
 on the [`process` object's `uncaughtException` event][] or the [`domain`][] module
-can be used. (_Note, however, that the `domain` module has been deprecated_)
+can be used. (Note, however, that the `domain` module has been deprecated.)
 
 ```js
 const myEmitter = new MyEmitter();
diff --git a/doc/api/fs.md b/doc/api/fs.md
index e185bdc5cb7747..f1f58c33fa9c2d 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -76,7 +76,7 @@ be omitted, in which case a default callback is used that rethrows errors. To
 get a trace to the original call site, set the `NODE_DEBUG` environment
 variable:
 
-*Note*: Omitting the callback function on asynchronous fs functions is
+**Note:** Omitting the callback function on asynchronous fs functions is
 deprecated and may result in an error being thrown in the future.
 
 ```txt
@@ -113,7 +113,7 @@ const fileUrl = new URL('file:///tmp/hello');
 fs.readFileSync(fileUrl);
 ```
 
-*Note*: `file:` URLs are always absolute paths.
+**Note:** `file:` URLs are always absolute paths.
 
 Using WHATWG [`URL`][] objects might introduce platform-specific behaviors.
 
@@ -138,7 +138,7 @@ fs.readFileSync(new URL('file:///c/p/a/t/h/file'));
 // TypeError [ERR_INVALID_FILE_URL_PATH]: File URL path must be absolute
 ```
 
-*Note*: `file:` URLs with drive letters must use `:` as a separator just after
+**Note:** `file:` URLs with drive letters must use `:` as a separator just after
 the drive letter. Using another separator will result in a throw.
 
 On all other platforms, `file:` URLs with a hostname are unsupported and will
@@ -194,7 +194,7 @@ filesystems that allow for non-UTF-8 filenames. For most typical
 uses, working with paths as Buffers will be unnecessary, as the string
 API converts to and from UTF-8 automatically.
 
-*Note* that on certain file systems (such as NTFS and HFS+) filenames
+**Note:** On certain file systems (such as NTFS and HFS+) filenames
 will always be encoded as UTF-8. On such file systems, passing
 non-UTF-8 encoded Buffers to `fs` functions will not work as expected.
 
@@ -591,7 +591,7 @@ fs.appendFile('message.txt', 'data to append', 'utf8', callback);
 
 Any specified file descriptor has to have been opened for appending.
 
-*Note*: If a file descriptor is specified as the `file`, it will not be closed
+**Note:** If a file descriptor is specified as the `file`, it will not be closed
 automatically.
 
 ## fs.appendFileSync(file, data[, options])
@@ -1428,7 +1428,7 @@ fs.mkdtemp('/tmp/foo-', (err, folder) => {
 });
 ```
 
-*Note*: The `fs.mkdtemp()` method will append the six randomly selected
+**Note:** The `fs.mkdtemp()` method will append the six randomly selected
 characters directly to the `prefix` string. For instance, given a directory
 `/tmp`, if the intention is to create a temporary directory *within* `/tmp`,
 the `prefix` *must* end with a trailing platform-specific path separator
@@ -1546,8 +1546,8 @@ On Linux, positional writes don't work when the file is opened in append mode.
 The kernel ignores the position argument and always appends the data to
 the end of the file.
 
-*Note*: The behavior of `fs.open()` is platform-specific for some flags. As such,
-opening a directory on macOS and Linux with the `'a+'` flag - see example
+**Note:** The behavior of `fs.open()` is platform-specific for some flags. As
+such, opening a directory on macOS and Linux with the `'a+'` flag - see example
 below - will return an error. In contrast, on Windows and FreeBSD, a file
 descriptor will be returned.
 
@@ -1714,7 +1714,7 @@ If `options` is a string, then it specifies the encoding. Example:
 ```js
 fs.readFile('/etc/passwd', 'utf8', callback);
 ```
-*Note*: When the path is a directory, the behavior of
+**Note:** When the path is a directory, the behavior of
 `fs.readFile()` and [`fs.readFileSync()`][] is platform-specific. On macOS,
 Linux, and Windows, an error will be returned. On FreeBSD, a representation
 of the directory's contents will be returned.
@@ -1733,7 +1733,7 @@ fs.readFile('<directory>', (err, data) => {
 
 Any specified file descriptor has to support reading.
 
-*Note*: If a file descriptor is specified as the `path`, it will not be closed
+**Note:** If a file descriptor is specified as the `path`, it will not be closed
 automatically.
 
 ## fs.readFileSync(path[, options])
@@ -1759,7 +1759,7 @@ Synchronous version of [`fs.readFile`][]. Returns the contents of the `file`.
 If the `encoding` option is specified then this function returns a
 string. Otherwise it returns a buffer.
 
-*Note*: Similar to [`fs.readFile()`][], when the path is a directory, the
+**Note:** Similar to [`fs.readFile()`][], when the path is a directory, the
 behavior of `fs.readFileSync()` is platform-specific.
 
 ```js
@@ -2144,9 +2144,9 @@ effectively stopping watching of `filename`.
 Calling `fs.unwatchFile()` with a filename that is not being watched is a
 no-op, not an error.
 
-*Note*: [`fs.watch()`][] is more efficient than `fs.watchFile()` and `fs.unwatchFile()`.
-`fs.watch()` should be used instead of `fs.watchFile()` and `fs.unwatchFile()`
-when possible.
+**Note:** [`fs.watch()`][] is more efficient than `fs.watchFile()` and
+`fs.unwatchFile()`.  `fs.watch()` should be used instead of `fs.watchFile()`
+and `fs.unwatchFile()` when possible.
 
 ## fs.utimes(path, atime, mtime, callback)
 <!-- YAML
@@ -2173,7 +2173,7 @@ changes:
 
 Change file timestamps of the file referenced by the supplied path.
 
-Note: the arguments `atime` and `mtime` of the following related functions
+**Note:** The arguments `atime` and `mtime` of the following related functions
 follow these rules:
 
 - The value should be a Unix timestamp in seconds. For example, `Date.now()`
@@ -2354,13 +2354,14 @@ These stat objects are instances of `fs.Stat`.
 To be notified when the file was modified, not just accessed, it is necessary
 to compare `curr.mtime` and `prev.mtime`.
 
-*Note*: when an `fs.watchFile` operation results in an `ENOENT` error, it will
- invoke the listener once, with all the fields zeroed (or, for dates, the Unix
- Epoch). In Windows, `blksize` and `blocks` fields will be `undefined`, instead
- of zero. If the file is created later on, the listener will be called again,
- with the latest stat objects. This is a change in functionality since v0.10.
+**Note:** When an `fs.watchFile` operation results in an `ENOENT` error, it
+will invoke the listener once, with all the fields zeroed (or, for dates, the
+Unix Epoch). In Windows, `blksize` and `blocks` fields will be `undefined`,
+instead of zero. If the file is created later on, the listener will be called
+again, with the latest stat objects. This is a change in functionality since
+v0.10.
 
-*Note*: [`fs.watch()`][] is more efficient than `fs.watchFile` and
+**Note:** [`fs.watch()`][] is more efficient than `fs.watchFile` and
 `fs.unwatchFile`. `fs.watch` should be used instead of `fs.watchFile` and
 `fs.unwatchFile` when possible.
 
@@ -2505,7 +2506,7 @@ Note that it is unsafe to use `fs.writeFile` multiple times on the same file
 without waiting for the callback. For this scenario,
 `fs.createWriteStream` is strongly recommended.
 
-*Note*: If a file descriptor is specified as the `file`, it will not be closed
+**Note:** If a file descriptor is specified as the `file`, it will not be closed
 automatically.
 
 ## fs.writeFileSync(file, data[, options])
@@ -2565,8 +2566,9 @@ Synchronous versions of [`fs.write()`][]. Returns the number of bytes written.
 
 ## FS Constants
 
-The following constants are exported by `fs.constants`. **Note:** Not every
-constant will be available on every operating system.
+The following constants are exported by `fs.constants`.
+
+**Note:** Not every constant will be available on every operating system.
 
 ### File Access Constants
 
diff --git a/doc/api/http.md b/doc/api/http.md
index 25b484c6a37400..0479c4f3bffccb 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -268,8 +268,8 @@ Until the data is consumed, the `'end'` event will not fire.  Also, until
 the data is read it will consume memory that can eventually lead to a
 'process out of memory' error.
 
-Note: Node.js does not check whether Content-Length and the length of the body
-which has been transmitted are equal or not.
+**Note:** Node.js does not check whether Content-Length and the length of the
+body which has been transmitted are equal or not.
 
 The request implements the [Writable Stream][] interface. This is an
 [`EventEmitter`][] with the following events:
@@ -731,7 +731,7 @@ This function is asynchronous. `callback` will be added as a listener for the
 
 Returns `server`.
 
-*Note*: The `server.listen()` method may be called multiple times. Each
+**Note:** The `server.listen()` method may be called multiple times. Each
 subsequent call will *re-open* the server using the provided options.
 
 ### server.listen(path[, callback])
@@ -747,7 +747,7 @@ Start a UNIX socket server listening for connections on the given `path`.
 This function is asynchronous. `callback` will be added as a listener for the
 [`'listening'`][] event.  See also [`net.Server.listen(path)`][].
 
-*Note*: The `server.listen()` method may be called multiple times. Each
+**Note:** The `server.listen()` method may be called multiple times. Each
 subsequent call will *re-open* the server using the provided options.
 
 ### server.listen([port][, hostname][, backlog][, callback])
@@ -765,7 +765,7 @@ Begin accepting connections on the specified `port` and `hostname`. If the
 [unspecified IPv6 address][] (`::`) when IPv6 is available, or the
 [unspecified IPv4 address][] (`0.0.0.0`) otherwise.
 
-*Note*: in most operating systems, listening to the
+**Note:** In most operating systems, listening to the
 [unspecified IPv6 address][] (`::`) may cause the `net.Server` to also listen on
 the [unspecified IPv4 address][] (`0.0.0.0`).
 
@@ -783,7 +783,7 @@ parameter is 511 (not 512).
 This function is asynchronous. `callback` will be added as a listener for the
 [`'listening'`][] event.  See also [`net.Server.listen(port)`][].
 
-*Note*: The `server.listen()` method may be called multiple times. Each
+**Note:** The `server.listen()` method may be called multiple times. Each
 subsequent call will *re-open* the server using the provided options.
 
 ### server.listening
@@ -982,7 +982,7 @@ header-related http module methods. The keys of the returned object are the
 header names and the values are the respective header values. All header names
 are lowercase.
 
-*Note*: The object returned by the `response.getHeaders()` method _does not_
+**Note:** The object returned by the `response.getHeaders()` method _does not_
 prototypically inherit from the JavaScript `Object`. This means that typical
 `Object` methods such as `obj.toString()`, `obj.hasOwnProperty()`, and others
 are not defined and *will not work*.
@@ -1177,7 +1177,7 @@ the second parameter specifies how to encode it into a byte stream.
 By default the `encoding` is `'utf8'`. `callback` will be called when this chunk
 of data is flushed.
 
-**Note**: This is the raw HTTP body and has nothing to do with
+**Note:** This is the raw HTTP body and has nothing to do with
 higher-level multi-part body encodings that may be used.
 
 The first time [`response.write()`][] is called, it will send the buffered
diff --git a/doc/api/modules.md b/doc/api/modules.md
index d09e58f5cb892e..5688ec9592457e 100644
--- a/doc/api/modules.md
+++ b/doc/api/modules.md
@@ -348,9 +348,9 @@ If this was in a folder at `./some-library`, then
 
 This is the extent of Node.js's awareness of package.json files.
 
-Note: If the file specified by the `"main"` entry of `package.json` is missing
-and can not be resolved, Node.js will report the entire module as missing with
-the default error:
+**Note:** If the file specified by the `"main"` entry of `package.json` is
+missing and can not be resolved, Node.js will report the entire module as
+missing with the default error:
 
 ```txt
 Error: Cannot find module 'some-library'
@@ -401,8 +401,9 @@ same module resolution semantics.
 
 If the `NODE_PATH` environment variable is set to a colon-delimited list
 of absolute paths, then Node.js will search those paths for modules if they
-are not found elsewhere.  (Note: On Windows, `NODE_PATH` is delimited by
-semicolons instead of colons.)
+are not found elsewhere.
+
+**Note:** On Windows, `NODE_PATH` is delimited by semicolons instead of colons.
 
 `NODE_PATH` was originally created to support loading modules from
 varying paths before the current [module resolution][] algorithm was frozen.
@@ -425,7 +426,7 @@ configured `node_prefix`.
 
 These are mostly for historic reasons.
 
-*Note*: It is strongly encouraged to place dependencies in the local
+**Note:** It is strongly encouraged to place dependencies in the local
 `node_modules` folder. These will be loaded faster, and more reliably.
 
 ## The module wrapper
@@ -627,10 +628,10 @@ added: v0.5.1
 The `module.require` method provides a way to load a module as if
 `require()` was called from the original module.
 
-*Note*: In order to do this, it is necessary to get a reference to the `module`
-object.  Since `require()` returns the `module.exports`, and the `module` is
-typically *only* available within a specific module's code, it must be
-explicitly exported in order to be used.
+**Note:** In order to do this, it is necessary to get a reference to the
+`module` object.  Since `require()` returns the `module.exports`, and the
+`module` is typically *only* available within a specific module's code, it must
+be explicitly exported in order to be used.
 
 [`Error`]: errors.html#errors_class_error
 [module resolution]: #modules_all_together
diff --git a/doc/api/n-api.md b/doc/api/n-api.md
index 6136929e4a9567..d316b271db7f5a 100644
--- a/doc/api/n-api.md
+++ b/doc/api/n-api.md
@@ -2530,7 +2530,7 @@ const myaddon = require('./addon');
 myaddon.sayHello();
 ```
 
-**Note:**  The string passed to require is not necessarily the name passed into
+**Note:** The string passed to require is not necessarily the name passed into
 `NAPI_MODULE` in the earlier snippet but the name of the target in `binding.gyp`
 responsible for creating the `.node` file.
 
diff --git a/doc/api/net.md b/doc/api/net.md
index 8eea2d4bcd421f..01d29e4e43538b 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -185,12 +185,11 @@ by the OS through sysctl settings such as `tcp_max_syn_backlog` and `somaxconn`
 on Linux. The default value of this parameter is 511 (not 512).
 
 
-Note:
+**Note:** All [`net.Socket`][] are set to `SO_REUSEADDR` (See [socket(7)][] for
+details).
 
-* All [`net.Socket`][] are set to `SO_REUSEADDR` (See [socket(7)][] for
-  details).
-* The `server.listen()` method may be called multiple times. Each
-  subsequent call will *re-open* the server using the provided options.
+**Note:** The `server.listen()` method may be called multiple times. Each
+subsequent call will *re-open* the server using the provided options.
 
 One of the most common errors raised when listening is `EADDRINUSE`.
 This happens when another server is already listening on the requested
@@ -225,7 +224,7 @@ The `handle` object can be either a server, a socket (anything with an
 underlying `_handle` member), or an object with a `fd` member that is a
 valid file descriptor.
 
-*Note*: Listening on a file descriptor is not supported on Windows.
+**Note:** Listening on a file descriptor is not supported on Windows.
 
 #### server.listen(options[, callback])
 <!-- YAML
@@ -294,7 +293,7 @@ If `host` is omitted, the server will accept connections on the
 [unspecified IPv6 address][] (`::`) when IPv6 is available, or the
 [unspecified IPv4 address][] (`0.0.0.0`) otherwise.
 
-*Note*: in most operating systems, listening to the
+**Note:** In most operating systems, listening to the
 [unspecified IPv6 address][] (`::`) may cause the `net.Server` to also listen on
 the [unspecified IPv4 address][] (`0.0.0.0`).
 
@@ -852,7 +851,7 @@ Possible signatures:
 * [`net.createConnection(port[, host][, connectListener])`][`net.createConnection(port, host)`]
   for TCP connections.
 
-*Note*: the [`net.connect()`][] function is an alias to this function.
+**Note:** The [`net.connect()`][] function is an alias to this function.
 
 ### net.createConnection(options[, connectListener])
 <!-- YAML
diff --git a/doc/api/os.md b/doc/api/os.md
index b9f2775ce6a3b2..3a52cd4f373f31 100644
--- a/doc/api/os.md
+++ b/doc/api/os.md
@@ -165,8 +165,8 @@ For example:
 ]
 ```
 
-*Note*: Because `nice` values are UNIX-specific, on Windows the `nice` values of
-all processors are always 0.
+**Note:** Because `nice` values are UNIX-specific, on Windows the `nice` values
+of all processors are always 0.
 
 ## os.endianness()
 <!-- YAML
@@ -314,7 +314,7 @@ Currently possible values are:
 
 Equivalent to [`process.platform`][].
 
-*Note*: The value `'android'` may also be returned if the Node.js is built on
+**Note:** The value `'android'` may also be returned if the Node.js is built on
 the Android operating system. However, Android support in Node.js is considered
 to be experimental at this time.
 
@@ -328,8 +328,8 @@ added: v0.3.3
 The `os.release()` method returns a string identifying the operating system
 release.
 
-*Note*: On POSIX systems, the operating system release is determined by calling
-uname(3). On Windows, `GetVersionExW()` is used. Please see
+**Note:** On POSIX systems, the operating system release is determined by
+calling uname(3). On Windows, `GetVersionExW()` is used. Please see
 https://en.wikipedia.org/wiki/Uname#Examples for more information.
 
 ## os.tmpdir()
@@ -380,7 +380,7 @@ added: v0.3.3
 
 The `os.uptime()` method returns the system uptime in number of seconds.
 
-*Note*: On Windows the returned value includes fractions of a second.
+**Note:** On Windows the returned value includes fractions of a second.
 Use `Math.floor()` to get whole seconds.
 
 ## os.userInfo([options])
@@ -406,8 +406,9 @@ operating system response.
 
 ## OS Constants
 
-The following constants are exported by `os.constants`. **Note:** Not all
-constants will be available on every operating system.
+The following constants are exported by `os.constants`.
+
+**Note:** Not all constants will be available on every operating system.
 
 ### Signal Constants
 <!-- YAML
diff --git a/doc/api/path.md b/doc/api/path.md
index cf096ef9851475..021b42251cac0f 100644
--- a/doc/api/path.md
+++ b/doc/api/path.md
@@ -531,7 +531,7 @@ On Windows:
 // Returns: ['foo', 'bar', 'baz']
 ```
 
-*Note*: On Windows, both the forward slash (`/`) and backward slash (`\`) are
+**Note:** On Windows, both the forward slash (`/`) and backward slash (`\`) are
 accepted as path segment separators; however, the `path` methods only add
 backward slashes (`\`).
 
diff --git a/doc/api/process.md b/doc/api/process.md
index 40ec3e0b1aaff2..923e411f9d783e 100644
--- a/doc/api/process.md
+++ b/doc/api/process.md
@@ -360,7 +360,7 @@ process.on('SIGINT', () => {
 });
 ```
 
-*Note*: An easy way to send the `SIGINT` signal is with `<Ctrl>-C` in most
+**Note:** An easy way to send the `SIGINT` signal is with `<Ctrl>-C` in most
 terminal programs.
 
 It is important to take note of the following:
@@ -397,7 +397,7 @@ It is important to take note of the following:
    hanging in an endless loop, since listeners attached using `process.on()` are
    called asynchronously and therefore unable to correct the underlying problem.
 
-*Note*: Windows does not support sending signals, but Node.js offers some
+**Note:** Windows does not support sending signals, but Node.js offers some
 emulation with [`process.kill()`][], and [`ChildProcess.kill()`][]. Sending
 signal `0` can be used to test for the existence of a process. Sending `SIGINT`,
 `SIGTERM`, and `SIGKILL` cause the unconditional termination of the target
@@ -556,7 +556,7 @@ An example of the possible output looks like:
 }
 ```
 
-*Note*: The `process.config` property is **not** read-only and there are
+**Note:** The `process.config` property is **not** read-only and there are
 existing modules in the ecosystem that are known to extend, modify, or entirely
 replace the value of `process.config`.
 
@@ -1004,8 +1004,8 @@ if (process.getegid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows
-or Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.geteuid()
 <!-- YAML
@@ -1023,8 +1023,8 @@ if (process.geteuid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.getgid()
 <!-- YAML
@@ -1042,8 +1042,8 @@ if (process.getgid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 
 ## process.getgroups()
@@ -1057,8 +1057,8 @@ The `process.getgroups()` method returns an array with the supplementary group
 IDs. POSIX leaves it unspecified if the effective group ID is included but
 Node.js ensures it always is.
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.getuid()
 <!-- YAML
@@ -1076,8 +1076,8 @@ if (process.getuid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.hrtime([time])
 <!-- YAML
@@ -1139,8 +1139,8 @@ process.setgid(1000);                     // drop root gid
 console.log(process.getgroups());         // [ 27, 30, 46, 1000 ]
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.kill(pid[, signal])
 <!-- YAML
@@ -1162,9 +1162,9 @@ case, a signal of `0` can be used to test for the existence of a process.
 Windows platforms will throw an error if the `pid` is used to kill a process
 group.
 
-*Note*:Even though the name of this function is `process.kill()`, it is really
-just a signal sender, like the `kill` system call.  The signal sent may do
-something other than kill the target process.
+**Note:** Even though the name of this function is `process.kill()`, it is
+really just a signal sender, like the `kill` system call.  The signal sent may
+do something other than kill the target process.
 
 For example:
 
@@ -1181,8 +1181,8 @@ setTimeout(() => {
 process.kill(process.pid, 'SIGHUP');
 ```
 
-*Note*: When `SIGUSR1` is received by a Node.js process, Node.js will start the
-debugger, see [Signal Events][].
+**Note:** When `SIGUSR1` is received by a Node.js process, Node.js will start
+the debugger, see [Signal Events][].
 
 ## process.mainModule
 <!-- YAML
@@ -1331,7 +1331,7 @@ function definitelyAsync(arg, cb) {
 }
 ```
 
-*Note*: the next tick queue is completely drained on each pass of the
+**Note:** The next tick queue is completely drained on each pass of the
 event loop **before** additional I/O is processed.  As a result,
 recursively setting nextTick callbacks will block any I/O from
 happening, just like a `while(true);` loop.
@@ -1429,8 +1429,8 @@ used to send messages to the parent process. Messages will be received as a
 If Node.js was not spawned with an IPC channel, `process.send()` will be
 `undefined`.
 
-*Note*: This function uses [`JSON.stringify()`][] internally to serialize the
-`message`.*
+**Note:** This function uses [`JSON.stringify()`][] internally to serialize the
+`message`.
 
 ## process.setegid(id)
 <!-- YAML
@@ -1456,8 +1456,8 @@ if (process.getegid && process.setegid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 
 ## process.seteuid(id)
@@ -1484,8 +1484,8 @@ if (process.geteuid && process.seteuid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.setgid(id)
 <!-- YAML
@@ -1511,8 +1511,8 @@ if (process.getgid && process.setgid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.setgroups(groups)
 <!-- YAML
@@ -1527,8 +1527,8 @@ to have `root` or the `CAP_SETGID` capability.
 
 The `groups` array can contain numeric group IDs, group names or both.
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 ## process.setuid(id)
 <!-- YAML
@@ -1552,8 +1552,8 @@ if (process.getuid && process.setuid) {
 }
 ```
 
-*Note*: This function is only available on POSIX platforms (i.e. not Windows or
-Android)
+**Note:** This function is only available on POSIX platforms (i.e. not Windows
+or Android).
 
 
 ## process.stderr
@@ -1565,7 +1565,7 @@ The `process.stderr` property returns a stream connected to
 stream) unless fd `2` refers to a file, in which case it is
 a [Writable][] stream.
 
-Note: `process.stderr` differs from other Node.js streams in important ways,
+**Note:** `process.stderr` differs from other Node.js streams in important ways,
 see [note on process I/O][] for more information.
 
 ## process.stdin
@@ -1598,7 +1598,7 @@ As a [Duplex][] stream, `process.stdin` can also be used in "old" mode that
 is compatible with scripts written for Node.js prior to v0.10.
 For more information see [Stream compatibility][].
 
-*Note*: In "old" streams mode the `stdin` stream is paused by default, so one
+**Note:** In "old" streams mode the `stdin` stream is paused by default, so one
 must call `process.stdin.resume()` to read from it. Note also that calling
 `process.stdin.resume()` itself would switch stream to "old" mode.
 
@@ -1617,7 +1617,7 @@ For example, to copy process.stdin to process.stdout:
 process.stdin.pipe(process.stdout);
 ```
 
-Note: `process.stdout` differs from other Node.js streams in important ways,
+**Note:** `process.stdout` differs from other Node.js streams in important ways,
 see [note on process I/O][] for more information.
 
 ### A note on process I/O
@@ -1680,14 +1680,14 @@ The `process.title` property returns the current process title (i.e. returns
 the current value of `ps`). Assigning a new value to `process.title` modifies
 the current value of `ps`.
 
-*Note*: When a new value is assigned, different platforms will impose different
-maximum length restrictions on the title. Usually such restrictions are quite
-limited. For instance, on Linux and macOS, `process.title` is limited to the
-size of the binary name plus the length of the command line arguments because
-setting the `process.title` overwrites the `argv` memory of the process.
-Node.js v0.8 allowed for longer process title strings by also overwriting the
-`environ` memory but that was potentially insecure and confusing in some
-(rather obscure) cases.
+**Note:** When a new value is assigned, different platforms will impose
+different maximum length restrictions on the title. Usually such restrictions
+are quite limited. For instance, on Linux and macOS, `process.title` is limited
+to the size of the binary name plus the length of the command line arguments
+because setting the `process.title` overwrites the `argv` memory of the
+process.  Node.js v0.8 allowed for longer process title strings by also
+overwriting the `environ` memory but that was potentially insecure and
+confusing in some (rather obscure) cases.
 
 ## process.umask([mask])
 <!-- YAML
@@ -1720,7 +1720,7 @@ added: v0.5.0
 The `process.uptime()` method returns the number of seconds the current Node.js
 process has been running.
 
-*Note*: the return value includes fractions of a second. Use `Math.floor()`
+**Note:** The return value includes fractions of a second. Use `Math.floor()`
 to get whole seconds.
 
 ## process.version
diff --git a/doc/api/punycode.md b/doc/api/punycode.md
index b88a89832641ea..3d4fd2cd794a2e 100644
--- a/doc/api/punycode.md
+++ b/doc/api/punycode.md
@@ -31,7 +31,7 @@ to `'example.com'`) is represented by Punycode as the ASCII string
 
 The `punycode` module provides a simple implementation of the Punycode standard.
 
-*Note*: The `punycode` module is a third-party dependency used by Node.js and
+**Note:** The `punycode` module is a third-party dependency used by Node.js and
 made available to developers as a convenience. Fixes or other modifications to
 the module must be directed to the [Punycode.js][] project.
 
diff --git a/doc/api/querystring.md b/doc/api/querystring.md
index 64d557eec72203..616c66f43fae3d 100644
--- a/doc/api/querystring.md
+++ b/doc/api/querystring.md
@@ -67,7 +67,7 @@ For example, the query string `'foo=bar&abc=xyz&abc=123'` is parsed into:
 }
 ```
 
-*Note*: The object returned by the `querystring.parse()` method _does not_
+**Note:** The object returned by the `querystring.parse()` method _does not_
 prototypically inherit from the JavaScript `Object`. This means that typical
 `Object` methods such as `obj.toString()`, `obj.hasOwnProperty()`, and others
 are not defined and *will not work*.
diff --git a/doc/api/readline.md b/doc/api/readline.md
index 52220a182225c8..937c770595e589 100644
--- a/doc/api/readline.md
+++ b/doc/api/readline.md
@@ -27,7 +27,7 @@ rl.question('What do you think of Node.js? ', (answer) => {
 });
 ```
 
-*Note* Once this code is invoked, the Node.js application will not
+**Note:** Once this code is invoked, the Node.js application will not
 terminate until the `readline.Interface` is closed because the interface
 waits for data to be received on the `input` stream.
 
@@ -140,7 +140,7 @@ rl.on('SIGCONT', () => {
 });
 ```
 
-*Note*: The `'SIGCONT'` event is _not_ supported on Windows.
+**Note:** The `'SIGCONT'` event is _not_ supported on Windows.
 
 ### Event: 'SIGINT'
 <!-- YAML
@@ -192,7 +192,7 @@ rl.on('SIGTSTP', () => {
 });
 ```
 
-*Note*: The `'SIGTSTP'` event is _not_ supported on Windows.
+**Note:** The `'SIGTSTP'` event is _not_ supported on Windows.
 
 ### rl.close()
 <!-- YAML
@@ -260,7 +260,7 @@ rl.question('What is your favorite food? ', (answer) => {
 });
 ```
 
-*Note*: The `callback` function passed to `rl.question()` does not follow the
+**Note:** The `callback` function passed to `rl.question()` does not follow the
 typical pattern of accepting an `Error` object or `null` as the first argument.
 The `callback` is called with the provided answer as the only argument.
 
@@ -313,7 +313,7 @@ rl.write('Delete this!');
 rl.write(null, {ctrl: true, name: 'u'});
 ```
 
-*Note*: The `rl.write()` method will write the data to the `readline`
+**Note:** The `rl.write()` method will write the data to the `readline`
 Interface's `input` *as if it were provided by the user*.
 
 ## readline.clearLine(stream, dir)
diff --git a/doc/api/stream.md b/doc/api/stream.md
index a17a0c455d7bf8..bfe96b7bda0369 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -186,7 +186,7 @@ Examples of [Writable][] streams include:
 * [child process stdin][]
 * [`process.stdout`][], [`process.stderr`][]
 
-*Note*: Some of these examples are actually [Duplex][] streams that implement
+**Note:** Some of these examples are actually [Duplex][] streams that implement
 the [Writable][] interface.
 
 All [Writable][] streams implement the interface defined by the
@@ -268,7 +268,7 @@ added: v0.9.4
 The `'error'` event is emitted if an error occurred while writing or piping
 data. The listener callback is passed a single `Error` argument when called.
 
-*Note*: The stream is not closed when the `'error'` event is emitted.
+**Note:** The stream is not closed when the `'error'` event is emitted.
 
 ##### Event: 'finish'
 <!-- YAML
@@ -558,13 +558,13 @@ until a mechanism for either consuming or ignoring that data is provided. If
 the consuming mechanism is disabled or taken away, the Readable will *attempt*
 to stop generating the data.
 
-*Note*: For backwards compatibility reasons, removing [`'data'`][] event
+**Note:** For backwards compatibility reasons, removing [`'data'`][] event
 handlers will **not** automatically pause the stream. Also, if there are piped
 destinations, then calling [`stream.pause()`][stream-pause] will not guarantee
 that the stream will *remain* paused once those destinations drain and ask for
 more data.
 
-*Note*: If a [Readable][] is switched into flowing mode and there are no
+**Note:** If a [Readable][] is switched into flowing mode and there are no
 consumers available to handle the data, that data will be lost. This can occur,
 for instance, when the `readable.resume()` method is called without a listener
 attached to the `'data'` event, or when a `'data'` event handler is removed
@@ -670,7 +670,7 @@ added: v0.9.4
 The `'end'` event is emitted when there is no more data to be consumed from
 the stream.
 
-*Note*: The `'end'` event **will not be emitted** unless the data is
+**Note:** The `'end'` event **will not be emitted** unless the data is
 completely consumed. This can be accomplished by switching the stream into
 flowing mode, or by calling [`stream.read()`][stream-read] repeatedly until
 all data has been consumed.
@@ -742,7 +742,7 @@ readable: null
 end
 ```
 
-*Note*: In general, the `readable.pipe()` and `'data'` event mechanisms are
+**Note:** In general, the `readable.pipe()` and `'data'` event mechanisms are
 preferred over the use of the `'readable'` event.
 
 ##### readable.isPaused()
@@ -845,7 +845,7 @@ processing, the Writable destination *is not closed* automatically. If an
 error occurs, it will be necessary to *manually* close each stream in order
 to prevent memory leaks.
 
-*Note*: The [`process.stderr`][] and [`process.stdout`][] Writable streams are
+**Note:** The [`process.stderr`][] and [`process.stdout`][] Writable streams are
 never closed until the Node.js process exits, regardless of the specified
 options.
 
@@ -893,10 +893,10 @@ A Readable stream in object mode will always return a single item from
 a call to [`readable.read(size)`][stream-read], regardless of the value of the
 `size` argument.
 
-*Note:* If the `readable.read()` method returns a chunk of data, a `'data'`
+**Note:** If the `readable.read()` method returns a chunk of data, a `'data'`
 event will also be emitted.
 
-*Note*: Calling [`stream.read([size])`][stream-read] after the [`'end'`][]
+**Note:** Calling [`stream.read([size])`][stream-read] after the [`'end'`][]
 event has been emitted will return `null`. No runtime error will be raised.
 
 ##### readable.resume()
@@ -994,7 +994,7 @@ buffer. This is useful in certain situations where a stream is being consumed by
 code that needs to "un-consume" some amount of data that it has optimistically
 pulled out of the source, so that the data can be passed on to some other party.
 
-*Note*: The `stream.unshift(chunk)` method cannot be called after the
+**Note:** The `stream.unshift(chunk)` method cannot be called after the
 [`'end'`][] event has been emitted or a runtime error will be thrown.
 
 Developers using `stream.unshift()` often should consider switching to
@@ -1037,7 +1037,7 @@ function parseHeader(stream, callback) {
 }
 ```
 
-*Note*: Unlike [`stream.push(chunk)`][stream-push], `stream.unshift(chunk)`
+**Note:** Unlike [`stream.push(chunk)`][stream-push], `stream.unshift(chunk)`
 will not end the reading process by resetting the internal reading state of the
 stream. This can cause unexpected results if `readable.unshift()` is called
 during a read (i.e. from within a [`stream._read()`][stream-_read]
@@ -1224,7 +1224,7 @@ on the type of stream being created, as detailed in the chart below:
   </tr>
 </table>
 
-*Note*: The implementation code for a stream should *never* call the "public"
+**Note:** The implementation code for a stream should *never* call the "public"
 methods of a stream that are intended for use by consumers (as described in
 the [API for Stream Consumers][] section). Doing so may lead to adverse
 side effects in application code consuming the stream.
@@ -1336,10 +1336,10 @@ All Writable stream implementations must provide a
 [`writable._write()`][stream-_write] method to send data to the underlying
 resource.
 
-*Note*: [Transform][] streams provide their own implementation of the
+**Note:** [Transform][] streams provide their own implementation of the
 [`writable._write()`][stream-_write].
 
-*Note*: **This function MUST NOT be called by application code directly.** It
+**Note:** This function MUST NOT be called by application code directly. It
 should be implemented by child classes, and called only by the internal Writable
 class methods only.
 
@@ -1374,7 +1374,7 @@ user programs.
 * `callback` {Function} A callback function (optionally with an error
   argument) to be invoked when processing is complete for the supplied chunks.
 
-*Note*: **This function MUST NOT be called by application code directly.** It
+**Note:** This function MUST NOT be called by application code directly. It
 should be implemented by child classes, and called only by the internal Writable
 class methods only.
 
@@ -1511,7 +1511,7 @@ const myReadable = new Readable({
 
 * `size` {number} Number of bytes to read asynchronously
 
-*Note*: **This function MUST NOT be called by application code directly.** It
+**Note:** This function MUST NOT be called by application code directly. It
 should be implemented by child classes, and called only by the internal Readable
 class methods only.
 
@@ -1525,7 +1525,7 @@ from the resource and pushing data until `readable.push()` returns `false`. Only
 when `_read()` is called again after it has stopped should it resume pushing
 additional data onto the queue.
 
-*Note*: Once the `readable._read()` method has been called, it will not be
+**Note:** Once the `readable._read()` method has been called, it will not be
 called again until the [`readable.push()`][stream-push] method is called.
 
 The `size` argument is advisory. For implementations where a "read" is a
@@ -1593,7 +1593,7 @@ class SourceWrapper extends Readable {
   }
 }
 ```
-*Note*: The `readable.push()` method is intended be called only by Readable
+**Note:** The `readable.push()` method is intended be called only by Readable
 Implementers, and only from within the `readable._read()` method.
 
 #### Errors While Reading
@@ -1659,10 +1659,10 @@ Because JavaScript does not have support for multiple inheritance, the
 `stream.Duplex` class is extended to implement a [Duplex][] stream (as opposed
 to extending the `stream.Readable` *and* `stream.Writable` classes).
 
-*Note*: The `stream.Duplex` class prototypically inherits from `stream.Readable`
-and parasitically from `stream.Writable`, but `instanceof` will work properly
-for both base classes due to overriding [`Symbol.hasInstance`][]
-on `stream.Writable`.
+**Note:** The `stream.Duplex` class prototypically inherits from
+`stream.Readable` and parasitically from `stream.Writable`, but `instanceof`
+will work properly for both base classes due to overriding
+[`Symbol.hasInstance`][] on `stream.Writable`.
 
 Custom Duplex streams *must* call the `new stream.Duplex([options])`
 constructor and implement *both* the `readable._read()` and
@@ -1810,7 +1810,7 @@ A [Transform][] stream is a [Duplex][] stream where the output is computed
 in some way from the input. Examples include [zlib][] streams or [crypto][]
 streams that compress, encrypt, or decrypt data.
 
-*Note*: There is no requirement that the output be the same size as the input,
+**Note:** There is no requirement that the output be the same size as the input,
 the same number of chunks, or arrive at the same time. For example, a
 Hash stream will only ever have a single chunk of output which is
 provided when the input is ended. A `zlib` stream will produce output
@@ -1824,7 +1824,7 @@ methods. Custom Transform implementations *must* implement the
 [`transform._transform()`][stream-_transform] method and *may* also implement
 the [`transform._flush()`][stream-_flush] method.
 
-*Note*: Care must be taken when using Transform streams in that data written
+**Note:** Care must be taken when using Transform streams in that data written
 to the stream can cause the Writable side of the stream to become paused if
 the output on the Readable side is not consumed.
 
@@ -1889,7 +1889,7 @@ after all data has been output, which occurs after the callback in
 * `callback` {Function} A callback function (optionally with an error
   argument and data) to be called when remaining data has been flushed.
 
-*Note*: **This function MUST NOT be called by application code directly.** It
+**Note:** This function MUST NOT be called by application code directly. It
 should be implemented by child classes, and called only by the internal Readable
 class methods only.
 
@@ -1924,7 +1924,7 @@ user programs.
   argument and data) to be called after the supplied `chunk` has been
   processed.
 
-*Note*: **This function MUST NOT be called by application code directly.** It
+**Note:** This function MUST NOT be called by application code directly. It
 should be implemented by child classes, and called only by the internal Readable
 class methods only.
 
diff --git a/doc/api/timers.md b/doc/api/timers.md
index 8abcdcb5cb6890..044826508c6975 100644
--- a/doc/api/timers.md
+++ b/doc/api/timers.md
@@ -36,7 +36,7 @@ added: v0.9.1
 When called, requests that the Node.js event loop *not* exit so long as the
 `Timeout` is active. Calling `timeout.ref()` multiple times will have no effect.
 
-*Note*: By default, all `Timeout` objects are "ref'd", making it normally
+**Note:** By default, all `Timeout` objects are "ref'd", making it normally
 unnecessary to call `timeout.ref()` unless `timeout.unref()` had been called
 previously.
 
@@ -52,7 +52,7 @@ to remain active. If there is no other activity keeping the event loop running,
 the process may exit before the `Timeout` object's callback is invoked. Calling
 `timeout.unref()` multiple times will have no effect.
 
-*Note*: Calling `timeout.unref()` creates an internal timer that will wake the
+**Note:** Calling `timeout.unref()` creates an internal timer that will wake the
 Node.js event loop. Creating too many of these can adversely impact performance
 of the Node.js application.
 
@@ -85,7 +85,7 @@ next event loop iteration.
 
 If `callback` is not a function, a [`TypeError`][] will be thrown.
 
-*Note*: This method has a custom variant for promises that is available using
+**Note:** This method has a custom variant for promises that is available using
 [`util.promisify()`][]:
 
 ```js
@@ -142,12 +142,12 @@ Node.js makes no guarantees about the exact timing of when callbacks will fire,
 nor of their ordering. The callback will be called as close as possible to the
 time specified.
 
-*Note*: When `delay` is larger than `2147483647` or less than `1`, the `delay`
+**Note:** When `delay` is larger than `2147483647` or less than `1`, the `delay`
 will be set to `1`.
 
 If `callback` is not a function, a [`TypeError`][] will be thrown.
 
-*Note*: This method has a custom variant for promises that is available using
+**Note:** This method has a custom variant for promises that is available using
 [`util.promisify()`][]:
 
 ```js
diff --git a/doc/api/tls.md b/doc/api/tls.md
index 88f93f51d1de3b..c708556d3cad3e 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -115,7 +115,7 @@ handshake extensions:
 * SNI - Allows the use of one TLS server for multiple hostnames with different
   SSL certificates.
 
-*Note*: Use of ALPN is recommended over NPN. The NPN extension has never been
+**Note:** Use of ALPN is recommended over NPN. The NPN extension has never been
 formally defined or documented and generally not recommended for use.
 
 ### Client-initiated renegotiation attack mitigation
@@ -136,7 +136,7 @@ threshold is exceeded. The limits are configurable:
 * `tls.CLIENT_RENEG_WINDOW` {number} Specifies the time renegotiation window
   in seconds. Defaults to `600` (10 minutes).
 
-*Note*: The default renegotiation limits should not be modified without a full
+**Note:** The default renegotiation limits should not be modified without a full
 understanding of the implications and risks.
 
 To test the renegotiation limits on a server, connect to it using the OpenSSL
@@ -187,7 +187,7 @@ in [`tls.createServer()`], [`tls.connect()`], and when creating new
 
 Consult [OpenSSL cipher list format documentation][] for details on the format.
 
-*Note*: The default cipher suite included within Node.js has been carefully
+**Note:** The default cipher suite included within Node.js has been carefully
 selected to reflect current security best practices and risk mitigation.
 Changing the default cipher suite can have a significant impact on the security
 of an application. The `--tls-cipher-list` switch and `ciphers` option should by
@@ -228,7 +228,7 @@ three arguments when called:
 * `callback` {Function} A callback function taking no arguments that must be
   invoked in order for data to be sent or received over the secure connection.
 
-*Note*: Listening for this event will have an effect only on connections
+**Note:** Listening for this event will have an effect only on connections
 established after the addition of the event listener.
 
 ### Event: 'OCSPRequest'
@@ -269,14 +269,14 @@ The typical flow of an OCSP Request is as follows:
 5. Client validates the response and either destroys the socket or performs a
    handshake.
 
-*Note*: The `issuer` can be `null` if the certificate is either self-signed or
+**Note:** The `issuer` can be `null` if the certificate is either self-signed or
 the issuer is not in the root certificates list. (An issuer may be provided
 via the `ca` option when establishing the TLS connection.)
 
-*Note*: Listening for this event will have an effect only on connections
+**Note:** Listening for this event will have an effect only on connections
 established after the addition of the event listener.
 
-*Note*: An npm module like [asn1.js] may be used to parse the certificates.
+**Note:** An npm module like [asn1.js] may be used to parse the certificates.
 
 ### Event: 'resumeSession'
 <!-- YAML
@@ -297,7 +297,7 @@ the session cannot be resumed (i.e., doesn't exist in storage) the callback may
 be invoked as `callback(null, null)`. Calling `callback(err)` will terminate the
 incoming connection and destroy the socket.
 
-*Note*: Listening for this event will have an effect only on connections
+**Note:** Listening for this event will have an effect only on connections
 established after the addition of the event listener.
 
 The following illustrates resuming a TLS session:
@@ -435,11 +435,11 @@ added: v3.0.0
 
 Updates the keys for encryption/decryption of the [TLS Session Tickets][].
 
-*Note*: The key's `Buffer` should be 48 bytes long. See `ticketKeys` option in
+**Note:** The key's `Buffer` should be 48 bytes long. See `ticketKeys` option in
 [tls.createServer](#tls_tls_createserver_options_secureconnectionlistener) for
 more information on how it is used.
 
-*Note*: Changes to the ticket keys are effective only for future server
+**Note:** Changes to the ticket keys are effective only for future server
 connections. Existing or currently pending server connections will use the
 previous keys.
 
@@ -454,7 +454,7 @@ encryption of written data and all required TLS negotiation.
 
 Instances of `tls.TLSSocket` implement the duplex [Stream][] interface.
 
-*Note*: Methods that return TLS connection metadata (e.g.
+**Note:** Methods that return TLS connection metadata (e.g.
 [`tls.TLSSocket.getPeerCertificate()`][] will only return data while the
 connection is open.
 
@@ -488,11 +488,9 @@ changes:
   * `secureContext`: Optional TLS context object created with
     [`tls.createSecureContext()`][]. If a `secureContext` is _not_ provided, one
     will be created by passing the entire `options` object to
-    `tls.createSecureContext()`. *Note*: In effect, all
-    [`tls.createSecureContext()`][] options can be provided, but they will be
-    _completely ignored_ unless the `secureContext` option is missing.
-  * ...: Optional [`tls.createSecureContext()`][] options can be provided, see
-    the `secureContext` option for more information.
+    `tls.createSecureContext()`.
+  * ...: Optional [`tls.createSecureContext()`][] options that are used if the
+    `secureContext` option is missing, otherwise they are ignored.
 
 Construct a new `tls.TLSSocket` object from an existing TCP socket.
 
@@ -667,8 +665,8 @@ added: v0.11.4
 
 Returns the TLS session ticket or `undefined` if no session was negotiated.
 
-*Note*: This only works with client TLS sockets. Useful only for debugging, for
-session reuse provide `session` option to [`tls.connect()`][].
+**Note:** This only works with client TLS sockets. Useful only for debugging,
+for session reuse provide `session` option to [`tls.connect()`][].
 
 ### tlsSocket.localAddress
 <!-- YAML
@@ -724,10 +722,10 @@ The `tlsSocket.renegotiate()` method initiates a TLS renegotiation process.
 Upon completion, the `callback` function will be passed a single argument
 that is either an `Error` (if the request failed) or `null`.
 
-*Note*: This method can be used to request a peer's certificate after the
+**Note:** This method can be used to request a peer's certificate after the
 secure connection has been established.
 
-*Note*: When running as the server, the socket will be destroyed with an error
+**Note:** When running as the server, the socket will be destroyed with an error
 after `handshakeTimeout` timeout.
 
 ### tlsSocket.setMaxSendFragment(size)
@@ -809,12 +807,10 @@ changes:
   * `secureContext`: Optional TLS context object created with
     [`tls.createSecureContext()`][]. If a `secureContext` is _not_ provided, one
     will be created by passing the entire `options` object to
-    `tls.createSecureContext()`. *Note*: In effect, all
-    [`tls.createSecureContext()`][] options can be provided, but they will be
-    _completely ignored_ unless the `secureContext` option is missing.
+    `tls.createSecureContext()`.
   * `lookup`: {Function} Custom lookup function. Defaults to [`dns.lookup()`][].
-  * ...: Optional [`tls.createSecureContext()`][] options can be provided, see
-    the `secureContext` option for more information.
+  * ...: Optional [`tls.createSecureContext()`][] options that are used if the
+    `secureContext` option is missing, otherwise they are ignored.
 * `callback` {Function}
 
 The `callback` function, if specified, will be added as a listener for the
@@ -889,7 +885,7 @@ added: v0.11.3
 Same as [`tls.connect()`][] except that `path` can be provided
 as an argument instead of an option.
 
-*Note*: A path option, if specified, will take precedence over the path
+**Note:** A path option, if specified, will take precedence over the path
 argument.
 
 ## tls.connect(port[, host][, options][, callback])
@@ -905,8 +901,8 @@ added: v0.11.3
 Same as [`tls.connect()`][] except that `port` and `host` can be provided
 as arguments instead of options.
 
-*Note*: A port or host option, if specified, will take precedence over any port
-or host argument.
+**Note:** A port or host option, if specified, will take precedence over any
+port or host argument.
 
 
 ## tls.createSecureContext(options)
@@ -971,8 +967,6 @@ changes:
     preferences instead of the client's. When `true`, causes
     `SSL_OP_CIPHER_SERVER_PREFERENCE` to be set in `secureOptions`, see
     [OpenSSL Options][] for more information.
-    *Note*: [`tls.createServer()`][] sets the default value to `true`, other
-    APIs that create secure contexts leave it unset.
   * `ecdhCurve` {string} A string describing a named curve to use for ECDH key
     agreement or `false` to disable ECDH. Defaults to
     [`tls.DEFAULT_ECDH_CURVE`].  Use [`crypto.getCurves()`][] to obtain a list
@@ -994,9 +988,14 @@ changes:
     [OpenSSL Options][].
   * `sessionIdContext` {string} Optional opaque identifier used by servers to
     ensure session state is not shared between applications. Unused by clients.
-    *Note*: [`tls.createServer()`][] uses a 128 bit truncated SHA1 hash value
-    generated from `process.argv`, other APIs that create secure contexts
-    have no default value.
+
+**Note:** [`tls.createServer()`][] sets the default value of the
+`honorCipherOrder` option to `true`, other APIs that create secure contexts
+leave it unset.
+
+**Note:** [`tls.createServer()`][] uses a 128 bit truncated SHA1 hash value
+generated from `process.argv` as the default value of the `sessionIdContext`
+option, other APIs that create secure contexts have no default value.
 
 The `tls.createSecureContext()` method creates a credentials object.
 
@@ -1060,8 +1059,7 @@ changes:
     server will time out. See [SSL_CTX_set_timeout] for more details.
   * `ticketKeys`: A 48-byte `Buffer` instance consisting of a 16-byte prefix,
     a 16-byte HMAC key, and a 16-byte AES key. This can be used to accept TLS
-    session tickets on multiple instances of the TLS server. *Note* that this is
-    automatically shared between `cluster` module workers.
+    session tickets on multiple instances of the TLS server.
   * ...: Any [`tls.createSecureContext()`][] options can be provided. For
     servers, the identity options (`pfx` or `key`/`cert`) are usually required.
 * `secureConnectionListener` {Function}
@@ -1069,6 +1067,9 @@ changes:
 Creates a new [tls.Server][].  The `secureConnectionListener`, if provided, is
 automatically set as a listener for the [`'secureConnection'`][] event.
 
+**Note:** The `ticketKeys` options is automatically shared between `cluster`
+module workers.
+
 The following illustrates a simple echo server:
 
 ```js
@@ -1244,9 +1245,9 @@ stream.
 `tls.createSecurePair()` returns a `tls.SecurePair` object with `cleartext` and
 `encrypted` stream properties.
 
-*Note*: `cleartext` has the same API as [`tls.TLSSocket`][].
+**Note:** `cleartext` has the same API as [`tls.TLSSocket`][].
 
-*Note*: The `tls.createSecurePair()` method is now deprecated in favor of
+**Note:** The `tls.createSecurePair()` method is now deprecated in favor of
 `tls.TLSSocket()`. For example, the code:
 
 ```js
diff --git a/doc/api/url.md b/doc/api/url.md
index 7f2cc97b75e986..35b1d620b41359 100644
--- a/doc/api/url.md
+++ b/doc/api/url.md
@@ -290,7 +290,7 @@ console.log(url.format(myURL, {fragment: false, unicode: true, auth: false}));
   // Prints 'https://你好你好?abc'
 ```
 
-*Note*: This variation of the `url.format()` method is currently considered to
+**Note:** This variation of the `url.format()` method is currently considered to
 be experimental.
 
 ## url.parse(urlString[, parseQueryString[, slashesDenoteHost]])
@@ -380,7 +380,7 @@ console.log(myURL.hostname); // example.org
 console.log(myURL.pathname); // /foo
 ```
 
-*Note*: Using the `delete` keyword (e.g. `delete myURL.protocol`,
+**Note:** Using the `delete` keyword (e.g. `delete myURL.protocol`,
 `delete myURL.pathname`, etc) has no effect but will still return `true`.
 
 A comparison between this API and `url.parse()` is given below. Above the URL
@@ -388,7 +388,7 @@ A comparison between this API and `url.parse()` is given below. Above the URL
 object returned by `url.parse()` are shown. Below it are properties of a WHATWG
 `URL` object.
 
-*Note*: WHATWG URL's `origin` property includes `protocol` and `host`, but not
+**Note:** WHATWG URL's `origin` property includes `protocol` and `host`, but not
 `username` or `password`.
 
 ```txt
@@ -835,7 +835,7 @@ added: v7.10.0
 Instantiate a new `URLSearchParams` object with a query hash map. The key and
 value of each property of `obj` are always coerced to strings.
 
-*Note*: Unlike [`querystring`][] module, duplicate keys in the form of array
+**Note:** Unlike [`querystring`][] module, duplicate keys in the form of array
 values are not allowed. Arrays are stringified using [`array.toString()`][],
 which simply joins all array elements with commas.
 
diff --git a/doc/api/util.md b/doc/api/util.md
index 7a9a779cbab935..7d0e10fdae391d 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -151,9 +151,9 @@ changes:
     description: The `constructor` parameter can refer to an ES6 class now.
 -->
 
-_Note: usage of `util.inherits()` is discouraged. Please use the ES6 `class` and
-`extends` keywords to get language level inheritance support. Also note that
-the two styles are [semantically incompatible][]._
+**Note:** Usage of `util.inherits()` is discouraged. Please use the ES6 `class`
+and `extends` keywords to get language level inheritance support. Also note
+that the two styles are [semantically incompatible][].
 
 * `constructor` {Function}
 * `superConstructor` {Function}
diff --git a/doc/api/v8.md b/doc/api/v8.md
index 21c2627898e481..0fadfa41742588 100644
--- a/doc/api/v8.md
+++ b/doc/api/v8.md
@@ -7,7 +7,7 @@ built into the Node.js binary. It can be accessed using:
 const v8 = require('v8');
 ```
 
-*Note*: The APIs and implementation are subject to change at any time.
+**Note:** The APIs and implementation are subject to change at any time.
 
 ## v8.cachedDataVersionTag()
 <!-- YAML
@@ -167,7 +167,7 @@ The serialization API provides means of serializing JavaScript values in a way
 that is compatible with the [HTML structured clone algorithm][].
 The format is backward-compatible (i.e. safe to store to disk).
 
-*Note*: This API is under development, and changes (including incompatible
+**Note:** This API is under development, and changes (including incompatible
 changes to the API or wire format) may occur until this warning is removed.
 
 ### v8.serialize(value)
diff --git a/doc/api/vm.md b/doc/api/vm.md
index aa36319ac20ffc..5e10ae3576b727 100644
--- a/doc/api/vm.md
+++ b/doc/api/vm.md
@@ -14,7 +14,7 @@ const vm = require('vm');
 JavaScript code can be compiled and run immediately or compiled, saved, and run
 later.
 
-*Note*: The vm module is not a security mechanism.
+**Note:** The vm module is not a security mechanism.
 **Do not use it to run untrusted code**.
 
 ## Class: vm.Script
@@ -125,7 +125,7 @@ console.log(util.inspect(sandbox));
 // { animal: 'cat', count: 12, name: 'kitty' }
 ```
 
-*Note*: Using the `timeout` or `breakOnSigint` options will result in new
+**Note:** Using the `timeout` or `breakOnSigint` options will result in new
 event loops and corresponding threads being started, which have a non-zero
 performance overhead.
 
@@ -327,7 +327,7 @@ console.log(Debug.findScript(process.emit).name);  // 'events.js'
 console.log(Debug.findScript(process.exit).name);  // 'internal/process.js'
 ```
 
-*Note*: The debug context and object are intrinsically tied to V8's debugger
+**Note:** The debug context and object are intrinsically tied to V8's debugger
 implementation and may change (or even be removed) without prior warning.
 
 The `Debug` object can also be made available using the V8-specific
@@ -458,7 +458,7 @@ const code =
 vm.runInThisContext(code)(require);
  ```
 
-*Note*: The `require()` in the above case shares the state with the context it
+**Note:** The `require()` in the above case shares the state with the context it
 is passed from. This may introduce risks when untrusted code is executed, e.g.
 altering objects in the context in unwanted ways.
 
diff --git a/doc/api/zlib.md b/doc/api/zlib.md
index f889914bb0ba56..dffe45e08548d9 100644
--- a/doc/api/zlib.md
+++ b/doc/api/zlib.md
@@ -54,8 +54,8 @@ the compression encodings accepted by the client. The [`Content-Encoding`][]
 header is used to identify the compression encodings actually applied to a
 message.
 
-**Note: the examples given below are drastically simplified to show
-the basic concept.**  Using `zlib` encoding can be expensive, and the results
+**Note:** the examples given below are drastically simplified to show
+the basic concept.  Using `zlib` encoding can be expensive, and the results
 ought to be cached.  See [Memory Usage Tuning][] for more information
 on the speed/memory/compression tradeoffs involved in `zlib` usage.
 
@@ -100,7 +100,7 @@ http.createServer((request, response) => {
     acceptEncoding = '';
   }
 
-  // Note: this is not a conformant accept-encoding parser.
+  // Note: This is not a conformant accept-encoding parser.
   // See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
   if (acceptEncoding.match(/\bdeflate\b/)) {
     response.writeHead(200, { 'Content-Encoding': 'deflate' });
@@ -229,7 +229,7 @@ not surprising. This section is taken almost directly from the
 [zlib documentation][].  See <http://zlib.net/manual.html#Constants> for more
 details.
 
-*Note*: Previously, the constants were available directly from
+**Note:** Previously, the constants were available directly from
 `require('zlib')`, for instance `zlib.Z_NO_FLUSH`. Accessing the constants
 directly from the module is currently still possible but should be considered
 deprecated.
diff --git a/doc/releases.md b/doc/releases.md
index 6433eeeacb14b4..f75bb6edcd2013 100644
--- a/doc/releases.md
+++ b/doc/releases.md
@@ -86,7 +86,7 @@ This macro is used to signal an ABI version for native addons. It currently has
 
 The general rule is to bump this version when there are _breaking ABI_ changes and also if there are non-trivial API changes. The rules are not yet strictly defined, so if in doubt, please confer with someone that will have a more informed perspective, such as a member of the NAN team.
 
-**Note** that it is current TSC policy to bump major version when ABI changes. If you see a need to bump `NODE_MODULE_VERSION` then you should consult the TSC. Commits may need to be reverted or a major version bump may need to happen.
+**Note:** It is current TSC policy to bump major version when ABI changes. If you see a need to bump `NODE_MODULE_VERSION` then you should consult the TSC. Commits may need to be reverted or a major version bump may need to happen.
 
 ### 3. Update the Changelog
 
@@ -279,7 +279,8 @@ Use `tools/release.sh` to promote and sign the build. When run, it will perform
 
 If you didn't wait for ARM builds in the previous step before promoting the release, you should re-run `tools/release.sh` after the ARM builds have finished. That will move the ARM artifacts into the correct location. You will be prompted to re-sign SHASUMS256.txt.
 
-Note: it is possible to only sign a release by running `./tools/release.sh -s vX.Y.Z`.
+**Note:** It is possible to only sign a release by running
+`./tools/release.sh -s vX.Y.Z`.
 
 ### 13. Check the Release