Skip to content

Commit

Permalink
Merge pull request redhat-documentation#228 from bergerhoffer/renamin…
Browse files Browse the repository at this point in the history
…g-master-branch

Renaming master branch to main
  • Loading branch information
bergerhoffer authored Sep 27, 2022
2 parents e97f4f5 + cf7c4b7 commit ba228eb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,4 +27,4 @@ deploy:
github_token: $GH_TOKEN # Set in travis-ci.org dashboard
local_dir: output
on:
branch: master
branch: main
2 changes: 1 addition & 1 deletion ADMIN.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <new-branch> upstream/master
$ git checkout -b <new-branch> upstream/main
```

3. Make your edits.
Expand Down
2 changes: 1 addition & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion supplementary_style_guide/introduction/contributing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit ba228eb

Please sign in to comment.