10 Commits (02a09671220dc19b3c1ce8017068f6fb92c4c47e)

Author	SHA1	Message	Date
Joseph Cook	a0aac03ffa	docs: update merge pages now merge is done (#25842)	2 years ago
Joseph Cook	52672ff330	docs: update pre-merge info (#25099) ... * initial commit for pre-merge prep pages * tidy and add validator info * tidy up typos etc * Apply suggestions from code review Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> * apply suggestions from review * apply suggestion from review updates sentence about Geth stalling w/out consensus client * apply changes from review + warn about early prep Removes info as suggested by Martin. Adds warning suggested by Remy on Launchpad repo about waiting for merge releases before setting up ex/cons clients on mainnet. * minor fixes Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com>	2 years ago
Zachinquarantine	26b8170f5e	[DOCS]: add note about hardcoded ropsten ttd (#25138) ... As per #25018 (included in v1.10.19), the new Ropsten TTD is hardcoded, and users no longer have to use the --override.terminaltotaldifficulty flag.	2 years ago
Sina Mahmoodi	81604199c6	merge: fix ropsten ttd (#25052)	2 years ago
Andrei Drozd	3e629777c1	Fix typo in "the merge" documentation (#25023)	3 years ago
Felix Lange	ed5e3c79dd	fix syntax error in merge.md	3 years ago
Felix Lange	dc5223d3b3	update text about ropsten merge transition	3 years ago
Felix Lange	c5b524d8bf	add ttd override for Ropsten	3 years ago
Joseph Cook	65592fb3e5	add info to merge page (#24972) ... * add info to merge page * Update merge.md Co-authored-by: Felix Lange <fjl@twurst.com>	3 years ago
Sina Mahmoodi	545feda51a	docs: add basic info about the merge (#24948) ... * merge: add basic info * second pass * merge guide updates Co-authored-by: Felix Lange <fjl@twurst.com>	3 years ago