githubtraining · brianamarie · Dec 3, 2020 · Dec 3, 2020
diff --git a/README.md b/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
 

diff --git a/config.yml b/config.yml
@@ -44,7 +44,7 @@ before:
     store:
       repositoryUrl: '{{ payload.repository.html_url }}'
       actionsUrl: '{{ payload.repository.html_url }}/actions'
-      workflowEditUrl: '{{ payload.repository.html_url }}/edit/master/.github/workflows/my-workflow.yml'
+      workflowEditUrl: '{{ payload.repository.html_url }}/edit/main/.github/workflows/my-workflow.yml'
       branchSettingsUrl: '{{ payload.repository.html_url }}/settings/branches'
   - type: createProjectBoard
     name: Learning Lab Project Board
@@ -62,7 +62,7 @@ before:
       welcomeIssueUrl: "%result.data.html_url%"
       welcomeIssueNumber: "%result.data.number%"
     data:
-      quicklink: "{{ store.repositoryUrl }}/new/master?filename=.github/workflows/my-workflow.yml"
+      quicklink: "{{ store.repositoryUrl }}/new/main?filename=.github/workflows/my-workflow.yml"
       actionsUrl: "{{ store.repositoryUrl }}/actions/new"
     comments:
       - 00_explain-gh-script.md
@@ -183,7 +183,7 @@ steps:
         issue: "%store.secondIssueNumber%"
         data:
           columnID: "%store.columnID%"
-          quicklink: "%payload.repository.html_url%/edit/master/.github/workflows/my-workflow.yml"
+          quicklink: "%payload.repository.html_url%/edit/main/.github/workflows/my-workflow.yml"
     #  new pull request
   - title: Modify your workflow file
     description: Create a pull request to add changes to your workflow
@@ -237,7 +237,7 @@ steps:
         data:
           actionsUrl: "%payload.repository.html_url%/actions"
 
-  - title: Merge the updated workflow into the master branch
+  - title: Merge the updated workflow into the main branch
     description: Make the workflow available for use on the repository
     event: pull_request.closed
     link: "{{ store.secondPullUrl }}"
@@ -303,7 +303,7 @@ steps:
           listProj: "%actions.projectBoard.data%"
           listCol: "%actions.listColumns.data%"
           columnID: "%actions.listColumns.data.0.id%"
-          quicklink: "%payload.repository.html_url%/edit/master/.github/workflows/my-workflow.yml"
+          quicklink: "%payload.repository.html_url%/edit/main/.github/workflows/my-workflow.yml"
 
   - title: Create better comments
     description: Use a templated repsonse as the comment body
@@ -358,7 +358,7 @@ steps:
         event: APPROVE
 
   - title: Merge the updated workflow
-    description: Merge the worklow to the master branch
+    description: Merge the worklow to the main branch
     event: pull_request.closed
     link: "{{store.thirdPullUrl}}"
     actions:
@@ -393,7 +393,7 @@ steps:
           1. Edit your [workflow file]( {{ store.workflowEditUrl }}) and look for errors in the linter built into the browser.
           1. Look for the [workflow trigger](https://help.github.com/en/actions/reference/events-that-trigger-workflows) and ensure you are performing an action that triggers that workflow.
 
-          If you need to make changes to your code, remove the [master branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `master` branch.
+          If you need to make changes to your code, remove the [main branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `main` branch.
           </details>
 
           ---

diff --git a/responses/00_explain-gh-script.md b/responses/00_explain-gh-script.md
@@ -57,7 +57,7 @@ Again, that's not too hard at all. Now let's do the same thing, only using the G
         repo: github.context.repo.repo,
         owner: github.context.repo.owner,
         head: github.context.ref,
-        base: "master",
+        base: "main",
         title: "from my action",
         body: "## I totally used GitHub Script to pull this off 🔥"
     })

diff --git a/responses/00_octokit-comparison.md b/responses/00_octokit-comparison.md
@@ -16,4 +16,4 @@ Anything you can do with Octokit can be accomplished with GitHub Script 🎉!
 
 _You may have noticed that when using GitHub Script the method call starts with `github` and not `octokit`. This is because GitHub Script provides you with a pre-authenticated octokit/rest.js client stored in a variable named `github`._
 
-_`context` is a reference to an object containing the [context of the current workflow run](https://github.com/actions/toolkit/blob/master/packages/github/src/context.ts)_
+_`context` is a reference to an object containing the [context of the current workflow run](https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts)_
diff --git a/responses/02_workflow-triggered.md b/responses/02_workflow-triggered.md
@@ -22,7 +22,7 @@ Try the following troubleshooting steps:
 1. Edit your [workflow file]( {{ store.workflowEditUrl }}) and look for errors in the linter built into the browser.
 1. Look for the [workflow trigger](https://help.github.com/en/actions/reference/events-that-trigger-workflows) and ensure you are performing an action that triggers that workflow.
 
-If you need to make changes to your code, remove the [master branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `master` branch.
+If you need to make changes to your code, remove the [main branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `main` branch.
 </details>
 
 ---

diff --git a/responses/05_workflow-triggered.md b/responses/05_workflow-triggered.md
@@ -10,7 +10,7 @@ Try the following troubleshooting steps:
 1. Edit your [workflow file]( {{ store.workflowEditUrl }}) and look for errors in the linter built into the browser.
 1. Look for the [workflow trigger](https://help.github.com/en/actions/reference/events-that-trigger-workflows) and ensure you are performing an action that triggers that workflow.
 
-If you need to make changes to your code, remove the [master branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `master` branch.
+If you need to make changes to your code, remove the [main branch protection]({{ store.branchSettingsUrl }}) and merge your changes into the `main` branch.
 </details>
 
 ---
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@ Anything you can do with Octokit can be accomplished with GitHub Script 🎉!

		_You may have noticed that when using GitHub Script the method call starts with `github` and not `octokit`. This is because GitHub Script provides you with a pre-authenticated octokit/rest.js client stored in a variable named `github`._

		_`context` is a reference to an object containing the [context of the current workflow run](https://github.com/actions/toolkit/blob/master/packages/github/src/context.ts)_
		_`context` is a reference to an object containing the [context of the current workflow run](https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts)_