Merge f40cba12a9 into 51dd5ce378

merchants: delist kraken for GB, add note for EEA

README.md

@@ -93,12 +93,12 @@ languages: ["en", "es", "NEW LANG HERE"]
 ```
 Save and exit the file.
 
-### 3. \_i18n folder
+### 2. \_i18n folder
 
 Navigate to the \_i18n folder and duplicate the en.yml file. Rename the duplicate to the two letter language code of your language with a `.yml`. Now duplicate the `en` folder and rename it with the correct language code.
 **The original folder and yml file themselves should still be there. They should not be renamed. There should be a new folder and yml file in addition to the ones that were already there.**
 
-### 4. Open an issue on the repo where the website is hosted
+### 3. Open an issue on the repo where the website is hosted
 
 After you've done all the above, you'll need to [open an issue on the repository](https://github.com/monero-project/monero-site/issues) asking to add the language you are working on to Weblate, where the core of the website is translated.
 

_i18n/ar/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/de/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/en.yml

@@ -163,7 +163,6 @@ merchants:
   disclaimer: |
     "Please note: these links are being provided as a convenience and for informational purposes only; they do not constitute an endorsement by the Monero community of any products, services or opinions of the corporations or organizations or individuals listed. The Monero community bears no responsibility for the accuracy, legality, or content of these external sites. Contact the external site for answers to questions regarding its content. As always, caveat emptor ('buyer beware'); you are responsible for doing your own research. Always use judgement when making online purchases."
   visitbisq: Visit Bisq
-  visitlocalmonero: Visit LocalMonero
   visithodlhodl: Visit HodlHodl
   centrexchanges: Centralized exchanges (CEXs) & Swappers
   centrexchangesp: If you prefer to use centralized exchanges, here is a list of renowned CEXes and swappers. Many more exchanges support Monero, we list here only a few reputable ones.
@@ -447,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
@@ -496,6 +497,8 @@ faq:
   a12-1: In Monero, every @transaction output is uniquely associated with a key image that can only be generated by the holder of that output. Key images that are used more than once are rejected by the miners as double-spends and cannot be added to a valid @block. When a new transaction is received, miners verify that the key image does not already exist for a previous transaction to ensure it's not a double-spend.
   a12-2: We can also know that transaction amounts are valid even though the value of the inputs that you are spending and the value of the outputs you are sending are encrypted (these are hidden to everyone except the recipient). Because the amounts are encrypted using @Pedersen-commitments what this means is that no observers can tell the amounts of the inputs and outputs, but they can do math on the Pedersen commitments to determine that no Monero was created out of thin air.
   a12-3: As long as the encrypted output amounts you create is equal to the sum of the inputs that are being spent (which include an output for the recipient and a change output back to yourself and the unencrypted transaction fee), then you have a legitimate transaction and know no Monero is being created out of thin air. Pedersen commitments mean that the sums can be verified as being equal, but the Monero value of each of the sums and the Monero value of the inputs and outputs individually are undeterminable.
+  aabout-auditability: More about supply auditability
+  adetailed-auditability: Deeper analysis of supply auditability
   q13: Is Monero magic and protects my privacy no matter what I do?
   a13: Monero is not magic. If you use Monero but give your name and address to another party, the other party will not magically forget your name and address. If you give out your secret keys, others will know what you've done. If you get compromised, others will be able to keylog you. If you use a weak password, others will be able to brute force your keys file. If you backup your seed in the cloud, you'll be poorer soon.
   q14: Is Monero 100% anonymous?
@@ -548,7 +551,7 @@ faq:
   alongtimemove: Don't worry, your coins are safe. To be able to spend them you only have to download and run the latest Monero software. You can use the @mnemonic-seed you previously saved to restore your wallet at any time. Note that hard forks in Monero are scheduled and non-contentious. Which means no new coin is created.
   qvuln: Are there known vulnerabilities in Monero?
   avuln: >
-    The Monero community has created a series of videos called "Breaking Monero", where potential Monero vulnerabilities are explored and discussed. There are 14 videos, with each exploring a different subject. Check out <a href="https://www.monerooutreach.org/breaking-monero/">the videos on monerooutreach.org</a>.
+    The Monero community has created a series of videos called "Breaking Monero", where potential Monero vulnerabilities are explored and discussed. There are 14 videos, with each exploring a different subject. Check out <a href="https://www.youtube.com/playlist?list=PLsSYUeVwrHBnAUre2G_LYDsdo-tD0ov-y">the playlist on YouTube</a>.
   vulnspotify: Available on Spotify as podcast
   qasicresistance: "What is ASIC resistance? Why is it important?"
   aasicresistance: ASICs are basically special computers created to do only one job, contrary to normal computers, which are made for general purpose. This characteristic makes ASICs very efficient for @mining.
@@ -704,14 +707,13 @@ 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
   scan-txid: How to scan for a missing transaction CLI/GUI
-  join-monero-matrix: How to join the Monero Core Team Matrix server
+  join-monero-matrix: Joining the Monero Community Matrix Server via Element
 
 roadmap:
   completed: Completed task
@@ -1010,6 +1012,7 @@ moneropedia:
     stealthaddress: Stealth Address
     tail-emission: Tail Emission
     transaction: Transactions
+    transaction-weight: Transaction Weight
     unlocktime: Transaction Unlock Time
     viewkey: View Key
     wallet: Wallet
@@ -1026,7 +1029,6 @@ tools:
 
   network: Network
   monerohash-nodes: Monero node map
-  localmonero-blocks: Explorer and Statistics
   nownodes: node APIs
   getblockio: Blockchain nodes provider
   monerofail: Monero node list and node map
@@ -1035,7 +1037,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/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

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

@@ -56,4 +56,4 @@ For example I would type :
 
 ### Step 7
 
-After the the blockchain has finished syncing up you can open your Monero wallet normally. Your downloaded blockchain.raw can be deleted.
+After the blockchain has finished syncing up you can open your Monero wallet normally. Your downloaded blockchain.raw can be deleted.

_i18n/en/resources/user-guides/join-monero-matrix.md

@@ -1,8 +1,8 @@
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 
-Monero developers primarily communicate via IRC and Matrix channels. You can join IRC/Libera and Matrix rooms using Matrix. An open source network for secure, decentralized communication.
+Monero contributors primarily communicate via IRC and Matrix channels. You can join IRC/Libera and Matrix rooms using Matrix. An open source network for secure, decentralized communication.
 
-In order to access the Matrix protocol you will need to use a Matrix client. A popular client is Element. Element is a free, open-source program that can be accessed via web, desktop, and mobile.
+In order to access the Matrix protocol you will need to use a Matrix client. In this tutorial we will use Element as a client. Element is a free, open-source program that can be accessed via web, desktop, and mobile.
 
 ### Getting Element
 
@@ -10,25 +10,28 @@ Go to [element.io](https://element.io/get-started#download) to download the late
 
 ### Setting the custom host server
 
-While matrix is a federated protocol and you could use any host server for your account (including the default matrix.org server). We recommend changing your server to the one hosted by the Monero core team to support decentralization. If you do choose this option remember to set your custom server when logging in on a new device.
+While matrix is a federated protocol and you could use any host server for your account (including the default matrix.org server). We recommend changing your server to the one hosted, maintained and [sponsored]({{ site.baseurl }}/community/sponsorships/) by the Monero Community to support decentralization. If you do choose this option remember to set your custom server when logging in on a new device.
 
-When signing up choose to edit your host server and type in `matrix.monero.social` as shown.
+When signing up choose to edit your host server and type in `monero.social` as shown.
 
 Web/Desktop view
 
-![Web-Desktop-View](/img/resources/user-guides/en/join-monero-matrix/desktop-web.png){:width="600px"}
+![Web-Desktop-View-1](/img/resources/user-guides/en/join-monero-matrix/desktop-web-1.avif){:width="100%"}
+![Web-Desktop-View-2](/img/resources/user-guides/en/join-monero-matrix/desktop-web-2.avif){:width="100%"}
 
-Android view
+<!--Both Android and IOS have same GUI-->
+Android/IOS view
 
-![iPhone-View](/img/resources/user-guides/en/join-monero-matrix/android.png){:height="600px"}
+![Android-View-1](/img/resources/user-guides/en/join-monero-matrix/android-1.avif){:width="49%"}
+![Android-View-2](/img/resources/user-guides/en/join-monero-matrix/android-2.avif){:width="49%"}
 
-iPhone View
-
-![Android-View](/img/resources/user-guides/en/join-monero-matrix/iphone.png){:height="600px"}
 
 ### Creating your account
 
-You must provide a username and password to setup an account. Consider the privacy implications if you are considering to link an email address or phone number to your account. The email field is used solely for recovering your account if you lose your password. 
+You must provide an e-mail, username and password to setup an account. The email field is used solely for anti-spam measures and recovering your account if you lose your password. 
 
 Once you have entered in your credentials continue through the setup steps, and log into your account. Now search for "Monero" rooms and join the communities you like!
 
+### Joining the Monero rooms
+
+Now you are ready to join the Monero rooms, to find the list of rooms, check out the [workgroups](/community/workgroups/) and [hangouts](/community/hangouts/).

_i18n/en/resources/user-guides/multisig-messaging-system.md

@@ -821,7 +821,7 @@ The normal MMS wallet syncing process assumes that all signers are cooperative a
 
 However, with *M* being smaller than *N* in configurations like 2/3 multisig you can successfully sync with only (number of required signers minus 1) sync messages. `mms next` will tell you when you have reached this lower threshold and give a hint how to override and go ahead early: Use `mms next sync`.
 
-If later you receive more sync data messages nevertheless just delete them with `mms delete`: They are unneeded, unprocessable for you and worst case will mess up the the next sync round.
+If later you receive more sync data messages nevertheless just delete them with `mms delete`: They are unneeded, unprocessable for you and worst case will mess up the next sync round.
 
 Usually if you initiate sync the MMS will create messages to *all* other signers. If you want to prevent that to make it as hard as possible for other signers to transact further, make sure to set `auto-send` to false, answer "No" when first being asked to send, and manually delete any unwanted messages before sending the rest out with `mms send`.
 

_i18n/en/resources/user-guides/prove-payment.md

@@ -39,7 +39,7 @@ If it's set to 0, set it to 1:
 
 Alice can open her monero-wallet-gui and go to the history page to see her transaction detail:
 
-![History](/img/resources/user-guides/en/prove-payment/history.png)
+![History](/img/resources/user-guides/en/prove-payment/history.avif)
 
 Here, she can copy the transaction ID and Bob's address by clicking on each of them.
 Then she can click on `P` to get a payment proof (transaction key):
@@ -73,7 +73,8 @@ Obviously, Charlie will want to double check with Bob the address is really his
 
 Charlie will open his monero-wallet-gui and go to the Advanced > Prove/Check page to fill the Check section with the informations provided by Alice:
 
-![Check payment](/img/resources/user-guides/en/prove-payment/check-payment.png)
+![Check payment-1](/img/resources/user-guides/en/prove-payment/check-payment-1.avif)
+![Check payment-2](/img/resources/user-guides/en/prove-payment/check-payment-2.avif)
 
 Then clicking on Check will tell Charlie how much this particular transaction sent to this address, and how much confirmation the transaction had:
 

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

@@ -10,19 +10,19 @@ If your wallet is not in Advanced mode, you will have to change it to Advanced m
 
 If your wallet is already in Advanced mode, you can skip the next step.
 
-![Wallet mode](/img/resources/user-guides/en/remote_node/wallet_mode_info.png){:width="600px"}
+![Wallet mode](/img/resources/user-guides/en/remote_node/wallet_mode_info.avif){:width="600px"}
 
 ## Change your wallet to advanced mode
 
 If your wallet is open, you need to close it first. Go to `Settings` > `Wallet` > `Close this wallet`
 
-![Close Wallet](/img/resources/user-guides/en/remote_node/close_open_wallet.png){:width="600px"}
+![Close Wallet](/img/resources/user-guides/en/remote_node/close_open_wallet.avif){:width="600px"}
 
 The main menu (`Welcome to Monero` screen) will open. At the bottom left, click on `Change wallet mode` button, and on the next page select `Advanced mode`. Next, open your wallet file again.
 
-![Change Wallet Mode](/img/resources/user-guides/en/remote_node/change_wallet_mode.png){:width="600px"}
+![Change Wallet Mode](/img/resources/user-guides/en/remote_node/change_wallet_mode.avif){:width="600px"}
 
-![Advanced Mode](/img/resources/user-guides/en/remote_node/advanced_mode.png){:width="600px"}
+![Advanced Mode](/img/resources/user-guides/en/remote_node/advanced_mode.avif){:width="600px"}
 
 ## Finding a public remote node
 
@@ -34,7 +34,8 @@ When opening your wallet, a pop up will appear with the option `Use custom setti
 
 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.png){:width="600px"}
+![Configure Remote Node](/img/resources/user-guides/en/remote_node/remote_node_config.avif){:width="600px"}
+![Configure Remote Node 2](/img/resources/user-guides/en/remote_node/remote_node_config-2.avif){:width="600px"}
 
 On this page select `Remote Node`.
 

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

@@ -25,28 +25,24 @@ If you run into any trouble, running `./monero-wallet-cli --help` will show you
 
 Launch `monero-wallet-gui`. If this is the first time you launched it go to the next step, otherwise click `Cancel`:
 
-![cancel opening](/img/resources/user-guides/en/restore_from_keys/cancel-opening.png)
-
-Select your appropriate language `English(US)`:
-
-![choose language](/img/resources/user-guides/en/restore_from_keys/choose-language.png)
+![cancel opening](/img/resources/user-guides/en/restore_from_keys/cancel-opening.avif)
 
 Click on `Restore wallet from keys or mnemonic seed`:
 
-![choose restore](/img/resources/user-guides/en/restore_from_keys/choose-restore.png)
+![choose restore](/img/resources/user-guides/en/restore_from_keys/choose-restore.avif)
 
-Select `Restore from keys`, give your wallet a name & storage location, and complete the `Account address (public)`, `View key (private)` & `Spend key (private)`. Optionaly, specify a `Restore height (optional)` to avoid scanning of oldest blocks. Then click the `Right` arrow:
+Select `Restore from keys`, give your wallet a name & storage location, and complete the `Account address (public)`, `View key (private)` & `Spend key (private)`. Optionally, specify a `Restore height (optional)` to avoid scanning of oldest blocks. Then click the `Next` button:
 
-![restore wallet](/img/resources/user-guides/en/restore_from_keys/restore-wallet.png)
+![restore wallet](/img/resources/user-guides/en/restore_from_keys/restore-wallet.avif)
 
-On the next page, give your wallet a strong password and confirm it before clicking the `Right` arrow:
+On the next page, give your wallet a strong password and confirm it before clicking the `Next` button:
 
-![wallet password](/img/resources/user-guides/en/restore_from_keys/wallet-password.png)
+![wallet password](/img/resources/user-guides/en/restore_from_keys/wallet-password.avif)
 
-Specify your daemon settings and click the `Right` arrow:
+Specify your daemon settings and click the `Next` button:
 
-![daemon settings](/img/resources/user-guides/en/restore_from_keys/daemon-settings.png)
+![daemon settings](/img/resources/user-guides/en/restore_from_keys/daemon-settings.avif)
 
-Click on `USE MONERO` to enjoy your restored wallet:
+Click on `Create wallet` to complete the restoration process:
 
-![all set up](/img/resources/user-guides/en/restore_from_keys/all-set-up.png)
+![all set up](/img/resources/user-guides/en/restore_from_keys/all-set-up.avif)

_i18n/es/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/fr/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/it/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/nb-no/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/nl/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/pl/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/pt-br/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/ru/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/tr/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/zh-cn/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_i18n/zh-tw/resources/moneropedia/transaction-weight.md

@@ -0,0 +1,15 @@
+---
+terms: ["transaction-weight"]
+summary: "metric used for adjusting fee of a transaction"
+---
+
+{% include disclaimer.html translated="no" translationOutdated="no" %}
+### The Basics
+
+Transaction weight is the metric used for adjusting fee. It is used to set the fee for @transactions.
+
+### More Information
+
+Refer to @Scalability to see how transaction weight is calculated.
+
+

_includes/header.html

@@ -86,15 +86,15 @@
             <div class="topnav">
               <div class="row middle-xs">
                   <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4">
-                    <a href="{% if site.lang == 'en' %}
+                    <a href="{% if site.lang == 'en' -%}
                     
                     {{ site.baseurl_root }}/
                     
-                    {% else %}
+                    {%- else -%}
                     
                     {{ site.baseurl_root }}/{{site.lang}}
                     
-                    {% endif %}"><img src="/img/monero-logo.png" width="500" height="135" alt="Monero Logo" class="monero-logo"></a>
+                    {%- endif %}"><img src="/img/monero-logo.png" width="500" height="135" alt="Monero Logo" class="monero-logo"></a>
                   </div>
                   <div class="col-lg-8 col-md-8 col-sm-8 topnav-list end-xs">
                       <div class="row end-xs middle-xs">
@@ -175,15 +175,15 @@
         <div class="mob bot-nav white-nav">
             <div class="row center-xs middle-xs">
                 <div class="col-xs-6">
-                    <a href="{% if site.lang == 'en' %}
+                    <a href="{% if site.lang == 'en' -%}
                     
                     {{ site.baseurl_root }}/
                     
-                    {% else %}
+                    {%- else -%}
                     
                     {{ site.baseurl_root }}/{{site.lang}}
                     
