diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fcb992a..fd9dfab 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,7 +23,7 @@ This course is currently in production. It was designed to meet the learning out - to change the starter code for the learner, edit the [template repository](https://lab.github.com/docs/course-ownership-and-repositories#the-repositories) 1. Commit your changes to your fork. 1. Open a pull request with: - - base branch: the master branch of this repository + - base branch: the main branch of this repository - compare branch: the branch containing your commits in your fork 1. Wait for a review from the Learning Lab team, which will be automatically requested @@ -61,4 +61,4 @@ There are many ways you can contribute! Here are just a few: ### Releasing -When your course branch has been merged into `master`, the [course version](https://lab.github.com/docs/course-versioning) on Learning Lab will automatically update and any new learners will receive the updated version of the course. There are no additional requirements on your part. \ No newline at end of file +When your course branch has been merged into `main`, the [course version](https://lab.github.com/docs/course-versioning) on Learning Lab will automatically update and any new learners will receive the updated version of the course. There are no additional requirements on your part. \ No newline at end of file diff --git a/README.md b/README.md index f9c1246..f68f391 100644 --- 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 index 9b023da..c59af26 100644 --- a/config.yml +++ b/config.yml @@ -8,7 +8,7 @@ template: name: hello-github-actions repo: hello-github-actions-template before: - # protect the master branch + # protect the main branch - type: updateBranchProtection # open issue 1 (welcome) @@ -18,7 +18,7 @@ before: comments: - 00.1_first-steps.md data: - dockerfileUrl: "%payload.repository.html_url%/new/master?filename=action-a/Dockerfile" + dockerfileUrl: "%payload.repository.html_url%/new/main?filename=action-a/Dockerfile" # Repo artifacts: # Issue 1: Welcome diff --git a/responses/00.1_first-steps.md b/responses/00.1_first-steps.md index 941e1f8..440e6f0 100644 --- a/responses/00.1_first-steps.md +++ b/responses/00.1_first-steps.md @@ -43,7 +43,7 @@ Our action will use a Docker container so it will require a `Dockerfile`. Let's 1. Commit your file - If you're working locally, you will also need stage your file and to push the branch to GitHub. -1. Open a pull request with your new branch against `master` +1. Open a pull request with your new branch against `main`

I'll respond in your new pull request with next steps.

diff --git a/responses/06.0_workflow-success.md b/responses/06.0_workflow-success.md index ea50eaf..0b481db 100644 --- a/responses/06.0_workflow-success.md +++ b/responses/06.0_workflow-success.md @@ -6,11 +6,11 @@ You should see the string "Hello world, I'm Mona!" printed at the bottom to `std ## Step 7: Incorporate the workflow -As a final step, merge this pull request so the action will be a part of the `master` branch. +As a final step, merge this pull request so the action will be a part of the `main` branch. Anyone that uses this repository, and any future code can benefit from this workflow and your new action! -### :keyboard: Activity: Merge your workflow into the `master` branch +### :keyboard: Activity: Merge your workflow into the `main` branch 1. Merge this pull request 1. Delete your branch