CodeYourFuture · SallyMcGrath · Dec 18, 2024 · Dec 18, 2024
diff --git a/common-content/en/blocks/house-rules/index.md b/common-content/en/blocks/house-rules/index.md
@@ -28,7 +28,7 @@ We teach you how to look things up. Try to use Google to answer your own questio
 
 #### Use the computer yourself
 
-Don't let volunteers or peers type for you. Ask for help, but do the work on your own.
+Don't let volunteers or peers type for you. Ask for help, but do the work yourself.
 
 #### Help each other out
 

diff --git a/common-content/en/blocks/wrap/index.md b/common-content/en/blocks/wrap/index.md
@@ -12,7 +12,7 @@ You are done for the day. Take a moment to reflect on what you have learned and
 Stand in a circle and share:
 
 - 📛 your name
-- 💪🏽 one thing you built today
+- 💪🏽 one thing you achieved today
 - 👷🏾 the task you are going to work on next
 - 🛟 one thing you need help with
 

diff --git a/common-content/en/module/fundamentals/next-steps/index.md b/common-content/en/module/fundamentals/next-steps/index.md
@@ -24,7 +24,7 @@ Pair up with a new person. In pairs, complete the following tasks:
 > If you're unsure about the answer to any of the questions below, start a thread in Slack to clarify the answer (unless there is already a thread discussing this matter).
 
 1. Starting from the home page of this website, locate the setup page and the prep page for sprint 1 of the next module.
-1. List the things you need to install ( if anything ) for the upcoming module.
+1. List the things you need to install (if anything) for the upcoming module.
 1. Check you can find the backlog page for the next sprint. Double check you've copied all the issues from the backlog over to your Course Planner.
 1. Double check you've copied all the issues from the backlog over to your Course Planner.
 1. Identify all the issues with 🔑 icon that are marked as **Priority**. What does the **Priority icon** 🔑 mean?
@@ -33,7 +33,7 @@ Pair up with a new person. In pairs, complete the following tasks:
 
 ## For volunteers
 
-1. Locate the planning board for your region ( if one exists )
+1. Locate the planning board for your region (if one exists)
 1. Locate the day-plan for the next module
 1. Check the instructions and links on the **Priority 🔑 issues** for the upcoming week ( both Tech Ed and PD )
 1. In the day-plan for the upcoming week identify the instructions for any workshops and visit the repository containing that readme. Check the instructions make sense.
diff --git a/common-content/en/module/induction/checkout-a-commit/index.md b/common-content/en/module/induction/checkout-a-commit/index.md
@@ -18,7 +18,7 @@ Recall that a commit is a snapshot of our project at some point in time.
 Therefore, we should be able to check out a previous version of our project and look at the files and folders there.
 We can use the Github interface to check out the files and folders at a previous commit.
 
-{{<note type="exercise" title="Exercise 3.1">}}
+{{<note type="exercise">}}
 
 Go back to this page https://github.com/CodeYourFuture/education-blog/commits/main
 

