From 79daccf7e1ef028d48ba02c29c347af4b98fc696 Mon Sep 17 00:00:00 2001 From: Tim Beiko Date: Fri, 11 Mar 2022 06:34:37 -0800 Subject: [PATCH] Update name Decided during https://github.com/ethereum/pm/issues/491 --- network-upgrades/mainnet-upgrades/{merge.md => paris.md} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename network-upgrades/mainnet-upgrades/{merge.md => paris.md} (92%) diff --git a/network-upgrades/mainnet-upgrades/merge.md b/network-upgrades/mainnet-upgrades/paris.md similarity index 92% rename from network-upgrades/mainnet-upgrades/merge.md rename to network-upgrades/mainnet-upgrades/paris.md index 67aa4732bb..02170e0a29 100644 --- a/network-upgrades/mainnet-upgrades/merge.md +++ b/network-upgrades/mainnet-upgrades/paris.md @@ -1,4 +1,6 @@ -## Merge Upgrade Specification +## Paris Upgrade Specification + +The Paris specification corresponds to the execution layers changes associated with Ethereum's transition to proof-of-stake, a.k.a. The Merge. ### Included EIPs Specifies changes included in the network upgrade.