Skip to content

Commit 5ee762a

Browse files
authored
Merge pull request #12301 from ethereum/v8-1-1
2 parents c37204f + 0c0e52f commit 5ee762a

File tree

249 files changed

+822
-7247
lines changed

Some content is hidden

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

249 files changed

+822
-7247
lines changed

.all-contributorsrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@
15211521
"login": "sassal",
15221522
"name": "sassal",
15231523
"avatar_url": "https://avatars0.githubusercontent.com/u/9276959?v=4",
1524-
"profile": "https//twitter.com/sassal0x",
1524+
"profile": "https://twitter.com/sassal0x",
15251525
"contributions": [
15261526
"content"
15271527
]
@@ -8830,7 +8830,7 @@
88308830
"login": "joonspoon",
88318831
"name": "June Clarke ",
88328832
"avatar_url": "https://avatars.githubusercontent.com/u/302478?v=4",
8833-
"profile": "jointheleague.org",
8833+
"profile": "https://www.jointheleague.org/",
88348834
"contributions": [
88358835
"doc"
88368836
]
@@ -8839,7 +8839,7 @@
88398839
"login": "slf188",
88408840
"name": "菲利",
88418841
"avatar_url": "https://avatars.githubusercontent.com/u/49417481?v=4",
8842-
"profile": "huggingface.co/slf188",
8842+
"profile": "https://huggingface.co/slf188",
88438843
"contributions": [
88448844
"doc"
88458845
]

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
402402
</tr>
403403
<tr>
404404
<td align="center" valign="top" width="14.28%"><a href="https://etherworld.co"><img src="https://avatars0.githubusercontent.com/u/29681685?v=4?s=100" width="100px;" alt="Pooja Ranjan"/><br /><sub><b>Pooja Ranjan</b></sub></a><br /><a href="#content-poojaranjan" title="Content">🖋</a></td>
405-
<td align="center" valign="top" width="14.28%"><a href="https//twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
405+
<td align="center" valign="top" width="14.28%"><a href="https://twitter.com/sassal0x"><img src="https://avatars0.githubusercontent.com/u/9276959?v=4?s=100" width="100px;" alt="sassal"/><br /><sub><b>sassal</b></sub></a><br /><a href="#content-sassal" title="Content">🖋</a></td>
406406
<td align="center" valign="top" width="14.28%"><a href="https://zaremba.ch"><img src="https://avatars0.githubusercontent.com/u/811701?v=4?s=100" width="100px;" alt="Robert Zaremba"/><br /><sub><b>Robert Zaremba</b></sub></a><br /><a href="#content-robert-zaremba" title="Content">🖋</a></td>
407407
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tasdienes"><img src="https://avatars1.githubusercontent.com/u/18563486?v=4?s=100" width="100px;" alt="Tas"/><br /><sub><b>Tas</b></sub></a><br /><a href="#ideas-tasdienes" title="Ideas, Planning, & Feedback">🤔</a> <a href="#content-tasdienes" title="Content">🖋</a></td>
408408
<td align="center" valign="top" width="14.28%"><a href="https://github.com/s-pace"><img src="https://avatars2.githubusercontent.com/u/32097720?v=4?s=100" width="100px;" alt="Sylvain Pace"/><br /><sub><b>Sylvain Pace</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=s-pace" title="Code">💻</a></td>
@@ -1409,8 +1409,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
14091409
<td align="center" valign="top" width="14.28%"><a href="https://www.xcubicle.com"><img src="https://avatars.githubusercontent.com/u/381050?v=4?s=100" width="100px;" alt="Patoshi"/><br /><sub><b>Patoshi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=patoshii" title="Documentation">📖</a></td>
14101410
</tr>
14111411
<tr>
1412-
<td align="center" valign="top" width="14.28%"><a href="jointheleague.org"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt="June Clarke "/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
1413-
<td align="center" valign="top" width="14.28%"><a href="huggingface.co/slf188"><img src="https://avatars.githubusercontent.com/u/49417481?v=4?s=100" width="100px;" alt="菲利"/><br /><sub><b>菲利</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=slf188" title="Documentation">📖</a></td>
1412+
<td align="center" valign="top" width="14.28%"><a href="https://www.jointheleague.org/"><img src="https://avatars.githubusercontent.com/u/302478?v=4?s=100" width="100px;" alt="June Clarke "/><br /><sub><b>June Clarke </b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=joonspoon" title="Documentation">📖</a></td>
1413+
<td align="center" valign="top" width="14.28%"><a href="https://huggingface.co/slf188"><img src="https://avatars.githubusercontent.com/u/49417481?v=4?s=100" width="100px;" alt="菲利"/><br /><sub><b>菲利</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=slf188" title="Documentation">📖</a></td>
14141414
<td align="center" valign="top" width="14.28%"><a href="https://github.com/DamitusThyYeetus123"><img src="https://avatars.githubusercontent.com/u/108782125?v=4?s=100" width="100px;" alt="DamitusThyYeetus123"/><br /><sub><b>DamitusThyYeetus123</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=DamitusThyYeetus123" title="Documentation">📖</a></td>
14151415
<td align="center" valign="top" width="14.28%"><a href="https://github.com/matusame"><img src="https://avatars.githubusercontent.com/u/97032288?v=4?s=100" width="100px;" alt="matusame"/><br /><sub><b>matusame</b></sub></a><br /><a href="#translation-matusame" title="Translation">🌍</a></td>
14161416
<td align="center" valign="top" width="14.28%"><a href="https://github.com/laurentlucian"><img src="https://avatars.githubusercontent.com/u/33508364?v=4?s=100" width="100px;" alt="Lohan"/><br /><sub><b>Lohan</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=laurentlucian" title="Code">💻</a></td>

