rename master to main in branch context (#32)

githubtraining · Nov 30, 2020 · 108f182 · 108f182
1 parent 8c4eec4
commit 108f182
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 20 deletions.
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
@@ -27,7 +27,7 @@ tags: [
 ]
 before:
  - type: updateBranchProtection
- branch: master
+ branch: main
  enforce_admins: true
  required_pull_request_reviews:
  include_admins: true

diff --git a/course-description.md b/course-description.md
@@ -24,7 +24,7 @@ In this course, you'll learn:
 | Student action | App response |
 | -------------- | ------------ |
 | Writes a task list | Comments in issue #1 to enable pages (01a-turn-on-ghp.md) |
-| Enable GitHub Pages from `master` | Comments in issue #1 congrats (01b-close-issue.md), Opens PR #2 (title: Outline your portfolio, body-contents: 02-headers.md, pr-contents: 02-resume.md) |
+| Enable GitHub Pages from `main` | Comments in issue #1 congrats (01b-close-issue.md), Opens PR #2 (title: Outline your portfolio, body-contents: 02-headers.md, pr-contents: 02-resume.md) |
 | Edit file in PR #2 by adding header formatting | Validate via status check and/or PR review, comments (03-pr-succeeds.md) or (03-request-changes.md) |
 | Merge pull request #2 | Comments (03-next.md) in PR #2, opens PR #3 (title: Introduce yourself to the world, body-contents: 04-add-image.md, pr-contents: "Add image here" on line 2 or 3 of README.md) |
 | Add's image in PR #3 | Validate via status check and/or PR review, comments (04-image-works-url.md) or (04-request-changes.md) |

diff --git a/course-overview.md b/course-overview.md
@@ -95,7 +95,7 @@ Since this project is going to be a static web page, the first thing you'll need
 ### :memo: Activity: Enable GitHub Pages
 1. Under your repository name in this repository, click **Settings**.
  ![image of settings tab](https://help.github.com/assets/images/help/repository/repo-actions-settings.png)
-1. Use the Select source drop-down menu to select `master` as your GitHub Pages publishing source.
+1. Use the Select source drop-down menu to select `main` as your GitHub Pages publishing source.
  ![image of selecting a source](https://help.github.com/assets/images/help/pages/select-master-branch-docs-folder-as-source.png)
 1. Click **Save**.
  ![image of clicking save](https://help.github.com/assets/images/help/pages/click-save-next-to-master-branch-docs-folder-source-selection.png)
@@ -263,7 +263,7 @@ _You **can** combine them_
 
 ### :memo: Activity: Fix the markdown
 
-1. Create a pull request with `base: master` and `compare: fix-markdown`.
+1. Create a pull request with `base: main` and `compare: fix-markdown`.
 1. Edit the file in this pull request.
 1. By using the **Preview** tab and your :sparkles: new Markdown knowledge, see what markdown is broken.
 1. Fix the markdown.

diff --git a/responses/01_turn-on-ghp.md b/responses/01_turn-on-ghp.md
@@ -6,7 +6,7 @@ Now let's turn our focus to the content of your portfolio. Because this portfoli
 
 ### :keyboard: Activity: Enable GitHub Pages
 1. Under your repository name, click [**Settings**]({{ repoUrl }}/settings).
-1. In the **GitHub Pages** section, use the **Select source** drop-down menu to select `master` as your GitHub Pages publishing source.
+1. In the **GitHub Pages** section, use the **Select source** drop-down menu to select `main` as your GitHub Pages publishing source.
 
 > _I may take up to a minute to respond as I wait for GitHub Pages to create a deployment of your repository_.
 

diff --git a/responses/03_pr-succeeds.md b/responses/03_pr-succeeds.md
@@ -5,9 +5,9 @@ I see you've added at least one header, @{{ user.username }}. You can continue w
 ### :keyboard: Activity: Merge the Pull Request
 
 {% if preferences.gitTool == 'cli' %}
-1. Check out to the `master` branch:
+1. Check out to the `main` branch:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Merge your branch:
  ```shell

diff --git a/responses/06_success.md b/responses/06_success.md
@@ -5,9 +5,9 @@ This looks great, @{{ user.username }}! You've created a link to show off your p
 ### :keyboard: Activity: Merge the Pull Request
 
 {% if preferences.gitTool == 'cli' %}
-1. Check out to the `master` branch:
+1. Check out to the `main` branch:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Merge your branch:
  ```shell

diff --git a/responses/09_success.md b/responses/09_success.md
@@ -5,9 +5,9 @@ Nice list, @{{ user.username }}! You can merge this pull request when you're rea
 ### :keyboard: Activity: Merge the Pull Request
 
 {% if preferences.gitTool == 'cli' %}
-1. Check out to the `master` branch:
+1. Check out to the `main` branch:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Merge your branch:
  ```shell

diff --git a/responses/es/01_turn-on-ghp.md b/responses/es/01_turn-on-ghp.md
@@ -6,7 +6,7 @@ Ahora centrémonos en el contenido de tu portafolio. Dado que este portafolio se
 
 ### :keyboard: Actividad: Activa GitHub Pages
 1. Debajo del nombre de tu repositorio, haz clic en [**Settings**]({{ repoUrl }}/settings).
-1. En la sección **GitHub Pages**, utiliza el desplegable **Select source** para seleccionar `master` como tu fuente de publicación para GitHub Pages.
+1. En la sección **GitHub Pages**, utiliza el desplegable **Select source** para seleccionar `main` como tu fuente de publicación para GitHub Pages.
 
 > _Puede que tarde hasta un minuto responder mientras GitHub Pages crea un despliegue de tu repositorio._ 
 

diff --git a/responses/es/03_pr-succeeds.md b/responses/es/03_pr-succeeds.md
@@ -5,9 +5,9 @@ Veo que has añadido al menos un encabezado, @{{ user.username }}. Puedes contin
 ### :keyboard: Actividad: Combina la solicitud de extracción
 
 {% if preferences.gitTool == 'cli' %}
-1. Cámbiate a la rama `master`:
+1. Cámbiate a la rama `main`:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Combina tu rama:
  ```shell

diff --git a/responses/es/06_success.md b/responses/es/06_success.md
@@ -5,9 +5,9 @@
 ### :keyboard: Actividad: Combina la solicitud de extracción
 
 {% if preferences.gitTool == 'cli' %}
-1. Cámbiate a la rama `master`:
+1. Cámbiate a la rama `main`:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Combina tu rama:
  ```shell

diff --git a/responses/es/09_success.md b/responses/es/09_success.md
@@ -5,9 +5,9 @@
 ### :keyboard: Actividad: Combina la solicitud de extracción
 
 {% if preferences.gitTool == 'cli' %}
-1. Cámbiate a la rama `master`:
+1. Cámbiate a la rama `main`:
  ```shell
- git checkout master
+ git checkout main
  ```
 2. Combina tu rama:
  ```shell