Skip to content

Commit 7db51cd

Browse files
wackerowsamajammin
andcommitted
chore: copy adjustments
Co-Authored-By: Sam Richards <sbrichards@gmail.com>
1 parent eaad30f commit 7db51cd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/content/upgrades/beacon-chain/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sidebar: true
77
image: ../../../assets/upgrades/core.png
88
summaryPoint1: The Beacon Chain introduced proof-of-stake to the Ethereum ecosystem.
99
summaryPoint2: It was merged with the original Ethereum proof-of-work chain in September 2022.
10-
summaryPoint3: The consensus logic and block gossip protocol introduced by the Beacon Chain now secures Ethereum.
10+
summaryPoint3: The Beacon Chain introduced the consensus logic and block gossip protocol which now secures Ethereum.
1111
---
1212

1313
<UpgradeStatus isShipped dateKey="page-upgrades-beacon-date">

src/content/upgrades/merge/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ template: upgrade
66
sidebar: true
77
image: ../../../assets/upgrades/merge.png
88
summaryPoint1: Ethereum Mainnet uses proof-of-stake, but this wasn't always the case.
9-
summaryPoint2: The transition from the original proof-of-work mechanism to proof-of-stake was called The Merge.
10-
summaryPoint3: The Merge refers to the original Ethereum Mainnet becoming part of a separate proof-of-stake blockchain called the Beacon Chain, now existing as one chain.
9+
summaryPoint2: The upgrade from the original proof-of-work mechanism to proof-of-stake was called The Merge.
10+
summaryPoint3: The Merge refers to the original Ethereum Mainnet merging with a separate proof-of-stake blockchain called the Beacon Chain, now existing as one chain.
1111
summaryPoint4: The Merge reduced Ethereum's energy consumption by ~99.95%.
1212
---
1313

1414
<UpgradeStatus dateKey="page-upgrades-beacon-date">
15-
The Merge was completed on September 15, 2022. This completed Ethereum's transition to proof-of-stake consensus, officially deprecating proof-of-work and reducing energy consumption by ~99.95%.
15+
The Merge was executed on September 15, 2022. This completed Ethereum's transition to proof-of-stake consensus, officially deprecating proof-of-work and reducing energy consumption by ~99.95%.
1616
</UpgradeStatus>
1717

1818
## What was The Merge? {#what-is-the-merge}

0 commit comments

Comments
 (0)