Merge 1581988b4d into 51dd5ce378

merchants: delist kraken for GB, add note for EEA

_i18n/en.yml

@@ -146,8 +146,8 @@ merchants:
   useit: "Merchants that accept Monero"
   use: Over the years, merchants of all kinds have come to value the financial privacy that Monero brings. In fact, merchant adoption is continuously rising.
   dirdescr: "If you are looking for places to spend your Monero, the directories below have some options. Please remember to do your own research before trusting them with your money:"
-  descrp2p: The best way to exchange Monero for other currencies (or the other way round) is using P2P exchanges, because they allow traders to directly interact with each other, without the need of trusted third parties (except maybe for providing an escrow service). These exchanges are more private than their centralized counterparts and allow people to be in complete control of their coins if they are non-custodial, but they usually have less volume than 'traditional' exchanges. In the section below, we offer a list of P2P exchanges that support Monero.
-  swapsdescr: A new exciting way to exchange Monero is Atomic Swaps, which <a href="https://www.getmonero.org/2021/08/20/atomic-swaps.html">we announced</a> on August 2021. Atomic Swaps are a completely decentralized way to swap Bitcoin <-> Monero (more info in the blog post). The technology is brand new, so there aren't many swap providers yet, but you can already sell XMR for BTC using this protocol at
+  descrp2p: A great way to exchange Monero for other currencies is to use a Peer to Peer [P2P] exchange. P2P exchanges allow traders to directly interact with one another, and (in some cases) without the need of trusted third party (except for providing an escrow service). These exchanges are typically more private than their centralized and/or custodial counterparts. In the section below, we offer a list of P2P exchanges that support Monero.
+  swapsdescr: A trustless method to exchange Monero with other cryptocurrencies is to use Atomic Swaps, which [we wrote about](https://www.getmonero.org/2021/08/20/atomic-swaps.html) in August 2021. Atomic Swaps are a completely trustless way to swap Cryptocurrencies <-> Monero (more info in the blog post). You can swap XMR for a variety of cryptocurrencies using platforms such as [BasicSwapDEX](https://basicswapdex.com) and [unstoppableswap.net](https://unstoppableswap.net).
   bisqdescr: Decentralized P2P exchange based on Bitcoin and Tor.
   cardfoss: "Open source:"
   cardkyc: "<b>No KYC</b> (Know Your Customer):"
@@ -446,6 +446,8 @@ contributing:
   sponsor_p2: for more info.
   altqrmonero: Monero QR code
   altqrbitcoin: Bitcoin QR code
+  primary_address: Primary address
+  donation_viewkeys: View-only wallet details
 
 faq:
   basics: Basics
@@ -705,9 +707,8 @@ user-guides:
   ledger-wallet-cli: How to use a Ledger wallet on Monero CLI
   multisig-messaging-system: Multisig transactions with MMS and CLI wallet
   tor_wallet: How to connect your wallet to your own node over Tor
-  node-i2pzero: How to run a node through I2P with I2P-zero
+  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
@@ -1035,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

community/merchants/index.md

@@ -24,7 +24,7 @@ meta_descr: merchants.descr
       <div class="info-block">
         <h2>P2P exchanges and Atomic Swaps</h2>
         <p>{% t merchants.descrp2p %}</p>
-        <p>{% t merchants.swapsdescr %} <a href="https://unstoppableswap.net/">unstoppableswap.net</a>.</p>
+        <p>{% t merchants.swapsdescr %}</p>
       </div>
     </div>
     <div class="row">
@@ -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://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://bitcoinvn.io?deposit=vnd&settle=xmr">BitcoinVN</a> (VND*)</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://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://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">
@@ -71,6 +71,13 @@ meta_descr: meta_descr.contributing
                             <h3>{% t contributing.genfund %}</h3>
                             <p>{% t contributing.genfund_p %}</p>
                             <p>Monero:<br><code class="donation-field">888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H</code></p>
+                            <details>
+                                <summary>{% t contributing.donation_viewkeys %}:</summary>
+                                <ul>
+                                    <li>{% t contributing.primary_address %}: <code class="donation-field">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</code></li>
+                                    <li>{% t moneropedia.entries.viewkey %}: <code class="donation-field">f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501</code></li>
+                                </ul>
+                            </details>
                             <p>Bitcoin:<br><code class="donation-field">1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H</code></p>
                             <p>@openalias: <code class="donation-field">donate.getmonero.org</code></p>
                         </div>

resources/developer-guides/daemon-rpc.md

@@ -1,14 +1,11 @@
 ---
 layout: user-guide
 title: "Daemon RPC documentation"
+deprecated_url: https://docs.getmonero.org/rpc-library/monerod-rpc/"
 ---
 
 {% t global.lang_tag %}
 
-<div class="info-block center-xs">
-    <h3 style="padding: 0;">⚠️ This page is deprecated</h3> <p>The latest version of this document is available at <a href="https://docs.getmonero.org/rpc-library/monerod-rpc/">docs.getmonero.org</a>.</p>
-</div>
-
 # Daemon RPC
 
 ## Introduction

resources/developer-guides/wallet-rpc.md

@@ -1,14 +1,11 @@
 ---
 layout: user-guide
 title: "Wallet RPC documentation"
+deprecated_url: https://docs.getmonero.org/rpc-library/wallet-rpc/"
 ---
 
 {% t global.lang_tag %}
 
-<div class="info-block center-xs">
-    <h3 style="padding: 0;">⚠️ This page is deprecated</h3> <p>The latest version of this document is available at <a href="https://docs.getmonero.org/rpc-library/wallet-rpc/">docs.getmonero.org</a>.</p>
-</div>
-
 # Wallet RPC
 
 ## Introduction

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

@@ -110,13 +110,12 @@ meta_descr: meta_descr.userguides
                         <div class="col">
                             <h2>{% t user-guides.anonimizationnetworks %}</h2>
                             <p><a href="{{site.baseurl}}/resources/user-guides/tor_wallet.html">{% t user-guides.tor_wallet %}</a></p>
-                            <p><a href="{{site.baseurl}}/resources/user-guides/node-i2p-zero.html">{% t user-guides.node-i2pzero %}</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>
             </div>
         </div>
     </section>
-</div>
+</div>

resources/user-guides/node-i2p-zero.md

@@ -3,6 +3,7 @@ layout: user-guide
 title: Run a Monero node through I2P with I2P-zero
 permalink: /resources/user-guides/node-i2p-zero.html
 outdated: False
+deprecated_url: https://docs.getmonero.org/running-node/monerod-tori2p/#__tabbed_1_2/
 ---
 
 {% t global.lang_tag %}