From fd07db4da2ccf90c831b1279de7eed0e2c554f63 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 09:29:17 -0500 Subject: [PATCH 1/7] Reminder of workshop expectations Fixes 198 --- episodes/reflecting.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/episodes/reflecting.md b/episodes/reflecting.md index e60c7664b..6c8637e3c 100644 --- a/episodes/reflecting.md +++ b/episodes/reflecting.md @@ -22,6 +22,19 @@ After completing this episode, participants should be able to... Welcome back! +::::::::::::::::::::: instructor + +This episode picks-up after a long break in training for learners, you may need to remind +them of the following expectations as part of training. + +- The [Carpentries Code of Conduct][coc] +- How to get in the queue to participate - hand-raising, typing in chat, etc. +- Microphones muted when you aren't speaking (if virtual) +- Any other expectations for interaction + +:::::::::::::::::::::::::::::::: + + ![ In this episode, we will discuss the final step of the iterative lesson design process: how you can use the notes, information, and feedback you collected when trialling your lesson @@ -113,3 +126,7 @@ Designing and developing quality lessons is hard - there are many pieces of a pu - Identify changes and improvements you want to make as a result of trialling your lesson and schedule co-working sessions to work on these tasks. :::::::::::::::::::::::::::::::::::::::::::::::::: + + +[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html + From f41fceb6587eb75b34eb311e27cff4fb71c9b041 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 09:47:09 -0500 Subject: [PATCH 2/7] Update links.md with coc link --- links.md | 1 + 1 file changed, 1 insertion(+) diff --git a/links.md b/links.md index 3ec21aa30..5ef57ec33 100644 --- a/links.md +++ b/links.md @@ -3,6 +3,7 @@ [carpentries-lab]: https://carpentries-lab.org/ [carpentries-website]: https://carpentries.org/ [cldt-site]: https://carpentries.github.io/lesson-development-training/ +[coc]: ../CODE_OF_CONDUCT.md [codimd-notes-template]: https://codimd.carpentries.org/cldt-notes-template?both#Exercise-evaluating-learning-objectives-15-minutes [component-guide]: https://carpentries.github.io/sandpaper-docs/component-guide.html [dc]: https://datacarpentry.org/ From 66637798906d5e8de542b12389e65b03c53d5477 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 09:48:56 -0500 Subject: [PATCH 3/7] Update reflecting.md to use links.md for the coc link --- episodes/reflecting.md | 1 - 1 file changed, 1 deletion(-) diff --git a/episodes/reflecting.md b/episodes/reflecting.md index 6c8637e3c..ae2f7fa7f 100644 --- a/episodes/reflecting.md +++ b/episodes/reflecting.md @@ -128,5 +128,4 @@ Designing and developing quality lessons is hard - there are many pieces of a pu :::::::::::::::::::::::::::::::::::::::::::::::::: -[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html From d6e4f98325a41f8bb5eefcca28599bc28a620752 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 09:49:28 -0500 Subject: [PATCH 4/7] Update introduction.md to use coc link from links.md --- episodes/introduction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/episodes/introduction.md b/episodes/introduction.md index 1926de019..53fc9e6d5 100644 --- a/episodes/introduction.md +++ b/episodes/introduction.md @@ -66,7 +66,7 @@ participate by writing your answers in the shared document for the workshop. To make clear what is expected, everyone participating in The Carpentries activities is required to abide by our -[Code of Conduct](../CODE_OF_CONDUCT.md). +[Code of Conduct][coc]. Any form of behaviour to exclude, intimidate, or cause discomfort is a violation of the Code of Conduct. In order to foster a positive and professional learning environment we encourage you to: From 06254aff456421006d79c8b892e830f1df481e9c Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 09:56:04 -0500 Subject: [PATCH 5/7] Making relative link for CoC correct in links.md --- links.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/links.md b/links.md index 5ef57ec33..0516ad87d 100644 --- a/links.md +++ b/links.md @@ -3,7 +3,7 @@ [carpentries-lab]: https://carpentries-lab.org/ [carpentries-website]: https://carpentries.org/ [cldt-site]: https://carpentries.github.io/lesson-development-training/ -[coc]: ../CODE_OF_CONDUCT.md +[coc]: CODE_OF_CONDUCT.md [codimd-notes-template]: https://codimd.carpentries.org/cldt-notes-template?both#Exercise-evaluating-learning-objectives-15-minutes [component-guide]: https://carpentries.github.io/sandpaper-docs/component-guide.html [dc]: https://datacarpentry.org/ From 66c72640b69bae5af4a256ed6440f9dc261330b4 Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 10:04:43 -0500 Subject: [PATCH 6/7] Using full CoC link --- links.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/links.md b/links.md index 0516ad87d..f99b364c4 100644 --- a/links.md +++ b/links.md @@ -3,7 +3,7 @@ [carpentries-lab]: https://carpentries-lab.org/ [carpentries-website]: https://carpentries.org/ [cldt-site]: https://carpentries.github.io/lesson-development-training/ -[coc]: CODE_OF_CONDUCT.md +[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html [codimd-notes-template]: https://codimd.carpentries.org/cldt-notes-template?both#Exercise-evaluating-learning-objectives-15-minutes [component-guide]: https://carpentries.github.io/sandpaper-docs/component-guide.html [dc]: https://datacarpentry.org/ From 4c6907e148c7e8c4c1d909657a362c809533848c Mon Sep 17 00:00:00 2001 From: Sarah Stevens Date: Fri, 29 Sep 2023 10:05:21 -0500 Subject: [PATCH 7/7] removing duplicate coc link --- CODE_OF_CONDUCT.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f146f90b9..2c813e27f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -7,5 +7,4 @@ we pledge to follow the [Carpentry Code of Conduct][coc]. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by following our [reporting guidelines][coc-reporting]. -[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html [coc-reporting]: https://docs.carpentries.org/topic_folders/policies/incident-reporting.html