-                    {% endif %}"><img src="/img/monero-logo.png" width="500" height="135" alt="Monero Logo" class="monero-logo"></a>
+                    {%- endif %}"><img src="/img/monero-logo.png" width="500" height="135" alt="Monero Logo" class="monero-logo"></a>
                 </div>
                 <div class="dropdown col-xs-6 text-center mob-language-change">
                 <input class="burger-checkdropdown" id="moblangdrop" type="checkbox" tabindex="0">

_layouts/user-guide.html

@@ -5,6 +5,12 @@ layout: base
     <!-- FULL WIDTH BLOCK -->
         <section class="container full guides">
                 <div class="info-block text-adapt">
+                    {% if page.deprecated_url %}
+                        <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="{{ page.deprecated_url }}">docs.getmonero.org</a>.</p>
+                        </div>
+                    {% endif %}
                     <div>
                         {{content}}
                         <p style="text-align: right;">
@@ -15,4 +21,4 @@ layout: base
                 </div>
         </section>
     <!-- END FULL WIDTH BLOCK -->
-    </div>
+    </div>

_posts/2014-06-18-monero-missive-for-the-week-of-2014-06-16.md

@@ -24,4 +24,4 @@ This feature requires more testing, and is NOT in the main code base yet. If you
 
 4. We have had a lot of people asking about the progress of the GUI wallet. We'd like to reiterate that there are a great number of core and fundamental things that need to be worked on *before* we can get lots and lots of users flocking in. Some of the core necessities that we're working on at breakneck pace are: QoS to reduce the bandwidth demand on full nodes (as everyone will be running a full node at this stage anyway), segregation of wallet functions in order to create a far more robust system for exchanges and merchants to use, [Gitian-based builds](http://gitian.org) for everyone's safety and to ensure binaries are safe (safer, really), moving blockchain storage to an embedded database, fixing the now-infamous "ABSTRACT_SERVER_SEND_QUE_MAX_COUNT" (in big red letters!) error that is quite harmless but everyone freaks out about, and so on.
 
-   These are issues at Monero's core that we're working on, and we need to have these in place and fixed before a GUI wallet is widely dispersed, otherwise there will be massive resource constraints placed on user's systems. We're not here to win a race against other cryptocurrencies. We're here to to continue to push out great features and stable and reliable code, in a way that will make sure Monero is around for decades and not just a flash-in-the-pan.
+   These are issues at Monero's core that we're working on, and we need to have these in place and fixed before a GUI wallet is widely dispersed, otherwise there will be massive resource constraints placed on user's systems. We're not here to win a race against other cryptocurrencies. We're here to continue to push out great features and stable and reliable code, in a way that will make sure Monero is around for decades and not just a flash-in-the-pan.

_posts/2015-03-02-monero-missive-for-the-week-of-2015-03-02.md

@@ -119,7 +119,7 @@ You know, we use Google Maps, he uses MMAP!
 
 Ok, so that really should give all our listeners an indication as to what the current state of the database is, the painpoints we've faced and have had to overcome, and what we're going to be doing in future...not only to make Monero run on multiple platforms, but to make it run smoothly and efficiently on the smallest of devices.
 
-So that's the database, I think that's the bulk of what we wanted to chat about about the database, unless there's anything else you'd like to add.
+So that's the database, I think that's the bulk of what we wanted to chat about the database, unless there's anything else you'd like to add.
 
 #### Gingeropolous
 

_posts/2015-09-14-monero-missive-for-the-week-of-2015-09-14.md

@@ -279,7 +279,7 @@ Yea, I'm sorry
 
 #### Riccardo
 
-But, I think the other thing that's come out of this, that's been quite cool is that rznag's written a little test system in Python that uses the the Tippero Python Library, and that's great for system automators, or merchants, or developers that are using Monero. The whole ecosystem's starting to build up now, where there are a lot of libraries with tools to test them, and so, I think the more that stuff happens over time, the easier it's going to be for integrators to just like say, “ok, I'm going to take this library and use it”, rather than sitting in #Monero-dev IRC channel and asking for help.
+But, I think the other thing that's come out of this, that's been quite cool is that rznag's written a little test system in Python that uses the Tippero Python Library, and that's great for system automators, or merchants, or developers that are using Monero. The whole ecosystem's starting to build up now, where there are a lot of libraries with tools to test them, and so, I think the more that stuff happens over time, the easier it's going to be for integrators to just like say, “ok, I'm going to take this library and use it”, rather than sitting in #Monero-dev IRC channel and asking for help.
 
 #### Gingeropolous
 

_posts/2016-02-10-monero-missive-2015-year-in-review.md

@@ -72,7 +72,7 @@ Some [highlights of the FFS over the year](https://forum.getmonero.org/9/work-in
 
 - [tewinget's Documentation and Cleanup of Source Code](https://forum.getmonero.org/9/work-in-progress/2373/documentation-and-cleanup-of-source-code): raised 3600 XMR in 23 contributions; completed 3/4 milestones.
 - [moneromoo's initial fundraiser for 6 months of work](https://forum.getmonero.org/22/completed-tasks/334/fund-a-developer-moneromoo-will-work-part-time-on-monero-for-260-hours-over-approx-6-months): raised over its target of 7800 XMR in 45 contributions; completed all 6 milestones.
-- [moneromoo's second fundraiser for for about 10 additional months of work](https://forum.getmonero.org/9/work-in-progress/2410/a-continuation-for-all-purpose-programming-of-what-needs-to-get-done-in-monero): raised 18000 XMR in 21 contributions; completed 3/10 milestones thus far.
+- [moneromoo's second fundraiser for about 10 additional months of work](https://forum.getmonero.org/9/work-in-progress/2410/a-continuation-for-all-purpose-programming-of-what-needs-to-get-done-in-monero): raised 18000 XMR in 21 contributions; completed 3/10 milestones thus far.
 - [Shen Noether's translation of some of the website content into Chinese](https://forum.getmonero.org/9/work-in-progress/329/translation-of-content-on-getmonero-org-into-chinese): raised 950 XMR from a target of 600 XMR in 9 contributions; completed its milestone.
 - [Shen Noether's fundraiser to complete the C++ implementation of RingCT](https://forum.getmonero.org/9/work-in-progress/2450/ring-ct-c-crypto): raised 3150 XMR in 13 contributions; has very nearly reached completion of all 7 of its milestones.
 - [Wolf0's very efficient AMD miner](https://forum.getmonero.org/9/work-in-progress/2400/open-source-amd-miner-by-wolf0): raised 7750 XMR in 20 contributions; completed 6/7 milestones.

_posts/2016-12-22-monero-core-gui-beta-released.md

@@ -14,7 +14,7 @@ Download links are at the bottom of this post, and please take note of the known
 
 ### Known Issues
 
-- Due to several important updates, 0.10.1 wallet binaries will not work with with wallets created by the GUI. Please use the binaries included in the package instead. Note: you can definitely use the 0.10.1 daemon:)
+- Due to several important updates, 0.10.1 wallet binaries will not work with wallets created by the GUI. Please use the binaries included in the package instead. Note: you can definitely use the 0.10.1 daemon:)
 - If you have been testing earlier builds you may have to delete your configs. There is [a guide describing how to do this on this StackExchange post](http://monero.stackexchange.com/questions/2866/where-are-the-monero-core-configuration-parameters-stored/2870#2870).
 - Older computers may have an issue with the QT renderer, and will either crash or display a white / black window. You can change the rendering mode [as described on this StackExchange post](http://monero.stackexchange.com/questions/2928/how-to-change-the-monero-core-rendering-mode-for-older-computers/2929#2929).
 

_posts/2018-10-11-monero-0.13.0-released.md

@@ -167,7 +167,7 @@ Some highlights of this major release are:
 - Fix output shuffling for multisig
 - Fix race adding the same tx twice to the txpool
 - fix configuring version.cpp without git
-- Add warnings about inaccurate balances to to watch-only wallet
+- Add warnings about inaccurate balances to watch-only wallet
 - New unit tests
 - Many more smaller fixes, speedups, improvements and other tweaks
 

_posts/2019-06-04-Long-Payment-ID-Deprecation.md

@@ -36,7 +36,7 @@ In sum, payment IDs have serveral salient drawbacks and will therefore
 be phased out. Services are recommended to upgrade to subaddresses as
 soon as possible. Subaddresses essentially function similar to Bitcoin
 HD wallets and should thus be relatively straightforward to implement.
-Furthermore, subaddresses are managable from a resource point point of
+Furthermore, subaddresses are managable from a resource point of
 view.
 
 Yours sincerely,

community/merchants/index.md

@@ -48,25 +48,6 @@ meta_descr: merchants.descr
         </div>
       </div>
       <div class="right half no-pad-sm col-lg-6 col-md-6 col-sm-12 col-xs-12">
-        <div class="info-block">
-          <div class="center-xs">
-            <img class="merch" src="/img/merchants/localmonero.png" alt="LocalMonero logo" title="LocalMonero">
-            <p>{% t merchants.locmondescr %}</p>
-          </div>
-          <div>
-            <p><b>{% t merchants.cardfoss %}</b> <span class="cross"></span></p>
-            <p><b>{% t merchants.noncustodial %}</b> <span class="cross"></span></p>
-            <p>{% t merchants.cardkyc %} {% t merchants.depsell %}</p>
-            <p><b>XMR &#8596; fiat:</b> <span class="check"></span></p>
-            <p><b>{% t merchants.cardonion %}</b> <span class="check"></span></p>
-            <p><b>{% t merchants.cardi2p %}</b> <span class="check"></span></p>
-          </div>
-          <div class="center-xs">
-            <p><a href="https://localmonero.co" class="btn-link btn-fixed btn-primary-top">{% t merchants.visitlocalmonero %}</a></p>
-          </div>
-        </div>
-      </div>
-      <div class="left half no-pad-sm col-lg-6 col-md-6 col-sm-12 col-xs-12">
         <div class="info-block">
           <div class="center-xs">
             <img class="merch" src="/img/merchants/hodlhodl.jpg" alt="HodlHodl Logo" title="HodlHodl">
@@ -85,7 +66,7 @@ meta_descr: merchants.descr
           </div>
         </div>
       </div>
-      <div class="right half no-pad-sm col-lg-6 col-md-6 col-sm-12 col-xs-12">
+      <div class="left half no-pad-sm col-lg-6 col-md-6 col-sm-12 col-xs-12">
         <div class="info-block">
           <div class="center-xs">
             <img class="merch" src="/img/merchants/basicswapdex.png" alt="BasicSwapDEX Logo" title="BasicSwapDEX">
@@ -112,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">

css/custom.css

@@ -3639,10 +3639,10 @@ img.emoji {
 
 .tabPanel-widget > label,
 .tabPanel-widget > h2 {
-  font-size: 1.1rem;
+  font-size: 1rem;
   width: calc(100% / 7);
-  height: 2rem;
-  line-height: 2rem;
+  height: 1rem;
+  line-height: 1rem;
   padding: 1rem 0;
 }
 
@@ -3805,7 +3805,7 @@ img.emoji {
 
 }
 
-@media only screen and (max-width: 48rem) {
+@media only screen and (max-width: 24rem) {
     .roadmap .mobile-roadmap {
     height: 2rem;
 }
@@ -3894,7 +3894,7 @@ img.emoji {
 }
 
 .tabPanel-widget h2 {
-    font-size: 1.4rem;
+    font-size: 1rem;
 }
 
 .roadmap .tabPanel-widget > input + h2 + div.tabPanel-content {
@@ -4699,3 +4699,9 @@ input.accordion[type=radio]:checked + label::after {
 .tools h2 {
     text-align: left;
 }
+
+/* /get-started/contributing/ */
+
+.donation-field {
+  user-select: all; /* Select donation addresses with one click */
+}

downloads/index.md

@@ -243,7 +243,7 @@ meta_descr: downloads.intro
                             <th>{% t downloads.sourcecode %}</th>
                         </tr>
                         <tr>
-                            <td><img class="small" src="/img/cakewallet.png" width="172" height="202" loading="lazy" alt="Cake Wallet Logo"><a href="https://cakewallet.com/">Cake Wallet</a></td>
+                            <td><img class="small" src="/img/monerocom-wallet.png" width="172" height="202" loading="lazy" alt="Monero.com Wallet Logo"><a href="https://cakewallet.com">Monero.com Wallet</a></td>
                             <td><span class="icon-android"></span><span class="icon-apple"></span></td>
                             <td><span class="icon-linux"></span><span class="icon-apple"></span></td>
                             <td><a class="ext-noicon" href="https://github.com/cake-tech/cake_wallet" aria-label="GitHub icon" target="_blank"><span class="icon-github"></span></a></td>
@@ -263,7 +263,7 @@ meta_descr: downloads.intro
                         <tr>
                             <td><img class="small" src="/img/stack-wallet.png" width="100" height="100" loading="lazy" alt="Stack Wallet logo"><a href="https://stackwallet.com/">Stack Wallet</a></td>
                             <td><span class="icon-android"></span><span class="icon-apple"></span></td>
-                            <td>X</td>
+                            <td><span class="icon-linux"></span><span class="icon-windows"></span><span class="icon-apple"></span></td>
                             <td><a class="ext-noicon" href="https://github.com/cypherstack/stack_wallet" aria-label="GitHub icon" target="_blank"><span class="icon-github"></span></a></td>
                         </tr>
                         </table>
@@ -296,6 +296,7 @@ meta_descr: downloads.intro
                                 <li><a class="ext-noicon" href="https://cakewallet.com" aria-label="GitHub icon" target="_blank"><img class="mob" style="width: 50px" src="/img/cakewallet.png" width="172" height="202" loading="lazy" alt="Cake Wallet Logo">Cake Wallet</a></li>
                                 <li><a class="ext-noicon" href="https://featherwallet.org/" aria-label="Feather icon" target="_blank"><img class="mob" src="/img/feather.png" width="100" height="100" loading="lazy" alt="Feather Logo">Feather</a></li>
                                 <li><a class="ext-noicon" href="https://monerujo.io" aria-label="GitHub icon" target="_blank"><img class="mob" src="/img/Monerujo-wallet.png" width="100" height="100" loading="lazy" alt="Monerujo Logo">Monerujo</a></li>
+                                <li><a class="ext-noicon" href="https://stackwallet.com" aria-label="GitHub icon" target="_blank"><img class="mob" src="/img/stack-wallet.png" width="100" height="100" loading="lazy" alt="Stack Wallet Logo">Stack Wallet</a></li>
                             </ul>
                             <h3>{% t downloads.remotesync %}</h3>
                             <p>{% t downloads.remotesyncinfo %}</p>
@@ -337,7 +338,7 @@ meta_descr: downloads.intro
                                     <th>{% t downloads.hwthfirm %}</th>
                                 </tr>
                                 <tr>
-                                    <td><a class="ext-noicon" href="https://support.ledger.com/hc/en-us/articles/360006352934-Monero-XMR-" target="_blank"><img class="hw" src="/img/ledger.png" loading="lazy" alt="ledger logo"></a><p><a href="https://support.ledger.com/hc/en-us/articles/360006352934-Monero-XMR-" target="_blank">{% t downloads.instructions %}</a></p></td>
+                                    <td><a class="ext-noicon" href="https://support.ledger.com/article/360006352934-zd" target="_blank"><img class="hw" src="/img/ledger.png" loading="lazy" alt="ledger logo"></a><p><a href="https://support.ledger.com/article/360006352934-zd" target="_blank">{% t downloads.instructions %}</a></p></td>
                                     <td>
                                         <ul>
                                             <li>Nano S</li>
@@ -385,7 +386,7 @@ meta_descr: downloads.intro
                                 </table>
                                 <div class="mobile-only">
                                     <div>
-                                    <h3><a class="ext-noicon" href="https://support.ledger.com/hc/en-us/articles/360006352934-Monero-XMR-" target="_blank"><img class="hw" src="/img/ledger.png" loading="lazy" alt="ledger logo"></a><p><a href="https://support.ledger.com/hc/en-us/articles/360006352934-Monero-XMR-" target="_blank">{% t downloads.instructions %}</a></p></h3>
+                                    <h3><a class="ext-noicon" href="https://support.ledger.com/article/360006352934-zd" target="_blank"><img class="hw" src="/img/ledger.png" loading="lazy" alt="ledger logo"></a><p><a href="https://support.ledger.com/article/360006352934-zd" target="_blank">{% t downloads.instructions %}</a></p></h3>
                                     <ul>
                                         <b>{% t downloads.hwmobmodels %}</b>
                                             <li>Nano S</li>

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">
@@ -56,7 +56,7 @@ meta_descr: meta_descr.contributing
             </div>
             <!-- end full block-->
             <!-- full block-->
-            <div class="full col-lg-12 col-md-12 col-sm-12 col-xs-12">
+            <div id="donate" class="full col-lg-12 col-md-12 col-sm-12 col-xs-12">
                 <div class="info-block text-adapt">
                     <div class="row center-xs">
                         <div class="col">
@@ -70,9 +70,16 @@ meta_descr: meta_descr.contributing
                         <div class="col-xs-12">
                             <h3>{% t contributing.genfund %}</h3>
                             <p>{% t contributing.genfund_p %}</p>
-                            <p>Monero:<br><code>888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H</code></p>
-                            <p>Bitcoin:<br><code>1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H</code></p>
-                            <p>@openalias: <code>donate.getmonero.org</code></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>
                     </div><br>
                     <div class="row center-xs">

get-started/faq/index.md

@@ -253,7 +253,8 @@ meta_descr: faq.intro
                         <p>{% t faq.a12-1 %}</p>
                         <p>{% t faq.a12-2 %}</p>
                         <p>{% t faq.a12-3 %}</p>
-                        <p>{% t faq.additional %} <a href="{{ site.baseurl_root }}/2020/01/17/auditability.html">About supply auditability</a></p>
+                        <p>{% t faq.additional %} <a href="{{ site.baseurl_root }}/2020/01/17/auditability.html">{% t faq.aabout-auditability %}</a></p>
+                        <p>{% t faq.additional %} <a href="https://moneroinflation.com">{% t faq.adetailed-auditability %}</a></p>
                     </div>
                 </div>
                 <div class="tab" id="max-supply">

get-started/mining/index.md

@@ -45,7 +45,6 @@ meta_descr: meta_descr.mining
                         <p>{% t mining.choosepol %}
                         <ul>
                             <li><a href="https://miningpoolstats.stream/monero">miningpoolstats.stream</a></li>
-                            <li><a href="https://pools.xmr.wiki">pools.xmr.wiki</a></li>
                         </ul>
                         </p>
                 </div>

legal/index.md

@@ -21,15 +21,15 @@ title: titles.legal
                     </div>
 <div class="row">
 <div class="col" markdown="1">
-This website is operated by The Monero Project, a loose collective of individuals behind Monero. By visiting and using this website you will be accepting these Terms of Use ("TOU"). Please read them carefully and if you disagree with the TOU in any way, then do not use this website. The Monero Project reserves the right to post changes to the TOU on this website at any time, and by your continuing to use the website thereafter, you agree to be bound by the new version of the TOU. If any TOU changes are not acceptable, you must stop your use of this website. In these TOU, "The Monero Project" and "we" refers to The Monero Project, and "User" or "you" refers to each visitor to this website. "Monero" refers to the digital currency that can be used by the software available on this website.
+This website is operated by The Monero Project, a loose collective of individuals behind Monero. By visiting and using this website you will be accepting these Terms of Use ("TOU"). Please read them carefully, and if you disagree with the TOU in any way, then do not use this website. The Monero Project reserves the right to post changes to the TOU on this website at any time, and by your continuing to use the website thereafter, you agree to be bound by the new version of the TOU. If any TOU changes are not acceptable, you must stop your use of this website. In these TOU, "The Monero Project" or "we" refers to The Monero Project, and "User" or "you" refers to each visitor to this website. "Monero" refers to the digital currency that can be used by the software available on this website.
 
 ### Sites and Services
 
-We do not guarantee that access to or use of this website or any services will be uninterrupted or error free, and The Monero Project shall not be liable for any feature not being accessible or for any unavailability of its website and services. The website and its features may be expanded, limited or modified at any time by The Monero Project to meet the needs of its Users, or for technical or other reasons, without advance notice or reason. We may also in our sole discretion, and at any time, discontinue providing, temporarily or permanently, any or all of the website, without notice. To access some of the content or features of the website or its services, Users may need to enhance or update the hardware or software in their computer systems. The Monero Project assumes no responsibility for any failure to access the website or any services, partially or fully, whether due to the User's system, the Internet network or any other cause.
+We do not guarantee that access to or use of this website or any services will be uninterrupted or error-free, and The Monero Project shall not be liable for any feature not being accessible or for any unavailability of its website and services. The website and its features may be expanded, limited or modified at any time by The Monero Project to meet the needs of its Users, or for technical or other reasons, without advance notice or reason. We may also, at our sole discretion, and at any time, discontinue providing any or all of the website, temporarily or permanently, with or without notice. To access some of the content or features of the website or its services, Users may need to enhance or update the hardware or software in their computer systems. The Monero Project assumes no responsibility for any failure to access the website or any services, partially or fully, whether due to the User's system, the Internet network or any other cause.
 
 ### Minors
 
-We do not provide information or services to minors, and if you are under 18 you may only use this site with the active involvement of a parent, guardian or other supervising adult.
+We do not provide information or services to minors, and if you are under 18, you may only use this site with the active involvement of a parent, guardian or other supervising adult.
 
 ### No Investment Advice
 
@@ -37,11 +37,11 @@ This website does not provide individual or customized legal, tax, financial, or
 
 ### Content Limitations
 
-We make no guarantees as to the accuracy, thoroughness or quality of the information on this website, which is provided only on an "AS-IS" and "AS AVAILABLE" basis at User's sole risk. This information may be provided by third parties and The Monero Project shall not be responsible or liable for any errors, omissions or inaccuracies in the website content. The information provided at this site are neither comprehensive nor appropriate for every individual. Some of the information is relevant only in certain parts of the world, and may not be relevant to or compliant with the laws, regulations or other legal requirements of other countries. It is your responsibility to determine whether, how and to what extent your intended use of the information and services will be technically and legally possible in the areas of the world where you intend to use them. You are advised to verify any information before using it for any personal, financial or business purpose. In addition, the opinions and views expressed in any forum post on this website are solely those of the author(s) of the article and do not reflect the opinions of The Monero Project. The website content and services may be modified at any time by us, without advance notice or reason, and The Monero Project shall have no obligation to notify you of any corrections or changes to any website content.
+We make no guarantees as to the accuracy, thoroughness or quality of the information on this website, which is provided only on an "AS-IS" and "AS AVAILABLE" basis at User's sole risk. Information may be provided by third parties, and The Monero Project shall not be responsible or liable for any errors, omissions or inaccuracies in the website content. The information provided at this site is neither comprehensive nor appropriate for every individual. Some of the information is relevant only in certain parts of the world, and may not be relevant to or compliant with the laws, regulations or other legal requirements of other countries. It is your responsibility to determine whether, how, and to what extent your intended use of the information and services will be technically and legally possible in the areas of the world where you intend to use them. You are advised to verify any information before using it for any personal, financial or business purpose. In addition, the opinions and views expressed in any forum post on this website are solely those of the author(s) of the article and do not reflect the opinions of The Monero Project. The website content and services may be modified at any time by us, without advance notice or reason, and The Monero Project shall have no obligation to notify you of any corrections or changes to any website content.
 
 ### Proprietary Rights and License
 
-This website and its content are protected by copyright, trademark and other proprietary laws. For details please refer to our [Copyright section](#copyright).
+This website and its content are protected by copyright, trademark and other proprietary laws. For details, please refer to our [Copyright section](#copyright).
 
 ### Third Party Content
 
@@ -53,7 +53,7 @@ By posting or submitting any material to this website, including on the forum, y
 
 ### Viruses and Malware
 
-The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with, and where appropriate SHA hashes are provided for end users to confirm they have downloaded the correct file. Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection or viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt consider [compiling Monero from the source code](https://github.com/monero-project/bitmonero).
+The Monero Project takes many precautions to ensure the files available for downloading through this website are not tampered with, and where appropriate, [SHA hashes](https://www.getmonero.org/downloads/hashes.txt) are provided for end users to confirm they have downloaded the correct file. Nonetheless, The Monero Project does not guarantee that files available for downloading through this website will be free of infection, viruses or other code that may have contaminating or destructive properties. You are responsible for implementing sufficient procedures and checkpoints to satisfy your particular requirements for integrity, security and accuracy of data input and output, and for maintaining a means external to the site for the reconstruction of any lost data. It is almost always advisable to check the SHA hashes of the files you have downloaded, and if in any doubt, consider [compiling Monero from the source code](https://github.com/monero-project/monero#compiling-monero-from-source).
 
 ### Sponsors and Advertisers are Not Endorsed
 
@@ -61,11 +61,11 @@ Though we seek to partner with quality companies, we are not responsible for the
 
 ### Offsite Links
 
-As a convenience to Users, the The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for use of or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.
+As a convenience to Users, the The Monero Project website and services may provide links to other sites or resources. Because we do not review or have no control over such sites and resources, The Monero Project shall not be responsible or liable for the use of, or reliance on any content, products, services or information at such sites or resources. Inclusion of any links does not imply any endorsement, affiliation, approval, association or sponsorship by The Monero Project of the linked websites, resources, their operators or owners. When you select a link, you may be leaving our website. The information available on Third Parties' websites may have certain restrictions on its use or distribution which differ from these TOU.
 
 ### Password Protected Areas
 
-Some areas of the The Monero Project site ("Password Protected Areas"), primarily the Monero forum, are password protected and available only to Users who are registered on the Monero forum. Registration requires Users to fully complete the account registration process. The Monero Project reserves the right to deny or revoke registration or access to Password Protected Areas for any User. The Monero Project takes reasonable measures to ensure the security of the Password Protected Areas but cannot guarantee the absolute security of information or communications in such Password Protected Areas. Users are responsible for maintaining the security of the password they set and must notify us if they believe that the security of their password or account has been breached or subject to unauthorized use. Additional account security is available through the use of GPG authentication, and all users of any Password Protected Areas are encouraged to take advantage of this layer of protection. The Monero Project will not be liable for any loss or liability incurred as a result of an unauthorized person using a User's password.
+Some areas of The Monero Project site ("Password Protected Areas"), primarily the Monero forum, are password protected and available only to Users who are registered on the Monero forum. Registration requires Users to fully complete the account registration process. The Monero Project reserves the right to deny or revoke registration or access to Password Protected Areas for any User. The Monero Project takes reasonable measures to ensure the security of the Password Protected Areas but cannot guarantee the absolute security of information or communications in such Password Protected Areas. Users are responsible for maintaining the security of the password they set and must notify us if they believe that the security of their password or account has been breached or subject to unauthorized use. Additional account security is available through the use of GPG authentication, and all users of any Password Protected Areas are encouraged to take advantage of this layer of protection. The Monero Project will not be liable for any loss or liability incurred as a result of an unauthorized person using a User's password.
 
 ### Prohibited Conduct
 
@@ -86,7 +86,7 @@ This website may collect personal information from some Users. Because The Moner
 
 ### Communications
 
-When you visit our website or send us email, our responses to your communications will be by e-mail. All agreements, notices and communications that we provide to you by email will satisfy all legal requirements that they be in writing and delivered to you. The Monero Project will have the right to disclose any email sent by a User, or any objectionable material, to comply with legal process or to protect the rights or property of The Monero Project, its customers, suppliers and Users.
+When you send us an email, our responses to your communications will be by email. All agreements, notices and communications that we provide to you by email will satisfy all legal requirements that they be in writing and delivered to you. The Monero Project will have the right to disclose any email sent by a User, or any objectionable material, to comply with legal process or to protect the rights or property of The Monero Project, its customers, suppliers and Users.
 
 ### No Monero Financial Services
 
@@ -102,7 +102,7 @@ THE MONERO PROJECT DISCLAIMS ALL WARRANTIES, REPRESENTATIONS AND CONDITIONS OF A
 
 ### EXCLUSION OF CONSEQUENTIAL DAMAGES
 
-IN NO EVENT WILL THE MONERO PROJECT BE LIABLE FOR ANY INCIDENTAL, INCIDENTAL, SPECIAL, CONSEQUENTIAL, EXEMPLARY OR INDIRECT DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE THIS WEBSITE OR ANY OF ITS SERVICES OR CONTENT, OR LOSS OF DATA, EVEN IF THE MONERO PROJECT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND WHETHER BASED ON CONTRACT, TORT, NEGLIGENCE, PRODUCT LIABILITY, STRICT LIABILITY OR OTHERWISE.
+IN NO EVENT WILL THE MONERO PROJECT BE LIABLE FOR ANY INCIDENTAL, SPECIAL, CONSEQUENTIAL, EXEMPLARY OR INDIRECT DAMAGES ARISING OUT OF THE USE OF OR INABILITY TO USE THIS WEBSITE OR ANY OF ITS SERVICES OR CONTENT, OR LOSS OF DATA, EVEN IF THE MONERO PROJECT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND WHETHER BASED ON CONTRACT, TORT, NEGLIGENCE, PRODUCT LIABILITY, STRICT LIABILITY OR OTHERWISE.
 
 ### EXCLUSION OF LIMITATIONS AND DISCLAIMERS
 
@@ -133,11 +133,11 @@ These TOU, and any applicable TOS, constitute the entire agreement between each
 <div class="col" markdown="1">
 ### The Monero Project
 
-The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is released under the  CC BY-SA 4.0 license (the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
+The majority of the content on this website, including the Monero logo and our Monero Missive podcast, is released under the  CC BY-SA 4.0 license (the [Creative Commons Attribution-ShareAlike 4.0 International license](https://creativecommons.org/licenses/by-sa/4.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so, you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use.
 
 ### Other Attributed Items
 
-Certain logos, such as those for the operating systems and platforms we support as well as those of our sponsors, are copyrighted by their owners. The Monero Project does not own these copyrights, and use these logos either with permission or in an unambiguous and unharmful way.
+Certain logos, such as those for the operating systems and platforms we support as well as those of our sponsors, are copyrighted by their owners. The Monero Project does not own these copyrights, and uses these logos either with permission or in an unambiguous and unharmful way.
 </div>
 </div>
             </div>

resources/developer-guides/daemon-rpc.md

@@ -1,6 +1,7 @@
 ---
 layout: user-guide
 title: "Daemon RPC documentation"
+deprecated_url: https://docs.getmonero.org/rpc-library/monerod-rpc/"
 ---
 
 {% t global.lang_tag %}
@@ -58,6 +59,7 @@ Note: "@atomic-units" refer to the smallest fraction of 1 XMR according to the m
 * [/get_hashes.bin](#get_hashesbin)
 * [/get_o_indexes.bin](#get_o_indexesbin)
 * [/get_outs.bin](#get_outsbin)
+* [/get_output_distribution.bin](#get_output_distributionbin)
 * [/get_transactions](#get_transactions)
 * [/get_alt_blocks_hashes](#get_alt_blocks_hashes)
 * [/is_key_image_spent](#is_key_image_spent)
@@ -86,6 +88,8 @@ Note: "@atomic-units" refer to the smallest fraction of 1 XMR according to the m
 * [/get_outs](#get_outs)
 * [/update](#update)
 * [/pop_blocks](#pop_blocks)
+* [/get_transaction_pool_hashes](#get_transaction_pool_hashes)
+* [/get_public_nodes](#get_public_nodes)
 
 
 ---
@@ -197,7 +201,7 @@ Outputs:
 Example:
 
 ```
-$ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block_template","params":{"wallet_address":"44GBHzv6ZyQdJkjqZje6KLZ3xSyN1hBSFAnLP6EAqJtCRVzMzZmeXTC2AHKDS9aEDTRKmo6a6o9r9j86pYfhCWDkKjbtcns","reserve_size":60}' -H 'Content-Type: application/json'
+$ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block_template","params":{"wallet_address":"44GBHzv6ZyQdJkjqZje6KLZ3xSyN1hBSFAnLP6EAqJtCRVzMzZmeXTC2AHKDS9aEDTRKmo6a6o9r9j86pYfhCWDkKjbtcns","reserve_size":60}}' -H 'Content-Type: application/json'
 
 {
   "id": "0",
@@ -238,7 +242,7 @@ Outputs:
 In this example, a block blob which has not been mined is submitted:
 
 ```
-$ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"submit_block","params":["0707e6bdfedc053771512f1bc27c62731ae9e8f2443db64ce742f4e57f5cf8d393de28551e441a0000000002fb830a01ffbf830a018cfe88bee283060274c0aae2ef5730e680308d9c00b6da59187ad0352efe3c71d36eeeb28782f29f2501bd56b952c3ddc3e350c2631d3a5086cac172c56893831228b17de296ff4669de020200000000"]' -H 'Content-Type: application/json'
+$ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"submit_block","params":["0707e6bdfedc053771512f1bc27c62731ae9e8f2443db64ce742f4e57f5cf8d393de28551e441a0000000002fb830a01ffbf830a018cfe88bee283060274c0aae2ef5730e680308d9c00b6da59187ad0352efe3c71d36eeeb28782f29f2501bd56b952c3ddc3e350c2631d3a5086cac172c56893831228b17de296ff4669de020200000000"]}' -H 'Content-Type: application/json'
 
 {
   "error": {
@@ -258,7 +262,7 @@ Inputs:
 * *amount_of_blocks* - unsigned int; number of blocks to be generated.
 * *wallet_address* - string; address to receive the coinbase reward.
 * *prev_block* - string;
-* *starting_nonce* - unsigned int; Increased by miner untill it finds a matching result that solves a block.
+* *starting_nonce* - unsigned int; Increased by miner until it finds a matching result that solves a block.
 
 Outputs:
 * *blocks* - list of string;
@@ -502,7 +506,7 @@ Outputs:
 * *top_hash* - string; If payment for RPC is enabled, the hash of the highest block in the chain. Otherwise, empty.
 * *untrusted* - boolean; States if the result is obtained using the bootstrap mode, and is therefore not trusted (`true`), or when the daemon is fully synced and thus handles the RPC locally (`false`)
 
-In this example, blocks range from height 1545999 to 1546000 is looked up (notice that the returned informations are ascending order and that it is at the April 2018 network upgrade time):
+In this example, blocks range from height 1545999 to 1546000 is looked up (notice that the returned information are ascending order and that it is at the April 2018 network upgrade time):
 
 ```
 $ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block_headers_range","params":{"start_height":1545999,"end_height":1546000}}' -H 'Content-Type: application/json'
@@ -1349,7 +1353,7 @@ $ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"r
 
 ### **sync_info**
 
-Get synchronisation informations
+Get synchronization information
 
 Alias: *None*.
 
@@ -1538,7 +1542,7 @@ Outputs:
 Example:
 
 ```
-$ curl http://localhost:18082/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_miner_data"}' -H 'Content-Type: application/json'
+$ curl http://localhost:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_miner_data"}' -H 'Content-Type: application/json'
 
 {
   "id": "0",
@@ -1650,6 +1654,7 @@ Example:
 
 ```
 $ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"flush_cache","params":{"bad_txs":true,"bad_blocks":true}}' -H 'Content-Type: application/json'
+
 {
   "id": "0",
   "jsonrpc": "2.0",
@@ -1688,6 +1693,7 @@ Example:
 
 ```
 $ curl http://127.0.0.1:18081/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"add_aux_pow","params":{"blocktemplate_blob":" ... ","aux_pow":[{"id":"3200b4ea97c3b2081cd4190b58e49572b2319fed00d030ad51809dff06b5d8c8","hash":"7b35762de164b20885e15dbe656b1138db06bb402fa1796f5765a23933d8859a"}]}}' -H 'Content-Type: application/json''
+
 {
   "id": "0",
   "jsonrpc": "2.0",
@@ -1906,6 +1912,39 @@ $ curl http://127.0.0.1:18081/get_o_indexes.bin --data-binary '{"txid":"d6e48158
 --->
 
 
+### **/get_output_distribution.bin**
+
+Get outputs. Binary request version of [get_output_distribution](#get_output_distribution).
+
+Alias: *None*.
+
+Inputs:
+
+* *credits* - unsigned int; If payment for RPC is enabled, the number of credits available to the requesting client. Otherwise, 0.
+* *top_hash* - string; If payment for RPC is enabled, the hash of the highest block in the chain. Otherwise, empty.
+* *amounts* - array of unsigned int; amounts to look for
+* *cumulative* - boolean; (optional, default is `false`) States if the result should be cumulative (`true`) or not (`false`)
+* *from_height* - unsigned int; (optional, default is 0) starting height to check from
+* *to_height* - unsigned int; (optional, default is 0) ending height to check up to
+* *binary* - boolean; (optional, default is `true`); Must be `true`.
+* *compress* - unsigned int; (optional, default is `false`) Respond with compressed data.
+
+Outputs:
+
+* *credits* - unsigned int; If payment for RPC is enabled, the number of credits available to the requesting client. Otherwise, 0.
+* *distributions* - array of structure distribution as follows:
+  * *amount* - unsigned int
+  * *base* - unsigned int
+  * *binary* - boolean; Always `true`.
+  * *compress* - unsigned int; `true` if compressed data, `false` otherwise.
+  * *distribution* - array of unsigned int; This field exists instead of *compressed_data* if the *compress* option was not used.
+  * *compressed_data* - array of unsigned int; This field exists instead of *distribution* if the *compress* option was used.
+  * *start_height* - unsigned int
+* *status* - string; General RPC error code. "OK" means everything looks good.
+* *top_hash* - string; If payment for RPC is enabled, the hash of the highest block in the chain. Otherwise, empty.
+* *untrusted* - boolean; States if the result is obtained using the bootstrap mode, and is therefore not trusted (`true`), or when the daemon is fully synced and thus handles the RPC locally (`false`)
+
+
 ### **/get_transactions**
 
 Look up one or more transactions by hash.
@@ -1932,7 +1971,7 @@ Outputs:
     * *vin* - List of inputs into transaction:
       * *key* - The public key of the previous output spent in this transaction.
         * *amount* - The amount of the input, in @atomic-units.
-        * *key_offsets* - A list of integer offets to the input.
+        * *key_offsets* - A list of integer offsets to the input.
         * *k_image* - The key image for the given input
     * *vout* - List of outputs from transaction:
       * *amount* - Amount of transaction output (if coinbase output, otherwise 0), in @atomic-units.
@@ -2120,7 +2159,7 @@ Alias: */sendrawtransaction*.
 
 Inputs:
 
-* *tx_as_hex* - string; Full transaction information as hexidecimal string.
+* *tx_as_hex* - string; Full transaction information as hexadecimal string.
 * *do_not_relay* - boolean; Stop relaying transaction to other nodes (default is `false`).
 
 Outputs:
@@ -2156,7 +2195,7 @@ Alias: *None*.
 Inputs:
 
 * *do_background_mining* - boolean; States if the mining should run in background (`true`) or foreground (`false`).
-* *ignore_battery* - boolean; States if batery state (on laptop) should be ignored (`true`) or not (`false`).
+* *ignore_battery* - boolean; States if battery state (on laptop) should be ignored (`true`) or not (`false`).
 * *miner_address* - string; Account address to mine to.
 * *threads_count* - unsigned int; Number of mining thread to run.
 
@@ -2486,7 +2525,7 @@ Categories are represented as a comma separated list of `<Category>:<level>` (si
   * *TRACE* - lower level
 A level automatically includes higher level.
 By default, categories are set to `*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO,msgwriter:INFO`.
-Setting the categories to "" prevent any logs to be outputed.
+Setting the categories to "" prevents any logs from being outputted.
 
 Alias: *None*.
 
@@ -2577,21 +2616,21 @@ Outputs:
   * *fee* - unsigned int; The amount of the mining fee included in the transaction, in @atomic-units.
   * *id_hash* - string; The transaction ID hash.
   * *kept_by_block* - boolean; States if the tx was included in a block at least once (`true`) or not (`false`).
-  * *last_failed_height* - unsigned int; If the transaction validation has previously failed, this tells at what height that occured.
+  * *last_failed_height* - unsigned int; If the transaction validation has previously failed, this tells at what height that occurred.
   * *last_failed_id_hash* - string; Like the previous, this tells the previous transaction ID hash.
   * *last_relayed_time* - unsigned int; Last unix time at which the transaction has been relayed.
   * *max_used_block_height* - unsigned int; Tells the height of the most recent block with an output used in this transaction.
   * *max_used_block_id_hash* - string; Tells the hash of the most recent block with an output used in this transaction.
   * *receive_time* - unsigned int; The Unix time that the transaction was first seen on the network by the node.
   * *relayed* - boolean; States if this transaction has been relayed
-  * *tx_blob* - unsigned int; Hexadecimal blob represnting the transaction.
+  * *tx_blob* - unsigned int; Hexadecimal blob representing the transaction.
   * *tx_json* - json string; JSON structure of all information in the transaction:
     * *version* - Transaction version
     * *unlock_time* - If not 0, this tells when a transaction output is spendable.
     * *vin* - List of inputs into transaction:
       * *key* - The public key of the previous output spent in this transaction.
         * *amount* - The amount of the input, in @atomic-units.
-        * *key_offsets* - A list of integer offets to the input.
+        * *key_offsets* - A list of integer offsets to the input.
         * *k_image* - The key image for the given input
     * *vout* - List of outputs from transaction:
       * *amount* - Amount of transaction output (if coinbase output, otherwise 0), in @atomic-units.
@@ -3073,3 +3112,96 @@ $ curl http://127.0.0.1:18081/pop_blocks -d '{"nblocks":6}' -H 'Content-Type: ap
   "untrusted": false
 }
 ```
+
+
+### **/get_transaction_pool_hashes**
+
+Get hashes from transaction pool.
+
+Alias: *None*.
+
+Inputs: *None*.
+
+Outputs:
+
+* *credits* - unsigned int; If payment for RPC is enabled, the number of credits available to the requesting client. Otherwise, 0.
+* *status* - string; General RPC error code. "OK" means everything looks good.
+* *top_hash* - string; If payment for RPC is enabled, the hash of the highest block in the chain. Otherwise, empty.
+* *tx_hashes* - array of strings; This is an array of transaction hashes in hexadecimal string form.
+* *untrusted* - boolean; States if the result is obtained using the bootstrap mode, and is therefore not trusted (`true`), or when the daemon is fully synced and thus handles the RPC locally (`false`)
+
+Example:
+
+```
+$ curl http://127.0.0.1:18081/get_transaction_pool_hashes -H 'Content-Type: application/json'
+
+{
+  "credits": 0,
+  "status": "OK",
+  "top_hash": "",
+  "tx_hashes": ["e27bb84f1cf1f47a79578d3bb1f47a81745a4c5a5551622b4e924eb0b83f960d","b9f76e686f389e126ada5caf47034c57adeef671d8b899cba1ead606c868f819"],
+  "untrusted": false
+}
+```
+
+
+### **/get_public_nodes**
+
+Get public peer information.
+
+Alias: *None*.
+
+Inputs:
+
+* *gray* - boolean; (Optional; defaults to `false`) Include gray peers.
+* *white* - boolean; (Optional; defaults to `true`) Include white peers.
+* *include_blocked* - boolean; (Optional; defaults to `false`) Include blocked peers.
+
+Outputs:
+
+* *status* - string; General RPC error code. "OK" means everything looks good.
+* *whites* - array of `public_node` structures defined as follows:
+  * *host* - string; The node's IP address. This includes IPv4, IPv6, Onion, and i2p addresses.
+  * *last_seen* - unsigned int; UNIX timestamp of the last time the node was seen.
+  * *rpc_credits_per_hash* - unsigned int; If payment for RPC is enabled, the number of credits the node is requesting per hash. Otherwise, 0.
+  * *rpc_port* - unsigned int; RPC port number of the node.
+* *gray* - array of `public_node` structures; This is an array structures containing node information on gray peers. See *white* above.
+* *untrusted* - boolean; States if the result is obtained using the bootstrap mode, and is therefore not trusted (`true`), or when the daemon is fully synced and thus handles the RPC locally (`false`)
+
+Example:
+
+```
+$ curl http://127.0.0.1:18081/get_public_nodes -d '{"gray":true}' -H 'Content-Type: application/json'
+
+{
+  "gray": [{
+    "host": "142.93.132.1",
+    "last_seen": 0,
+    "rpc_credits_per_hash": 0,
+    "rpc_port": 18089
+  },{
+    "host": "193.142.4.2",
+    "last_seen": 0,
+    "rpc_credits_per_hash": 0,
+    "rpc_port": 19084
+  }],
+  "status": "OK",
+  "untrusted": false,
+  "white": [{
+    "host": "70.52.75.3",
+    "last_seen": 1722812577,
+    "rpc_credits_per_hash": 0,
+    "rpc_port": 18081
+  },{
+    "host": "::ffff:207.180.221.220",
+    "last_seen": 1722872337,
+    "rpc_credits_per_hash": 0,
+    "rpc_port": 18089
+  },{
+    "host": "zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:18083",
+    "last_seen": 1720186288,
+    "rpc_credits_per_hash": 0,
+    "rpc_port": 18089
+  }]
+}
+```

resources/developer-guides/index.md

@@ -20,9 +20,9 @@ meta_descr: developer-guides.head
                         </div>
                     </div>
                     <p><i>{% t developer-guides.outdated %}</i></p>
-                    <h3><span class="icon-page"></span><a href="{{ site.baseurl_root }}/resources/developer-guides/daemon-rpc.html">{% t developer-guides.daemonrpc %}</a></h3>
+                    <h3><span class="icon-page"></span><a href="https://docs.getmonero.org/rpc-library/monerod-rpc/">{% t developer-guides.daemonrpc %}</a></h3>
                         <p>{% t developer-guides.daemonrpc_descr %}</p>
-                    <h3><span class="icon-page"></span><a href="{{ site.baseurl_root }}/resources/developer-guides/wallet-rpc.html">{% t developer-guides.walletrpc %}</a></h3>
+                    <h3><span class="icon-page"></span><a href="https://docs.getmonero.org/rpc-library/wallet-rpc/">{% t developer-guides.walletrpc %}</a></h3>
                         <p>{% t developer-guides.walletrpc_descr %}</p>
                 </div>
             </div>

resources/developer-guides/wallet-rpc.md

@@ -1,9 +1,11 @@
 ---
 layout: user-guide
 title: "Wallet RPC documentation"
+deprecated_url: https://docs.getmonero.org/rpc-library/wallet-rpc/"
 ---
 
 {% t global.lang_tag %}
+
 # Wallet RPC
 
 ## Introduction

resources/moneropedia/transaction-weight.md

@@ -0,0 +1,10 @@
+---
+layout: moneropedia
+title: titles.moneropedia
+entry: moneropedia.entries.transaction-weight
+---
+
+@moneropedia_article
+
+{% t global.lang_tag %}
+{% tf resources/moneropedia/transaction-weight.md %}

resources/roadmap/index.md

@@ -28,7 +28,7 @@ meta_descr: meta_descr.roadmap
                 <div class="tabPanel-widget">
                     <label for="tab-1" tabindex="0"></label>
                     <input id="tab-1" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2014-2019</h2>
+                    <h2>2014-'19</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2014</h2>
                             <ul>
@@ -156,7 +156,7 @@ meta_descr: meta_descr.roadmap
                     </div>
                     <label for="tab-2" tabindex="0"></label>
                     <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2020</h2>
+                    <h2>'20</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2020</h2>
                             <ul>
@@ -178,7 +178,7 @@ meta_descr: meta_descr.roadmap
                     </div>
                     <label for="tab-3" tabindex="0"></label>
                     <input id="tab-3" type="radio" name="tabs" aria-hidden="true" checked>
-                    <h2>2021</h2>
+                    <h2>'21</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2021</h2>
                             <ul>
@@ -192,7 +192,7 @@ meta_descr: meta_descr.roadmap
                     </div>
                     <label for="tab-4" tabindex="0"></label>
                     <input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
-                    <h2>2022</h2>
+                    <h2>'22</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2022</h2>
                             <ul>
@@ -206,7 +206,7 @@ meta_descr: meta_descr.roadmap
                     </div>
                     <label for="tab-5" tabindex="0"></label>
                     <input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
-                    <h2>2023</h2>
+                    <h2>'23</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2023</h2>
                             <ul>
@@ -220,7 +220,7 @@ meta_descr: meta_descr.roadmap
                     </div>
                     <label for="tab-6" tabindex="0"></label>
                     <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
-                    <h2>2024</h2>
+                    <h2>'24</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2024</h2>
                             <ul>
@@ -239,9 +239,9 @@ meta_descr: meta_descr.roadmap
                                 <h3 class="months">{% t roadmap.comingsoon %}</h3>
                                     <li class="ongoing"><a href="https://github.com/Rucknium/OSPEAD">{% t roadmap.ospead %}</a></li>
                                     <li class="ongoing">{% t roadmap.bp++ %}</li>
-                                    <li class="ongoing">{% t roadmap.cuprate %}</li>
+                                    <li class="ongoing"><a href="https://cuprate.org/">{% t roadmap.cuprate %}</a></li>
+                                    <li class="ongoing"><a href="https://github.com/seraphis-migration/strategy/wiki/Our-Wallet-Rewrite-Project-After-Priority-Switched-From-Seraphis-to-FCMPs">{% t roadmap.fcmp-plus %}</a></li>
                                     <li class="upcoming">{% t roadmap.seraphis-jamtis %}</li>
-                                    <li class="upcoming"><a href="https://github.com/seraphis-migration/strategy/wiki/Our-Wallet-Rewrite-Project-After-Priority-Switched-From-Seraphis-to-FCMPs">{% t roadmap.fcmp-plus %}</a></li>
                                     <li class="proposed"><a href="https://github.com/monero-project/research-lab/issues/94">{% t roadmap.mrl-tasks %}</a></li>
                             </ul>
                     </div>

resources/tools/index.md

@@ -20,10 +20,10 @@ meta_descr: meta_descr.tools
                     <div class="col">
                         <h2>{% t tools.block-explorers %}</h2>
                         <p><a href="https://xmrchain.net/">xmrchain.net</a></p>
-                        <p><a href="https://moneroblocks.info">MoneroBlocks</a></p>
                         <p><a href="https://www.exploremonero.com/">Explore Monero</a></p>
                         <p><a href="https://monerovision.com">MoneroVision</a></p>
                         <p><a href="https://p2pool.io/explorer/">P2Pool</a> (<a href="http://yucmgsbw7nknw7oi3bkuwudvc657g2xcqahhbjyewazusyytapqo4xid.onion/explorer/">{% t tools.onion-service %}</a>)</p>
+                        <p><a href="https://localmonero.co/blocks/">LocalMonero.co blocks</a> (<a href="http://nehdddktmhvqklsnkjqcbpmb63htee2iznpcbs5tgzctipxykpj6yrid.onion/blocks">{% t tools.onion-service %}</a>)</p>
                     </div>
                 </div>
             </div>
@@ -47,7 +47,6 @@ meta_descr: meta_descr.tools
                     <div class="col">
                         <h2>{% t tools.network %}</h2>
                         <p><a href="https://monerohash.com/nodes-distribution.html">monerohash.com - {% t tools.monerohash-nodes %}</a></p>
-                        <p><a href="https://localmonero.co/blocks/">LocalMonero.co blocks - {% t tools.localmonero-blocks %}</a></p>
                         <p><a href="https://nownodes.io/nodes/monero-xmr">NOWNodes - {% t tools.nownodes %}</a></p>
                         <p><a href="https://getblock.io">GetBlock - {% t tools.getblockio %}</a></p>
                         <p><a href="https://monero.fail/">Monero.fail - {% t tools.monerofail %}</a></p>
@@ -62,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/join-monero-matrix.md

@@ -1,6 +1,6 @@
 ---
 layout: user-guide
-title: How to join the Monero Core Team Matrix server
+title: Joining the Monero Community Matrix Server via Element
 permalink: /resources/user-guides/join-monero-matrix.html
 outdated: False
 ---

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 %}