ITP Onboarding Updates

common-content/en/module/induction/accounts/index.md

@@ -52,7 +52,7 @@ You will use [GitHub](https://github.com/signup) to store your code and to colla
 
 ### LinkedIn
 
-Sign up for LinkedIn. LinkedIn is the largest professional social network. You will use it to help you get a job and to advance your career.
+Sign up for [LinkedIn](https://www.linkedin.com/). LinkedIn is the largest professional social network. You will use it to help you get a job and to advance your career.
 
 Make a LinkedIn account. Use your real name. Sign in with Google. Connect with your cohort.
 
@@ -79,8 +79,6 @@ See this example fully filled-in Slack profile - make sure yours has at least th
 
 ## Applications
 
-If you're working on a library computer, you can't download these applications. You will use [GitHub Dev](https://github.dev/) to complete coursework instead.
-
 ### Google Chrome
 
 - [ ] I have downloaded and installed Google Chrome.
@@ -90,12 +88,12 @@ Use your professional Chrome profile for all your {{<our-name>}} work. You will
 
 ### VSCode
 
-We will use [Visual Studio Code](https://code.visualstudio.com/) (VSCode), a professional IDE you will use on this course and at work.
+We will use [Visual Studio Code](https://code.visualstudio.com/) (VSCode), a customisable text editor you will use on this course and at work. If you are new to using tools like VSCode there are [video resources](https://www.youtube.com/watch?v=B-s71n0dHUk) which can help you familiarise yourself with the interface.
 
 - [ ] I have downloaded and installed [Visual Studio Code](https://code.visualstudio.com/).
 
 ### Zoom
 
-Usually we use [Meet](https://applieddigitalskills.withgoogle.com/c/college-and-continuing-education/en/google-meet-for-beginners/overview.html), but sometimes we use [Zoom for remote sessions](https://zoom.us/download). Install it now.
+Usually we use [Meet](https://applieddigitalskills.withgoogle.com/c/college-and-continuing-education/en/google-meet-for-beginners/overview.html), but sometimes we use [Zoom for remote sessions](https://zoom.us/download). If you are using a library computer you can use the web version, if you are using your own computer you should install it now.
 
 - [ ] I have downloaded and installed [Zoom](https://zoom.us/download) onto my computer.

common-content/en/module/induction/branching/index.md

@@ -20,7 +20,7 @@ On the left page of the page, we see additional information:
 
 ![main-branch-highlighted](main-branch-highlighted.png)
 
-> So what is **`main`**?
+So what is `main`?
 
 `main` is a **branch**.
 
@@ -35,7 +35,7 @@ gitGraph
 
 A branch represents a particular history of development in a project - the different versions there have been.
 
-{{<note type="definition" title="definition: Branch">}}
+{{<note type="definition" title="Definition: Branch">}}
 
 A **branch** is a sequence of commits in a project.
 
@@ -50,14 +50,18 @@ gitGraph
         commit
         commit
         branch "try-purple"
+        checkout "try-purple"
         commit
         commit
         checkout main
         branch "try-blue"
         commit
+        checkout main
+        commit
+        commit
 ```
 
-The **`main`** branch is often treated as a special branch - it's where we put commits which people working on the project have agreed on. Other branches (e.g. the experimental purple branch) may have extra changes that have not been agreed on. If people working on the project agree the changes from the purple branch are good, we'll add those changes to the main branch.
+The `main` branch is often treated as a special branch - it's where we put commits which people working on the project have agreed on. Other branches (e.g. the `try-purple` branch) may have extra changes that have not been agreed on. If people working on the project agree the changes from the purple branch are good, we'll add those changes to the main branch.
 
 When we're working on something new, we haven't agreed with other people that our new thing is good yet, so we often don't add our changes to the main branch straight away. Instead we make our own branch to experiment on.
 
@@ -75,13 +79,11 @@ gitGraph
 
 In the diagram above, we can continue to commit on the "week-1-coursework" branch without altering the history of the `main` branch.
 
-{{<note type="exercise" title="exercise 8.1">}}
-
-### Creating a local branch
+{{<note type="exercise" title="Exercise - Creating a local branch">}}
 
 1. Open the `education-blog` repository in VSCode.
 
-2. Using this clip, create a new branch called `update-blog-1` in your local repository 👉 https://youtube.com/clip/UgkxvXsnm_98Rx0NUZq25apQWA6POccRoQzw
+2. Using [this clip](https://youtube.com/clip/UgkxvXsnm_98Rx0NUZq25apQWA6POccRoQzw), create a new branch called `update-blog-1` in your local repository.
 
 📋 How can you check that you've successfully created a branch?
 

common-content/en/module/induction/check-git-installation/index.md

@@ -1,9 +1,9 @@
 +++
-title = 'Check Git installation'
+title = 'Check Git Installation'
 time = 15
 vocabulary=[]
 [tasks]
-1='Double check Git is installed on your local machine'
+1='Check Git is installed on your local machine'
 [build]
   render = 'never'
   list = 'local'
@@ -13,16 +13,19 @@ vocabulary=[]
 
 ### Git
 
-You will use Git continually as a developer. We will cover Git in more depth later in the course. Right now, we will just check that you have it installed.
+{{<note type="definition" title="Definition: Git">}}
 
-Open up a terminal and run the command `git --version` to double check you have Git installed.
+Git is **version control software** that allows developers to create and manage different versions of a project.
+
+{{</note>}}
+
+You will use Git continually as a developer. Before we can do any work with it we need to check that you have it installed.
+
+Open your computer's terminal application and run the command `git --version` to double check you have Git installed.
 If it is installed successfully, you should get a version number (which may not be exactly the same as this example, but should look similar):
 
 ```
 git version 2.40.0
 ```
 
 Otherwise, you will need to [install](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) it or ask for support on your Slack channel.
-
-> [!TIP]
-> If you are working on a library computer, you do not have a terminal, but your github.dev account already has Git installed. (It's called "Source Control".) So you can skip this step.

common-content/en/module/induction/checkout-a-commit/index.md

@@ -16,7 +16,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">}}
+{{<note type="exercise" title="Exercise - Explore a Commit">}}
 
 Go back to this page https://github.com/CodeYourFuture/education-blog/commits/main
 

common-content/en/module/induction/cyf-blog/index.md

@@ -1,5 +1,5 @@
 +++
-title = 'Blog'
+title = 'CYF Blog'
 time ="5"
 hide_from_overview = true
 [build]
@@ -14,6 +14,6 @@ Ahmed and Naima are writing a blog together about their struggles learning codin
 
 The published blog is live here 👉 [Educational blog](https://git-demo-week1.netlify.app/)
 
-{{<note type="exercise" title="exercise 1.1">}}
+{{<note type="exercise" title="Exercise - Investigate the Resources">}}
 Explore the [Educational blog](https://git-demo-week1.netlify.app/). Click on the link on the site and check to see if it is working.
 {{</note>}}

common-content/en/module/induction/cyf-folder/index.md

@@ -15,27 +15,4 @@ vocabulary=[]
 > [!IMPORTANT]
 > Make a folder called `{{<our-name>}}` in your home directory. Store all your work for the course in this folder.
 
-You'll need to create a {{<our-name>}} folder to store your projects on the course. You can do this any way you like, but here we are using the terminal.
-
-### How to create a folder using the terminal
-
-1. Open a terminal on your computer.
-
-For each of the steps below, you'll need to use the command line in your terminal.
-
-Use this [cli documentation](https://www.techrepublic.com/article/16-terminal-commands-every-user-should-know/) to remember terminal commands.
-
-2. In your terminal, print your current working directory.
-
-3. List the files and folders in your current working directory.
-
-You'll need a place to store your work for the course.
-
-4. **M**a**k**e a new **dir**ectory called `{{<our-name>}}` in your home directory.
-
-5. **C**hange **d**irectory into the `{{<our-name>}}` directory.
-
-6. Double check you're in the right place by **p**rinting your current **w**orking **d**irectory.
-
-> [!TIP]
-> If you're working on a library computer, skip this step. You will store your work in your GitHub account.
+You'll need to create a `{{<our-name>}}` folder to store your projects on the course. It's up to you how you organise your work, but we suggest having a sub-directory for each module and then for each sprint. You can create the folder using your system's file explorer, or using the terminal app if you're comfortable doing that.

common-content/en/module/induction/development-process/index.md

@@ -11,15 +11,15 @@ hide_from_overview = true
 
 Ahmed and Naima are using the following **development process** for writing their blog:
 
-> - writing the blog in a single file on a **single** computer
-> - saving multiple versions of the file on the same computer
-> - taking turns to use the computer during the day
+- Writing the blog in a single file on a **single** computer
+- Saving multiple versions of the file on the same computer
+- Taking turns to use the computer during the day
 
 At the moment, the computer has a folder with the blog that looks like this:
 
 ![different-blog-versions](different-blog-versions.png)
 
-{{<note type="exercise" title="Exercise">}}
+{{<note type="exercise" title="Exercise - Challenges">}}
 
 Describe some of the challenges that Ahmed and Naima face when trying to write a blog together in this way.
 

common-content/en/module/induction/forking-a-repository/index.md

@@ -12,11 +12,15 @@ time ="10"
 
 Often we want to take an existing project and start working on it independently. In other words: we start making our own versions of the project separate from the original project.
 
-We can create a {{<tooltip title="fork">}}A **fork** is a copy of a repository that exists on Github{{</tooltip>}}.
+We can create a **fork**. A fork is a copy of a repository that exists on Github.
 
-When we create a fork on Github, the new forked repository gets a new url:
+A GitHub repository's url looks like this:
 
-#### https://github.com/CodeYourFuture/cyf-demo-repo
+```
+https://github.com/CodeYourFuture/cyf-demo-repo
+```
+
+Like any url it is made up of different parts.
 
 ```mermaid
 flowchart LR
@@ -52,13 +56,11 @@ flowchart LR
     C --> D[cyf-demo-repo]
 ```
 
-{{<note type="exercise" title="🍴 Fork a repo">}}
-
-### 🍴 Fork a repo
+{{<note type="exercise" title="Exercise - Fork a Repo">}}
 
 1. Go to https://github.com/CodeYourFuture/education-blog.
-1. Find the **Fork** button on this page.
-1. Click on the Fork button to create a new fork of the repository and set yourself as the owner of the fork.
+2. Find the **Fork** button on this page.
+3. Click on the Fork button to create a new fork of the repository and set yourself as the owner of the fork.
 
 📋 How can you check you successfully forked the original repository?
 

common-content/en/module/induction/previous-versions/index.md

@@ -9,34 +9,22 @@ time ="20"
 
 +++
 
-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.
+We can view the different commits of a project on Github. This means we can see what an application looked like before, in previous versions.
 
-{{<note type="exercise">}}
-Here are some different versions of the same educational backlog.
+{{<note type="exercise" title="Exercise - Comparing Previous Versions">}}
+Here are some different versions of the educational blog we introduced in the previous module.
 
 [Deployed version A educational blog](https://git-demo-week1-version-a.netlify.app/)
 
-<!---
-Version A should have a test p element on the index page
--->
-
 [Deployed version B educational blog](https://git-demo-week1-version-b.netlify.app/)
 
-<!---
-Version B should have nothing on the index page
--->
-
 [Deployed version C educational blog](https://git-demo-week1-version-c.netlify.app/)
 
-<!---
-Version C should be same as production deployment but with some rogue characters on the page
--->
-
 #### Questions
 
 1. What is the difference between Version A and Version B on the index page (the page you first land on after clicking on the link)
 1. What is the difference between Version C and the main version of the site.
-1. Which commit from the [**education-blog**](https://github.com/CodeYourFuture/education-blog/commits/main) repo correspond to Version C? Remember to check the git history.
-1. Which commit from the [**education-blog**](https://github.com/CodeYourFuture/education-blog/commits/main) repo correspond to Version A?
+1. Which commit from the [**education-blog**](https://github.com/CodeYourFuture/education-blog/commits/main) repo corresponds to Version C? Remember to check the git history.
+1. Which commit from the [**education-blog**](https://github.com/CodeYourFuture/education-blog/commits/main) repo corresponds to Version A?
 
 {{</note>}}

common-content/en/module/induction/sharing-history/index.md

@@ -12,9 +12,7 @@ time="30"
 
 +++
 
-Earlier on, Ahmed and Naima realised they also need the following:
-
-> a way to share the history of the project between different users and different computers
+Earlier on, Ahmed and Naima realised they also need a way to share the history of the project between different users and different computers.
 
 To share a project and its history, we can use an online platform called **GitHub**
 
@@ -26,60 +24,48 @@ By storing projects on GitHub, multiple users can gain access to the history of
 On GitHub we call our project and its history a **repository**.
 {{</note>}}
 
-{{<note type="exercise" title="Exercise">}}
-
-### Explore 🔍
+{{<note type="exercise" title="Exercise - Exploring a Repository">}}
 
 In this exercise, you'll need to explore a **GitHub repository.**
 
 You'll need to look around and figure out where to find different files and find out information about them.
 
-**⚠️ You won't be expected to know what the files do at this stage.**
+**You won't be expected to know what the files do at this stage.**
 
 Go to the following link: https://github.com/CodeYourFuture/education-blog
 
 It will take you to a GitHub repository called **education-blog**.
 
 Answer the following questions using the page linked to above:
 
-a) View the **README.md** file. What do the instructions tell you?
-b) How many files are there inside the `blogs` folder?
-c) How many lines are there in the **package.json** file?
-d) Find the file with the blog content you can see on the live site here [blog 1](https://git-demo-week1.netlify.app/blogs/1)
+1. View the **README.md** file. What do the instructions tell you?
+2. How many files are there inside the `blogs` folder?
+3. How many lines are there in the **package.json** file?
+4. Find the file with the blog content you can see on the live site here [blog 1](https://git-demo-week1.netlify.app/blogs/1)
 
 You'll learn more about these type of files throughout the course.
 
 {{</note>}}
 
-> We can use the Github interface to explore the different **commits** (versions) of a project too.
+We can use the Github interface to explore the different **commits** (versions) of a project too.
 
-{{<note type="exercise" title="exercise">}}
-
-### Explore 🔍
+{{<note type="exercise" title="Exercise - Exploring a Commit">}}
 
 Go to the following link: https://github.com/CodeYourFuture/education-blog/commits/main
 
-Try answering the following questions:
-
-Go to the commit that says "add test p element to index page"
+Go to the commit that says "add test p element to index page" and try answering the following questions:
 
-#### Questions
-
-- How many files were changed in this commit?
-- Who created the change?
-- What time did the change take place?
+1. How many files were changed in this commit?
+2. Who created the change?
+3. What time did the change take place?
 
 {{</note>}}
 
-{{<note type="exercise" title="exercise">}}
-
-### Explore 🔍
+{{<note type="exercise" title="Exercise - Finding a Commit">}}
 
 Go to the following link: https://github.com/CodeYourFuture/education-blog/commits/main and locate commit that says "remove \ and # from start of paragraph"
 
-#### Questions
-
-- How many files were changed in this commit?
-- What change was made in this commit?
+1. How many files were changed in this commit?
+2. What change was made in this commit?
 
 {{</note>}}