Initial pass of resource updates

index.md

@@ -144,8 +144,8 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA
 :hidden:
 
 about/index.md
-about/pasthackweeks.md
+% about/pasthackweeks.md
 OceanHackWeek 2022 <ohw22/index.md>
-% resources/index.md
+resources/index.md
 % posts
 ```

resources/index.md

@@ -1,20 +1,25 @@
 # Resources
 
-Welcome to [OceanHackWeek](about/index.md) 2021 (OHW21)! OHW21 is a 4-day collaborative learning experience taking place August 3-6, 2021, as a hybrid in-person and virtual event. It is aimed at exploring, creating and promoting effective computation and analysis workflows for large and complex oceanographic data. It includes tutorials, data exploration, software development, collaborative projects and community networking. At our [general web site (https://oceanhackweek.github.io)](https://oceanhackweek.github.io) you can read more about OceanHackWeek, including the [OHW21 organizing committee](https://oceanhackweek.github.io/our-team.html) and links to [events from previous years](https://oceanhackweek.github.io/pasthackweeks.html).
+:::{admonition} Updates in progress
+:class: warning
 
-**This site is being actively updated this week (week before OHW21)! Some parts are still out of date, and is the content from last year. We'll keep you posted about updates via Slack. In the meantime, please watch out for references to 2020 ("OHW20") or links that don't work.**
+The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
 
-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 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.
 
 ## Schedules
 
-There are three different schedules, corresponding to the **in-person event**, the **main virtual event** and the **Oceania virtual event**. The "Oceania" virtual event is intended to accommodate participants from Australia to India. You will be asked to choose between the two virtual groups. Go to [the Schedule page for details](schedule.md).
+There are a few different schedules and participants may need to pay attention to multiple based on if they are part of the global event, or at a satellite.
+Go to [the Schedule page for details](schedule.md).
 
 ## Preparation
 
-We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. **On July 29 and 30, we will offer short "pre-hackweek" optional sessions to answer questions on the basics of Git, GitHub, Jupyter and core R and Python scientific libraries, and OceanHackWeek in general. The schedule is available in the [Schedule page](schedule.md#pre-hackweek-optional-check-ins), and the Zoom link will be sent via Slack.**
+We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. 
+<!-- **On July 29 and 30, we will offer short "pre-hackweek" optional sessions to answer questions on the basics of Git, GitHub, Jupyter and core R and Python scientific libraries, and OceanHackWeek in general. The schedule is available in the [Schedule page](schedule.md#pre-hackweek-optional-check-ins), and the Zoom link will be sent via Slack.** -->
 
-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/).
+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}
 :maxdepth: 2
@@ -23,7 +28,8 @@ We will use Slack, Zoom and GitHub as our primary communication and content deli
 
 logistics/overview
 logistics/getting_help
-logistics/coffeebreaks
+schedule
+% logistics/coffeebreaks
 ```
 
 ```{toctree}

resources/logistics/getting_help.md

@@ -1,24 +1,44 @@
 # Getting Help
 
+:::{admonition} Updates in progress
+:class: warning
+
+The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
+
+:::
+
 We know how overwhelming all of this information can be. Here is some for asking questions and figuring out where to turn for help.
 
-You can ask anything on the Slack `#ohw21-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers.
+You can ask anything on the Slack `#ohw22-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers.
 
 ## Helpdesk
 
-We've set up the `#ohw21-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly.
+We've set up the `#ohw22-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). 
+
+We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. If you know the rough category of help that you may need, please tag one of the helpdesk user groups to get their attention. All help usergroups can be found by typing `@help-` and Slack will prompt with options.
+
+You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly.
+
+### Slack help groups
+
+- `@help-infrastructure` - For issues regarding the JupyterHub, Slack, Github, and Zoom.
+- `@help-projects` - For help with managing projects, for instance asking how to set up a new repo, or organize meetings.
+- `@help-python` - Questions about Python programming.
+- `@help-r` - Questions about R programming.
+- `@help-tutorials` - For help with tutorial logistics, like cloning the notebooks.
+- `@help-website` - If there are any issues with the website tag us to take a look.
 
 ## During tutorials
 
-- Ask questions on Slack! Use the `#ohw21-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials
+- Ask questions on Slack! Use the `#ohw22-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials
 - **Vote up** questions from others to help the moderators prioritize which questions to ask the speaker during tutorials.
 - Tutorial moderators will mark questions that are best answered by the instructor and ask helpers (and anyone else!) to answer the rest in real time. Then when the instructor ask if there are questions the moderators will read those reserved for the instructor.
 - Zoom Chat will **not** be available. Ask on Slack!
 - You will be muted at the start of the tutorial presentation. The moderator will review questions on Slack and ask the questions to the instructor during Q&A time.
 
 ## Projects
 
-See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw21_project` channel, too.
+See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw22_project` channel, too.
 
 ## Reporting a Code of Conduct violation
 

resources/logistics/overview.md

@@ -1,12 +1,12 @@
 # Logistics Overview
 
