Rename master branch to main

area17 · Sep 2, 2021 · 93e665e · 93e665e
1 parent abf2252
commit 93e665e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,11 +18,11 @@ Twill follows [Semantic Versioning](https://semver.org/). Major releases are rel
 When referencing Twill from your application, you should always use a version constraint such as `^2.0`, since major releases of Twill do include breaking changes.
 
 # Which branch?
-All bug fixes should be sent to the latest stable branch (`2.x`). Bug fixes should never be sent to the `master` branch unless they fix features that exist only in the upcoming release.
+All bug fixes should be sent to the latest stable branch (`2.x`). Bug fixes should never be sent to the `main` branch unless they fix features that exist only in the upcoming release.
 
 Minor features that are fully backwards compatible with the current Twill release may be sent to the latest stable branch (`2.x`).
 
-Major new features should always be sent to the `master` branch, which contains the upcoming Twill release.
+Major new features should always be sent to the `main` branch, which contains the upcoming Twill release.
 
 Please send coherent history — make sure each individual commit in your pull request is meaningful. If you had to make a lot of intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
 

diff --git a/docs-api/config.php b/docs-api/config.php
@@ -13,7 +13,7 @@
     ->in($dir);
 
 $versions = GitVersionCollection::create($dir)
-    ->add('master', 'master branch')
+    ->add('main', 'main branch')
     ->add('1.1', '1.1 branch')
     ->add('1.2', '1.2 branch')
     ->add('2.x', '2.x branch');

diff --git a/docs/.sections/api-documentation.md b/docs/.sections/api-documentation.md
@@ -3,6 +3,6 @@
 [Doctum](https://github.com/code-lts/doctum) generated API documentation of the framework is available [here](https://twill.io/docs/api/2.x) for `2.x` and previous versions.
 
 - [`2.x`](https://twill.io/docs/api/2.x)
-- [`master`](https://twill.io/docs/api/master)
+- [`main`](https://twill.io/docs/api/main)
 - [`1.2`](https://twill.io/docs/api/1.2)
 - [`1.1`](https://twill.io/docs/api/1.1)
diff --git a/docs/.sections/preface.md b/docs/.sections/preface.md
@@ -156,7 +156,7 @@ Additional contributors include [Laurens van Heems](https://area17.com/about/lau
 ### Contribution guide
 
 #### Code of Conduct
-Twill is dedicated to building a welcoming, diverse, safe community. We expect everyone participating in the Twill community to abide by our [Code of Conduct](https://github.com/area17/twill/blob/master/CODE_OF_CONDUCT.md). Please read it. Please follow it.
+Twill is dedicated to building a welcoming, diverse, safe community. We expect everyone participating in the Twill community to abide by our [Code of Conduct](https://github.com/area17/twill/blob/main/CODE_OF_CONDUCT.md). Please read it. Please follow it.
 
 #### Bug reports and features submission
 To submit an issue or request a feature, please do so on [Github](https://github.com/area17/twill/issues).
@@ -175,11 +175,11 @@ Twill follows [Semantic Versioning](https://semver.org/). Major releases are rel
 When referencing Twill from your application, you should always use a version constraint such as `^2.0`, since major releases of Twill do include breaking changes.
 
 #### Which branch?
-All bug fixes should be sent to the latest stable branch (`2.x`). Bug fixes should never be sent to the `master` branch unless they fix features that exist only in the upcoming release.
+All bug fixes should be sent to the latest stable branch (`2.x`). Bug fixes should never be sent to the `main` branch unless they fix features that exist only in the upcoming release.
 
 Minor features that are fully backwards compatible with the current Twill release may be sent to the latest stable branch (`2.x`).
 
-Major new features should always be sent to the `master` branch, which contains the upcoming Twill release.
+Major new features should always be sent to the `main` branch, which contains the upcoming Twill release.
 
 Please send coherent history — make sure each individual commit in your pull request is meaningful. If you had to make a lot of intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
 

diff --git a/frontend/js/mixins/cropper.js b/frontend/js/mixins/cropper.js
@@ -1,6 +1,6 @@
 export default {
   props: {
-    // Cropper options @see: https://github.com/fengyuanchen/cropperjs/blob/master/README.md#options
+    // Cropper options @see: https://github.com/fengyuanchen/cropperjs/blob/main/README.md#options
     aspectRatio: {
       type: Number,
       default: null