Merge branch 'dev' of github.com:ethereum/ethereum-org-website into dev

Author: nhsz

.all-contributorsrc

@@ -1521,7 +1521,7 @@
       "login": "sassal",
       "name": "sassal",
       "avatar_url": "https://avatars0.githubusercontent.com/u/9276959?v=4",
-      "profile": "https//twitter.com/sassal0x",
+      "profile": "https://twitter.com/sassal0x",
       "contributions": [
         "content"
       ]
@@ -8830,7 +8830,7 @@
       "login": "joonspoon",
       "name": "June Clarke ",
       "avatar_url": "https://avatars.githubusercontent.com/u/302478?v=4",
-      "profile": "jointheleague.org",
+      "profile": "https://www.jointheleague.org/",
       "contributions": [
         "doc"
       ]
@@ -8839,7 +8839,7 @@
       "login": "slf188",
       "name": "菲利",
       "avatar_url": "https://avatars.githubusercontent.com/u/49417481?v=4",
-      "profile": "huggingface.co/slf188",
+      "profile": "https://huggingface.co/slf188",
       "contributions": [
         "doc"
       ]

.github/ISSUE_TEMPLATE/suggest_glossary_term.yaml

@@ -31,7 +31,7 @@ body:
   - type: textarea
     id: glossary_term_sources
     attributes:
-      label: Sources, if any (please do not submit copywrited content without appropriate approval)
+      label: Sources, if any (please do not submit copyrighted content without appropriate approval)
       description: Please list any sources utilized
     validations:
       required: false

README.md

@@ -402,7 +402,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://etherworld.co"><img src="https://avatars0.githubusercontent.com/u/29681685?v=4?s=100" width="100px;" alt="Pooja Ranjan"/><br /><sub><b>Pooja Ranjan</b></sub></a><br /><a href="#content-poojaranjan" title="Content">🖋</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https//twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://zaremba.ch"><img src="https://avatars0.githubusercontent.com/u/811701?v=4?s=100" width="100px;" alt="Robert Zaremba"/><br /><sub><b>Robert Zaremba</b></sub></a><br /><a href="#content-robert-zaremba" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tasdienes"><img src="https://avatars1.githubusercontent.com/u/18563486?v=4?s=100" width="100px;" alt="Tas"/><br /><sub><b>Tas</b></sub></a><br /><a href="#ideas-tasdienes" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-tasdienes" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/s-pace"><img src="https://avatars2.githubusercontent.com/u/32097720?v=4?s=100" width="100px;" alt="Sylvain Pace"/><br /><sub><b>Sylvain Pace</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=s-pace" title="Code">💻</a></td>
@@ -1409,8 +1409,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://www.xcubicle.com"><img src="https://avatars.githubusercontent.com/u/381050?v=4?s=100" width="100px;" alt="Patoshi"/><br /><sub><b>Patoshi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=patoshii" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="jointheleague.org"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt="June Clarke "/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="huggingface.co/slf188"><img src="https://avatars.githubusercontent.com/u/49417481?v=4?s=100" width="100px;" alt="菲利"/><br /><sub><b>菲利</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=slf188" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.jointheleague.org/"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt="June Clarke "/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://huggingface.co/slf188"><img src="https://avatars.githubusercontent.com/u/49417481?v=4?s=100" width="100px;" alt="菲利"/><br /><sub><b>菲利</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=slf188" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DamitusThyYeetus123"><img src="https://avatars.githubusercontent.com/u/108782125?v=4?s=100" width="100px;" alt="DamitusThyYeetus123"/><br /><sub><b>DamitusThyYeetus123</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=DamitusThyYeetus123" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/matusame"><img src="https://avatars.githubusercontent.com/u/97032288?v=4?s=100" width="100px;" alt="matusame"/><br /><sub><b>matusame</b></sub></a><br /><a href="#translation-matusame" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/laurentlucian"><img src="https://avatars.githubusercontent.com/u/33508364?v=4?s=100" width="100px;" alt="Lohan"/><br /><sub><b>Lohan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=laurentlucian" title="Code">💻</a></td>

netlify.toml

@@ -22,4 +22,5 @@
     "./src/intl/**/*",
     "!./public/**/*",
     "!./node_modules/@swc/core-linux-x64-musl/**/*",
+    "!./node_modules/@swc/core-linux-x64-gnu/**/*",
   ]

package.json

@@ -25,6 +25,7 @@
     "@docsearch/react": "^3.5.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
+    "@radix-ui/react-navigation-menu": "^1.1.4",
     "@socialgouv/matomo-next": "^1.8.0",
     "clipboard": "^2.0.11",
     "embla-carousel-react": "^7.0.0",

public/.well-known/security.txt

@@ -2,27 +2,26 @@
 Hash: SHA256
 
 Contact: mailto:[email protected]
-Expires: 2023-12-31T23:59:00.000Z
+Expires: 2026-12-31T23:59:00.000Z
 Encryption: https://ethereum.org/security_at_ethereum.org.asc
 Acknowledgments: https://bounty.ethereum.org
 Preferred-Languages: en
 Canonical: https://ethereum.org/.well-known/security.txt
 Policy: https://bounty.ethereum.org
 Hiring: https://ethereum.org/en/community/get-involved/#ethereum-jobs
