@@ -286,13 +286,14 @@ performance implications for some applications. See the
 
 ## Class fs.Dir
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
 A class representing a directory stream.
 
-Created by [`fs.opendir()`][], [`fs.opendirSync()`][], or
-[`fsPromises.opendir()`][].
+Created by [`fs.opendir()`][], [`fs.opendirSync()`][], or [`fsPromises.opendir()`][].
+
+Example using async interation:
 
 ```js
 const fs = require('fs');
@@ -306,9 +307,19 @@ async function print(path) {
 print('./').catch(console.error);
 ```
 
+### dir.path
+<!-- YAML
+added: REPLACEME
+-->
+
+* {string}
+
+The read-only path of this directory as was provided to [`fs.opendir()`][],
+[`fs.opendirSync()`][], or [`fsPromises.opendir()`][].
+
 ### dir.close()
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
 * Returns: {Promise}
@@ -321,7 +332,7 @@ closed.
 
 ### dir.close(callback)
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
 * `callback` {Function}
@@ -334,104 +345,84 @@ The `callback` will be called after the resource handle has been closed.
 
 ### dir.closeSync()
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
 Synchronously close the directory's underlying resource handle.
 Subsequent reads will result in errors.
 
-### dir.path
-<!-- YAML
-added: v12.12.0
--->
-
-* {string}
-
-The read-only path of this directory as was provided to [`fs.opendir()`][],
-[`fs.opendirSync()`][], or [`fsPromises.opendir()`][].
-
-### dir.read()
+### dir.read([options])
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
-* Returns: {Promise} containing {fs.Dirent|null}
+* `options` {Object}
+  * `encoding` {string|null} **Default:** `'utf8'`
+* Returns: {Promise} containing {fs.Dirent}
 
 Asynchronously read the next directory entry via readdir(3) as an
 [`fs.Dirent`][].
 
-After the read is completed, a `Promise` is returned that will be resolved with
-an [`fs.Dirent`][], or `null` if there are no more directory entries to read.
+A `Promise` is returned that will be resolved with a [Dirent][] after the read
+is completed.
 
-Directory entries returned by this function are in no particular order as
-provided by the operating system's underlying directory mechanisms.
-Entries added or removed while iterating over the directory may or may not be
-included in the iteration results.
+_Directory entries returned by this function are in no particular order as
+provided by the operating system's underlying directory mechanisms._
 
-### dir.read(callback)
+### dir.read([options, ]callback)
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
+* `options` {Object}
+  * `encoding` {string|null} **Default:** `'utf8'`
 * `callback` {Function}
   * `err` {Error}
-  * `dirent` {fs.Dirent|null}
+  * `dirent` {fs.Dirent}
 
 Asynchronously read the next directory entry via readdir(3) as an
 [`fs.Dirent`][].
 
-After the read is completed, the `callback` will be called with an
-[`fs.Dirent`][], or `null` if there are no more directory entries to read.
+The `callback` will be called with a [Dirent][] after the read is completed.
 
-Directory entries returned by this function are in no particular order as
-provided by the operating system's underlying directory mechanisms.
-Entries added or removed while iterating over the directory may or may not be
-included in the iteration results.
+The `encoding` option sets the encoding of the `name` in the `dirent`.
 
-### dir.readSync()
+_Directory entries returned by this function are in no particular order as
+provided by the operating system's underlying directory mechanisms._
+
+### dir.readSync([options])
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
-* Returns: {fs.Dirent|null}
+* `options` {Object}
+  * `encoding` {string|null} **Default:** `'utf8'`
+* Returns: {fs.Dirent}
 
 Synchronously read the next directory entry via readdir(3) as an
 [`fs.Dirent`][].
 
-If there are no more directory entries to read, `null` will be returned.
+The `encoding` option sets the encoding of the `name` in the `dirent`.
 
-Directory entries returned by this function are in no particular order as
-provided by the operating system's underlying directory mechanisms.
-Entries added or removed while iterating over the directory may or may not be
-included in the iteration results.
+_Directory entries returned by this function are in no particular order as
+provided by the operating system's underlying directory mechanisms._
 
 ### dir\[Symbol.asyncIterator\]()
 <!-- YAML
-added: v12.12.0
+added: REPLACEME
 -->
 
