Merge branch 'master' into set-external-anchor-target

.github/workflows/ci.yml

@@ -4,19 +4,19 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0.1' ]
+        ruby: [ '2.7', '3.0.1' ]
     name: Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: install bundler
-        run: gem install bundler:1.17.3
+        run: gem install bundler:2.2.23
       - name: bundle install
         run: bundle install --jobs 4 --retry 3
       - name: build site

.github/workflows/hashes.yaml

@@ -12,13 +12,13 @@ on:
 jobs:
   validate-hashes:
     name: Validate Hashes
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
         run: |
-          sudo apt-get install -y --no-install-recommends curl gpg jq python-pip
-          sudo pip install yq
+          sudo apt-get install -y --no-install-recommends curl gpg jq python3-pip
+          sudo pip3 install yq
       - name: Verify hashes.txt signature
         run: |
           curl -sL https://raw.githubusercontent.com/monero-project/monero/master/utils/gpg_keys/binaryfate.asc |

Gemfile

@@ -4,6 +4,5 @@ gem 'jekyll'
 gem 'jekyll-paginate'
 gem 'builder'
 gem 'wdm', '>= 0.1.0' if Gem.win_platform?
-gem 'jekyll-multiple-languages-plugin'
+gem 'jekyll-multiple-languages-plugin', '= 1.7.0'
 gem 'jekyll-feed'
-gem "webrick", "~> 1.7"

Gemfile.lock

