diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f8143d71b5..992be2da75 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -47,7 +47,7 @@ For a simple local development environment running on PHP, you will need:
#### GNU/Linux Based Operating Systems
-First, install Node.js (18.x recommended) from [Nodesource](https://github.com/nodesource/distributions/blob/master/README.md#debian-and-ubuntu-based-distributions).
+First, install Node.js (18.x recommended) from [Nodesource](https://github.com/nodesource/distributions/blob/main/README.md#debian-and-ubuntu-based-distributions).
_If you are on an unsupported version of elementary OS—i.e. during development of a new version—you may need to download the provided installation script, modify it first to map `elementaryOS` and the version codename to `Ubuntu` and its equivalent codename, then `chmod +x` the script and run it as root._
@@ -201,13 +201,13 @@ git checkout -b feature_branch_name
git push -u origin feature_branch_name
```
-### Updating from Master
+### Updating from Main
```bash
-git pull origin master
+git pull origin main
```
-### Merge from master
+### Merge from main
```bash
git checkout feature_branch_name
-git merge master
+git merge main
```
diff --git a/.github/workflows/update_translations.yml b/.github/workflows/update_translations.yml
index 8da273719e..f5b902a124 100644
--- a/.github/workflows/update_translations.yml
+++ b/.github/workflows/update_translations.yml
@@ -22,7 +22,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
with:
- ref: 'master'
+ ref: 'main'
submodules: true
- name: Setup PHP
diff --git a/README.md b/README.md
index 9416124ff7..420ba4240e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
The New elementary.io
================
-[](https://travis-ci.org/elementary/website)
+[](https://github.com/elementary/website/actions/workflows/ci.yml)
[](https://l10n.elementaryos.org/engage/website/?utm_source=widget)
A focused, minimum viable product (hence MVP) for a website that accompanied the release of elementary OS Freya.
@@ -19,7 +19,7 @@ Project Organization
* User Documentation
* Journal
* **Reviews** Do all work in branches, then submit pull requests for review when ready
- * No dummy content in master, ever.
+ * No dummy content in main, ever.
* Small diff is best diff.
* The reviewer is the gatekeeper. Be kind of a dick.
@@ -39,7 +39,7 @@ Templating System
* PHP-based
* Pages go in root as .php files
-* `require_once '_backend/preload.php';`, set any variables, then `include $template['header'];` (see [code-of-conduct](https://github.com/elementary/website/blob/master/code-of-conduct.php) for an example) at top of page.
+* `require_once '_backend/preload.php';`, set any variables, then `include $template['header'];` (see [code-of-conduct](https://github.com/elementary/website/blob/main/code-of-conduct.php) for an example) at top of page.
* `include $template['footer'];` at bottom of page.
* Page variables:
* `$page['title']`
@@ -49,7 +49,7 @@ Templating System
Contributing
============
-See guidelines for [coding](https://github.com/elementary/website/blob/master/.github/CONTRIBUTING.md) and [translating](https://github.com/elementary/website/blob/master/TRANSLATE.md).
+See guidelines for [coding](https://github.com/elementary/website/blob/main/.github/CONTRIBUTING.md) and [translating](https://github.com/elementary/website/blob/main/TRANSLATE.md).
Security
========
diff --git a/TRANSLATE.md b/TRANSLATE.md
index 31bf50143b..0e0b4b3c46 100644
--- a/TRANSLATE.md
+++ b/TRANSLATE.md
@@ -63,4 +63,4 @@ Alternatively, you can add the `data-l10n-off` attribute to a tag:
## Adding a new language to the list on the website
-The list of available languages is hard-coded in [`_backend/Lib/L10n.php`](https://github.com/elementary/website/blob/master/_backend/Lib/L10n.php). If a new language is complete, you can add it by appending it to the list. Languages are sorted by index (see [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)) and are localized.
+The list of available languages is hard-coded in [`_backend/Lib/L10n.php`](https://github.com/elementary/website/blob/main/_backend/Lib/L10n.php). If a new language is complete, you can add it by appending it to the list. Languages are sorted by index (see [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)) and are localized.
diff --git a/_backend/config.loader.php b/_backend/config.loader.php
index 3917f9207a..14f975fabf 100644
--- a/_backend/config.loader.php
+++ b/_backend/config.loader.php
@@ -9,9 +9,9 @@
if (is_readable(__DIR__.'/config.php')) {
$secretConfig = (require __DIR__.'/config.php');
-// Fallback to master if on testing branch
-} elseif (is_readable(__DIR__.'/../../master/_backend/config.php')) {
- $secretConfig = (require __DIR__.'/../../master/_backend/config.php');
+// Fallback to main if on testing branch
+} elseif (is_readable(__DIR__.'/../../main/_backend/config.php')) {
+ $secretConfig = (require __DIR__.'/../../main/_backend/config.php');
}
// Merge configuration
diff --git a/_scripts/pages/docs/main.js b/_scripts/pages/docs/main.js
index 2496382708..c29f36420d 100644
--- a/_scripts/pages/docs/main.js
+++ b/_scripts/pages/docs/main.js
@@ -63,7 +63,7 @@ Promise.all([highlight, jQuery]).then(([hljs, $]) => {
$index.prependTo($sidebar)
const $actions = $('
The “e” logomark is to be used to refer to elementary, Inc., especially when a square ratio is required. It should be used at larger sizes and when alongside similarly-weighted logos. The thinner, alternate logomark may be used in smaller contexts or when the default logomark feels too heavy.
elementary provides basic documentation for both users and developers. All of our documentation is written in Markdown and hosted on GitHub, so submitting a change or a new section is a piece of cake.
+ 
+ 
+ 