public/.well-known/security.txt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22
Hash: SHA256
33

44
Contact: mailto:[email protected]
5-
Expires: 2023-12-31T23:59:00.000Z
5+
Expires: 2026-12-31T23:59:00.000Z
66
Encryption: https://ethereum.org/security_at_ethereum.org.asc
77
Acknowledgments: https://bounty.ethereum.org
88
Preferred-Languages: en
99
Canonical: https://ethereum.org/.well-known/security.txt
1010
Policy: https://bounty.ethereum.org
1111
Hiring: https://ethereum.org/en/community/get-involved/#ethereum-jobs
12-
1312
-----BEGIN PGP SIGNATURE-----
1413

15-
iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmMV3bMACgkQ6I0zNPpf
16-
agrOjhAAgMDS9RJUbJzcAybRfp/STq4Kf50TFd3iqx/t8ECw5UGazefieHesOhZ5
17-
9B9l6VAIHEGqbm+ukkhT+eBofhkAGEupiH/rUTy3hpFo1Ggp9QGi464Y8RyB0hID
18-
BwjAsAVEdHyh8T6YrqxKRGvgELuEMZfuPfVhdIGU8CfEQozzuA9q3mChckXdTlSt
19-
TvOKTMdnNPMlEhp4dT93iQaXDBAncE48TkUi/c8U4qolkskuDhZ4qJkc7xcv5Uk4
20-
TfF83Xs87AF9ZmABWawlCx7VHhp0HGljtGUpobf2DXV0TG77/dZzMQ4xdyqvDq+v
21-
tm3djp3UHZVhOkDxMKpBzLnCkCvyvh/tvN4j/trdHHzXx6gEEkuiR5wPPoomCosi
22-
95AGNFf0vpe2HucL/bOrBySxME+hifAnmkiaXltLbyUUTBQPfkHMHMoq1dmPokm2
23-
4RZaZ1A/K7rirZLC4w/RmxONVqvxT0baFTcZGyKzYm6gEZ9kCwWw1tyEl472yK0H
24-
UR2cAhlo+Wa61cOTtwHVw0FMVyG0xZkR04y8WM3T8lE6imGLSmCDgPMZm8XnKdkY
25-
SMGD3+TzLxe6mymmw+1dGXCPjjkImdrhBGxlwEU74vkFQKiWv/GftiDYYcilcQbS
26-
OD1N7PTmpef+JEYXOpwxxUTSXu0SfVTSkx0wnHkqbib7Wwv5IwY=
27-
=g+49
14+
iQIzBAEBCAAdFiEErpbtlp5HmwCE8+F/6I0zNPpfagoFAmXYslMACgkQ6I0zNPpf
15+
agrlTA//Q1P+fzNaYtUUm7pg7Jz4VaEACaQZ5qNNmKl9VZ6yCS45pmqpPAAyDM2p
16+
ZyFOUF3Q3UmHdwmVEGrHSREhoqx5I78KH4dmx4G38RG+4SMhSCZG0Ztf9Z3Dg0o2
17+
ZeO7vS7mp/STyxiG1Nnkg5Ivhuhq8sdQXF7hM+9JUVri7upEH0QtdAS/jZaoLCvx
18+
GsWe8XnBru8aH9O2kCO4iigCphOpzaSORJH7rcuo/mo6jGvJER4J0RkjK2KMX7W/
19+
TFQmpR+8Sxaw+einVEQBDppcbBhOO7yAHq3TQOa01pxIQJ2togJ0Sl3pUiYeqPgf
20+
aITyRfzhyh+zEb7V49QOIohvazZA7gnBmgUW8xF9cfTrChsxKV8TxovGc/cHroy9
21+
JI8XkJaZbX1GlbIUqTKgc/MF01gXXVTyjbnQ6HtCNG4BAq3hsWDnoziodGFojn/+
22+
PiY9cLok8Jxy6nzV0ANLunfbNF2usjPEDFxRviCSS3NoBXhq0+Ra/MXljKB46lb5
23+
qkfBdsAF9IJ8Bx7knrLbpVMe8tciXcXqorCfEBZONNk9RL5OkuDQgPQXi/2sRXXN
24+
xxIpxkDf63104NIypjEjp5c8WkD+VF84BhNuhYsp50T2hfgtL39vOGaQ2593Rss1
25+
j8MNLO2xlwoHiJoTe3CFw/Yl7MtjJSxiaQ0v42JRxyjclLDX1Rc=
26+
=CMMm
2827
-----END PGP SIGNATURE-----