-* Returns: {AsyncIterator} of {fs.Dirent}
+* Returns: {AsyncIterator} to fully iterate over all entries in the directory.
 
-Asynchronously iterates over the directory via readdir(3) until all entries have
-been read.
-
-Entries returned by the async iterator are always an [`fs.Dirent`][].
-The `null` case from `dir.read()` is handled internally.
-
-See [`fs.Dir`][] for an example.
-
-Directory entries returned by this iterator are in no particular order as
-provided by the operating system's underlying directory mechanisms.
-Entries added or removed while iterating over the directory may or may not be
-included in the iteration results.
+_Directory entries returned by this iterator are in no particular order as
+provided by the operating system's underlying directory mechanisms._
 
 ## Class: fs.Dirent
 <!-- YAML
 added: v10.10.0
 -->
 
-A representation of a directory entry, as returned by reading from an
-[`fs.Dir`][].
+A representation of a directory entry, as returned by reading from an [`fs.Dir`][].
 
 Additionally, when [`fs.readdir()`][] or [`fs.readdirSync()`][] is called with
 the `withFileTypes` option set to `true`, the resulting array is filled with
@@ -2701,6 +2692,46 @@ Returns an integer representing the file descriptor.
 For detailed information, see the documentation of the asynchronous version of
 this API: [`fs.open()`][].
 
+## fs.opendir(path[, options], callback)
+<!-- YAML
+added: REPLACEME
+-->
+
+* `path` {string|Buffer|URL}
+* `options` {Object}
+  * `encoding` {string|null} **Default:** `'utf8'`
+* `callback` {Function}
+  * `err` {Error}
+  * `dir` {fs.Dir}
+
+Asynchronously open a directory. See opendir(3).
+
+Creates an [`fs.Dir`][], which contains all further functions for reading from
+and cleaning up the directory.
+
+The `encoding` option sets the encoding for the `path` while opening the
+directory and subsequent read operations (unless otherwise overriden during
+reads from the directory).
+
+## fs.opendirSync(path[, options])
+<!-- YAML
+added: REPLACEME
+-->
+
+* `path` {string|Buffer|URL}
+* `options` {Object}
+  * `encoding` {string|null} **Default:** `'utf8'`
+* Returns: {fs.Dir}
+
+Synchronously open a directory. See opendir(3).
+
+Creates an [`fs.Dir`][], which contains all further functions for reading from
+and cleaning up the directory.
+
+The `encoding` option sets the encoding for the `path` while opening the
+directory and subsequent read operations (unless otherwise overriden during
+reads from the directory).
+
 ## fs.read(fd, buffer, offset, length, position, callback)
 <!-- YAML
 added: v0.0.2
@@ -4862,21 +4893,14 @@ by [Naming Files, Paths, and Namespaces][]. Under NTFS, if the filename contains
 a colon, Node.js will open a file system stream, as described by
 [this MSDN page][MSDN-Using-Streams].
 
-### fsPromises.opendir(path\[, options\])
+## fsPromises.opendir(path[, options])
 <!-- YAML
-added: v12.12.0
-changes:
-  - version: v13.1.0
-    pr-url: https://github.com/nodejs/node/pull/30114
-    description: The `bufferSize` option was introduced.
+added: REPLACEME
 -->
 
 * `path` {string|Buffer|URL}
 * `options` {Object}
   * `encoding` {string|null} **Default:** `'utf8'`
-  * `bufferSize` {number} Number of directory entries that are buffered
-    internally when reading from the directory. Higher values lead to better
-    performance but higher memory usage. **Default:** `32`
 * Returns: {Promise} containing {fs.Dir}
 
 Asynchronously open a directory. See opendir(3).
@@ -4885,9 +4909,10 @@ Creates an [`fs.Dir`][], which contains all further functions for reading from
 and cleaning up the directory.
 
 The `encoding` option sets the encoding for the `path` while opening the
-directory and subsequent read operations.
+directory and subsequent read operations (unless otherwise overriden during
+reads from the directory).
 
-Example using async iteration:
+Example using async interation:
 
 ```js
 const fs = require('fs');
@@ -4901,7 +4926,7 @@ async function print(path) {
 print('./').catch(console.error);
 ```
 
-### fsPromises.readdir(path\[, options\])
+### fsPromises.readdir(path[, options])
 <!-- YAML
 added: v10.0.0
 changes: