Skip to content

Commit 97ed6a8

Browse files
committed
Merge branch 'dev' into deprecate-languages-page
2 parents 8dacdf2 + 432cc86 commit 97ed6a8

File tree

62 files changed

+463
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+463
-381
lines changed

public/_redirects

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,6 @@
172172

173173
/*/guides/how-to-register-an-ethereum-account /:splat/guides/how-to-create-an-ethereum-account/ 301!
174174

175+
/*/deprecated-software /:splat/dapps/ 301!
176+
175177
/*/languages /:splat/contributing/translation-program/ 301!
26.9 KB
Loading
14.8 KB
Loading
-6.39 KB
Loading
-468 KB
Loading
15 KB
Loading
5.37 KB
Loading

public/content/developers/docs/consensus-mechanisms/pow/mining/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Watch Austin walk you through mining and the proof-of-work blockchain.
7070

7171
## The mining algorithm {#mining-algorithm}
7272

73-
Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/). Ethhash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/).
73+
Ethereum Mainnet only ever used one mining algorithm - ['Ethash'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/ethash/). Ethash was the successor to an original R&D algorithm known as ['Dagger-Hashimoto'](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/dagger-hashimoto/).
7474

7575
[More on mining algorithms](/developers/docs/consensus-mechanisms/pow/mining/mining-algorithms/).
7676

38.2 KB
Loading
47 KB
Loading

0 commit comments

Comments
 (0)