-
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmMV3bMACgkQ6I0zNPpf
-agrOjhAAgMDS9RJUbJzcAybRfp/STq4Kf50TFd3iqx/t8ECw5UGazefieHesOhZ5
-9B9l6VAIHEGqbm+ukkhT+eBofhkAGEupiH/rUTy3hpFo1Ggp9QGi464Y8RyB0hID
-BwjAsAVEdHyh8T6YrqxKRGvgELuEMZfuPfVhdIGU8CfEQozzuA9q3mChckXdTlSt
-TvOKTMdnNPMlEhp4dT93iQaXDBAncE48TkUi/c8U4qolkskuDhZ4qJkc7xcv5Uk4
-TfF83Xs87AF9ZmABWawlCx7VHhp0HGljtGUpobf2DXV0TG77/dZzMQ4xdyqvDq+v
-tm3djp3UHZVhOkDxMKpBzLnCkCvyvh/tvN4j/trdHHzXx6gEEkuiR5wPPoomCosi
-95AGNFf0vpe2HucL/bOrBySxME+hifAnmkiaXltLbyUUTBQPfkHMHMoq1dmPokm2
-4RZaZ1A/K7rirZLC4w/RmxONVqvxT0baFTcZGyKzYm6gEZ9kCwWw1tyEl472yK0H
-UR2cAhlo+Wa61cOTtwHVw0FMVyG0xZkR04y8WM3T8lE6imGLSmCDgPMZm8XnKdkY
-SMGD3+TzLxe6mymmw+1dGXCPjjkImdrhBGxlwEU74vkFQKiWv/GftiDYYcilcQbS
-OD1N7PTmpef+JEYXOpwxxUTSXu0SfVTSkx0wnHkqbib7Wwv5IwY=
-=g+49
+iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmXYslMACgkQ6I0zNPpf
+agrlTA//Q1P+fzNaYtUUm7pg7Jz4VaEACaQZ5qNNmKl9VZ6yCS45pmqpPAAyDM2p
+ZyFOUF3Q3UmHdwmVEGrHSREhoqx5I78KH4dmx4G38RG+4SMhSCZG0Ztf9Z3Dg0o2
+ZeO7vS7mp/STyxiG1Nnkg5Ivhuhq8sdQXF7hM+9JUVri7upEH0QtdAS/jZaoLCvx
+GsWe8XnBru8aH9O2kCO4iigCphOpzaSORJH7rcuo/mo6jGvJER4J0RkjK2KMX7W/
+TFQmpR+8Sxaw+einVEQBDppcbBhOO7yAHq3TQOa01pxIQJ2togJ0Sl3pUiYeqPgf
+aITyRfzhyh+zEb7V49QOIohvazZA7gnBmgUW8xF9cfTrChsxKV8TxovGc/cHroy9
+JI8XkJaZbX1GlbIUqTKgc/MF01gXXVTyjbnQ6HtCNG4BAq3hsWDnoziodGFojn/+
+PiY9cLok8Jxy6nzV0ANLunfbNF2usjPEDFxRviCSS3NoBXhq0+Ra/MXljKB46lb5
+qkfBdsAF9IJ8Bx7knrLbpVMe8tciXcXqorCfEBZONNk9RL5OkuDQgPQXi/2sRXXN
+xxIpxkDf63104NIypjEjp5c8WkD+VF84BhNuhYsp50T2hfgtL39vOGaQ2593Rss1
+j8MNLO2xlwoHiJoTe3CFw/Yl7MtjJSxiaQ0v42JRxyjclLDX1Rc=
+=CMMm
 -----END PGP SIGNATURE-----

public/_redirects

@@ -72,9 +72,9 @@
 
 /en/dart/ /en/developers/docs/programming-languages/dart/ 301!
 
-/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
+/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
 
-/en/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
+/en/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
 
 /*/beginners /:splat/what-is-ethereum/ 301!
 
@@ -148,7 +148,7 @@
 
 /*/eth2 /:splat/upgrades/ 301!
 
-/*/developers/docs/layer-2-scaling /:splat/developers/docs/scaling 301!
+/*/developers/docs/scaling /:splat/developers/docs/scaling 301!
 
 /*/developers/docs/scaling/layer-2-rollups /:splat/developers/docs/scaling 301!
 

public/content/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/index.md renamed to public/content/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/index.md

@@ -4,7 +4,7 @@ description: A detailed look at the Dagger-Hashimoto algorithm.
 lang: en
 ---
 
-Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining was switched off completely at [The Merge](/updates/merge) on 15th September 2022. Since then, Ethereum has been secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead. This page is for historical interest - the information here is no longer relevant for post-Merge Ethereum.
+Dagger-Hashimoto was the original research implementation and specification for Ethereum's mining algorithm. Dagger-Hashimoto was superseded by [Ethash](#ethash). Mining was switched off completely at [The Merge](/roadmap/merge/) on 15th September 2022. Since then, Ethereum has been secured using a [proof-of-stake](/developers/docs/consensus-mechanisms/pos) mechanism instead. This page is for historical interest - the information here is no longer relevant for post-Merge Ethereum.
 
 ## Prerequisites {#prerequisites}