Merge branch 'master' into erc20-permit

OpenZeppelin · Dec 11, 2020 · 4444d3b · 4444d3b
2 parents acd82cd + 03d51c5
commit 4444d3b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/contracts/token/ERC20/README.adoc b/contracts/token/ERC20/README.adoc
@@ -14,16 +14,16 @@ There a few core contracts that implement the behavior specified in the EIP:
 
 Additionally there are multiple custom extensions, including:
 
-* designation of addresses that can pause token transfers for all users ({ERC20Pausable}).
-* gasless approval of tokens ({ERC20Permit}).
-* efficient storage of past token balances to be later queried at any point in time ({ERC20Snapshot}).
-* destruction of own tokens ({ERC20Burnable}).
-* enforcement of a cap to the total supply when minting tokens ({ERC20Capped}).
+* {ERC20Permit}: gasless approval of tokens.
+* {ERC20Snapshot}: efficient storage of past token balances to be later queried at any point in time.
+* {ERC20Burnable}: destruction of own tokens.
+* {ERC20Capped}: enforcement of a cap to the total supply when minting tokens.
+* {ERC20Pausable}: ability to pause token transfers.
 
 Finally, there are some utilities to interact with ERC20 contracts in various ways.
 
-* {SafeERC20} is a wrapper around the interface that eliminates the need to handle boolean return values.
-* {TokenTimelock} can hold tokens for a beneficiary until a specified time.
+* {SafeERC20}: a wrapper around the interface that eliminates the need to handle boolean return values.
+* {TokenTimelock}: hold tokens for a beneficiary until a specified time.
 
 The following related EIPs are in draft status and can be found in the drafts directory.
 

diff --git a/package-lock.json b/package-lock.json