diff --git a/common-content/en/module/induction/next-steps/index.md b/common-content/en/module/induction/next-steps/index.md
@@ -23,7 +23,7 @@ Get into pairs with somebody you've not paired up with today and try figuring ou
 
 1. Using the curriculum, locate the page setup page for the upcoming module.
 1. Using the [curriculum website](https://curriculum.codeyourfuture.io/), locate the page with the prep material for the first week of the next module
-1. List the things you need to install ( if anything ) for the upcoming module.
+1. List the things you need to install (if anything) for the upcoming module.
 1. Check you can find the backlog page for the Induction sprint. Double check you've copied all the issues from the backlog over to your Course Planner.
 1. Identify all the issues with 🔑 icon that are marked as **Priority**. What does the **Priority icon** 🔑 mean?
 1. Go to your group Slack channel and start a thread 🧵 outlining times you're free to meet up to discuss the prep work during the week
@@ -32,7 +32,7 @@ Get into pairs with somebody you've not paired up with today and try figuring ou
 
 ## For volunteers
 
-1. Locate the classroom planning board for your region ( if one exists )
+1. Locate the classroom planning board for your region (if one exists)
 1. Locate the day-plan for the next week/module
-1. Check the instructions and links on the **Priority 🔑 issues** for the upcoming week ( both Tech Ed and PD )
+1. Check the instructions and links on the **Priority 🔑 issues** for the upcoming week (both Tech Ed and PD)
 1. In the day-plan for the upcoming week identify the instructions for any workshops and visit the repository containing that readme. Check the instructions make sense.
diff --git a/common-content/en/module/induction/previous-versions/index.md b/common-content/en/module/induction/previous-versions/index.md
@@ -13,7 +13,7 @@ emoji= '📜'
 
 We can view the different commits of a project on Github. This means we can see what the website looked like before, in previous versions.
 
-{{<note type="exercise" title="exercise 4.1">}}
+{{<note type="exercise">}}
 Here are some different versions of the same educational backlog.
 
 [Deployed version A educational blog](https://git-demo-week1-version-a.netlify.app/)

diff --git a/common-content/en/module/onboarding/blockers/index.md b/common-content/en/module/onboarding/blockers/index.md
@@ -35,6 +35,8 @@ Make sure to add only one blocker per note.
 
 {{<note title="Example Blockers" type="example">}}
 
+- I can't find a Slack channel people keep mentioning.
+- People tell me I should be replying to a Slack message in a thread, and I don't know how.
 - I can't open a PR, because...
 - How do I fix extra stray files in my PR?
 - I don't have a computer so I can't complete my work!

diff --git a/common-content/en/module/onboarding/expectations/index.md b/common-content/en/module/onboarding/expectations/index.md
@@ -3,7 +3,7 @@ title="⚖️ Expectations"
 emoji="⚖️"
 time=5
 objectives = [
-  "List the expectations of the track."
+  "List the expectations of the course."
 ]
 hide_from_overview="true"
 [build]

diff --git a/org-cyf-itp/content/onboarding/sprints/2/day-plan/index.md b/org-cyf-itp/content/onboarding/sprints/2/day-plan/index.md
@@ -16,23 +16,23 @@ name="Workshop: Asking Questions"
 src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/asking-questions/"
 time="120"
 [[blocks]]
+name="Study Group"
+src="module/onboarding/development"
+time=30
+[[blocks]]
 name="lunch"
 src="blocks/lunch"
 [[blocks]]
 name="Blockers! Getting Unstuck"
 src="module/onboarding/blockers"
 time=45
 [[blocks]]
-name="Study Group"
-src="module/onboarding/development"
-time=45
-[[blocks]]
 name="Afternoon break"
 src="blocks/afternoon-break"
 [[blocks]]
 name="Study Group"
 src="module/onboarding/development"
-time=75
+time=90
 [[blocks.nested.blocks]]
 name="Optional structured activity for consolidating Git"
 src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/git-day-1"

diff --git a/org-cyf-itp/content/onboarding/sprints/3/day-plan/index.md b/org-cyf-itp/content/onboarding/sprints/3/day-plan/index.md
@@ -16,29 +16,29 @@ name="Workshop: Developer Tools"
 src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/devtools/"
 time="120"
 [[blocks]]
-name="lunch"
-src="blocks/lunch"
-[[blocks]]
-name="Blockers! Getting Unstuck"
-src="module/onboarding/blockers"
-time=45
-[[blocks]]
 name="Study Group"
 src="module/onboarding/development"
-time=45
+time=30
 [[blocks.nested.blocks]]
 name="Optional structured activity: Pair Programming"
 src="module/onboarding/pairing"
 [[blocks.nested.blocks]]
 name="Optional structured activity: Submit your Step"
 src="module/onboarding/steps"
 [[blocks]]
+name="lunch"
+src="blocks/lunch"
+[[blocks]]
+name="Blockers! Getting Unstuck"
+src="module/onboarding/blockers"
+time=45
+[[blocks]]
 name="Afternoon break"
 src="blocks/afternoon-break"
 [[blocks]]
 name="Study Group"
 src="module/onboarding/development"
-time=75
+time=90
 [[blocks.nested.blocks]]
 name="Optional structured activity: consolidating SQL"
 src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/google-sheets-sql-quiz"

diff --git a/org-cyf-itp/content/onboarding/success/index.md b/org-cyf-itp/content/onboarding/success/index.md
@@ -15,6 +15,7 @@ weight = 11
 ### 🎯 You've achieved your learning objectives if you can:
 
 ```objectives
+- Explain to someone how we use prep, backlogs, day plans, and success pages at {{<our-name>}}.
 - Track changes to data (your code) over time with Git and GitHub.
 - Validate data with HTML forms.
 - Analyse structured data with SQL in a spreadsheet.
@@ -33,7 +34,7 @@ weight = 11
 
 1. Make a new issue on your own Coursework Planner.
 1. Link to the two Pull Requests on your issue. You don't have to wait for your PRs to be reviewed, but you must have made them.
-1. Submit the issue link to step 1 of ITP on [CYF Course Portal](https://application-process.codeyourfuture.io/)
+1. Submit the issue link to step 1 of ITP on [CYF Course Portal](https://application-process.codeyourfuture.io/).
 1. [Apply to enroll as a Trainee](https://forms.gle/vRuofa7aeL5DsbhGA).
 
 Here are those PRs again: