Merge branch 'dev' into all-contributors/add-Fuliggine

Author: corwintines

.all-contributorsrc

@@ -10514,6 +10514,15 @@
       "contributions": [
         "content"
       ]
+    },
+    {
+      "login": "Omsify",
+      "name": "Omsify",
+      "avatar_url": "https://avatars.githubusercontent.com/u/87442202?v=4",
+      "profile": "https://github.com/Omsify",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -1642,6 +1642,7 @@ 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/etan-status"><img src="https://avatars.githubusercontent.com/u/89844309?v=4?s=100" width="100px;" alt="Etan Kissling"/><br /><sub><b>Etan Kissling</b></sub></a><br /><a href="#content-etan-status" title="Content">🖋</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linktr.ee/kritik"><img src="https://avatars.githubusercontent.com/u/57076429?v=4?s=100" width="100px;" alt="kritik sah"/><br /><sub><b>kritik sah</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Akritik-sah" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuliggine"><img src="https://avatars.githubusercontent.com/u/56844974?v=4?s=100" width="100px;" alt="Fuliggine"/><br /><sub><b>Fuliggine</b></sub></a><br /><a href="#content-Fuliggine" title="Content">🖋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Omsify"><img src="https://avatars.githubusercontent.com/u/87442202?v=4?s=100" width="100px;" alt="Omsify"/><br /><sub><b>Omsify</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AOmsify" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

src/content/developers/docs/consensus-mechanisms/pos/block-proposal/index.md

@@ -8,7 +8,7 @@ Blocks are the fundamental units of the blockchain. Blocks are discrete units of
 
 ## Prerequisites {#prerequisites}
 
-Block proposal is part of the proof-of-stake protocol. To help understand this page, we recommend you read about [proof-of-stake](src/content/developers/docs/consensus-mechanisms/pos/) and [block architecture](src/content/developers/docs/blocks/).
+Block proposal is part of the proof-of-stake protocol. To help understand this page, we recommend you read about [proof-of-stake](/developers/docs/consensus-mechanisms/pos/) and [block architecture](/developers/docs/blocks/).
 
 ## Who produces blocks? {#who-produces-blocks}
 

src/content/staking/pools/index.md

@@ -60,7 +60,7 @@ Have a suggestion for a staking tool we missed? Check out our [product listing p
 ## Frequently asked questions {#faq}
 
 <ExpandableCard title="How do I earn rewards?">
-Typically ERC-20 staking tokens are issued to stakers that represents the value of their staked ETH plus rewards. Keep in mind that different pools will distribute staking rewards to their users via slightly different methods, but this is the common theme.
+Typically ERC-20 staking tokens are issued to stakers and represent the value of their staked ETH plus rewards. Keep in mind that different pools will distribute staking rewards to their users via slightly different methods, but this is the common theme.
 </ExpandableCard>
 
 <ExpandableCard title="When can I withdraw my stake?">

src/data/community-events.json

@@ -1,4 +1,22 @@
 [
+   {
+    "title": "Road to Devcon（Shenzhen）",
+    "to": "https://ethsz.openbuild.xyz/",
+    "sponsor": null,
+    "location": "Shenzhen, China",
+    "description": "Preheating activities for DEVCON 7 in the China region.Developers and communities, let us gather at Devcon！",
+    "startDate": "2023-10-21",
+    "endDate": "2023-10-21"
+  },
+  {
+    "title": "Ethereum Rio",
+    "to": "https://www.ethereumbrasil.com/",
+    "sponsor": null,
+    "location": "Rio de Janeiro, Brazil",
+    "description": "3rd Edition of LATAM's most loved ETH event. Bootcamp, Buildathon & Conference",
+    "startDate": "2024-04-09",
+    "endDate": "2024-04-14"
+  },
   {
     "title": "ETHKL 2023",
     "to": "https://hack.ethkl.org/",
@@ -201,7 +219,7 @@
     "title": "ETHGlobal Istanbul",
     "to": "https://ethglobal.com/events/istanbul",
     "sponsor": null,
-    "location": "Istanbul, Türkiye",
+    "location": "Istanbul, Turkey",
     "description": "ETHGlobal Istanbul is going to be an event full of hacking, networking, side events and fun activites.",
     "startDate": "2023-11-17",
     "endDate": "2023-11-19"
@@ -331,5 +349,14 @@
     "description": "ETH Riyadh unites developers and builders from Saudi Arabia and the other Middle East regions, nurturing their roles and connections in the Ethereum ecosystem.",
     "startDate": "2023-09-20",
     "endDate": "2023-10-15"
+  },
+  {
+    "title": "A General Forum on Ethereum Localism",
+    "to": "https://pdxdao.xyz/localism/",
+    "sponsor": null,
+    "location": "Portland, OR, USA",
+    "description": "Three days and thoughtful side events will create a container where the Ethereum community can elaborate for itself, in a plurality of directions, what an experimentalism of the city can mean and look like for web3.",
+    "startDate": "2023-10-13",
+    "endDate": "2023-10-15"
   }
 ]