Skip to content

Commit

Permalink
differences for PR #1490
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Feb 17, 2023
1 parent 7c66e4a commit e026edc
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 46 deletions.
10 changes: 5 additions & 5 deletions 01-welcome.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ It is, however, necessary for all participants to use pronouns and names as list
For those unfamiliar with the practice of sharing pronouns, these resources may be helpful
for further reading:

- The proper use of pronouns in language: [https://lgbt.ucsf.edu/pronounsmatter](https://lgbt.ucsf.edu/pronounsmatter)
- The importance of using pronouns: [https://www.pronouns.org/](https://www.pronouns.org/)
- How to use personal pronouns: [https://www.pronouns.org/how](https://www.pronouns.org/how)
- How to deal with situations when you use the wrong pronoun: [https://www.pronouns.org/mistakes](https://www.pronouns.org/mistakes)
- The [proper use of pronouns in language](https://lgbt.ucsf.edu/pronounsmatter)
- The [importance of using pronouns](https://www.pronouns.org/)
- [How to use personal pronouns](https://www.pronouns.org/how)
- [How to deal with situations when you use the wrong pronoun](https://www.pronouns.org/mistakes)

::::::::::::::::::::::::::::::::::::::::::::::::::

![](fig/Icebreaker_Stephan_Jantzen_in_Stadthafen_Rostock_2010-12-28_perspective_correction-GD.jpg){alt='Photo of an Icebreaker ship, named Stephan Jantzen' width="600px" }
A different kind of "icebreaker." Photo credit: Grand-Duc, Wikipedia, [http://en.wikipedia.org/wiki/User:Grand-Duc](https://en.wikipedia.org/wiki/User:Grand-Duc)
A different kind of "icebreaker." Photo credit: [Grand-Duc, Wikipedia](https://en.wikipedia.org/wiki/User:Grand-Duc)

## Before The Course Begins

Expand Down
2 changes: 1 addition & 1 deletion 02-practice-learning.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ perhaps illustrated as:

1) On a piece of paper, draw a simplified concept map of the same concept you discussed in the last activity, but this time without the analogy.
What are 3-4 core
concepts involved? How are those concepts related? (Note: if you would like to try out an online tool for this exercise, visit [https://excalidraw.com](https://excalidraw.com) .)
concepts involved? How are those concepts related? (Note: if you would like to try out an online tool for this exercise, visit [excalidraw](https://excalidraw.com).)

2) In the Etherpad, write some notes on this process. Was it difficult? Do you think it would be a useful exercise prior to teaching about your topic?
What challenges might a novice face in creating a concept map of this kind?
Expand Down
3 changes: 1 addition & 2 deletions 05-memory.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ frequent formative assessment is important.

## Test Your Working Memory

This website implements a short test of working memory:
[https://miku.github.io/activememory/][memory-test]
This [website implements a short test of working memory][memory-test].

What was your score? If you are comfortable, share your answer
in the Etherpad.
Expand Down
2 changes: 1 addition & 1 deletion 09-eia.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ things that we do, things that we are, and things that we champion. Many of thes

## Discuss The Carpentries Core Values

1. Take a moment to read through the Core Values on this page: [https://carpentries.org/values/][core-values]
1. Take a moment to read through the [Core Values][core-values]
2. Choose one core value that resonates with you. What is a decision you might make in a workshop
that could look different if you were actively considering the core value you chose?

Expand Down
5 changes: 2 additions & 3 deletions 11-practice-teaching.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,14 @@ it is OK to remind yourself:

We will start by observing some examples of teaching and providing some feedback.

Watch this example teaching video as a group
Watch [this example teaching video][bad-teaching-video] as a group
and then give feedback on it.
[https://www.youtube.com/watch?v=-ApVt04rB4U][bad-teaching-video]
Put your feedback in the Etherpad.
Organize your feedback along two axes:
positive vs. opportunities for growth (sometimes called "negative")
and content (what was said) vs. presentation (how it was said).

Note: there is a version of this video with subtitles in both Spanish and English here: [https://www.youtube.com/watch?v=jxgMVwQamO0](https://www.youtube.com/watch?v=jxgMVwQamO0)
Note: there is a version of [this video with subtitles in both Spanish and English](https://www.youtube.com/watch?v=jxgMVwQamO0)

This exercise should take about 10 minutes.

Expand Down
6 changes: 3 additions & 3 deletions 14-checkout.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Extensions may be granted for any reason up to 1 year from your training date.

## Be The Expert: Checkout Q \& A

In small groups, read and discuss one of the three checkout procedures described on this page: [https://carpentries.github.io/instructor-training/checkout/index.html](checkout.md)
In small groups, read and discuss one of the three [checkout procedures described on this page](checkout.md).
Make notes in the Etherpad:

- What points do you think it is most important or helpful for people to remember?
Expand All @@ -52,12 +52,12 @@ This exercise should take about 10 minutes.

## Schedule a Discussion or Demo

Visit the discussion Etherpad to sign up for a session: [https://pad.carpentries.org/community-discussions](https://pad.carpentries.org/community-discussions)
Visit the [discussion Etherpad to sign up](https://pad.carpentries.org/community-discussions) for a session.
If the session you would like to attend is full, contact the discussion
host and co-host to ask if you can attend.

If you would prefer to do your teaching demonstration before your discussion,
visit the demo Etherpad and sign up there: [https://pad.carpentries.org/teaching-demos](https://pad.carpentries.org/teaching-demos)
visit the [teaching demo Etherpad and sign up there](https://pad.carpentries.org/teaching-demos)
This demo [rubric](demos_rubric/) is provided as a guide for Trainers evaluating potential new Instructors during the teaching demonstration.

If these pages are hard to navigate or you cannot find a suitable time, save these links where
Expand Down
3 changes: 1 addition & 2 deletions 15-carpentries.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,7 @@ Want to **join meetings** (to meet new people or listen in)?

## Get Connected

Take a couple of minutes to sign up for The Carpentries channels you want to stay involved with on this page:
[https://carpentries.org/connect/][connect-page]
Take a couple of minutes to sign up for [The Carpentries channels][connect-page] you want to stay involved with.
When you are done, share a channel you find interesting or useful on the Etherpad.

This exercise should take about 5 minutes.
Expand Down
4 changes: 2 additions & 2 deletions 17-live.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ Many error messages are obscure and not written with novices in mind. Continue t

## Compare and Contrast

Watch this first participatory live coding demo video: [https://youtu.be/bXxBeNkKmJE][live-coding-bad]
and this second demo video: [https://youtu.be/SkPmwe\_WjeY][live-coding-good]
Watch this first [participatory live coding demo video][live-coding-bad]
and this [second demo video][live-coding-good]
as a group and then summarize your feedback on both in the Etherpad.
Use the 2x2 rubric for feedback we discussed earlier.

Expand Down
6 changes: 3 additions & 3 deletions 20-performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ process of observing and giving feedback, and to make changes to how we teach ba

## Round Two

1. Before splitting into groups, read the rubric that is given to Instructor Trainers
as a suggested framework for evaluating the online teaching demonstration sessions that are part of Instructor checkout.
[https://carpentries.github.io/instructor-training/demos\_rubric/](demos_rubric.md). (Note: demos are not scored, so this rubric is for
1. Before splitting into groups, read the [rubric that is given to Instructor Trainers](demos_rubric.md)
as a suggested framework for evaluating the online teaching demonstration sessions that are part of Instructor checkout.
(Note: demos are not scored, so this rubric is for
advisory purposes only.)
What questions do you have?
2. Return to your groups and repeat the previous live coding exercise, re-teaching the same content as before.
Expand Down
12 changes: 6 additions & 6 deletions 21-management.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,9 @@ We encourage you to **discuss an approach to managing Code of Conduct violations

## Know Your Resources

1) Take 5 minutes to read through the Code of Conduct Incident Response Guidelines: [https://docs.carpentries.org/topic\_folders/policies/incident-response.html](https://docs.carpentries.org/topic_folders/policies/incident-response.html)
2) Discuss what you have read in small groups. As questions arise, you may wish to refer to our complete Code of Conduct section in The Carpentries Handbook:
[https://docs.carpentries.org/topic\_folders/policies/index\_coc.html](https://docs.carpentries.org/topic_folders/policies/index_coc.html) or to the Transparency Reports released by The Carpentries Code of Conduct Committee: [https://github.com/carpentries/executive-council-info/tree/master/code-of-conduct-transparency-reports](https://github.com/carpentries/executive-council-info/tree/master/code-of-conduct-transparency-reports)
1) Take 5 minutes to read through the [Code of Conduct Incident Response Guidelines](https://docs.carpentries.org/topic_folders/policies/incident-response.html)
2) Discuss what you have read in small groups. As questions arise, you may wish to refer to [our complete Code of Conduct section in The Carpentries Handbook](https://docs.carpentries.org/topic_folders/policies/index_coc.html)
or to the [Transparency Reports released by The Carpentries Code of Conduct Committee](https://github.com/carpentries/executive-council-info/tree/master/code-of-conduct-transparency-reports).

- What kinds of things could your instructional team agree upon in advance of your workshop?
- What questions do you have about CoC enforcement?
Expand Down Expand Up @@ -396,13 +396,13 @@ instructions for setting them up.
For this activity, your Trainer will put you in groups, but you may choose whether to work together or independently.
If you work independently, you can still use your group as a resource to ask questions as they emerge.

Go to the workshop template repository: [https://github.com/carpentries/workshop-template](https://github.com/carpentries/workshop-template)
Go to the [workshop template repository](https://github.com/carpentries/workshop-template)

- If you have a GitHub account (or don't mind creating one) and are comfortable doing so,
follow the directions to begin creating a workshop website using your local location and today's date.

- Alternatively, have a look at the video tutorial linked on the instructions page. With any time
remaining, have a look at the websites for upcoming Carpentries workshops on our website: [https://carpentries.org/upcoming\_workshops/](https://carpentries.org/upcoming_workshops/)
remaining, have a look at the websites for [upcoming Carpentries workshops](https://carpentries.org/upcoming_workshops/)

- Add your questions and thoughts on this process to the Etherpad. If you created a workshop website,
add the link there as well.
Expand All @@ -413,7 +413,7 @@ Note: Sometimes web browsers will cache the workshop webpage, so when
you make changes in GitHub, they do not show up on the workshop webpage
immediately. Two ways to avoid this are to use a "private" or
"incognito" mode in your web browser or by following these
instructions to bypass your browser cache: [https://en.wikipedia.org/wiki/Wikipedia:Bypass\_your\_cache](https://en.wikipedia.org/wiki/Wikipedia:Bypass_your_cache).
[instructions to bypass your browser cache](https://en.wikipedia.org/wiki/Wikipedia:Bypass_your_cache).


::::::::::::::::::::::::::::::::::::::::::::::::::
Expand Down
6 changes: 3 additions & 3 deletions checkout.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ If you find something that you know how to fix by changing the code of the lesso
and comment on existing PRs. We will not cover the details here, but there is [a
community-contributed guide on how to create a PR][github-guide] that can help.

Each lesson repository has a document, named `CONTRIBUTING.md`, that outlines contribution guidelines. The one for this repository
is [here][contributing]. Maintainers for each repository may choose to customize their own guidelines.
Each lesson repository has a document, named `CONTRIBUTING.md`, that outlines contribution guidelines.
You can read [the contributing guidelines for this repository][contributing]. Maintainers for each repository may choose to customize their own guidelines.

### Add Your Lesson Contribution to Your Carpentries Record

Expand All @@ -77,7 +77,7 @@ For this checkout task, please:

If you have difficulty submitting your lesson contribution in AMY, please email us at [[email protected]](mailto:[email protected]) -- we would like to know about your problem and can help to get you logged in. However, if you would like to submit your contribution before you receive a response from us, you can use [this form](https://docs.google.com/forms/d/e/1FAIpQLSeMBOj5Rdh8Mgk0ebRbeRyHhGHKbItdft6avWuEzmeg8CgWbA/viewform) as an alternative.

You can track your progress by [logging into AMY here](https://amy.carpentries.org).
You can track your progress by [logging into AMY](https://amy.carpentries.org).

### Alternatives to GitHub

Expand Down
Empty file modified fig/carpentries-venn-diagram_20200904.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions instructor-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Details about the Instructor Trainer role including the application process, dut
### Immediately after the event

- Send a list of those who completed the training to checkout@carpentries.
- Send an email to trainees thanking them for participating and linking to [checkout checklist][checkout-checklist]. See template [here][post-template].
- Send an email to trainees thanking them for participating and linking to [checkout checklist][checkout-checklist]. See [an email template to thank the participants][post-template].
- Review survey results and prepare to discuss at upcoming [Trainers discussion meeting][trainer-pad].
- File any relevant issues or PRs to the [instructor training repo][training-repo].

Expand Down Expand Up @@ -157,8 +157,8 @@ account for yourself for free. This personal account will be able to attend the
About a week before your event, you will be given login credentials for a Carpentry account. Alternatively, if no
one has yet claimed "host" in your session, you can click "claim host" next to your name in the Participants list;
you will be asked for a 6-digit host key, which you can find [in this message](https://carpentries.topicbox.com/groups/trainers/T3ec157cc9a3d1833/zoom-host-code).
See [the explanation here][zoom-host-key] for step-by-step instructions on how to
claim host in Zoom Rooms using the host key.
See [the explanation for step-by-step instructions on how to
claim host in Zoom Rooms using the host key][zoom-host-key].

This account will be the host for the event and will have extra privileges including the
ability to mute participants and assign participants into breakout rooms. Decide ahead of time with your co-Trainer(s) who will log-in with/claim these credentials. The host
Expand Down
24 changes: 12 additions & 12 deletions md5sum.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
"LICENSE.md" "afaf427b4223952624dcb6d8ded53ec0" "site/built/LICENSE.md" "2023-02-07"
"config.yaml" "35ca141b17689b60b6366c3da77392c0" "site/built/config.yaml" "2023-02-08"
"index.md" "7725f1d384dd594483ddadb4c37193b9" "site/built/index.md" "2023-02-07"
"episodes/01-welcome.md" "9c60b7ab4083124062f0842808bd0902" "site/built/01-welcome.md" "2023-02-07"
"episodes/02-practice-learning.md" "f22c27e477202225364d193d33cbd3f7" "site/built/02-practice-learning.md" "2023-02-17"
"episodes/01-welcome.md" "88081f22e2a5e5e494066cb5a5bd87c4" "site/built/01-welcome.md" "2023-02-17"
"episodes/02-practice-learning.md" "e07417fc6348e1be2172ffd3db551249" "site/built/02-practice-learning.md" "2023-02-17"
"episodes/03-coffee.md" "0e92c4f4bf3aee68bfab4f09161d4a92" "site/built/03-coffee.md" "2023-02-07"
"episodes/04-expertise.md" "265599dcb010c6e59d45ea61f3f790ef" "site/built/04-expertise.md" "2023-02-07"
"episodes/05-memory.md" "80ce55a7bd2dd7ead854260d4f0fc31b" "site/built/05-memory.md" "2023-02-07"
"episodes/05-memory.md" "3e96c1fd45c0186764767e42cc9ba6d0" "site/built/05-memory.md" "2023-02-17"
"episodes/06-feedback.md" "88e6660500b0543583aa4de6e3fd55c3" "site/built/06-feedback.md" "2023-02-07"
"episodes/07-lunch.md" "c4483d62e67d5f7e131e6ea1b7d14196" "site/built/07-lunch.md" "2023-02-07"
"episodes/08-motivation.md" "a1fd6341b8d24dec56ae18ec102ab130" "site/built/08-motivation.md" "2023-02-07"
"episodes/09-eia.md" "37beead1cdeb5dbdeac02d897fcb1835" "site/built/09-eia.md" "2023-02-07"
"episodes/09-eia.md" "fcd79874a539d71deb81458a54bbfaf2" "site/built/09-eia.md" "2023-02-17"
"episodes/10-coffee.md" "3d5420a721f87b8886a1b367fe3c995e" "site/built/10-coffee.md" "2023-02-07"
"episodes/11-practice-teaching.md" "03508dd93a8111538b5ed9a2b0852427" "site/built/11-practice-teaching.md" "2023-02-07"
"episodes/11-practice-teaching.md" "91f2a5d533ed83c1b2ab565cd0f965b5" "site/built/11-practice-teaching.md" "2023-02-17"
"episodes/12-homework.md" "2e83b5196f20590c840bd7f8b1f17431" "site/built/12-homework.md" "2023-02-07"
"episodes/13-second-welcome.md" "2cfee894b3ffd7070fdce87980817e2e" "site/built/13-second-welcome.md" "2023-02-07"
"episodes/14-checkout.md" "6f644aa73437900e285f531b5ac7b264" "site/built/14-checkout.md" "2023-02-07"
"episodes/15-carpentries.md" "274a3e9bb0ab620a3d8373dcad018b50" "site/built/15-carpentries.md" "2023-02-07"
"episodes/14-checkout.md" "fd645f4626a2ef75d9d028c45f98d03e" "site/built/14-checkout.md" "2023-02-17"
"episodes/15-carpentries.md" "ee03dfdbbc65948635738006dbead5d0" "site/built/15-carpentries.md" "2023-02-17"
"episodes/16-coffee.md" "071097b7f1e99403e32bf4c077db9adf" "site/built/16-coffee.md" "2023-02-07"
"episodes/17-live.md" "3b89453f4dc999e08fb743ac836f21b6" "site/built/17-live.md" "2023-02-07"
"episodes/17-live.md" "6000e8b82f0ed2be9fa031d6cb26e539" "site/built/17-live.md" "2023-02-17"
"episodes/18-preparation.md" "dcb4f514b54fe9792e3232744dfd69b9" "site/built/18-preparation.md" "2023-02-07"
"episodes/19-lunch.md" "e1e52804614cfc72fd5ef7ab27b95044" "site/built/19-lunch.md" "2023-02-07"
"episodes/20-performance.md" "dce5aee7040bd06856a5c1b2d5f6e35e" "site/built/20-performance.md" "2023-02-07"
"episodes/21-management.md" "07f88634280c6f9b37f2dcf3eec517ab" "site/built/21-management.md" "2023-02-07"
"episodes/20-performance.md" "06a450bb46b7fb62f160b9064ed9d4ab" "site/built/20-performance.md" "2023-02-17"
"episodes/21-management.md" "898d9a30df8e809b631633c2d87a03bb" "site/built/21-management.md" "2023-02-17"
"episodes/22-coffee.md" "6aac5f397d50e66664d0752bc2ff68b9" "site/built/22-coffee.md" "2023-02-07"
"episodes/23-introductions.md" "6cf52a9387d4f2d784351440eab4636c" "site/built/23-introductions.md" "2023-02-14"
"episodes/24-practices.md" "5f37c51ce4f52aaa8eb9e20cb6cf7eff" "site/built/24-practices.md" "2023-02-07"
"episodes/25-wrap-up.md" "45cc0024ccd30f6336f0bebf02660405" "site/built/25-wrap-up.md" "2023-02-07"
"instructors/icebreakers.md" "9f283630638475d2fa261f68993479fb" "site/built/icebreakers.md" "2023-02-07"
"instructors/additional_exercises.md" "87776770d9c89ee3da9f23541652cbfc" "site/built/additional_exercises.md" "2023-02-07"
"instructors/registration_confirmation.md" "2f960fff94f98f47911705c4f2160f77" "site/built/registration_confirmation.md" "2023-02-07"
"instructors/instructor-notes.md" "635988656637e06ec0aa55a5161aa3c1" "site/built/instructor-notes.md" "2023-02-07"
"instructors/instructor-notes.md" "69c9be7881bda695d20346de97454810" "site/built/instructor-notes.md" "2023-02-17"
"learners/training_calendar.md" "a9bff6d3ab0bee01e68deca65f7aca53" "site/built/training_calendar.md" "2023-02-07"
"learners/checkout.md" "de10fb434e9a866999d14db440310cbf" "site/built/checkout.md" "2023-02-07"
"learners/checkout.md" "4682fe365392484819456c6047e78156" "site/built/checkout.md" "2023-02-17"
"learners/demo_lessons.md" "bcec52d47d53f81a778b31efb54ae158" "site/built/demo_lessons.md" "2023-02-17"
"learners/demos_rubric.md" "c8f13a44b61985d757b7e2a5a4ddeb88" "site/built/demos_rubric.md" "2023-02-07"
"learners/members.md" "5d50bcf356daefb5b6aad563306dd085" "site/built/members.md" "2023-02-07"
Expand Down

0 comments on commit e026edc

Please sign in to comment.