diff --git a/INSTALL.md b/INSTALL.md
index a017fc91c5..5e8aeceb89 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -45,7 +45,7 @@ On your Linux or OS X system, you will need to have installed
## Unsupported development HTML Interface
-Note: This interface isn't always kept up to date with MASTER on Github.
+Note: This interface isn't always kept up to date with the main branch on Github.
The dependencies for this are:
diff --git a/LICENSE.md b/LICENSE.md
index 87b6319280..9ad4a142a4 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
# License
-## Main Source
-(contents of [app/](https://github.com/samaaron/sonic-pi/tree/master/app) and [etc/synthdefs/](https://github.com/samaaron/sonic-pi/tree/master/etc/synthdefs) directories)
+## Main Source
+(contents of [app/](https://github.com/samaaron/sonic-pi/tree/main/app) and [etc/synthdefs/](https://github.com/samaaron/sonic-pi/tree/main/etc/synthdefs) directories)
The MIT License (MIT)
@@ -33,11 +33,11 @@ Sonic Pi GUI binaries must comply with the terms of the GPL
The font used in the GUI is [Hack](http://sourcefoundry.org/hack/) released under the [Hack Open Font License v2.0](https://github.com/chrissimpkins/Hack/blob/master/LICENSE.md)
-## Docs, Tutorial and Examples
-(contents of [etc/doc/](https://github.com/samaaron/sonic-pi/tree/master/etc/doc) and [etc/examples](https://github.com/samaaron/sonic-pi/tree/master/etc/examples) directories)
+## Docs, Tutorial and Examples
+(contents of [etc/doc/](https://github.com/samaaron/sonic-pi/tree/main/etc/doc) and [etc/examples](https://github.com/samaaron/sonic-pi/tree/main/etc/examples) directories)
All the examples (in
-[etc/examples](https://github.com/samaaron/sonic-pi/tree/master/etc/examples))
+[etc/examples](https://github.com/samaaron/sonic-pi/tree/main/etc/examples))
and contents of the doc directory including the articles and the
tutorial are copyright by Sam Aaron unless a specific author is stated
with the comment `# coded by ...` in which case the copyright is
@@ -48,7 +48,7 @@ CC BY-SA 4.0 license:
## Samples
-(contents of [etc/samples/](https://github.com/samaaron/sonic-pi/tree/master/etc/samples))
+(contents of [etc/samples/](https://github.com/samaaron/sonic-pi/tree/main/etc/samples))
All the bundled samples are individually licensed under a
[CC0 1.0 Universal Public Domain Dedication](http://creativecommons.org/publicdomain/zero/1.0/). They
@@ -60,7 +60,7 @@ links to their sources can be found in the file
## Wavetables
-(contents of [etc/wavetables/](https://github.com/samaaron/sonic-pi/tree/master/etc/wavetables)
+(contents of [etc/wavetables/](https://github.com/samaaron/sonic-pi/tree/main/etc/wavetables)
All the bundled wavetable samples are individually licensed under a
[CC0 1.0 Universal Public Domain Dedication](http://creativecommons.org/publicdomain/zero/1.0/). They
@@ -92,7 +92,7 @@ relevant licenses:
### Included Ruby Libraries for Server
-(contents of [app/server/vendor/](https://github.com/samaaron/sonic-pi/tree/master/app/server/vendor))
+(contents of [app/server/vendor/](https://github.com/samaaron/sonic-pi/tree/main/app/server/vendor))
* [ActiveSupport](https://github.com/rails/rails/tree/master/activesupport) - [MIT License](http://opensource.org/licenses/MIT)
* [Atomic](http://github.com/headius/ruby-atomic) - [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/README.md b/README.md
index e78495531d..5a19be00bc 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,6 @@ Sonic Pi is under active development, and welcomes new contributors:
[](https://hosted.weblate.org/engage/sonic-pi/)
-[](https://travis-ci.org/samaaron/sonic-pi)
+[](https://travis-ci.org/samaaron/sonic-pi)
[](https://gitter.im/samaaron/sonic-pi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/TRANSLATION-WORKFLOW.md b/TRANSLATION-WORKFLOW.md
index 322841d0fe..fcc8e70462 100644
--- a/TRANSLATION-WORKFLOW.md
+++ b/TRANSLATION-WORKFLOW.md
@@ -26,8 +26,8 @@ ready for i18n in Sonic Pi.
## Integrating Weblate
-The rest of this document is mostly meant as a cheatsheet for @samaaron
-as the main developer in charge of the master repository.
+The rest of this document is mostly meant as a cheatsheet for @samaaron
+as the main developer in charge of the main repository.
[Weblate](https://weblate.org) is an open-source web-based translation
editor. Their development team runs a hosted version of the tool and
@@ -42,20 +42,20 @@ it will pull changes from and push updates to us.
## Setup
-This is a one-time setup for the master repository and needs to be done
+This is a one-time setup for the main repository and needs to be done
by the main developer.
- [Sign up](https://hosted.weblate.org/accounts/register/),
preferably using your Github account authorization.
-- To enable Weblate pulling updates from the master repository, add the
+- To enable Weblate pulling updates from the main repository, add the
[Weblate service](https://docs.weblate.org/en/latest/admin/continuous.html#github-setup)
in the repository settings and use the URL
`https://hosted.weblate.org` for the Weblate service settings.
-- To enable Weblate pushing translation updates back to the master
- repository, add the [Weblate push user](https://github.com/weblate)
- to the collaborators in the master branch's repository settings.
+- To enable Weblate pushing translation updates back to the main
+ repository, add the [Weblate push user](https://github.com/weblate)
+ to the collaborators in the main branch's repository settings.
After this, translations will be synced automatically between Github
and Weblate, using the [lazy
@@ -85,10 +85,10 @@ To initiate a translation update:
all outstanding translation updates and wait for it to push them from
Weblate to Github.
-2. Update your local repo to the current HEAD of the master branch from
+2. Update your local repo to the current HEAD of the main branch from
Github, update the translation files, commit the update and push it
- back to the master branch.
-
+ back to the main branch.
+
```
git pull
@@ -109,6 +109,6 @@ To initiate a translation update:
This will update all translation files and remove obsolete entries.
-Weblate will then fetch the changes automatically, translators can
-update them and the finished translations will flow back into the
-master repository.
+Weblate will then fetch the changes automatically, translators can
+update them and the finished translations will flow back into the
+main repository.
diff --git a/etc/doc/tutorial/A.15-performance.md b/etc/doc/tutorial/A.15-performance.md
index 913fe2d68d..f4d58876bc 100644
--- a/etc/doc/tutorial/A.15-performance.md
+++ b/etc/doc/tutorial/A.15-performance.md
@@ -94,12 +94,12 @@ live loop running due to an error. If you already have the `sync:` opt
pointing to another valid `live_loop`, then you can quickly fix the
error and re-run the code to re-start things without missing a beat.
-## 4. Use the Master Mixer
+## 4. Use the Main Mixer
-One of Sonic Pi's best kept secrets is that it has a master mixer
+One of Sonic Pi's best kept secrets is that it has a main mixer
through which all sound flows. This mixer has both a low pass filter and
a high pass filter built-in, so you can easily perform global
-modifications to the sound. The master mixer's functionality can be
+modifications to the sound. The main mixer's functionality can be
accessed via the fn `set_mixer_control!`. For example, whilst some code
is running and making sound, enter this into a spare buffer and hit
`Run`:
@@ -155,7 +155,7 @@ This month, instead of giving you a final example that combines all the
things discussed, let's part by setting down a challenge. See if you can
spend a week practicing one of these ideas every day. For example, one
day practice manual triggers, the next do some basic `live_loop` work
-and the following day play around with the master mixer. Then
+and the following day play around with the main mixer. Then
repeat. Don't worry if things feel slow and clunky at first - just keep
practicing and before you know it you'll be live coding for a real
audience.