master -> main

.github/workflows/e2e-tests-readonly.yml

@@ -1,7 +1,7 @@
 name: Read-only e2e tests
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   test:
     runs-on: ubuntu-20.04

.github/workflows/e2e-tests-readwrite.yml

@@ -1,7 +1,7 @@
 name: Read-write e2e tests
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   test:
     runs-on: ubuntu-20.04

.github/workflows/unit-tests.yml

@@ -1,7 +1,7 @@
 name: Unit tests
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 jobs:
   test:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -2,4 +2,4 @@
 
 For full release notes, see [GitHub releases](https://github.com/semaphore-social/semaphore/releases).
 
-For breaking changes, see [BREAKING_CHANGES.md](https://github.com/semaphore-social/semaphore/blob/master/BREAKING_CHANGES.md).
+For breaking changes, see [BREAKING_CHANGES.md](https://github.com/semaphore-social/semaphore/blob/main/BREAKING_CHANGES.md).

CONTRIBUTING.md

@@ -158,14 +158,14 @@ This is also available locally after `yarn run build` at `.sapper/client/report.
 This section only applies to `beta.semaphore.social` and `semaphore.social`, not if you're hosting your own version of
 Semaphore.
 
-The site uses [Vercel](https://vercel.com). The `master` branch publishes to `beta.semaphore.social` and the `production`
+The site uses [Vercel](https://vercel.com). The `main` branch publishes to `beta.semaphore.social` and the `production`
 branch deploys to `semaphore.social`.
 
 ## Architecture
 
-See [Architecture.md](https://github.com/semaphore-social/semaphore/blob/master/docs/Architecture.md).
+See [Architecture.md](https://github.com/semaphore-social/semaphore/blob/main/docs/Architecture.md).
 
 ## Internationalization
 
-See [Internationalization.md](https://github.com/semaphore-social/semaphore/blob/master/docs/Internationalization.md).
+See [Internationalization.md](https://github.com/semaphore-social/semaphore/blob/main/docs/Internationalization.md).
 

README.md

@@ -8,7 +8,7 @@ An alternative web client for [Mastodon](https://joinmastodon.org), focused on s
 
 Semaphore is available at [semaphore.social](https://semaphore.social). Beta releases are at [beta.semaphore.social](https://beta.semaphore.social).
 
-See the [user guide](https://github.com/semaphore-social/semaphore/blob/master/docs/User-Guide.md) for basic usage. See the [admin guide](https://github.com/semaphore-social/semaphore/blob/master/docs/Admin-Guide.md) if Semaphore cannot connect to your instance.
+See the [user guide](https://github.com/semaphore-social/semaphore/blob/main/docs/User-Guide.md) for basic usage. See the [admin guide](https://github.com/semaphore-social/semaphore/blob/main/docs/Admin-Guide.md) if Semaphore cannot connect to your instance.
 
 For updates and support, follow [@semaphore@fosstodon.org](https://fosstodon.org/@semaphore).
 
@@ -108,14 +108,14 @@ Having an [nginx config generator](https://github.com/semaphore-social/semaphore
 
 ## Developing and testing
 
-See [CONTRIBUTING.md](https://github.com/semaphore-social/semaphore/blob/master/CONTRIBUTING.md) for
+See [CONTRIBUTING.md](https://github.com/semaphore-social/semaphore/blob/main/CONTRIBUTING.md) for
 how to run Semaphore in dev mode and run tests.
 
 ## Changelog
 
 For a changelog, see the [GitHub releases](http://github.com/semaphore-social/semaphore/releases/).
 
-For a list of breaking changes, see [BREAKING_CHANGES.md](https://github.com/semaphore-social/semaphore/blob/master/BREAKING_CHANGES.md).
+For a list of breaking changes, see [BREAKING_CHANGES.md](https://github.com/semaphore-social/semaphore/blob/main/BREAKING_CHANGES.md).
 
 
 ## What's with the name?

docs/Internationalization.md

@@ -1,6 +1,6 @@
 # Internationalization
 
-To contribute or change translations for Semaphore, look in the [src/intl](https://github.com/semaphore-social/semaphore/tree/master/src/intl) directory. Create a new file or edit an existing file based on its [two-letter language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) and optionally, a region. For instance, `en-US.js` is American English, and `fr.js` is French.
+To contribute or change translations for Semaphore, look in the [src/intl](https://github.com/semaphore-social/semaphore/tree/main/src/intl) directory. Create a new file or edit an existing file based on its [two-letter language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) and optionally, a region. For instance, `en-US.js` is American English, and `fr.js` is French.
 
 The default is `en-US.js`, and any strings not defined in a language file will fall back to the strings from that file.
 

docs/User-Guide.md

@@ -10,15 +10,15 @@ This will walk you through the basic usage of Semaphore and its major difference
 
 The home page is both where you write toots and where you read your home timeline:
 
-![Screenshot of home page](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot1.png)
+![Screenshot of home page](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot1.png)
 
 When you scroll down, the "toot" button transforms into a "compose" button:
 
-![Screenshot showing home page scrolled down](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot2.png)
+![Screenshot showing home page scrolled down](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot2.png)
 
 If you press this compose button, you can toot anywhere in your home timeline.
 
-![Screenshot showing compose box in a modal dialog](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot3.png)
+![Screenshot showing compose box in a modal dialog](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot3.png)
 
 ## Community page
 
@@ -26,15 +26,15 @@ By default, the Local Timeline is pinned to the top navigation. In the "Communit
 Lists, the Local Timeline, the Federated Timeline, and your Favorites, and you can also pin any of these to
 the top navigation.
 
-![Screenshot of Community page with options to pin multiple timelines](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot4.png)
+![Screenshot of Community page with options to pin multiple timelines](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot4.png)
 
 ## Multiple instances
 
 You can manage your instances in the settings:
 
-![Screenshot of instance settings with a list of instances](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot5.png)
+![Screenshot of instance settings with a list of instances](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot5.png)
 
 For each instance, you can choose a custom theme so that it's easy to 
 remember which instance you're currently using:
 
-![Screenshot of instance configuration with multiple themes available](https://github.com/semaphore-social/semaphore/blob/master/docs/Screenshot6.png)
+![Screenshot of instance configuration with multiple themes available](https://github.com/semaphore-social/semaphore/blob/main/docs/Screenshot6.png)

src/intl/de.js

@@ -22,7 +22,7 @@ export default {
       erstellt von <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
       und verteilt unter der
       <a rel="noopener" target="_blank"
-         href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">AGPL Lizenz</a>.
+         href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">AGPL Lizenz</a>.
       Hier ist die <a href="/settings/about#privacy-policy" rel="prefetch">Datenschutzerklärung</a>.
     </p>
   `,
@@ -325,7 +325,7 @@ export default {
     <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
     und verteilt unter der
     <a rel="noopener" target="_blank"
-       href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">GNU Affero General Public License</a>.
+       href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">GNU Affero General Public License</a>.
   </p>
 
   <h2 id="privacy-policy">Datenschutzerklärung</h2>

src/intl/en-US.js

@@ -23,7 +23,7 @@ export default {
       <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
       and distributed under the
       <a rel="noopener" target="_blank"
-         href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">AGPL License</a>.
+         href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">AGPL License</a>.
       Here is the <a href="/settings/about#privacy-policy" rel="prefetch">privacy policy</a>.
     </p>
   `,
@@ -337,7 +337,7 @@ export default {
     <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
     and distributed under the
     <a rel="noopener" target="_blank"
-       href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">GNU Affero General Public License</a>.
+       href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">GNU Affero General Public License</a>.
   </p>
 
   <h2 id="privacy-policy">Privacy Policy</h2>

src/intl/es.js

@@ -23,7 +23,7 @@ export default {
       <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
       y distribuido bajo la
       <a rel="noopener" target="_blank"
-         href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">Licencia AGPL</a>.
+         href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">Licencia AGPL</a>.
       Aquí está la <a href="/settings/about#privacy-policy" rel="prefetch">política de privacidad</a>.
     </p>
   `,
@@ -337,7 +337,7 @@ export default {
     <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
     y distribuido bajo la
     <a rel="noopener" target="_blank"
-       href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">GNU Affero General Public License</a>.
+       href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">GNU Affero General Public License</a>.
   </p>
 
   <h2 id="privacy-policy">Política de privacidad</h2>

src/intl/fr.js

@@ -23,7 +23,7 @@ export default {
       <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
       et distribué sous la
       <a rel="noopener" target="_blank"
-         href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">License AGPL</a>.
+         href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">License AGPL</a>.
       Lire la <a href="/settings/about#privacy-policy" rel="prefetch">politique de confidentialité</a>.
     </p>
   `,
@@ -326,7 +326,7 @@ export default {
     <a rel="noopener" target="_blank" href="https://nolanlawson.com">Nolan Lawson</a>
     et distribué sous le
     <a rel="noopener" target="_blank"
-       href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">License GNU Affero General Public (AGPL)</a>.
+       href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">License GNU Affero General Public (AGPL)</a>.
   </p>
 
   <h2 id="privacy-policy">Politique de confidentialité</h2>

src/intl/ru-RU.JS

@@ -23,7 +23,7 @@ export default {
       <a rel="noopener" target="_blank" href="https://nolanlawson.com">Ноланом Лоусоном</a>
       и распространяемое под лицензией
       <a rel="noopener" target="_blank"
-         href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">AGPL License</a>.
+         href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">AGPL License</a>.
       Здесь <a href="/settings/about#privacy-policy" rel="prefetch">политика конфиденциальности</a>.
     </p>
   `,
@@ -335,7 +335,7 @@ export default {
     <a rel="noopener" target="_blank" href="https://nolanlawson.com">Ноланом Лоусоном</a>
     и распространяется под
     <a rel="noopener" target="_blank"
-       href="https://github.com/semaphore-social/semaphore/blob/master/LICENSE">GNU Affero General Public License</a>.
+       href="https://github.com/semaphore-social/semaphore/blob/main/LICENSE">GNU Affero General Public License</a>.
   </p>
 
   <h2 id="privacy-policy">Политика конфиденциальности</h2>

src/routes/_actions/addInstance.js

@@ -12,7 +12,7 @@ const GENERIC_ERROR = `
   Is this a valid Mastodon instance? Is a browser extension
   blocking the request? Are you in private browsing mode?
   If you believe this is a problem with your instance, please send
-  <a href="https://github.com/semaphore-social/semaphore/blob/master/docs/Admin-Guide.md"
+  <a href="https://github.com/semaphore-social/semaphore/blob/main/docs/Admin-Guide.md"
     target="_blank" rel="noopener">this link</a> to the administrator of your instance.`
 
 function createKnownError (message) {