Merge 77030ecfc8 into 51dd5ce378

merchants: delist kraken for GB, add note for EEA

_i18n/en.yml

@@ -709,7 +709,6 @@ user-guides:
   tor_wallet: How to connect your wallet to your own node over Tor
   node-tori2p: How to add Tor and I2P to your node
   guiguide: Guide for the Monero GUI wallet
-  tailsguide: How to use Monero on Tails
   make-payment: How to make a payment
   change-restore-height: How to change the wallet restore height
   back: Back to the list
@@ -1037,7 +1036,6 @@ tools:
   market: Market
   backtestking: Build or buy your own trading strategy/bot.
   cryptoradar: Marketplace comparison website
-  kryptocheck: German marketplace comparison website
 
   misc: Miscellaneous
   monerohow-stats: Statistics

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

@@ -24,25 +24,32 @@ The main menu (`Welcome to Monero` screen) will open. At the bottom left, click
 
 ![Advanced Mode](/img/resources/user-guides/en/remote_node/advanced_mode.avif){:width="600px"}
 
-## Finding a public remote node
+## Finding a remote node
 
-First, you will need to find a public remote node to connect to. The website [moneroworld.com](https://moneroworld.com/#nodes) has some great resources about remote nodes, and the website [monero.fail](https://monero.fail) has a list of functioning remote nodes. 
+First, you will need to find a node to connect to.
 
-## Configuring your wallet to connect to a custom public remote node
+It is important to note that there are publicly advertised remote nodes which are run by malicious actors with the sole purpose of deanonymizing users.
+
+It is highly recommended that you either A) Run your own node, or B) Use a Trusted remote node - one that is controlled by someone that you trust.
+
+Though highly discouraged, you may opt to use an untrusted remote node. To maximize privacy, Tor or I2P nodes are preferred. The website [monero.fail](https://monero.fail) has a list of such nodes.
+
+## Configuring your wallet to connect to a custom remote node
 
 When opening your wallet, a pop up will appear with the option `Use custom settings`. Click on it, and you will be sent to `Settings` > `Node` page. 
 
 If you don't see this pop up, go to `Settings` > `Node` page.
 
 ![Configure Remote Node](/img/resources/user-guides/en/remote_node/remote_node_config.avif){:width="600px"}
+
+On the following page, select `Remote Node`.
+
+In the `Address` field you will enter the address (or IP) of the node that you want to connect to, and in `Port` field you will enter the port of the node.
+
+Example: If a node is listed as `node.getmonero.org:18089`, the address is `node.getmonero.org` and the port is `18089`. Note: `node.getmonero.org:18089` is for illustration purposes only. It is not a real node address.
+
 ![Configure Remote Node 2](/img/resources/user-guides/en/remote_node/remote_node_config-2.avif){:width="600px"}
 
-On this page select `Remote Node`.
+If the node requires authentication, you can enter the username in `Daemon username` and the password in `Daemon password`.
 
-In `Address` you should fill the address of the remote node that you want to connect to. This address might look like `node.moneroworld.com` or it could look like any IP address. 
+Finally, click on the `Connect` button and wait for your wallet to connect.
-
-In `Port` you should fill the port of the remote node. If a remote node is listed as `node.moneroworld.com:18089`, the address is `node.moneroworld.com` and the port is `18089`. The default port is `18081`, but it can vary depending on the node you are connecting to.
-
-If your remote node requires authentication, you can enter a username in `Daemon username` and a password in `Daemon password`.
-
-Finally, click on `Connect` button and wait for your wallet to connect.

community/merchants/index.md

@@ -93,13 +93,14 @@ meta_descr: merchants.descr
         <h3>CEXes</h3>
         <p>{% t merchants.cexp %}</p>
         <ul class="logo">
-            <li><a href="https://www.kraken.com/">Kraken</a> (EUR*, USD*, CAD, GBP, JPY, AUD, CHF)</li>
+            <li><a href="https://www.kraken.com/">Kraken</a> (USD¹, EUR¹ ², CAD, AUD, CHF)</li>
-            <li><a href="https://dvchain.co/">DV Chain (OTC)</a> (USD*, CAD*, GBP*, EUR*, JPY*, ...)</li>
+            <li><a href="https://dvchain.co/">DV Chain (OTC)</a> (USD¹, CAD¹, GBP¹, EUR¹, JPY¹, ...)</li>
-            <li><a href="https://www.bitfinex.com/">Bitfinex</a> (USD*)</li>
+            <li><a href="https://www.bitfinex.com/">Bitfinex</a> (USD¹)</li>
-            <li><a href="https://bitcoinvn.io?deposit=vnd&settle=xmr">BitcoinVN</a> (VND*)</li>
+            <li><a href="https://bitcoinvn.io?deposit=vnd&settle=xmr">BitcoinVN</a> (VND¹)</li>
             <li><a href="https://tradeogre.com/">TradeOgre</a></li>
           </ul>
-          <p>*Fiat currency to Monero trading pair (e.g. XMR/USD, XMR/EUR)</p>
+          <p>¹ Fiat currency to Monero trading pair (e.g. XMR/USD, XMR/EUR)</p>
+          <p>² XMR Unavailable for EEA Users</p>
         <h3>Swappers</h3>
         <p>{% t merchants.swappersp %}</p>
         <ul class="logo">

get-started/contributing/index.md

@@ -22,7 +22,7 @@ meta_descr: meta_descr.contributing
                     <div class="row start-xs">
                         <h3>{% t contributing.full-node %}</h3>
                         <p>{% t contributing.full-node_p %}</p>
-                        <p>{% t contributing.full-node_p2 %} <a href="{{ site.baseurl }}/resources/user-guides/vps_run_node.html">{% t user-guides.vps-node %}</a>, <a href="{{ site.baseurl }}/resources/user-guides/node-i2p-zero.html">{% t user-guides.node-i2pzero %}</a>, <a href="http://xmrguide25ibknxgaray5rqksrclddxqku3ggdcnzg4ogdi5qkdkd2yd.onion">{% t user-guides.tailsguide %}</a>. <a href="{{ site.baseurl }}/resources/user-guides/">{% t contributing.allguides %}</a></p>
+                        <p>{% t contributing.full-node_p2 %} <a href="{{ site.baseurl }}/resources/user-guides/vps_run_node.html">{% t user-guides.vps-node %}</a>, <a href="https://docs.getmonero.org/running-node/monerod-tori2p">{% t user-guides.node-tori2p %}</a>. <a href="{{ site.baseurl }}/resources/user-guides/">{% t contributing.allguides %}</a></p>
                         <h3>{% t contributing.develop %}</h3>
                         <p>{% t contributing.developp %}</p>
                             <ul class="logo">

resources/tools/index.md

@@ -61,7 +61,6 @@ meta_descr: meta_descr.tools
                     <div class="col">
                         <h2>{% t tools.market %}</h2>
                         <p><a href="https://cryptoradar.co/buy-monero">Cryptoradar - {% t tools.cryptoradar %}</a></p>
-                        <p><a href="https://kryptocheck.de">KryptoCheck - {% t tools.kryptocheck %}</a></p>
                     </div>
                 </div>
             </div>

resources/user-guides/index.md

@@ -112,7 +112,6 @@ meta_descr: meta_descr.userguides
                             <p><a href="{{site.baseurl}}/resources/user-guides/tor_wallet.html">{% t user-guides.tor_wallet %}</a></p>
                             <p><a href="https://docs.getmonero.org/running-node/monerod-tori2p">{% t user-guides.node-tori2p %}</a></p>
                             <p><a href="{{site.baseurl}}/resources/user-guides/cli_wallet_daemon_isolation_qubes_whonix.html">{% t user-guides.qubes %}</a></p>
-                            <p><a href="http://xmrguide25ibknxgaray5rqksrclddxqku3ggdcnzg4ogdi5qkdkd2yd.onion">{% t user-guides.tailsguide %}</a><img alt="onion logo" class="onion-mid" src="/img/onion-tor.svg" title="Onion link"/></p>
                         </div>
                     </div>
                 </div>