Merge upstream openzeppelin-contracts into upstream-patched

.gitignore

@@ -54,6 +54,6 @@ allFiredEvents
 .coverage_cache
 .coverage_contracts
 
-# buidler
+# hardhat
 cache
 artifacts

contracts/proxy/README.adoc

@@ -13,7 +13,7 @@ An alternative upgradeability mechanism is provided in <<Beacon>>. This pattern,
 
 The {Clones} library provides a way to deploy minimal non-upgradeable proxies for cheap. This can be useful for applications that require deploying many instances of the same contract (for example one per user, or one per task). These instances are designed to be both cheap to deploy, and cheap to call. The drawback being that they are not upgradeable.
 
-CAUTION: Using upgradeable proxies correctly and securely is a difficult task that requires deep knowledge of the proxy pattern, Solidity, and the EVM. Unless you want a lot of low level control, we recommend using the xref:upgrades-plugins::index.adoc[OpenZeppelin Upgrades Plugins] for Truffle and Buidler.
+CAUTION: Using upgradeable proxies correctly and securely is a difficult task that requires deep knowledge of the proxy pattern, Solidity, and the EVM. Unless you want a lot of low level control, we recommend using the xref:upgrades-plugins::index.adoc[OpenZeppelin Upgrades Plugins] for Truffle and Hardhat.
 
 == Core
 

scripts/gen-nav.js

@@ -12,12 +12,20 @@ const files = proc.execFileSync(
 
 console.log('.API');
 
+function getPageTitle (directory) {
+  if (directory === 'metatx') {
+    return 'Meta Transactions';
+  } else {
+    return startCase(directory);
+  }
+}
+
 const links = files.map((file) => {
   const doc = file.replace(baseDir, '');
   const title = path.parse(file).name;
 
   return {
-    xref: `* xref:${doc}[${startCase(title)}]`,
+    xref: `* xref:${doc}[${getPageTitle(title)}]`,
     title,
   };
 });