Merge branch 'master' of github.com:Chia-Network/chia-blockchain into…

… beta-1.2

INSTALL.md

@@ -4,7 +4,7 @@ To install the chia-blockchain node, follow the instructions according to your o
 After installing, follow the remaining instructions in [README.md](README.md) to run the software.
 
 ### MacOS
-Make sure [brew](https://brew.sh/) is available before starting the setup.
+Currently Catalina (10.15.x) is required. Make sure [brew](https://brew.sh/) is available before starting the setup.
 ```bash
 brew upgrade python
 brew install npm gmp
@@ -66,7 +66,7 @@ sh install.sh
 ```
 You will need to download the Windows native Wallet and unzip into somewhere convenient in Windows.
 
-[main.js-win32-x64.zip](https://hosted.chia.net/beta-1.0-win64-wallet/main.js-win32-x64.zip)
+[Download: chia-win32-x64.zip](https://hosted.chia.net/beta-1.0-win64-wallet/chia-win32-x64.zip)
 
 Instead of `chia-start-wallet-ui &` as explained in the [README.md](README.md) you run `chia-start-wallet-server &` in Ubuntu/WSL 2 to allow the Wallet to connect to the Full Node running in Ubuntu/WSL 2. Once you've enabled `chia-start-wallet-server &` you can run `chia.exe` from the unzipped `chia-win32-x64` directory.
 

README.md

@@ -39,7 +39,7 @@ chia-start-wallet-server &
 And then run `chia.exe` from the unzipped `chia-win32-x64` directory in Windows (not Ubuntu/WSL 2.)
 
 ## Step 3b: Run a farmer + full node + wallet
-Instead of running only a full node (as in 4a), you can also run a farmer.
+Instead of running only a full node (as in 3a), you can also run a farmer.
 Farmers are entities in the network who use their hard drive space to try to create
 blocks (like Bitcoin's miners), and earn block rewards. First, you must generate some hard drive plots, which
 can take a long time depending on the [size of the plots](https://github.com/Chia-Network/chia-blockchain/wiki/k-sizes)