From 9c670d076b0870d9282815cf7d3529acb1b547cc Mon Sep 17 00:00:00 2001 From: taxmeifyoucan Date: Mon, 12 Feb 2024 15:38:38 +0100 Subject: [PATCH 1/2] update licence, docsify --- LICENSE | 56 ------------------------------------------------- docs/index.html | 4 ++-- docs/readme.md | 2 +- 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/LICENSE b/LICENSE index 2d58298e..a2e306d5 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/docs/index.html b/docs/index.html index e24d28d9..31217a49 100644 --- a/docs/index.html +++ b/docs/index.html @@ -15,7 +15,7 @@ - @@ -426,7 +426,7 @@ ], search: { maxAge: 86400000, // Expiration time, the default one day - paths: auto, + paths: 'auto', placeholder: 'Type to search', noData: 'No Results!', diff --git a/docs/readme.md b/docs/readme.md index 0ba7b621..ba7625fa 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -4,7 +4,7 @@ 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 From 4458116c2764b4b77e922f453b82adc6e82bdafb Mon Sep 17 00:00:00 2001 From: taxmeifyoucan Date: Mon, 12 Feb 2024 18:14:52 +0100 Subject: [PATCH 2/2] Add discord links --- docs/_footer.md | 2 +- docs/contributing.md | 2 +- docs/eps/intro.md | 2 ++ docs/readme.md | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/_footer.md b/docs/_footer.md index b6fd1a77..41e8abf8 100644 --- a/docs/_footer.md +++ b/docs/_footer.md @@ -1,2 +1,2 @@ --- -Wiki created by Josh Davis and Mário Havel from Protocol Support. CC License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International.. +Wiki created by Josh Davis and Mário Havel from Protocol Support. CC License
This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International.. diff --git a/docs/contributing.md b/docs/contributing.md index 0e6bd30c..119cff89 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -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 diff --git a/docs/eps/intro.md b/docs/eps/intro.md index 87c65c58..1183d3be 100644 --- a/docs/eps/intro.md +++ b/docs/eps/intro.md @@ -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. diff --git a/docs/readme.md b/docs/readme.md index ba7625fa..940da6f4 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -10,11 +10,11 @@ The protocol wiki is a collection of technical resources about the Ethereum prot 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).