Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades landing post-merge updates #8103

Merged
merged 2 commits into from Oct 4, 2022
Merged

Upgrades landing post-merge updates #8103

merged 2 commits into from Oct 4, 2022

Conversation

wackerow
Copy link
Member

Description

  • Updates copy from /upgrades page to match post-merge environment, including FAQ answers
  • Updates the ethUpgradeArticles list to most recent five for each category

Related Issue

#7075

@github-actions github-actions bot added the needs review 👀 Review is needed for this issue or pull request label Sep 30, 2022
@gatsby-cloud
Copy link

gatsby-cloud bot commented Sep 30, 2022

✅ ethereum-org-website-dev deploy preview ready

@@ -43,9 +43,9 @@
"page-upgrades-dive": "Dive into the vision",
"page-upgrades-dive-desc": "How are we going to make Ethereum more scalable, secure, and sustainable? All while keeping Ethereum's core ethos of decentralization.",
"page-upgrades-docking": "The Merge",
"page-upgrades-merge-answer-1": "The Merge is when Mainnet begins using the Beacon Chain for consensus, and proof-of-work is turned off, coming soon.",
"page-upgrades-merge-answer-1": "The Merge occurred via the Paris upgrade on September 15, 2022.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't love this phrasing but not blocking, and I can't think of anything better off the top of my head.

@minimalsm minimalsm merged commit 5628306 into dev Oct 4, 2022
@minimalsm minimalsm deleted the upgrades-landing branch October 4, 2022 08:57
@corwintines corwintines mentioned this pull request Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs review 👀 Review is needed for this issue or pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants