From 6b3a59b2d0d92d590b5d17d30f28347deba6e77b Mon Sep 17 00:00:00 2001 From: Emilio Mayorga Date: Wed, 27 Jul 2022 09:53:19 -0700 Subject: [PATCH 1/5] Various small fixes to resources pages. Small tweaks to code of conduct --- about/code-of-conduct.md | 4 ++-- index.md | 2 +- resources/index.md | 11 ++++------- resources/logistics/getting_help.md | 2 +- resources/prep/git.md | 2 +- resources/prep/github.md | 6 +++--- resources/prep/jupyterhub.md | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/about/code-of-conduct.md b/about/code-of-conduct.md index 10476d14..c10fe913 100644 --- a/about/code-of-conduct.md +++ b/about/code-of-conduct.md @@ -26,9 +26,9 @@ OceanHackWeek organizers may take action to redress anything designed to, or wit ## Reporting a violation -Harassment and other code of conduct violations reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).** +Harassment and other code of conduct violations reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the organizers or instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).** -This anti-harassment policy is based on the example policy from the Geek Feminism wiki, created by the Ada Initiative and other volunteers. +This anti-harassment policy is based on the example policy from the [Geek Feminism wiki](https://geekfeminism.fandom.com), created by the [Ada Initiative](https://adainitiative.org/) and other volunteers. ## Group discussion diff --git a/index.md b/index.md index 8aa2ab50..28ebc9a5 100644 --- a/index.md +++ b/index.md @@ -146,6 +146,6 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA about/index.md % about/pasthackweeks.md OceanHackWeek 2022 -resources/index.md +OHW22 Resources % posts ``` diff --git a/resources/index.md b/resources/index.md index c98f7fd4..7f8b193f 100644 --- a/resources/index.md +++ b/resources/index.md @@ -7,7 +7,7 @@ The resources are actively being updated! Some parts are still out of date, and ::: -To make sure that OHW21 will be a welcoming environment for everyone, please read our [Code of Conduct](/about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek. +To make sure that OHW22 will be a welcoming environment for everyone, please read our [Code of Conduct](/about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek. ## Schedules @@ -34,13 +34,12 @@ schedule ```{toctree} :hidden: -:caption: Preperation +:caption: Preparation -prep/git +Git prep/github prep/jupyterhub -prep/conda - +Conda, Python, R ``` ```{toctree} @@ -48,7 +47,6 @@ prep/conda :caption: Tutorials tutorials/getting_started - ``` ```{toctree} @@ -57,7 +55,6 @@ tutorials/getting_started projects/overview projects/steps - ``` ```{toctree} diff --git a/resources/logistics/getting_help.md b/resources/logistics/getting_help.md index ec98f990..296e5b36 100644 --- a/resources/logistics/getting_help.md +++ b/resources/logistics/getting_help.md @@ -42,5 +42,5 @@ See the [Projects Getting Started page](../projects/steps.md). Feel free to post ## Reporting a Code of Conduct violation -Harassment and other [Code of Conduct violations](../conduct.md) reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).** +Harassment and other [Code of Conduct violations](/about/code-of-conduct.md) reduce the value of OceanHackWeek for everyone. If someone makes you or anyone else feel unsafe or unwelcome, please report it as soon as possible to one of the organizers or instructors. You can make a report either personally or anonymously. **Anonymous reports can be made [here](https://oceanhackweek.wufoo.com/forms/zep2ybt1swlulc/).** diff --git a/resources/prep/git.md b/resources/prep/git.md index 5198bfd9..dcca306b 100644 --- a/resources/prep/git.md +++ b/resources/prep/git.md @@ -214,7 +214,7 @@ Submit a pull request by clicking `New pull request`: * Reviewer: look through changes in the files * Approve PR or ask for more changes. -```{admonition} +```{admonition} Note While your pull request is pending, any change you push to the fork will become a part of the request. This is useful if you are asked to make small changes before your PR is accepted. ``` diff --git a/resources/prep/github.md b/resources/prep/github.md index ef94d3e1..33c3e316 100644 --- a/resources/prep/github.md +++ b/resources/prep/github.md @@ -9,9 +9,9 @@ The resources are actively being updated! Some parts are still out of date, and ## About Git and GitHub -[Git](https://git-scm.com/) is a popular version control system that is the foundation of most open source software development. You are not required to be a Git pro in advance of this event, but come prepared to learn a lot about it! [GitHub](github.com) is a hosting service for Git repositories, enabling us to share code across teams in a web environment. +[Git](https://git-scm.com/) is a popular version control system that is the foundation of most open source software development. You are not required to be a Git pro in advance of this event, but come prepared to learn a lot about it! [GitHub](https://github.com) is a hosting service for Git repositories, enabling us to share code across teams in a web environment. -We will use Git and GitHub for collaborative work. Be sure to arrive at {OceanHackWeek with your own [GitHub](https://github.com/) account. +We will use Git and GitHub for collaborative work. Be sure to arrive at {OceanHackWeek with your own [GitHub](https://github.com) account. ## Why do I need a GitHub account? @@ -30,7 +30,7 @@ Then, click on the big green button and then answer a few required questions. Be GitHub organizations are a convenient way for teams to get all content relevant to a specific project or workshop into one place. By having everything in one central location you will spend less time searching for hackweek content. GitHub organizations have "teams" that offer simple ways to provide respository access to groups of people, rather than individuals. -We have created a GitHub organization called oceanhackweek at [https://github.com/oceanhackweek](https://github.com/oceanhackweek). For security purposes you can only join the organization by invitation. You should already have received the invitation to GitHub. If you didn't: +We have created a GitHub organization called "oceanhackweek" at [https://github.com/oceanhackweek](https://github.com/oceanhackweek). For security purposes you can only join the organization by invitation. You should already have received the invitation to GitHub. If you didn't: 1. Once you have a GitHub ID, in the `#ohw22-helpdesk` Slack channel ask for help and include `@help-infrastructure` in your message so that folks who have the ability to make changes are notified. 2. We will then send you an invitation which should generate an email notification to the email you provided when you signed up for GitHub diff --git a/resources/prep/jupyterhub.md b/resources/prep/jupyterhub.md index 4b366658..93a27f44 100644 --- a/resources/prep/jupyterhub.md +++ b/resources/prep/jupyterhub.md @@ -1,4 +1,4 @@ -# JupyterHub +# Jupyter and the Hub :::{admonition} Updates in progress :class: warning From 00c63cf573506e430887c6cfa48a6879f9d9682a Mon Sep 17 00:00:00 2001 From: Emilio Mayorga Date: Wed, 27 Jul 2022 10:05:33 -0700 Subject: [PATCH 2/5] Add top-level Resources menu item for Code of Conduct --- resources/index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/index.md b/resources/index.md index 7f8b193f..64ba8784 100644 --- a/resources/index.md +++ b/resources/index.md @@ -21,6 +21,12 @@ We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for We will use Slack, Zoom and GitHub as our primary communication and content delivery platforms. The week before OceanHackWeek you will receive via email an invitation to join the OceanHackWeek GitHub organization, [https://github.com/oceanhackweek/](https://github.com/oceanhackweek/) if you have not received it already, along with Slack invites and Zoom connection info. + +```{toctree} +:hidden: +Code of Conduct +``` + ```{toctree} :maxdepth: 2 :hidden: From 78751ec348744631cea7173238b4a60a5a557a91 Mon Sep 17 00:00:00 2001 From: Emilio Mayorga Date: Wed, 27 Jul 2022 10:09:35 -0700 Subject: [PATCH 3/5] OHW22 Resources is now the page title --- index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.md b/index.md index 28ebc9a5..8aa2ab50 100644 --- a/index.md +++ b/index.md @@ -146,6 +146,6 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA about/index.md % about/pasthackweeks.md OceanHackWeek 2022 -OHW22 Resources +resources/index.md % posts ``` From f8aac5237cf969080e26c2e8476d2c9d41104d32 Mon Sep 17 00:00:00 2001 From: Emilio Mayorga Date: Wed, 27 Jul 2022 10:16:29 -0700 Subject: [PATCH 4/5] OHW22 Resources is now the page title (fix last commit) --- ohw22/index.md | 3 ++- resources/index.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ohw22/index.md b/ohw22/index.md index 3171efea..00abc9b7 100644 --- a/ohw22/index.md +++ b/ohw22/index.md @@ -94,8 +94,9 @@ In coordination with the OHW Northwest satellite event, there will be a **[3-wee :caption: OceanHackWeek 2022 (OHW22) :hidden: -Information for Applicants +Resources Global Virtual Event Regional Satellite Events +Information for Applicants Organizers ``` diff --git a/resources/index.md b/resources/index.md index 64ba8784..699ddb5d 100644 --- a/resources/index.md +++ b/resources/index.md @@ -1,4 +1,4 @@ -# Resources +# OHW22 Resources :::{admonition} Updates in progress :class: warning From b913473189086fe487bb56d801658d0d97641a4a Mon Sep 17 00:00:00 2001 From: Emilio Mayorga Date: Wed, 27 Jul 2022 10:19:28 -0700 Subject: [PATCH 5/5] Add Resources to the OHW page toctree --- ohw22/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohw22/index.md b/ohw22/index.md index 00abc9b7..9796b1a6 100644 --- a/ohw22/index.md +++ b/ohw22/index.md @@ -94,9 +94,9 @@ In coordination with the OHW Northwest satellite event, there will be a **[3-wee :caption: OceanHackWeek 2022 (OHW22) :hidden: -Resources Global Virtual Event Regional Satellite Events +Resources Information for Applicants Organizers ```