From cf7c4b77766db6460e1ec9a62a56dcb9764e86db Mon Sep 17 00:00:00 2001 From: Andrea Hoffer Date: Tue, 27 Sep 2022 10:52:52 -0400 Subject: [PATCH] Renaming master branch to main --- .travis.yml | 4 ++-- ADMIN.adoc | 2 +- CONTRIBUTING.md | 4 ++-- HISTORY.md | 2 +- supplementary_style_guide/introduction/contributing.adoc | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c358a9a0..77f3df99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required branches: # source branch only: - - master # Name of the branch from which to publish36 + - main # Name of the branch from which to publish36 services: - docker @@ -27,4 +27,4 @@ deploy: github_token: $GH_TOKEN # Set in travis-ci.org dashboard local_dir: output on: - branch: master + branch: main diff --git a/ADMIN.adoc b/ADMIN.adoc index 42e9a2f3..4b4b61a6 100644 --- a/ADMIN.adoc +++ b/ADMIN.adoc @@ -34,4 +34,4 @@ You also have the following responsibilities: === Maintaining the style guide site on GitHub * Ensure that the link:https://redhat-documentation.github.io/supplementary-style-guide/[style guide site] is available and displayed correctly. -* Create pull requests to update the link:https://github.com/redhat-documentation/supplementary-style-guide/blob/master/README.md[README.md], link:https://github.com/redhat-documentation/supplementary-style-guide/blob/master/GUIDELINES.adoc[GUIDELINES.adoc] and the link:https://github.com/redhat-documentation/supplementary-style-guide/blob/master/CONTRIBUTING.md[CONTRIBUTING.md], if necessary. +* Create pull requests to update the link:https://github.com/redhat-documentation/supplementary-style-guide/blob/main/README.md[README.md], link:https://github.com/redhat-documentation/supplementary-style-guide/blob/main/GUIDELINES.adoc[GUIDELINES.adoc] and the link:https://github.com/redhat-documentation/supplementary-style-guide/blob/main/CONTRIBUTING.md[CONTRIBUTING.md], if necessary. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 86dbecfa..231af3fd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,10 +41,10 @@ To submit an update: $ git fetch upstream ``` -2. Check out a branch from upstream/master +2. Check out a branch from upstream/main ``` - $ git checkout -b upstream/master + $ git checkout -b upstream/main ``` 3. Make your edits. diff --git a/HISTORY.md b/HISTORY.md index 88d7eaa2..70739395 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,6 @@ # What's new -Review the history of significant updates to the _Red Hat supplementary style guide for product documentation_. You can see the full change history by reviewing the [commits](https://github.com/redhat-documentation/supplementary-style-guide/commits/master). +Review the history of significant updates to the _Red Hat supplementary style guide for product documentation_. You can see the full change history by reviewing the [commits](https://github.com/redhat-documentation/supplementary-style-guide/commits/main). #### Table of contents diff --git a/supplementary_style_guide/introduction/contributing.adoc b/supplementary_style_guide/introduction/contributing.adoc index 77322d3f..b5b2edd1 100644 --- a/supplementary_style_guide/introduction/contributing.adoc +++ b/supplementary_style_guide/introduction/contributing.adoc @@ -6,4 +6,4 @@ If you have a suggestion or question, open an link:https://github.com/redhat-doc == Making an update to this guide -If you want to contribute an update to this guide, see the link:https://github.com/redhat-documentation/doc-style/blob/master/CONTRIBUTING.md[Contributing guide] provided in the project's GitHub repository. +If you want to contribute an update to this guide, see the link:https://github.com/redhat-documentation/doc-style/blob/main/CONTRIBUTING.md[Contributing guide] provided in the project's GitHub repository.