@@ -1,67 +1,71 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     builder (3.2.4)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.0)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.10)
+    google-protobuf (3.21.12)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.0)
+    jekyll (4.3.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3)
+      kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 2.0)
-    jekyll-feed (0.15.1)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-multiple-languages-plugin (1.7.0)
       jekyll (>= 2.0, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    rb-fsevent (0.11.0)
+    public_suffix (5.0.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (4.0.1)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (2.0.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+    sass-embedded (1.57.1)
+      google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
 
 PLATFORMS
@@ -71,9 +75,8 @@ DEPENDENCIES
   builder
   jekyll
   jekyll-feed
-  jekyll-multiple-languages-plugin
+  jekyll-multiple-languages-plugin (= 1.7.0)
   jekyll-paginate
-  webrick (~> 1.7)
 
 BUNDLED WITH
    2.2.23

README.md

@@ -75,7 +75,7 @@ Screenshots cannot be translated as text obviously, so the only viable solution
 For example, if the user guide `How to solo mine with the GUI` is translated into French and you want to have the screenshot translated, follow these steps:
 
 1. Go to `/img/resources/user-guides`
-2. If this is the first localized screenshot for that language, you'll need to create a dedicate folder with the code of that language. In this example we'll use `fr`.
+2. If this is the first localized screenshot for that language, you'll need to create a dedicated folder with the code of that language. In this example we'll use `fr`.
 3. Copy the folder containing the screenshots of the guide you are working on from inside the `en` folder. In this example you have to copy `solo_mine_GUI` into `fr`
 4. Now take a look at the screenshots inside `solo_mine_GUI` and replace them with screenshots of the GUI in French.
 5. Edit the path of the images in the markdown file which contains the guide. Remember that by default all guides point to the English version, so everything you'll have to do is to change the path of the screenshot and replace `en` with your language code. In our example, we need to navigate to `/_i18n/fr/resources/user-guides/solo_mine_GUI.md` and change the path of all screenshots from `/img/resources/user-guides/en/remote_node/SCREENSHOT.png` to `/img/resources/user-guides/fr/remote_node/SCREENSHOT.png`.
@@ -294,7 +294,7 @@ Where `STATUS` can be:
 - `ongoing` for milestones currently being worked on
 - `upcoming` for milestones not yet completed or in progress
 
-If an entry is `completed`, a green tick simble will be displayed on its left. if it's `ongoing` a roadwork sign and `upcoming` a compass.
+If an entry is `completed`, a green tick symbol will be displayed on its left. if it's `ongoing` a roadwork sign and `upcoming` a compass.
 
 `KEY` is the key used in the `_i18n/LANG.yml` file, in the `roadmap` section. If you are adding a new entry, you only need to add the key and its contained text in the `_i18n/en.yml` file. Weblate, the localization platform, will deal with making the string available for translators and then add it to all languages.
 
@@ -304,7 +304,7 @@ The roadmap can be translated on Weblate [on Weblate](https://translate.getmoner
 
 ## How to add a question to the FAQ
 
-The structure of the FAQ is a bit more complex than it used to be and contains anchors, variables and a TOC. A step by step guide would be too complex to follow. A basic knowledge of HTML is necessary to edit the page. If you wish to add a new FAQ please open an issue in the repository or/and contact the Website workgroup.
+The structure of the FAQ is a bit more complex than it used to be and contains anchors, variables and a TOC. A step by step guide would be too complex to follow. Basic knowledge of HTML is necessary to edit the page. If you wish to add a new FAQ please open an issue in the repository or/and contact the Website workgroup.
 
 ## How to add a publication to the Library
 

_data/chats.yml

@@ -18,7 +18,7 @@ chats:
   matrix: https://matrix.to/#/#monero-pools:monero.social
 
 - monero-research-lab:
-  matrix: https://matrix.to/#/#monero-research-lab:matrix.org
+  matrix: https://matrix.to/#/#monero-research-lab:monero.social
 
 - monero-translations:
   matrix: https://matrix.to/#/#monero-translations:monero.social
@@ -27,4 +27,4 @@ chats:
   matrix: https://matrix.to/#/#monero-hardware:matrix.org
 
 - monero-site:
-  matrix: https://matrix.to/#/#monero-site:haveno.network
+  matrix: https://matrix.to/#/#monero-site:monero.social

_data/downloads.yml

@@ -1,30 +1,30 @@
 # 'vers' is meant to be used in case of a platform-specific release (e.g. vers: "0.18.2.0 - Mumbling Potato")
 
 gui:
-- version: "0.18.1.2 - Fluorine Fermi"
+- version: "0.18.2.2 - Fluorine Fermi"
   downloads:
    - platform: Windows 64-bit (Installer)
-     hash: c5dbf3e8fca7341dea1194e57b22f233ceb9471aca8692da6ffd0b4bc3a54a1b
+     hash: 165c183a7490cfe04a8296e05ad592e3e08705c879bd9facf2dab16a6ef2cf05
      link: https://downloads.getmonero.org/gui/win64install
      icon: icon-windows
      vers: 
    - platform: Windows 64-bit (Zip)
-     hash: c57cd8f27dacf64a11a4f86911a99116ab54438c37c87fb7ccb3c616d9a64b6a
+     hash: 770eb381e1eb3490113c1edac67a92506e0b027daa1de8486b8d5fac3b4def54
      link: https://downloads.getmonero.org/gui/win64
      icon: icon-windows
      vers: 
    - platform: macOS Intel
-     hash: 0e2e79471ffcc25b939de1937d54610510eaed0cbb19bbdc21a7aa64a2e9ec73
+     hash: 0b676d21b8133830b8446744382ae7c8b51d0e228713184d70100721504bdd4c
      link: https://downloads.getmonero.org/gui/mac64
      icon: icon-apple
      vers: 
    - platform: Linux 64-bit
-     hash: 1f9406044434eea770f1548a5bad5708f326f7295fb7c12d6c607ff783018a08
+     hash: 027707b0ad740908c26895e3bf569ca284a813263129fe2635049313c5129230
      link: https://downloads.getmonero.org/gui/linux64
      icon: icon-linux
      vers: 
    - platform: Source Code (archive)
-     hash: 29e805d4f97c213d03ab2c9279708d297b0ddf7f5a3f6abe05fb5a7f1c453ff7
+     hash: 58ced28d3eecda0c47f51003ae65b5bdf076ef60bdb25614421a07ef2e0791a4
      link: https://downloads.getmonero.org/gui/source
      icon: icon-github
    - platform: Source Code
@@ -33,65 +33,65 @@ gui:
 
 
 cli:
-- version: "0.18.1.2 - Fluorine Fermi"
+- version: "0.18.2.2 - Fluorine Fermi"
   downloads:
    - platform: Windows 64-bit
-     hash: 0a3d4d1af7e094c05352c31b2dafcc6ccbc80edc195ca9eaedc919c36accd05a
+     hash: 964c13f5d596289d2ab8ba9e265ff1e255a06269cf8fd216187d7b77a11c1371
      link: https://downloads.getmonero.org/cli/win64
      icon: icon-windows
      vers: 
    - platform: Windows 32-bit
-     hash: 71e2990ce860521c54a36c9dc77c3c7acdffc92630c4df03ba1253b428b7ac64
+     hash: b7366408e74b321aa5fa3993187a862d93dc41cbc43dc585f82fc17a4c423ded
      link: https://downloads.getmonero.org/cli/win32
      icon: icon-windows
      vers:
    - platform: macOS Intel
-     hash: ba1108c7a5e5efe15b6a628fb007c50f01c231f61137bba7427605286dbc6f01
+     hash: 8043a681155bf0339dc2eac1feb93d03295bd68c9bb5b472600fa5b1439ba68d
      link: https://downloads.getmonero.org/cli/mac64
      icon: icon-apple
      vers:
    - platform: macOS ARM
-     hash: 620b825c04f84845ed09de03b207a3230a34f74b30a8a07dde504a7d376ee4b9
+     hash: b6acf2716e6474d329d4c0bdf3b797299e4e789758f631bafa3930b613e3643c
      link: https://downloads.getmonero.org/cli/macarm8
      icon: icon-apple
      vers:
    - platform: Linux 64-bit
-     hash: 7d51e7072351f65d0c7909e745827cfd3b00abe5e7c4cc4c104a3c9b526da07e
+     hash: 186800de18f67cca8475ce392168aabeb5709a8f8058b0f7919d7c693786d56b
      link: https://downloads.getmonero.org/cli/linux64
      icon: icon-linux
      vers: 
    - platform: Linux 32-bit
-     hash: ac7b6098fcbe53b91a53e10d75b98d4580f0ec0525b400acfb1ffb6fb7ce8cd4
+     hash: c0999191b57156fc7b4e7e64fe50ffdf16781bae0ebc12c96c41b2c60bdee79f
      link: https://downloads.getmonero.org/cli/linux32
      icon: icon-linux
      vers:
    - platform: Linux ARMv8
-     hash: e1467fe289c98349be2b1c4c080e30a224eb3217c814fab0204241b2b19b9c6b
+     hash: f3867f2865cb98ab1d18f30adfd9168f397bd07bf7c36550dfe3a2a11fc789ba
      link: https://downloads.getmonero.org/cli/linuxarm8
      icon: icon-linux
      vers:
    - platform: Linux ARMv7
-     hash: 94ece435ed60f85904114643482c2b6716f74bf97040a7af237450574a9cf06d
+     hash: 11b70a9965e3749970531baaa6c9d636b631d8b0a0256ee23a8e519f13b4b300
      link: https://downloads.getmonero.org/cli/linuxarm7
      icon: icon-linux
      vers:
    - platform: Android ARMv8
-     hash: e0821251dc02180d2a91bc96835e2f2b2b05f22d3c229d1e819251fa6771bbdf
+     hash: c9d4889ff3f2c01e34f3beb3ab640fd73a535cc715ae8db591fd23724be0401c
      link: https://downloads.getmonero.org/cli/androidarm8
      icon: icon-android
      vers:
    - platform: Android ARMv7
-     hash: 105818bf5e0e7d677c4ea10dbd4df1f8258d5735bbf6348d9f93449f42bea588
+     hash: ec7b9913d048bec79ec7f7320df03e1f9c7ee015a051d8509e2d4ed33ddf3301
      link: https://downloads.getmonero.org/cli/androidarm7
      icon: icon-android
      vers:
    - platform: FreeBSD 64-bit
-     hash: 4b1ab16d35a7e77da7a928a45e0db19474be0ee91f6899bcaae10ee294f2b0a2
+     hash: 187f58410b5aac866f7200bb1e4244ba1940b51db772d33374dfa748f30c11a7
      link: https://downloads.getmonero.org/cli/freebsd64
      icon: icon-freebsd
      vers:
    - platform: Source Code (archive)
-     hash: 0b667acba2223f8f082b388d7ceb5d212e0515b8a94395f3ec69183ef4bebf6c
+     hash: c3345c4ca24aab13182433ccec8f7008ec3e37ba5e8c640714ad015a1f683aac
      link: https://downloads.getmonero.org/cli/source
      icon: icon-github
    - platform: Source Code