Group Typo Fixes 4

README.md

@@ -15,8 +15,6 @@
 
 :mage: **Not sure how to get started?** Check out [Contracts Wizard](https://wizard.openzeppelin.com/) — an interactive smart contract generator.
 
-:building_construction: **Want to scale your decentralized application?** Check out [OpenZeppelin Defender](https://openzeppelin.com/defender) — a mission-critical developer security platform to code, audit, deploy, monitor, and operate with confidence.
-
 > [!IMPORTANT]
 > OpenZeppelin Contracts uses semantic versioning to communicate backwards compatibility of its API and storage layout. For upgradeable contracts, the storage layout of different major versions should be assumed incompatible, for example, it is unsafe to upgrade from 4.9.3 to 5.0.0. Learn more at [Backwards Compatibility](https://docs.openzeppelin.com/contracts/backwards-compatibility).
 
@@ -68,7 +66,7 @@ To keep your system secure, you should **always** use the installed code as-is,
 The guides in the [documentation site](https://docs.openzeppelin.com/contracts) will teach about different concepts, and how to use the related contracts that OpenZeppelin Contracts provides:
 
 * [Access Control](https://docs.openzeppelin.com/contracts/access-control): decide who can perform each of the actions on your system.
-* [Tokens](https://docs.openzeppelin.com/contracts/tokens): create tradeable assets or collectives, and distribute them via [Crowdsales](https://docs.openzeppelin.com/contracts/crowdsales).
+* [Tokens](https://docs.openzeppelin.com/contracts/tokens): create tradeable assets or collectives for popular ERC standards like ERC-20, ERC-721, ERC-1155, and ERC-6909.
 * [Utilities](https://docs.openzeppelin.com/contracts/utilities): generic useful tools including non-overflowing math, signature verification, and trustless paying systems.
 
 The [full API](https://docs.openzeppelin.com/contracts/api/token/ERC20) is also thoroughly documented, and serves as a great reference when developing your smart contract application. You can also ask for help or follow Contracts' development in the [community forum](https://forum.openzeppelin.com).

contracts/access/extensions/AccessControlDefaultAdminRules.sol

@@ -8,7 +8,7 @@ import {AccessControl, IAccessControl} from "../AccessControl.sol";
 import {SafeCast} from "../../utils/math/SafeCast.sol";
 import {Math} from "../../utils/math/Math.sol";
 import {IERC5313} from "../../interfaces/IERC5313.sol";
-import {IERC165} from "../../utils/introspection/ERC165.sol";
+import {IERC165} from "../../utils/introspection/IERC165.sol";
 
 /**
  * @dev Extension of {AccessControl} that allows specifying special rules to manage
@@ -357,14 +357,14 @@ abstract contract AccessControlDefaultAdminRules is IAccessControlDefaultAdminRu
     ///
 
     /**
-     * @dev Defines if an `schedule` is considered set. For consistency purposes.
+     * @dev Defines if a `schedule` is considered set. For consistency purposes.
      */
     function _isScheduleSet(uint48 schedule) private pure returns (bool) {
         return schedule != 0;
     }
 
     /**
-     * @dev Defines if an `schedule` is considered passed. For consistency purposes.
+     * @dev Defines if a `schedule` is considered passed. For consistency purposes.
      */
     function _hasSchedulePassed(uint48 schedule) private view returns (bool) {
         return schedule < block.timestamp;

contracts/access/extensions/IAccessControlDefaultAdminRules.sol

@@ -182,7 +182,7 @@ interface IAccessControlDefaultAdminRules is IAccessControl {
      * When the {defaultAdminDelay} is scheduled to be increased, it goes into effect after the new delay has passed with
      * the purpose of giving enough time for reverting any accidental change (i.e. using milliseconds instead of seconds)
      * that may lock the contract. However, to avoid excessive schedules, the wait is capped by this function and it can
-     * be overrode for a custom {defaultAdminDelay} increase scheduling.
+     * be overridden for a custom {defaultAdminDelay} increase scheduling.
      *
      * IMPORTANT: Make sure to add a reasonable amount of time while overriding this value, otherwise,
      * there's a risk of setting a high new delay that goes into effect almost immediately without the

contracts/access/manager/AccessManager.sol

@@ -69,7 +69,7 @@ contract AccessManager is Context, Multicall, IAccessManager {
         bool closed;
     }
 
-    // Structure that stores the details for a role/account pair. This structures fit into a single slot.
+    // Structure that stores the details for a role/account pair. This structure fits into a single slot.
     struct Access {
         // Timepoint at which the user gets the permission.
         // If this is either 0 or in the future, then the role permission is not available.

contracts/access/manager/IAccessManager.sol

@@ -123,7 +123,7 @@ interface IAccessManager {
 
     /**
      * @dev Minimum setback for all delay updates, with the exception of execution delays. It
-     * can be increased without setback (and reset via {revokeRole} in the case event of an
+     * can be increased without setback (and reset via {revokeRole} in the event of an
      * accidental increase). Defaults to 5 days.
      */
     function minSetback() external view returns (uint32);
@@ -170,7 +170,7 @@ interface IAccessManager {
 
     /**
      * @dev Get the access details for a given account for a given role. These details include the timepoint at which
-     * membership becomes active, and the delay applied to all operation by this user that requires this permission
+     * membership becomes active, and the delay applied to all operations by this user that requires this permission
      * level.
      *
      * Returns:
@@ -376,7 +376,7 @@ interface IAccessManager {
      * @dev Consume a scheduled operation targeting the caller. If such an operation exists, mark it as consumed
      * (emit an {OperationExecuted} event and clean the state). Otherwise, throw an error.
      *
-     * This is useful for contract that want to enforce that calls targeting them were scheduled on the manager,
+     * This is useful for contracts that want to enforce that calls targeting them were scheduled on the manager,
      * with all the verifications that it implies.
      *
      * Emit a {OperationExecuted} event.

contracts/account/extensions/draft-ERC7821.sol

@@ -10,7 +10,7 @@ import {Account} from "../Account.sol";
 /**
  * @dev Minimal batch executor following ERC-7821.
  *
- * Only supports supports single batch mode (`0x01000000000000000000`). Does not support optional "opData".
+ * Only supports single batch mode (`0x01000000000000000000`). Does not support optional "opData".
  *
  * @custom:stateless
  */

contracts/account/utils/EIP7702Utils.sol

@@ -12,7 +12,7 @@ library EIP7702Utils {
     bytes3 internal constant EIP7702_PREFIX = 0xef0100;
 
     /**
-     * @dev Returns the address of the delegate if `account` as an EIP-7702 delegation setup, or address(0) otherwise.
+     * @dev Returns the address of the delegate if `account` has an EIP-7702 delegation setup, or address(0) otherwise.
      */
     function fetchDelegate(address account) internal view returns (address) {
         bytes23 delegation = bytes23(account.code);

contracts/finance/VestingWallet.sol

@@ -106,7 +106,7 @@ contract VestingWallet is Context, Ownable {
     }
 
     /**
-     * @dev Release the native token (ether) that have already vested.
+     * @dev Release the native token (ether) that has already vested.
      *
      * Emits a {EtherReleased} event.
      */

contracts/governance/Governor.sol

@@ -659,7 +659,7 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
     }
 
     /**
-     * @dev Address through which the governor executes action. Will be overloaded by module that execute actions
+     * @dev Address through which the governor executes action. Will be overloaded by module that executes actions
      * through another contract such as a timelock.
      */
     function _executor() internal view virtual returns (address) {

contracts/governance/IGovernor.sol

@@ -334,7 +334,7 @@ interface IGovernor is IERC165, IERC6372 {
     function hasVoted(uint256 proposalId, address account) external view returns (bool);
 
     /**
-     * @dev Create a new proposal. Vote start after a delay specified by {IGovernor-votingDelay} and lasts for a
+     * @dev Create a new proposal. Vote starts after a delay specified by {IGovernor-votingDelay} and lasts for a
      * duration specified by {IGovernor-votingPeriod}.
      *
      * Emits a {ProposalCreated} event.

contracts/governance/extensions/GovernorStorage.sol

@@ -6,7 +6,7 @@ pragma solidity ^0.8.24;
 import {Governor} from "../Governor.sol";
 
 /**
- * @dev Extension of {Governor} that implements storage of proposal details. This modules also provides primitives for
+ * @dev Extension of {Governor} that implements storage of proposal details. This module also provides primitives for
  * the enumerability of proposals.
  *
  * Use cases for this module include:

contracts/governance/extensions/GovernorTimelockControl.sol

@@ -9,7 +9,7 @@ import {SafeCast} from "../../utils/math/SafeCast.sol";
 
 /**
  * @dev Extension of {Governor} that binds the execution process to an instance of {TimelockController}. This adds a
- * delay, enforced by the {TimelockController} to all successful proposal (in addition to the voting duration). The
+ * delay, enforced by the {TimelockController} to all successful proposals (in addition to the voting duration). The
  * {Governor} needs the proposer (and ideally the executor and canceller) roles for the {Governor} to work properly.
  *
  * Using this model means the proposal will be operated by the {TimelockController} and not by the {Governor}. Thus,
@@ -47,10 +47,10 @@ abstract contract GovernorTimelockControl is Governor {
             return currentState;
         }
 
-        bytes32 queueid = _timelockIds[proposalId];
-        if (_timelock.isOperationPending(queueid)) {
+        bytes32 queueId = _timelockIds[proposalId];
+        if (_timelock.isOperationPending(queueId)) {
             return ProposalState.Queued;
-        } else if (_timelock.isOperationDone(queueid)) {
+        } else if (_timelock.isOperationDone(queueId)) {
             // This can happen if the proposal is executed directly on the timelock.
             return ProposalState.Executed;
         } else {

contracts/interfaces/IERC3156FlashLender.sol

@@ -11,7 +11,7 @@ import {IERC3156FlashBorrower} from "./IERC3156FlashBorrower.sol";
  */
 interface IERC3156FlashLender {
     /**
-     * @dev The amount of currency available to be lended.
+     * @dev The amount of currency available to be lent.
      * @param token The loan currency.
      * @return The amount of `token` that can be borrowed.
      */

contracts/metatx/ERC2771Context.sol

@@ -8,7 +8,7 @@ import {Context} from "../utils/Context.sol";
 /**
  * @dev Context variant with ERC-2771 support.
  *
- * WARNING: Avoid using this pattern in contracts that rely in a specific calldata length as they'll
+ * WARNING: Avoid using this pattern in contracts that rely on a specific calldata length as they'll
  * be affected by any forwarder whose `msg.data` is suffixed with the `from` address according to the ERC-2771
  * specification adding the address size in bytes (20) to the calldata size. An example of an unexpected
  * behavior could be an unintended fallback (or another function) invocation while trying to invoke the `receive`

contracts/mocks/TimelockReentrant.sol

@@ -12,7 +12,7 @@ contract TimelockReentrant {
         _reentered = true;
     }
 
-    function enableRentrancy(address target, bytes calldata data) external {
+    function enableReentrancy(address target, bytes calldata data) external {
         _reenterTarget = target;
         _reenterData = data;
     }

contracts/mocks/docs/ERC4626Fees.sol

@@ -33,7 +33,7 @@ abstract contract ERC4626Fees is ERC4626 {
         return assets + _feeOnRaw(assets, _entryFeeBasisPoints());
     }
 
-    /// @dev Preview adding an exit fee on withdraw. See {IERC4626-previewWithdraw}.
+    /// @dev Preview adding an exit fee on withdrawal. See {IERC4626-previewWithdraw}.
     function previewWithdraw(uint256 assets) public view virtual override returns (uint256) {
         uint256 fee = _feeOnRaw(assets, _exitFeeBasisPoints());
         return super.previewWithdraw(assets + fee);

contracts/token/ERC20/README.adoc

@@ -21,7 +21,7 @@ Additionally there are multiple custom extensions, including:
 * {ERC20Capped}: enforcement of a cap to the total supply when minting tokens.
 * {ERC20Pausable}: ability to pause token transfers.
 * {ERC20FlashMint}: token level support for flash loans through the minting and burning of ephemeral tokens (standardized as ERC-3156).
-* {ERC20Votes}: support for voting and vote delegation.
+* {ERC20Votes}: support for voting and vote delegation. xref:governance.adoc#token[See the governance guide for a minimal example (with the required overrides when combining ERC20 + ERC20Permit + ERC20Votes)].
 * {ERC20Wrapper}: wrapper to create an ERC-20 backed by another ERC-20, with deposit and withdraw methods. Useful in conjunction with {ERC20Votes}.
 * {ERC20TemporaryApproval}: support for approvals lasting for only one transaction, as defined in ERC-7674.
 * {ERC1363}: support for calling the target of a transfer or approval, enabling code execution on the receiver within a single transaction.

contracts/token/ERC721/extensions/ERC721Consecutive.sol

@@ -20,7 +20,7 @@ import {Checkpoints} from "../../../utils/structs/Checkpoints.sol";
  * regained after construction. During construction, only batch minting is allowed.
  *
  * IMPORTANT: This extension does not call the {_update} function for tokens minted in batch. Any logic added to this
- * function through overrides will not be triggered when token are minted in batch. You may want to also override
+ * function through overrides will not be triggered when tokens are minted in batch. You may want to also override
  * {_increaseBalance} or {_mintConsecutive} to account for these mints.
  *
  * IMPORTANT: When overriding {_mintConsecutive}, be careful about call ordering. {ownerOf} may return invalid

contracts/token/ERC721/utils/ERC721Utils.sol

@@ -7,7 +7,7 @@ import {IERC721Receiver} from "../IERC721Receiver.sol";
 import {IERC721Errors} from "../../../interfaces/draft-IERC6093.sol";
 
 /**
- * @dev Library that provide common ERC-721 utility functions.
+ * @dev Library that provides common ERC-721 utility functions.
  *
  * See https://eips.ethereum.org/EIPS/eip-721[ERC-721].
  *

contracts/utils/Base64.sol

@@ -34,7 +34,7 @@ library Base64 {
      */
     function _encode(bytes memory data, string memory table, bool withPadding) private pure returns (string memory) {
         /**
-         * Inspired by Brecht Devos (Brechtpd) implementation - MIT licence
+         * Inspired by Brecht Devos (Brechtpd) implementation - MIT license
          * https://github.com/Brechtpd/base64/blob/e78d9fd951e7b0977ddca77d92dc85183770daf4/base64.sol
          */
         if (data.length == 0) return "";

contracts/utils/Bytes.sol

@@ -168,7 +168,7 @@ library Bytes {
 
     /**
      * @dev Reverses the byte order of a bytes32 value, converting between little-endian and big-endian.
-     * Inspired in https://graphics.stanford.edu/~seander/bithacks.html#ReverseParallel[Reverse Parallel]
+     * Inspired by https://graphics.stanford.edu/~seander/bithacks.html#ReverseParallel[Reverse Parallel]
      */
     function reverseBytes32(bytes32 value) internal pure returns (bytes32) {
         value = // swap bytes

contracts/utils/SlotDerivation.sol

@@ -16,7 +16,7 @@ pragma solidity ^0.8.20;
  * contract Example {
  *     // Add the library methods
  *     using StorageSlot for bytes32;
- *     using SlotDerivation for bytes32;
+ *     using SlotDerivation for *;
  *
  *     // Declare a namespace
  *     string private constant _NAMESPACE = "<namespace>"; // eg. OpenZeppelin.Slot

contracts/utils/Strings.sol

@@ -466,7 +466,7 @@ library Strings {
         bytes memory output = new bytes(2 * buffer.length); // worst case scenario
         uint256 outputLength = 0;
 
-        for (uint256 i; i < buffer.length; ++i) {
+        for (uint256 i = 0; i < buffer.length; ++i) {
             bytes1 char = bytes1(_unsafeReadBytesOffset(buffer, i));
             if (((SPECIAL_CHARS_LOOKUP & (1 << uint8(char))) != 0)) {
                 output[outputLength++] = "\\";

contracts/utils/cryptography/ECDSA.sol

@@ -54,6 +54,7 @@ library ECDSA {
      * be too long), and then calling {MessageHashUtils-toEthSignedMessageHash} on it.
      *
      * Documentation for signature generation:
+     *
      * - with https://web3js.readthedocs.io/en/v1.3.4/web3-eth-accounts.html#sign[Web3.js]
      * - with https://docs.ethers.io/v5/api/signer/#Signer-signMessage[ethers]
      */

contracts/utils/cryptography/README.adoc

@@ -1,7 +1,7 @@
 = Cryptography
 
 [.readme-notice]
-NOTE: This document is better viewed at https://docs.openzeppelin.com/contracts/api/utils/cryptography
+NOTE: This document is better viewed at https://docs.openzeppelin.com/contracts/api/utils#cryptography
 
 A collection of contracts and libraries that implement various signature validation schemes and cryptographic primitives. These utilities enable secure authentication, multisignature operations, and advanced cryptographic operations in smart contracts.
 

contracts/utils/cryptography/draft-ERC7739Utils.sol

@@ -59,7 +59,7 @@ library ERC7739Utils {
      * - `APP_DOMAIN_SEPARATOR` is the EIP-712 {EIP712-_domainSeparatorV4} of the application smart contract that is
      *   requesting the signature verification (though ERC-1271).
      * - `contentsHash` is the hash of the underlying data structure or message.
-     * - `contentsDescr` is a descriptor of the "contents" part of the the EIP-712 type of the nested signature.
+     * - `contentsDescr` is a descriptor of the "contents" part of the EIP-712 type of the nested signature.
      *
      * NOTE: This function returns empty if the input format is invalid instead of reverting.
      * data instead.

contracts/utils/draft-InteroperableAddress.sol

@@ -21,7 +21,7 @@ library InteroperableAddress {
     /**
      * @dev Format an ERC-7930 interoperable address (version 1) from its components `chainType`, `chainReference`
      * and `addr`. This is a generic function that supports any chain type, chain reference and address supported by
-     * ERC-7390, including interoperable addresses with empty chain reference or empty address.
+     * ERC-7930, including interoperable addresses with empty chain reference or empty address.
      */
     function formatV1(
         bytes2 chainType,

contracts/utils/math/Math.sol

@@ -134,10 +134,10 @@ library Math {
     }
 
     /**
-     * @dev Branchless ternary evaluation for `a ? b : c`. Gas costs are constant.
+     * @dev Branchless ternary evaluation for `condition ? a : b`. Gas costs are constant.
      *
      * IMPORTANT: This function may reduce bytecode size and consume less gas when used standalone.
-     * However, the compiler may optimize Solidity ternary operations (i.e. `a ? b : c`) to only compute
+     * However, the compiler may optimize Solidity ternary operations (i.e. `condition ? a : b`) to only compute
      * one branch when needed, making this function more expensive.
      */
     function ternary(bool condition, uint256 a, uint256 b) internal pure returns (uint256) {

contracts/utils/structs/CircularBuffer.sol

@@ -21,7 +21,7 @@ import {Panic} from "../Panic.sol";
  * - inclusion ({includes}): O(N) (worst case)
  * - reset ({clear}): O(1)
  *
- * * The struct is called `Bytes32CircularBuffer`. Other types can be cast to and from `bytes32`. This data structure
+ * The struct is called `Bytes32CircularBuffer`. Other types can be cast to and from `bytes32`. This data structure
  * can only be used in storage, and not in memory.
  *
  * Example usage:

contracts/utils/types/Time.sol

@@ -37,7 +37,7 @@ library Time {
     // ==================================================== Delay =====================================================
     /**
      * @dev A `Delay` is a uint32 duration that can be programmed to change value automatically at a given point in the
-     * future. The "effect" timepoint describes when the transitions happens from the "old" value to the "new" value.
+     * future. The "effect" timepoint describes when the transition happens from the "old" value to the "new" value.
      * This allows updating the delay applied to some operation while keeping some guarantees.
      *
      * In particular, the {update} function guarantees that if the delay is reduced, the old delay still applies for