Merge branch 'monero-project:master' into master

_i18n/en/resources/moneropedia/wallet.md

@@ -13,6 +13,6 @@ The term "hot wallet" describes a Monero @account which is connected to the Inte
 
 A cold wallet is generated on a trusted device or computer via an @airgap.  If the device is to be reused, the data storage should be securely overwritten.  As soon as a cold wallet is connected to the Internet or its mnemonic phrase or @spend-key is entered on an Internet-connected device, it's no longer "cold" and should be considered "hot".
 
-A Monero @paper-wallet can be generated by downloading the source code of https://moneroaddress.org/.  Verify the signature of the code on a trusted airgapped device.  Create the wallet and print or store it on the media of your choice.
+A Monero @paper-wallet can be generated by downloading the [wallet-generator page on Getmonero]({{ site.baseurl }}/generator). Verify the signature of the code on a trusted airgapped device.  Create the wallet and print or store it on the media of your choice.
 
 Monero accounts and paper-wallets can be stored on any media - paper, USB drive, CD/DVD, or a hardware wallet device (Ledger available since June 2018).

_i18n/en/resources/user-guides/Offline_Backup.md

@@ -33,4 +33,4 @@
 
 The account you've created was created in RAM, and the digital files are now inaccessible. If some adversary manages to somehow obtain the data, they will lack the long password to open it. If you need to receive payments, you have your public address, and you have the view key if needed. If you need access to it, you have your 25 word @mnemonic-seed, and you can now write out several copies of it, including an offsite copy (e.g. a bank deposit box).
 
-Related:  [Offline Account Generator](http://moneroaddress.org/)
+Related:  [Offline Account Generator]({{ site.baseurl}}/generator)

_i18n/en/resources/user-guides/securely_purchase.md

@@ -10,9 +10,9 @@ An incomplete list of Exchanges that support Monero is on our [Merchants page]({
 
 ## Step 2: Download and create a Paper Wallet on a secure and air-gapped computer.
 
-Download the @paper-wallet generator at: [moneroaddress.org](https://moneroaddress.org) and copy it to a USB stick (Direct link: [https://github.com/moneromooo-monero/monero-wallet-generator/archive/master.zip](https://github.com/moneromooo-monero/monero-wallet-generator/archive/master.zip)).
+Download the @paper-wallet generator at: [getmonero.org/generator]({{ site.baseurl}}/generator) and copy it to a USB stick (direct link: [wallet-generator.zip]({{ site.baseurl }}/resources/wallet-generator/wallet-generator.zip)).
 
-Unzip and open the paper wallet generator (monero-wallet-generator.html) into a web browser on an air-gapped (@airgap) computer that hasn't been used before, or has had a clean installation of the operative system.
+Unzip and open the paper wallet generator (wallet-generator.html) into a web browser on an air-gapped (@airgap) computer that hasn't been used before, or has had a clean installation of the operative system.
 
 Your paper wallet will have four important items:
 

resources/wallet-generator/index.html

@@ -0,0 +1,5 @@
+---
+permalink: /generator
+---
+
+{% include_relative monero-wallet-generator.html %}