Merge branch 'release-v4.0' of github.com:OpenZeppelin/openzeppelin-contracts…

Merge branch 'release-v4.0' of github.com:OpenZeppelin/openzeppelin-contracts into upstream-v4.0-patched

contracts/token/ERC721/README.adoc

@@ -39,7 +39,7 @@ NOTE: This core set of contracts is designed to be unopinionated, allowing devel
 
 {{ERC721Burnable}}
 
-{{ERC721TokenUri}}
+{{ERC721URIStorage}}
 
 == Presets
 

contracts/token/ERC721/extensions/ERC721URIStorage.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
 import "../ERC721.sol";
 
 /**
- * @dev ERC721 token with storage based token uri management.
+ * @dev ERC721 token with storage based token URI management.
  */
 abstract contract ERC721URIStorage is ERC721 {
     using Strings for uint256;

scripts/migrate-imports.js

@@ -47,7 +47,7 @@ const pathUpdates = {
   // 'proxy/Proxy.sol': undefined,
   // 'proxy/TransparentUpgradeableProxy.sol': 'proxy/transparent/TransparentUpgradeableProxy.sol',
   // 'proxy/UpgradeableBeacon.sol': 'proxy/beacon/UpgradeableBeacon.sol',
-  // 'proxy/UpgradeableProxy.sol': undefined,
+  // 'proxy/UpgradeableProxy.sol': 'proxy/ERC1967/ERC1967Proxy.sol',
   'token/ERC1155/ERC1155Burnable.sol': 'token/ERC1155/extensions/ERC1155Burnable.sol',
   'token/ERC1155/ERC1155Holder.sol': 'token/ERC1155/utils/ERC1155Holder.sol',
   'token/ERC1155/ERC1155Pausable.sol': 'token/ERC1155/extensions/ERC1155Pausable.sol',