public/_redirects

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474

7575
/en/dart/ /en/developers/docs/programming-languages/dart/ 301!
7676

77-
/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
77+
/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
7878

79-
/en/developers/docs/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
79+
/en/developers/docs/consensus-mechanisms/pow/mining/ /en/developers/docs/consensus-mechanisms/pow/mining/ 301!
8080

8181
/*/beginners /:splat/what-is-ethereum/ 301!
8282

@@ -150,7 +150,7 @@
150150

151151
/*/eth2 /:splat/upgrades/ 301!
152152

153-
/*/developers/docs/layer-2-scaling /:splat/developers/docs/scaling 301!
153+
/*/developers/docs/scaling /:splat/developers/docs/scaling 301!
154154

155155
/*/developers/docs/scaling/layer-2-rollups /:splat/developers/docs/scaling 301!
156156

Binary file not shown.
-3.4 MB
Binary file not shown.

public/content/community/code-of-conduct/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: The basic standards that we strive for across ethereum.org spaces.
44
lang: en
55
---
66

7+
# Code of conduct {#code-of-conduct}
8+
79
## Mission {#mission}
810

911
To develop and maintain the most comprehensive and accessible knowledge hub for Ethereum.

public/content/community/events/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lang: en
55
hideEditButton: true
66
---
77

8-
## Upcoming events {#events}
8+
# Upcoming events {#events}
99

1010
**Every month, there are major Ethereum events around the world.** Consider attending one near you to meet more people in the community, learn about employment opportunities, and develop new skills.
1111

public/content/contributing/design/adding-design-resources/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Guidelines and requirements to ensure quality of design materials o
44
lang: en
55
---
66

7+
# Adding design resources {#adding-design-resources}
8+
79
Anybody can suggest new design materials to the [Design and UX in web3 page](/developers/docs/design-and-ux/).
810

911
Be aware that the focus of this page is on providing user value to aspiring web3 designers. The design section is not there to advertise your services, products, or platforms.

public/content/contributing/style-guide/content-standardization/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ description: Guide to use consistent terminology in content writing
44
lang: en
55
---
66

7+
# Content standardization {#content-standardization}
8+
79
This style guide aims to standardize certain aspects of writing content to make the contribution process smoother.
810

911
## Use American English {#american-english}

0 commit comments

Comments
 (0)