-Some of you will participate in person at the [Bigelow Laboratory for Ocean Sciences](https://www.bigelow.org/) in Maine (US), and others will participate virtually from time zones all over the world. As we have learned throughout the pandemic, each of these gathering styles has strengths and weaknesses. We are committed to providing an engaging and full experience for everyone and will strive to facilitate cross communication and collaboration across all participants.
+Some of you will participate in person at various satellite events, and others will participate virtually from time zones all over the world. As we have learned throughout the pandemic, each of these gathering styles has strengths and weaknesses. We are committed to providing an engaging and full experience for everyone and will strive to facilitate cross communication and collaboration across all participants.
 
 ## Time
 
-OceanHackWeek 2021 will take place August 3-6. *Pre-hackweek OPTIONAL sessions* will be on July 29-30 as a 1-hour session each day.
+OceanHackWeek 2021 will take place August 15-19.
 
-**In-person participants** will gather for full days, 9am - 5pm EDT. While **virtual participants** may choose to engage primarily with this group and schedule via Zoom and Slack, we strongly encourage you to join the program designed specifically as a virtual event. The virtual event will be split into two schedules and groups based on the distribution of participant time zones, in a 3-hour daily block of formal, live activities. The **larger virtual event** will take place 11:00am - 2:00pm PDT / 18:00 - 21:00 UTC, *except the first day when we will start 30 minutes earlier*. The **“Oceania” virtual event** is intended to accommodate participants from Australia to India and will take place 12:00pm - 3:00pm AEST / 2:00 - 5:00 UTC. You will be asked to choose between the two virtual groups.
+**In-person participants** will gather as for times as directed by the satellite organizers. While **virtual participants** may choose to engage primarily with this group and schedule via Zoom and Slack, we strongly encourage you to join the program designed specifically as a virtual event. The virtual event will be split into two schedules and groups based on the distribution of participant time zones, in a 3-hour daily block of formal, live activities. The **larger virtual event** will take place 11:00am - 2:00pm PDT / 18:00 - 21:00 UTC.
 
 Detailed schedules are available [Schedule page](../schedule.md).
 

resources/prep/conda.md

@@ -1,6 +1,13 @@
 # Conda and installing Python and R environments
 
-### Overview 
+:::{admonition} Updates in progress
+:class: warning
+
+The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
+
+:::
+
+## Overview
 
 ### What is Conda?
 [**Conda**](http://conda.pydata.org/docs/) is an **open source `package` and `environment` management system for any programming languages, but very popular among python community,**
@@ -28,16 +35,27 @@ So even though Python is one of the most adaptable, easy-to-use software systems
 We also provide instructions for using [Anaconda](https://www.continuum.io), which is our recommended Python distribution, for installing and working with Python on your local computer. We can assist in setting up "conda" environments that will simplify the gathering of Python libraries and version specific to the tutorial you are working on.
 
 
-### Installing Conda Miniconda
+## Installing Conda Miniconda
+
+:::{admonition} For local development
+:class: warning
+
+Conda is already installed on our JupyterHub, so these instructions are for if you wish to get started with developing locally.
+
+We may not have the ability to support everyone's individual system, so we have the JupyterLab setup so that everyone can work on the same pre-configured platform.
+
+:::
 
 If you don't have conda (either with *Miniconda* or the full *Anaconda Distribution*) already installed **we recommend [installing Miniconda for latest Python 3](https://docs.conda.io/en/latest/miniconda.html).**
 
 https://conda.io/projects/conda/en/latest/user-guide/install/index.html
 
-#### Windows
+### Windows
+
 Download the proper installer for your Windows platform (64 bits). When installing, you will be asked if you wish to make the Anaconda Python your default Python for Windows. If you do not have any other installation that is a good option. If you want to keep multiple versions of Python on your machine (e.g. ESRI-supplied python, or 64 bit versions of Anaconda), then don't select the option to modify your path or modify your Windows registry settings.
 
-#### Linux and OSX
+### Linux and OSX
+
 You may follow manual steps from [here](https://docs.conda.io/en/latest/miniconda.html) similar to the instructions on Windows (see above). Alternatively, you can execute these commands on a terminal shell (in this case, the bash shell):
 
 ```bash
@@ -51,30 +69,28 @@ export PATH="$HOME/miniconda/bin:$PATH"
 conda update conda --yes
 ```
 
-### Installing Python
+## Installing Python
 
-We will be using Python 3.6 or 3.7 during the week (either will work). Since Anaconda (on Linux) expects you to work in the "bash" shell, if this is not already your default shell, you need to set it to be so (use the "chsh -s /bin/bash" command to change your default shell to bash) or just run an instance of bash from the command line before issuing "Conda" commands (/bin/bash or where it is located on your system).
+We will be using Python 3.8 or 3.9 during the week (either will work). Since Anaconda (on Linux) expects you to work in the "bash" shell, if this is not already your default shell, you need to set it to be so (use the "chsh -s /bin/bash" command to change your default shell to bash) or just run an instance of bash from the command line before issuing "Conda" commands (/bin/bash or where it is located on your system).
 
 If you are already familiar with Python 2.7, you can take a look at the syntax differences [here](http://sebastianraschka.com/Articles/2014_python_2_3_key_diff.html), but the main point to remember is to put the print statements in parentheses:
+
 ```python
 print('Hello World!')
 ```
 
-
 ``` bash
-$ conda create -n py37 python=3.7
+$ conda create -n py39 python=3.9
 ```
 
-To use Python 3.7: 
+To use Python 3.9: 
 
 ``` bash
-$ conda activate py37
+$ conda activate py39
 ```
 
 To check if you have the correct version: 
 
 ``` bash
 $ python --version
 ```
-
-