Merge branch 'master' of github.com:monero-project/monero-site into HEAD

.github/workflows/hashes.yaml

@@ -46,18 +46,18 @@ jobs:
               filename="${the_line[$length]}"
               echo "${filename}"
           }
-          # expects cli files between lines 2-13 and gui 14-18 (comments do not count, 1st line = 0)
-          # to add a new file to the cli, $num must be -gt 1 and -lt 15.
-          # gui $num is now -gt 14 and -lt 20 (new line has been added above)
+          # expects cli files between lines 2-14 and gui 15-19 (comments do not count, 1st line = 0)
+          # to add a new file to the cli, $num must be -gt 1 and -lt 16.
+          # gui $num is now -gt 15 and -lt 21 (new line has been added above)
           # a new gui file will only increase the -lt number by 1
           # changes to extensions / new files must be reflected in the cli_files / gui_files lists below
           num=0
           for line in "${lines[@]}"; do
-              if [ $num -gt 1 ] && [ $num -lt 14 ] ; then
+              if [ $num -gt 1 ] && [ $num -lt 15 ] ; then
                   #CLI
                   filename=$(get_filename "${line}")
                   filenames_cli+=("${filename}")
-              elif [ $num -gt 13 ] && [ $num -lt 20 ] ; then
+              elif [ $num -gt 14 ] && [ $num -lt 21 ] ; then
                  #GUI
                   filename=$(get_filename "${line}")
                   filenames_gui+=("${filename}")
@@ -71,6 +71,7 @@ jobs:
           "monero-freebsd-x64-${version_cli}.tar.bz2" \
           "monero-linux-armv7-${version_cli}.tar.bz2" \
           "monero-linux-armv8-${version_cli}.tar.bz2" \
+          "monero-linux-riscv64-${version_cli}.tar.bz2" \
           "monero-linux-x64-${version_cli}.tar.bz2" \
           "monero-linux-x86-${version_cli}.tar.bz2" \
           "monero-mac-armv8-${version_cli}.tar.bz2" \
@@ -141,6 +142,7 @@ jobs:
                       *cli/linux32) filename=monero-linux-x86 ;;
                       *cli/linuxarm8) filename=monero-linux-armv8 ;;
                       *cli/linuxarm7) filename=monero-linux-armv7 ;;
+                      *cli/linuxriscv64) filename=monero-linux-riscv64 ;;
                       *cli/androidarm8) filename=monero-android-armv8 ;;
                       *cli/androidarm7) filename=monero-android-armv7 ;;
                       *cli/freebsd64) filename=monero-freebsd-x64 ;;

README.md

@@ -106,15 +106,15 @@ After you've done all the above, you'll need to [open an issue on the repository
 
 ### GitHub Issues
 
-We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributor and the issue is not closed we ask that you close it in a timely manner. A contributor may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
+We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but if your issue is resolved by a contributor and the issue is not closed we ask that you close it in a timely manner. A contributor may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
 
 ### Reviewing Process
 
-When a pull request suggesting changes is opened, it will be merged only once it will be reviewed (with some exceptions, like binaries and hashes updates). The process to review a PR is simple:
+When a pull request suggesting changes is opened, it will be merged only once it is reviewed (with some exceptions, like binaries and hashes updates). The process to review a PR is simple:
 
 1. Go through the suggested changes and check that everything is fine and nothing is broken. We have multiple tools that make this process easier: Netlify's previews, which will show a preview of how the website will look like once the PR is merged; GitHub's checks, which will try to build the PR and will say if there were errors during the process.
 2. if you think something should be changed, comment on the interested lines, stating clearly what changes you suggest and why. GitHub gives [a set of useful tools](https://github.com/features/code-review/) to make code review easier for both authors and reviewers.
-3. When you think the PR is ready to be merged, use GitHub's native "Approve" option, or write a comment explicitly stating your approval. Some common ways to approve a PR is by writing: *ACK/uTACK*, *Reviewed* and *LGTM (Let's Get This Merged)*. Doesn't matter what wording you use, just make your approval clear.
+3. When you think the PR is ready to be merged, use GitHub's native "Approve" option, or write a comment explicitly stating your approval. Some common ways to approve a PR are by writing: *ACK/uTACK*, *Reviewed* and *LGTM (Let's Get This Merged)*. Doesn't matter what wording you use, just make your approval clear.
 4. In the case you wish a PR doesn't get merged for some reason, make it known by using clear wording. A common way to show disapproval is by writing *NACK (Not Acknowledged)*. NACKing a PR should be accompanied by a detailed explanation of why that PR should be refused.
 
 ## Updates on User Guides
