Merge pull request #45 from githubtraining/rename-default-branch

Update link to community contributors repo correct default branch

README.md

@@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details
 
 ## Contribute
 
-See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/master/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.
+See something we could improve? Check out the contributing guide in the [community contributors repository](https://github.com/githubtraining/community-contributors/blob/main/CONTRIBUTING.md) for more information on the types of contributions we :heart: and instructions.
 
-We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/master/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.
+We :heart: our community and take great care to ensure it is fun, safe and rewarding. Please review our [Code of Conduct](https://github.com/githubtraining/community-contributors/blob/main/CODE_OF_CONDUCT.md) for community expectations and guidelines for reporting concerns.
 
 ## License
 

config.yml

@@ -104,7 +104,7 @@ steps:
     - type: mergeBranch
       head: template
     - type: mergeBranch
-      head: master
+      head: main
       base: map-events
     - type: deleteBranch
       branch: template

responses/02_break-it-down.md

@@ -4,7 +4,7 @@ Great! When you commented, you triggered something called a webhook that I heard
 
 Now that you know what you want to teach, the next thing to do is break it down into steps. This can be tricky - put on a teacher hat and an engineer hat at the same time.
 
-To break down the thing you want to teach, think about the observable behaviors. They should show that the user is doing it right. If you were watching this person, how would you know they've mastered the thing? Some examples are:
+To break down the thing you want to teach, think about the observable behaviors. They should show that the user is doing it right. If you were watching this person, how would you know they have learned the thing? Some examples are:
 
 - Close an issue
 - Write a functional SQL query

responses/04_merge-conflict.md

@@ -5,14 +5,14 @@ If you've solved merge conflicts before, you know what to do: go ahead and resol
 If this is your first merge conflict, that's OK too. Here are instructions for resolving a merge conflict:
 
 1. At the bottom of the page in the "This branch has conflicts that must be resolved" section of the Pull Request, click the **Resolve conflicts** button.
-2. Look for the highlighted sections that begins with  `<<<<<<<  template` and ends with `>>>>>>> master`. These markers are added by Git to show you the content that is in conflict.
-3. Choose the version that you'd like to keep - do you want to keep the content between `<<<<<<<  template` and `======`, or `======` and `>>>>>>> master`? 
+2. Look for the highlighted sections that begins with  `<<<<<<<  template` and ends with `>>>>>>> main`. These markers are added by Git to show you the content that is in conflict.
+3. Choose the version that you'd like to keep - do you want to keep the content between `<<<<<<<  template` and `======`, or `======` and `>>>>>>> main`? 
 4. Delete the content that you do not want to keep.
 5. Next, remove the merge conflict markers by deleting the following lines:
 
        <<<<<<< template
        =======
-        >>>>>>> master
+        >>>>>>> main
 
 6. With the merge conflict markers removed, click **Mark as resolved**.
 7. Finally, click **Commit merge**.

responses/12_phase-3-config.md

@@ -6,7 +6,7 @@ To put this response in the config, it will be very similar to phase 1. But, _wh
 - type: gate
     left: '%payload.pull_request.base.ref%'
     operator: ===
-    right: master
+    right: main
     else:
     - type: respond
       with: 01_try-again.md

responses/13_metadata.md

@@ -6,7 +6,7 @@ The parts that we need now are the title, description, and the name of the learn
 
 Here are a few examples:
 
-- [Introduction to GitHub](https://github.com/githubtraining/introduction-to-github/blob/master/config.yml)
+- [Introduction to GitHub](https://github.com/githubtraining/introduction-to-github/blob/main/config.yml)
 ```
 title: Introduction to GitHub
 description: If you are looking for a quick and fun introduction to GitHub, you've found it. This class will get you started using GitHub in less than an hour.
@@ -15,15 +15,15 @@ template:
   repo: caption-this-template
   description: 'A robot powered training repository :robot:'
 ```
-- [Communicating Using Markdown](https://github.com/githubtraining/communicating-using-markdown/blob/master/config.yml)
+- [Communicating Using Markdown](https://github.com/githubtraining/communicating-using-markdown/blob/main/config.yml)
 ```
 title: "Communicating using Markdown"
 description: "This course will walk you through everything you need to start organizing ideas and collaborating using Markdown, a lightweight language for text formatting."
 template:
   name: "markdown-portfolio"
   repo: "communicating-using-md-template"
 ```
-- [This course - Writing a Learning Lab course](https://github.com/githubtraining/write-a-ll-course/blob/master/config.yml)
+- [This course - Writing a Learning Lab course](https://github.com/githubtraining/write-a-ll-course/blob/main/config.yml)
 ```
 title: Write a Learning Lab course
 description: Use Learning Lab's strengths for fast feedback to author your own course.

responses/14_troubleshooting.md

@@ -25,7 +25,7 @@ Check the responses referenced in the the `config.yml` file. Do they all exist?
 
 ### Get more detailed error messages
 
-More detailed error messages are available for draft courses made from pull requests. To do this, the course must first be published. Create another branch with the most up-to-date version of your course. Edit the course version on the `master` branch to reduce the possibility for errors. (You can do this by matching [the boilerplate repository](https://github.com/githubtraining/write-a-ll-course-template/blob/master/config.yml).)
+More detailed error messages are available for draft courses made from pull requests. To do this, the course must first be published. Create another branch with the most up-to-date version of your course. Edit the course version on the `main` branch to reduce the possibility for errors. (You can do this by matching [the boilerplate repository](https://github.com/githubtraining/write-a-ll-course-template/blob/main/config.yml).)
 
 ### Actions for every event