Merge branch 'dev' into adding-glossary-tooltips

Author: pettinarip

.all-contributorsrc

@@ -11110,6 +11110,145 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "intldds",
+      "name": "intldds",
+      "avatar_url": "https://avatars.githubusercontent.com/u/80983240?v=4",
+      "profile": "https://github.com/intldds",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "hodlon",
+      "name": "Hodlon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37387563?v=4",
+      "profile": "https://hodlon.art",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "M4x28",
+      "name": "Leonardo Birardi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64036726?v=4",
+      "profile": "https://github.com/M4x28",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Flamenk",
+      "name": "Parrot Iwai",
+      "avatar_url": "https://avatars.githubusercontent.com/u/78525550?v=4",
+      "profile": "https://github.com/Flamenk",
+      "contributions": [
+        "doc",
+        "translation"
+      ]
+    },
+    {
+      "login": "starwalker00",
+      "name": "starwalker00",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68958932?v=4",
+      "profile": "https://github.com/starwalker00",
+      "contributions": [
+        "bug",
+        "doc"
+      ]
+    },
+    {
+      "login": "Eversmile12",
+      "name": "VItto Rivabella",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72762629?v=4",
+      "profile": "http://vitto.cc",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "olafnub",
+      "name": "Andy Li",
+      "avatar_url": "https://avatars.githubusercontent.com/u/101077165?v=4",
+      "profile": "https://www.linkedin.com/in/andy-li-65284220b/",
+      "contributions": [
+        "bug",
+        "doc"
+      ]
+    },
+    {
+      "login": "maxammann",
+      "name": "Max Ammann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/905221?v=4",
+      "profile": "https://maxammann.org/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "dswilson4",
+      "name": "dswilson4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33137497?v=4",
+      "profile": "https://github.com/dswilson4",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "vbaranov",
+      "name": "Victor Baranov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4341812?v=4",
+      "profile": "https://ethereum.stackexchange.com/users/2128/viktor-baranov",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "drehuwann",
+      "name": "drehuwann",
+      "avatar_url": "https://avatars.githubusercontent.com/u/62968123?v=4",
+      "profile": "https://github.com/drehuwann",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "greetfish",
+      "name": "junble",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11615617?v=4",
+      "profile": "https://github.com/greetfish",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "viniciusmorais",
+      "name": "Vinicius de Morais",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3915778?v=4",
+      "profile": "https://github.com/viniciusmorais",
+      "contributions": [
+        "translation",
+        "doc"
+      ]
+    },
+    {
+      "login": "0xhsy",
+      "name": "0xhsy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/102006034?v=4",
+      "profile": "http://www.dsrvlabs.com",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "enjoyooor",
+      "name": "enjoyooor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/147568088?v=4",
+      "profile": "https://github.com/enjoyooor",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1732,6 +1732,27 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rimtaex"><img src="https://avatars.githubusercontent.com/u/155366533?v=4?s=100" width="100px;" alt="RimTaeX"/><br /><sub><b>RimTaeX</b></sub></a><br /><a href="#content-rimtaex" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://zarifpour.xyz"><img src="https://avatars.githubusercontent.com/u/16494335?v=4?s=100" width="100px;" alt="Daniel Zarifpour"/><br /><sub><b>Daniel Zarifpour</b></sub></a><br /><a href="#content-zarifpour" title="Content">🖋</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/intldds"><img src="https://avatars.githubusercontent.com/u/80983240?v=4?s=100" width="100px;" alt="intldds"/><br /><sub><b>intldds</b></sub></a><br /><a href="#content-intldds" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://hodlon.art"><img src="https://avatars.githubusercontent.com/u/37387563?v=4?s=100" width="100px;" alt="Hodlon"/><br /><sub><b>Hodlon</b></sub></a><br /><a href="#content-hodlon" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/M4x28"><img src="https://avatars.githubusercontent.com/u/64036726?v=4?s=100" width="100px;" alt="Leonardo Birardi"/><br /><sub><b>Leonardo Birardi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=M4x28" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Flamenk"><img src="https://avatars.githubusercontent.com/u/78525550?v=4?s=100" width="100px;" alt="Parrot Iwai"/><br /><sub><b>Parrot Iwai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Flamenk" title="Documentation">📖</a> <a href="#translation-Flamenk" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/starwalker00"><img src="https://avatars.githubusercontent.com/u/68958932?v=4?s=100" width="100px;" alt="starwalker00"/><br /><sub><b>starwalker00</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Astarwalker00" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=starwalker00" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://vitto.cc"><img src="https://avatars.githubusercontent.com/u/72762629?v=4?s=100" width="100px;" alt="VItto Rivabella"/><br /><sub><b>VItto Rivabella</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Eversmile12" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/andy-li-65284220b/"><img src="https://avatars.githubusercontent.com/u/101077165?v=4?s=100" width="100px;" alt="Andy Li"/><br /><sub><b>Andy Li</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aolafnub" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=olafnub" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://maxammann.org/"><img src="https://avatars.githubusercontent.com/u/905221?v=4?s=100" width="100px;" alt="Max Ammann"/><br /><sub><b>Max Ammann</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=maxammann" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dswilson4"><img src="https://avatars.githubusercontent.com/u/33137497?v=4?s=100" width="100px;" alt="dswilson4"/><br /><sub><b>dswilson4</b></sub></a><br /><a href="#content-dswilson4" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://ethereum.stackexchange.com/users/2128/viktor-baranov"><img src="https://avatars.githubusercontent.com/u/4341812?v=4?s=100" width="100px;" alt="Victor Baranov"/><br /><sub><b>Victor Baranov</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=vbaranov" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/drehuwann"><img src="https://avatars.githubusercontent.com/u/62968123?v=4?s=100" width="100px;" alt="drehuwann"/><br /><sub><b>drehuwann</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=drehuwann" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/greetfish"><img src="https://avatars.githubusercontent.com/u/11615617?v=4?s=100" width="100px;" alt="junble"/><br /><sub><b>junble</b></sub></a><br /><a href="#ideas-greetfish" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/viniciusmorais"><img src="https://avatars.githubusercontent.com/u/3915778?v=4?s=100" width="100px;" alt="Vinicius de Morais"/><br /><sub><b>Vinicius de Morais</b></sub></a><br /><a href="#translation-viniciusmorais" title="Translation">🌍</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=viniciusmorais" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.dsrvlabs.com"><img src="https://avatars.githubusercontent.com/u/102006034?v=4?s=100" width="100px;" alt="0xhsy"/><br /><sub><b>0xhsy</b></sub></a><br /><a href="#ideas-0xhsy" title="Ideas, Planning, & Feedback">🤔</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/enjoyooor"><img src="https://avatars.githubusercontent.com/u/147568088?v=4?s=100" width="100px;" alt="enjoyooor"/><br /><sub><b>enjoyooor</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=enjoyooor" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-org-website",
-  "version": "8.0.0",
+  "version": "8.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

public/_redirects

@@ -72,9 +72,9 @@
 
 /en/dart/ /en/developers/docs/programming-languages/dart/ 301!
 
-/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
+/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!
+/en/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
 
 /*/beginners /:splat/what-is-ethereum/ 301!
 
@@ -148,8 +148,6 @@
 
 /*/eth2 /:splat/upgrades/ 301!
 
-/*/developers/docs/scaling /:splat/developers/docs/scaling 301!
-
 /*/developers/docs/scaling/layer-2-rollups /:splat/developers/docs/scaling 301!
 
 /*/about/web-developer /:splat/about/#open-jobs 301!

public/content/community/events/index.md

@@ -11,7 +11,7 @@ hideEditButton: true
 
 <UpcomingEventsList/>
 
-This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.json)!
+This is a non-exhaustive list maintained by our community. Know of an upcoming Ethereum event to add to this list? [Please add it](https://github.com/ethereum/ethereum-org-website/blob/dev/src/data/community-events.ts)!
 
 ## Ethereum meetups {#meetups}
 

public/content/community/grants/index.md

@@ -33,6 +33,7 @@ These projects have created their own grants for projects aimed at developing an
 - [Lido Ecosystem Grants Organisation (LEGO)](https://lido.fi/lego) – _[Lido](https://lido.fi/) finance ecosystem_
 - [MetaMask Program](https://metamaskgrants.org/) - _[MetaMask](https://metamask.io/) employee-led grants DAO_
 - [SKALE Network Grants Program](https://skale.space/developers#grants) - _[SKALE Network](https://skale.space/) ecosystem_
+- [Swarm Foundation Grants Program](https://my.ethswarm.org/grants) - _[Swarm Foundation](https://www.ethswarm.org/) ecosystem_
 - [The Graph](https://thegraph.com/ecosystem/grants/) – _[The Graph](https://thegraph.com/) ecosystem_
 - [Uniswap Grants Program](https://www.uniswapfoundation.org/grants) – _[Uniswap](https://uniswap.org/) community_
 - [Web3 Grants](https://web3grants.net) - _An extensive list of web3/crypto related grant programs_

public/content/contributing/translation-program/content-buckets/index.md

@@ -152,9 +152,9 @@ Below is a breakdown of the website pages each content bucket contains.
 
 - [Proof-of-work](/developers/docs/consensus-mechanisms/pow/)
 - [Mining](/developers/docs/consensus-mechanisms/pow/mining/)
-- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/)
-- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/)
-- [Ethash](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/)
+- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/)
+- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/)
+- [Ethash](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/)
 
 ## 15) Ethereum stack developer docs {#ethereum-stack-docs}
 
@@ -239,9 +239,9 @@ Below is a breakdown of the website pages each content bucket contains.
 - [Recursive-length prefix (RLP) serialization](/developers/docs/data-structures-and-encoding/rlp/)
 - [Network addresses](/developers/docs/networking-layer/network-addresses/)
 - [Simple serialize](/developers/docs/data-structures-and-encoding/ssz/)
-- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/)
-- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/)
-- [Ethash](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/)
+- [Mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/)
+- [Dagger-Hashimoto](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/)
+- [Ethash](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/)
 - [Gasper](/developers/docs/consensus-mechanisms/pos/gasper/)
 - [Weak subjectivity](/developers/docs/consensus-mechanisms/pos/weak-subjectivity/)
 - [Web3 secret storage definition](/developers/docs/data-structures-and-encoding/web3-secret-storage/)

public/content/desci/index.md

@@ -68,7 +68,7 @@ The current standard model for funding science is that individuals or groups of
 
 Studies have shown that grant review panels do a poor job of selecting high-quality proposals as the same proposals given to different panels have wildly different outcomes. As funding has become more scarce, it has concentrated into a smaller pool of more senior researchers with more intellectually conservative projects. The effect has created a hyper-competitive funding landscape, entrenching perverse incentives and stifling innovation.
 
-Web3 has the potential to disrupt this broken funding model by experimenting with different incentive models developed by DAOs and Web3 broadly. [Retroactive public goods funding](https://medium.com/ethereum-optimism/retroactive-public-goods-funding-33c9b7d00f0c), [quadratic funding](https://papers.ssrn.com/sol3/papers.cfm?abstract_id=2003531), [DAO governance](https://www.antler.co/blog/daos-and-web3-governance) and [tokenized incentive structures](https://cdixon.org/2017/05/27/crypto-tokens-a-breakthrough-in-open-network-design) are some of the Web3 tools that could revolutionize science funding.
+Web3 has the potential to disrupt this broken funding model by experimenting with different incentive models developed by DAOs and Web3 broadly. [Retroactive public goods funding](https://medium.com/ethereum-optimism/retroactive-public-goods-funding-33c9b7d00f0c), [quadratic funding](https://papers.ssrn.com/sol3/papers.cfm?abstract_id=2003531), [DAO governance](https://www.antler.co/blog/daos-and-web3-governance-the-promise-implications-and-challenges-ahead) and [tokenized incentive structures](https://cdixon.org/2017/05/27/crypto-tokens-a-breakthrough-in-open-network-design) are some of the Web3 tools that could revolutionize science funding.
 
 ### IP ownership and development {#ip-ownership}
 

public/content/developers/docs/blocks/index.md

@@ -56,7 +56,7 @@ The block `body` contains several fields of its own:
 | `eth1_data`          | information about the deposit contract             |
 | `graffiti`           | arbitrary data used to tag blocks                  |
 | `proposer_slashings` | list of validators to be slashed                   |
-| `attester_slashings` | list of validators to be slashed                   |
+| `attester_slashings` | list of attesters to be slashed                   |
 | `attestations`       | list of attestations in favor of the current block |
 | `deposits`           | list of new deposits to the deposit contract       |
 | `voluntary_exits`    | list of validators exiting the network             |

public/content/developers/docs/consensus-mechanisms/pow/mining/index.md

@@ -70,9 +70,9 @@ Watch Austin walk you through mining and the proof-of-work blockchain.
 
 ## The mining algorithm {#mining-algorithm}
 
-Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/ethash/). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining-algorithms/dagger-hashimoto/).
+Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/).
 
-[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining-algorithms/).
+[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/).
 
 ## Related topics {#related-topics}