Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit 6db77ad

Browse files
authored
Merge pull request #35 from githubtraining/rename-branches
Rename master to main
2 parents 1ea3f57 + 427f238 commit 6db77ad

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ For more information on the goals of this course, check out the [`course-details
1414

1515
## Contribute
1616

17-
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.
17+
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.
1818

19-
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.
19+
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.
2020

2121
## License
2222

config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ steps:
8585
- type: gate
8686
left: '%payload.pull_request.base.ref%'
8787
operator: ===
88-
right: master
88+
right: main
8989
- type: updateBranchProtection
9090
- type: octokit
9191
method: repos.getPages

responses/00_class-introduction-issue.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ For this course, you'll need to know how to create a branch on GitHub, commit ch
1616

1717
### :keyboard: Activity: Generate a GitHub Pages site
1818

19-
The first step to publishing your blog to the web is to enable GitHub Pages on this repository <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. When you enable GitHub Pages on a repository, GitHub takes the content that's on the master branch and publishes a website based on its contents.
19+
The first step to publishing your blog to the web is to enable GitHub Pages on this repository <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. When you enable GitHub Pages on a repository, GitHub takes the content that's on the main branch and publishes a website based on its contents.
2020

2121
1. Under your repository name, click [**Settings**]({{ repoUrl }}/settings).
22-
1. In the "GitHub Pages" section, in the Source drop-down, select **master branch**.
22+
1. In the "GitHub Pages" section, in the Source drop-down, select **main branch**.
2323

2424
After GitHub Pages is enabled and the site is started, we'll be ready to create some more content.
2525

responses/01_update-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Your repository has an `index.md` file so we can update it to include your perso
88

99
### :keyboard: Activity: Create your homepage
1010

11-
1. Navigate to the **Code** tab of this repository, and browse to the `index.md` file, or click this link [here]({{ repoUrl }}/blob/master/index.md)
11+
1. Navigate to the **Code** tab of this repository, and browse to the `index.md` file, or click this link [here]({{ repoUrl }}/blob/main/index.md)
1212
2. In the upper right corner, click the ![octicon-pencil] icon to edit the `index.md` file
1313
3. Type the content you want on your homepage
1414
4. Scroll to the bottom, type a commit message, and click **Create a new branch for this commit and start a pull request**

responses/03_change-theme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You can check out the `_config.yml` file on the **Code** tab of your repository.
1212

1313
Let's change the `_config.yml` so it's a perfect fit for your new blog. First, we need to use a blog-ready theme. For this activity, we will use a theme named `minima`.
1414

15-
1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file, or click this link [here]({{ repoUrl }}/blob/master/_config.yml).
15+
1. Navigate to the **Code** tab of this repository, and browse to the `_config.yml` file, or click this link [here]({{ repoUrl }}/blob/main/_config.yml).
1616
2. In the upper right corner, click :pencil2: to open the file editor.
1717
3. Add a `theme:` set to **minima** so it shows in the `_config.yml` file as below:
1818
```

responses/es/00_class-introduction-issue.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Para este curso necesitas saber cómo crear una rama (_branch_) en GitHub, confi
1616

1717
### :keyboard: Actividad: Genera un sitio web con GitHub Pages
1818

19-
El primer paso para publicar tu blog en la web es activar GitHub Pages en este repositorio <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. Cuando habilitas GitHub Pages para un repositorio, GitHub toma el contenido que tenga en el branc `master` y publica un sitio web basado en esos contenidos.
19+
El primer paso para publicar tu blog en la web es activar GitHub Pages en este repositorio <sup>[:book:](https://help.github.com/articles/github-glossary/#repository)</sup>. Cuando habilitas GitHub Pages para un repositorio, GitHub toma el contenido que tenga en el branc `main` y publica un sitio web basado en esos contenidos.
2020

2121
1. Debajo del nombre de tu repositorio, haz clic en [**Settings**]({{ repoUrl }}/settings) (Ajustes).
22-
1. En la sección "GitHub Pages", en el desplegable Source, selecciona **master branch**.
22+
1. En la sección "GitHub Pages", en el desplegable Source, selecciona **main branch**.
2323

2424
Una vez que GitHub Pages se ha activado y se ha iniciado el sitio web, estaremos listos para crear algún contenido más.
2525

responses/es/01_update-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Tu repositorio tiene un archivo `index.md`, así que podemos actualizarlo para q
88

99
### :keyboard: Actividad: Crea tu página inicial
1010

11-
1. Navega a la pestaña **Code** de este repositorio y accede al archivo `index.md`, o haz clic en [este enlace]({{ repoUrl }}/blob/master/index.md)
11+
1. Navega a la pestaña **Code** de este repositorio y accede al archivo `index.md`, o haz clic en [este enlace]({{ repoUrl }}/blob/main/index.md)
1212
2. En la esquina superior derecha, haz clic en el icono a la derecha del archivo para editar el archivo `index.md`
1313
3. Escribe el contenido que quieres que aparezca en tu página principal
1414
4. Haz scroll hasta la parte inferior, escribe un mensaje de commit y haz clic en **Create a new branch for this commit and start a pull request**

responses/es/03_change-theme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Vamos a modificar `_config.yml` para que refleje perfectamente con tu nuevo blog
1414

1515

1616

17-
1. Navega a la pestaña **Code** de este repositorio y hasta el archivo `_config.yml`, o haz clic en [este enlace]({{ repoUrl }}/blob/master/_config.yml).
17+
1. Navega a la pestaña **Code** de este repositorio y hasta el archivo `_config.yml`, o haz clic en [este enlace]({{ repoUrl }}/blob/main/_config.yml).
1818
2. En la esquina superior derecha, haz clic en :pencil2: para abrir el editor.
1919
3. Añade un `theme:` que especifique **minima**, de forma que se vea así en tu archivo `_config.yml`:
2020
```

0 commit comments

Comments
 (0)