Skip to content

Commit

Permalink
Merge pull request #8 from eth-protocol-fellows/main
Browse files Browse the repository at this point in the history
Add discord links
  • Loading branch information
taxmeifyoucan authored Feb 12, 2024
2 parents 94b6a4b + 4458116 commit c0eef9d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 63 deletions.
56 changes: 0 additions & 56 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,59 +1,3 @@
Attribution-ShareAlike 4.0 International

=======================================================================

Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.

Using Creative Commons Public Licenses

Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.

Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors

Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees

=======================================================================

Creative Commons Attribution-ShareAlike 4.0 International Public
License

Expand Down
2 changes: 1 addition & 1 deletion docs/_footer.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
Wiki created by <a href="https://twitter.com/joshdavislight">Josh Davis</a> and <a href="https://twitter.com/TMIYChao">Mário Havel</a> from Protocol Support. <a rel="license" href="https://github.com//blob/main/LICENSE"><img alt="CC License" style="border-width:0" src="https://licensebuttons.net/l/by-sa/4.0/88x31.png" /></a><br/> This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International.</a>.
Wiki created by <a href="https://twitter.com/joshdavislight">Josh Davis</a> and <a href="https://twitter.com/TMIYChao">Mário Havel</a> from Protocol Support. <a rel="license" href="https://github.com/eth-protocol-fellows/protocol-studies/blob/main/LICENSE"><img alt="CC License" style="border-width:0" src="https://licensebuttons.net/l/by-sa/4.0/88x31.png" /></a><br/> This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International.</a>.
2 changes: 1 addition & 1 deletion docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ It **does not** cover onchain protocols/dapps, layer 2s/rollups or any other too

The wiki is supposed to cover all important parts of Ethereum core protocol and its development. The protocol architecture and related topics is reflected in the wiki format. The whole wiki lives under `/docs/wiki` and the [sidebar](_sidebar.md) defines the main documentation structure. High level areas are abstracted to directories which include all subtopics.

For contributors, we recommend focusing on specific topics contained in corresponding documents. It's best to own a single topic and work out all the details. Create a new document and add the topic to the sidebar if it's not there yet. Let others know what you are working on in the group channel and collaborate with contributors writing about related topics.
For contributors, we recommend focusing on specific topics contained in corresponding documents. It's best to own a single topic and work out all the details. Create a new document and add the topic to the sidebar if it's not there yet. Join the [discord server](https://discord.gg/HnCjCvCN),let others know what you are working on in the group channel and collaborate with other contributors writing about related topics.

## Editing wiki

Expand Down
2 changes: 2 additions & 0 deletions docs/eps/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ The second part of the program offers two distinct tracks focused on development

The first instance of EPF study group is starting in February 2024. It's completely open and permissionlesss and it is up to each participant as to how they want to approach it. Whether you want to learn as much as possible, focus only on certain topics or share your knowledge with others, you are welcomed. Altough it's opened, [you can register](https://forms.gle/7TqmryC217EPwgqr9) to help us tailor the experience better.

> Join our community [Discord server](https://discord.gg/HnCjCvCN)
Study group participants will collaboratively develop a comprehensive wiki, serving as an evolving knowledge base for current and future core developers. This will provide students with practical experience in contributing to open source resources, while gaining invaluable experience in documentation and community-driven development.

While this program is designed to act as a precursor to the Ethereum Protocol Fellowship, the study group is for anyone that is interested in learning more about the inner workings of the Ethereum Protocol. Those that have some general knowledge or use of Ethereum and/or blockchains as well as those that have some computer science, technical, or developer experience will get the most from this program.
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- <meta property="og:url" content="https:/> -->
<meta property="og:title" content="Protocol Wiki">
<meta property="og:description" content="EPF Study Group Wiki">
<meta property="og:image" content="https://raw.githubusercontent.com/eth-protocol-fellows/protocol-studies/wiki-pages/docs/images/epfsg_hero.jpg>
<meta property="og:image" content="https://raw.githubusercontent.com/eth-protocol-fellows/protocol-studies/wiki-pages/docs/images/epfsg_hero.jpg">

<meta property="twitter:card" content="summary_large_image">
<!-- <meta property="twitter:url" content="https://> -->
Expand Down Expand Up @@ -426,7 +426,7 @@
],
search: {
maxAge: 86400000, // Expiration time, the default one day
paths: auto,
paths: 'auto',
placeholder: 'Type to search',
noData: 'No Results!',

Expand Down
6 changes: 3 additions & 3 deletions docs/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ The protocol wiki is a collection of technical resources about the Ethereum prot

> :warning: Protocol Wiki is under contruction, [join us](study-group.md) and [contribute](contributing.md).
![](/docs/images/epfsg_hero.jpg)
![](https://raw.githubusercontent.com/eth-protocol-fellows/protocol-studies/wiki-pages/docs/images/epfsg_hero.jpg)

## Protocol Studies

Ethereum Protocol Fellowship Study Group (EPSsg) is an open study program for anyone interested in learning about internals of the protocol.

Learn more about EPS in its announcement blog.
Learn more about EPS in its [announcement blog](https://blog.ethereum.org/2024/02/07/epf-study-group). Join the community in our [Discord server](https://discord.gg/HnCjCvCN).

## Contributing

Protocol Wiki is a collaborative effort of Ethereum community. Take the opportunity to learn in EPS, collect resources and add them to the wiki.

> ### Start here
> * Are you a student or an aspiring core developer? Start learning about the [Ethereum protocol](/wiki/protocol/overview.md).
> * Are you a student or an aspiring core developer? Start learning about the [Ethereum protocol](eps/intro.md).

0 comments on commit c0eef9d

Please sign in to comment.