@@ -127,9 +127,9 @@ To keep track of those changes, the user guides (but not the developer guides) a
 {% include disclaimer.html translated="no" translationOutdated="no" %}
 ```
 
-This snippet is responsible for keeping track of the language version. If the guide is translated, change `translated="no"` to `translated="yes"`. if the page is translated, but something changed in the original guide in English, change `translationOutdated="no"` to `translationOutdated="yes"`.
+This snippet is responsible for keeping track of the language version. If the guide is translated, change `translated="no"` to `translated="yes"`. If the page is translated, but something changed in the original guide in English, change `translationOutdated="no"` to `translationOutdated="yes"`.
 
-The based version (English version) is however also tracked in the `Front Matter` from the /resources/user-guides/ directory file:
+However, the based version (English version) is tracked in the `Front Matter` from the `/resources/user-guides/` directory file:
 
 ```
 outdated: False
@@ -139,13 +139,13 @@ If the guide is outdated, simply change `False` into `True`.
 
 When you update a guide, you are responsible for updating this version tracking in every file involved in your update. Don't be afraid to ask for help if the process is not clear to you.
 
-The screenshots of all user guides are in `/img/user-guides/LANG`. Where `LANG` can be any of the languages supported by Getmonero. By default, all localized versions of the website will use the English version of the screenshots, see the [translations](#translation) section for info about translating screenshots.
+The screenshots of all user guides are in `/img/user-guides/LANG`, where `LANG` can be any of the languages supported by Getmonero. By default, all localized versions of the website will use the English version of the screenshots. See the [translations](#translation) section for info about translating screenshots.
 
 ## How to make a blog post
 
 ### 1. Make a file
 
-Navigate to the \_posts folder of the website and make a new file. Be sure the file name has no spaces and the ending is .md. Take a look at the other posts to get an idea of how to name yours
+Navigate to the `_posts` folder of the website and make a new file. Be sure the file name has no spaces and the ending is .md. Take a look at the other posts to get an idea of how to name yours
 
 ### 2. Front Matter
 
@@ -171,17 +171,17 @@ After the front matter is finished you are free to write the remainder of your b
 
 ### 1. Quick Start
 
-* Create file in /resources/user-guides with an .md ending and no spaces in filename.
-* Create file in /\_i18n/en/resources/user-guides with the exact same filename as above ending in .md
+* Create file in `/resources/user-guides` with an .md ending and no spaces in filename.
+* Create file in `/_i18n/en/resources/user-guides` with the exact same filename as above ending in .md
 * Write User Guide
 * Add versioning snippet
-* Add guide using markdown in the correct category, and in alphabetic order, in ALL LANGUAGES to /\_i18n/[ALL LANGUAGES]/resources/user-guides/index.md being careful not to mess with any indentation
+* Add guide using markdown in the correct category, and in alphabetic order, in ALL LANGUAGES to `/_i18n/[ALL LANGUAGES]/resources/user-guides/index.md` being careful not to mess with any indentation
 * Test/Build
 * Submit PR
 
 ### 2. Make a file
 
-Navigate to the /resources/user-guides folder and make a new file. Be sure the file name has no spaces and the ending is `.md`
+Navigate to the `/resources/user-guides` folder and make a new file. Be sure the file name has no spaces and the ending is `.md`
 
 ### 3. Content of file
 
@@ -212,7 +212,7 @@ If you are copying the structure of another guide, the snippet will be already t
 
 ### 5. Add Guide to the 'User Guide' landing page of EACH LANGUAGE
 
-In the /\_i18n/[ORIGINAL LANGUAGE OF USER GUIDE]/resources/user-guides folder, find the file labeled index.md and open it.
+In the `/_i18n/[ORIGINAL LANGUAGE OF USER GUIDE]/resources/user-guides` folder, find the file labeled index.md and open it.
 
 DO NOT CHANGE ANYTHING IN THIS DOCUMENT BESIDES WHAT YOU ARE INSTRUCTED TO.
 
@@ -226,7 +226,7 @@ In the event that you think your User Guide should be in a new Category that doe
 
 ### 1. Make a Global file
 
-Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
+Navigate to the `/resources/moneropedia` folder and make a new file. Be sure the file name has no spaces and the ending is .md
 Fill this file with this exact content:
 
 ```
@@ -247,7 +247,7 @@ Where `ENTRY` is a one word identifier for the title/name of your Moneropedia en
 
 ### 2. Make the localized File
 
-Navigate to the /\_i18n/en/resources/moneropedia folder and make a new file. give it the same <name>.md than in previous step.
+Navigate to the `/_i18n/en/resources/moneropedia` folder and make a new file. give it the same <name>.md than in previous step.
 Start the file with the front Matter:
 
 ```

_data/downloads.yml

@@ -80,6 +80,11 @@ cli:
      link: https://downloads.getmonero.org/cli/linuxarm7
      icon: icon-linux
      vers:
+   - platform: Linux RISC-V 64-bit 
+     hash: 
+     link: https://downloads.getmonero.org/cli/linuxrisc64
+     icon: icon-linux
+     vers:
    - platform: Android ARMv8
      hash: 6d9c7d31942dde86ce39757fd55027448ceb260b60b3c8d32ed018211eb4f1e4
      link: https://downloads.getmonero.org/cli/androidarm8

_i18n/de.yml

@@ -488,7 +488,7 @@ press-kit:
   whyconf1: Wir empfehlen jedem, Community-Mitglieder aus dem größten Datenschutzprojekt
     in verwandte Nachrichtenartikel und Veranstaltungen einzubeziehen.
   altpk-2: Bild von fluffypony während einer Präsentation vor Publikum auf der DEFCON
-  altpk-1: Bild einer Frau, die vor einem "Monero Talk"-Banner steht
+  altpk-1: Bild einer Frau, die vor einem Monero Talk-Banner steht
   whycommunity1: Monero ist für Transaktionen bekannt, die weitaus privater sind als
     bei allen anderen Kryptowährungen zusammen.
   contactsp: Es gibt mehrere Möglichkeiten, mit der Community in Kontakt zu treten.

_i18n/el.yml

@@ -12,7 +12,7 @@ library:
     \ δίκτυο Monero, την αρχιτεκτονική peer-to-peer, τον κύκλο ζωής συναλλαγών και\
     \ τις αρχές ασφαλείας.</li> <li>Εισαγωγές σε τεχνικά ιδρύματα του Monero, που\
     \ προορίζονται για προγραμματιστές, μηχανικούς, αρχιτέκτονες λογισμικού και περίεργους\
-    \ χρήστες.</ li> <li>Νέες εξελίξεις, όπως τα Kovri, Bulletproofs, Πολλαπλές Υπογραφές,\
+    \ χρήστες.</li> <li>Νέες εξελίξεις, όπως τα Kovri, Bulletproofs, Πολλαπλές Υπογραφές,\
     \ Υλικά Πορτοφόλια κ.λπ.</li> </ul>\n"
   zerotomonerov1p: "Δημοσιεύθηκε: 26 Ιουνίου 2018, με <a href=\"https://github.com/UkoeHB/Monero-RCT-report\"\
     >πηγαίο κώδικα LaTeX εδώ</a>\n"

_i18n/en.yml

@@ -169,6 +169,9 @@ merchants:
   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.
   cexp: Centralized exchanges that offer exchanging Monero for national currencies and cryptocurrencies.
   swappersp: Swappers let users exchange XMR for other cryptocurrencies.
+  basicswapdexdesc: Decentralized P2P atomic swaps with a strong focus on the user experience.
+  visitbasicswapdex: Visit BasicSwapDEX
+  setreq: Setup required
 
 sponsorships:
   intro: The following businesses actively support the Monero Project in its goal to bring financial privacy to the world. We couldn't be more grateful for their contributions. If you would like to sponsor the Monero Project and be listed on this page, please send an email to [email protected].
@@ -343,7 +346,7 @@ press-kit:
   whycommunity1: Monero is trusted for more private transactions than all other cryptocurrencies combined.
   whyconf: The Monero community has substantial involvement at Defcon, Grayhat and the CCC (Chaos Computer Club). The Monero Konferenco, an academic conference, is hosted annually.
   whyconf1: We encourage everyone to include community members from the largest privacy project in related news articles and events.
-  altpk-1: Picture of a woman standing in front of a 'Monero Talk' banner
+  altpk-1: Picture of a woman standing in front of a Monero Talk banner
   altpk-2: Picture of fluffypony making a presentation in front of a crowd at DEFCON
 
 accepting:
@@ -706,6 +709,7 @@ user-guides:
   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
 
 roadmap:
   completed: Completed task
@@ -941,6 +945,8 @@ library:
   zkbasicscheatsheet20220621p: >
     A lightly theoretical interlude (hopefully still gentle, trying to stress concepts more than formalism and selecting the approached topics) to lay the foundations for Bulletproof and other future Zero-Knowledge-related features, if any.
   newsletters: Newsletters
+  revuomonero: >
+    Revuo Monero is a weekly newsletter where you can find the most recent Monero news.
   themonerostandard: >
     Monero Standard is a weekly publication by recanman, providing up-to-date news and information on the Monero protocol.
     In addition to covering the latest developments in the Monero community, The Monero Standard also includes a weekly price chart, mining pool chart, blockchain statistics, and even a Meme of the Week.

_i18n/en/resources/moneropedia/unlocktime.md

@@ -15,8 +15,6 @@ Note that this works differently than Bitcoin's [nLockTime](https://en.bitcoin.i
 
 Using `unlock_time` has privacy consequences for the user(s) (and the wider Monero network if it is flooded with these). The value is public on the blockchain, so be aware of potential clustering. The feature is rarely used and may be removed in a future Monero release, so the Monero developers advise against building critical infrastructure that depends on this feature. 
 
-Decoy outputs may be selected from these locked outputs, thus identifying them as provable decoy outputs. At the moment, this has little impact on wider network privacy since this unlock time feature is so rarely used. 
-
 Further, true spends after a reasonably long lock time (more than several days) may be heuristically identified as the true spend, since there will be fewer other transactions using those outputs as decoys around that time period.
 
 Users should verify that the outputs they receive from others are not encumbered by an unexpected unlock time. Users may want to hold off acting upon such a transaction until the unlock time lapses. The `show_transfers` command includes the unlock time.

_i18n/en/resources/moneropedia/wallet.md

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

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

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

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

@@ -0,0 +1,34 @@
+{% 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.
+
+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.
+
+### Getting Element
+
+Go to [element.io](https://element.io/get-started#download) to download the latest version of the Element app on your computer. Alternatively you can use the Element [web app](https://app.element.io). There are Android apps available on [F-Droid](https://f-droid.org/packages/im.vector.app/) or [Google Play](https://play.google.com/store/apps/details?id=im.vector.app). As well as an app for [iPhone](https://apps.apple.com/app/vector/id1083446067). Once you have accessed the client of your choice create an account on our host server.
+
+### 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.
+
+When signing up choose to edit your host server and type in `matrix.monero.social` as shown.
+
+Web/Desktop view
+
+![Web-Desktop-View](/img/resources/user-guides/en/join-monero-matrix/desktop-web.png){:width="600px"}
+
+Android view
+
+![iPhone-View](/img/resources/user-guides/en/join-monero-matrix/android.png){:height="600px"}
+
+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. 
+
+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!
+