Changing references from master to main. #820

diff --git a/README.md b/README.md
index 3668d147e84ae136b03f5a3644d650f39b24cc5e..d4ccab2e6aa3c2ae77ee487cd00239f322fd43ef 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <div align="center">
 
 ![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/LemmyNet/lemmy.svg)
-[![Build Status](https://travis-ci.org/LemmyNet/lemmy.svg?branch=master)](https://travis-ci.org/LemmyNet/lemmy)
+[![Build Status](https://travis-ci.org/LemmyNet/lemmy.svg?branch=main)](https://travis-ci.org/LemmyNet/lemmy)
 [![GitHub issues](https://img.shields.io/github/issues-raw/LemmyNet/lemmy.svg)](https://github.com/LemmyNet/lemmy/issues)
 [![Docker Pulls](https://img.shields.io/docker/pulls/dessalines/lemmy.svg)](https://cloud.docker.com/repository/docker/dessalines/lemmy/)
 [![Translation status](http://weblate.yerbamate.dev/widgets/lemmy/-/lemmy/svg-badge.svg)](http://weblate.yerbamate.dev/engage/lemmy/)
@@ -26,7 +26,7 @@
     ·
     <a href="https://github.com/LemmyNet/lemmy/issues">Request Feature</a>
     ·
-    <a href="https://github.com/LemmyNet/lemmy/blob/master/RELEASES.md">Releases</a>
+    <a href="https://github.com/LemmyNet/lemmy/blob/main/RELEASES.md">Releases</a>
   </p>
 </p>
 
@@ -34,7 +34,7 @@
 
 Front Page|Post
 ---|---
-![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/chat_screen.png)
+![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/main/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/main/docs/img/chat_screen.png)
 
 [Lemmy](https://github.com/LemmyNet/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse).
 

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 2c6e3d312758b583eec6212724af909468b326d6..7baef94f550a5bc8a0064d783e10ab7e99a3340a 100755 (executable)
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-git checkout master
+git checkout main
 
 # Import translations
 git fetch weblate

diff --git a/docs/src/about.md b/docs/src/about.md
index 2c0e418b301ad2c8598a7563bf056999c581ed6e..8db35b4f6c2c0a8372d93cf750638aa70142cfdd 100644 (file)
--- a/docs/src/about.md
+++ b/docs/src/about.md
@@ -2,7 +2,7 @@
 
 Front Page|Post
 ---|---
-![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/chat_screen.png)
+![main screen](https://raw.githubusercontent.com/LemmyNet/lemmy/main/docs/img/main_screen.png)|![chat screen](https://raw.githubusercontent.com/LemmyNet/lemmy/main/docs/img/chat_screen.png)
 
 [Lemmy](https://github.com/LemmyNet/lemmy) is similar to sites like [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), or [Hacker News](https://news.ycombinator.com/): you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the [Fediverse](https://en.wikipedia.org/wiki/Fediverse).
 

diff --git a/docs/src/about_ranking.md b/docs/src/about_ranking.md
index fe9e82bbb6c4e0cdda5658d0c66d937a707f4f66..f1ed9b3867cf9360d2d94760c9c358e30cf81cf7 100644 (file)
--- a/docs/src/about_ranking.md
+++ b/docs/src/about_ranking.md
@@ -26,4 +26,4 @@ Gravity = Decay gravity, 1.8 is default
 
 A plot of rank over 24 hours, of scores of 1, 5, 10, 100, 1000, with a scale factor of 10k.
 
-![](https://raw.githubusercontent.com/LemmyNet/lemmy/master/docs/img/rank_algorithm.png)
+![](https://raw.githubusercontent.com/LemmyNet/lemmy/main/docs/img/rank_algorithm.png)

diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md
index cc4c568987a4d0b309d9ed8cf0eb9a66937f4316..c2aef3f7f910484e3ed335b1ee885ba2cd7829b0 100644 (file)
--- a/docs/src/administration_configuration.md
+++ b/docs/src/administration_configuration.md
@@ -1,7 +1,7 @@
 # Configuration
 
 The configuration is based on the file
-[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/master/server/config/defaults.hjson).
+[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/server/config/defaults.hjson).
 This file also contains documentation for all the available options. To override the defaults, you
 can copy the options you want to change into your local `config.hjson` file.
 

diff --git a/docs/src/administration_install_ansible.md b/docs/src/administration_install_ansible.md
index 4676f47d43309a8921f2a923381b9e6a6717419d..849957ad10910bdd2ddc4b699cc1f092dd1be54a 100644 (file)
--- a/docs/src/administration_install_ansible.md
+++ b/docs/src/administration_install_ansible.md
@@ -19,7 +19,7 @@ ansible-playbook lemmy.yml --become
 
 To update to a new version, just run the following in your local Lemmy repo:
 ```bash
-git pull origin master
+git pull origin main
 cd ansible
 ansible-playbook lemmy.yml --become
 ```

diff --git a/docs/src/administration_install_docker.md b/docs/src/administration_install_docker.md
index a2bed794f9fb0a0d4a0b34c1441574d5f5f0710a..ae0375a81614ffd0ed4b049b5c4a6dd413fe92e6 100644 (file)
--- a/docs/src/administration_install_docker.md
+++ b/docs/src/administration_install_docker.md
@@ -8,9 +8,9 @@ mkdir /lemmy
 cd /lemmy
 
 # download default config files
-wget https://raw.githubusercontent.com/LemmyNet/lemmy/master/docker/prod/docker-compose.yml
-wget https://raw.githubusercontent.com/LemmyNet/lemmy/master/docker/lemmy.hjson
-wget https://raw.githubusercontent.com/LemmyNet/lemmy/master/docker/iframely.config.local.js
+wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/prod/docker-compose.yml
+wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/lemmy.hjson
+wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/iframely.config.local.js
 
 # Set correct permissions for pictrs folder
 mkdir -p volumes/pictrs
@@ -21,10 +21,10 @@ After this, have a look at the [config file](administration_configuration.md) na
 
 `docker-compose up -d`
 
-To make Lemmy available outside the server, you need to setup a reverse proxy, like Nginx. [A sample nginx config](https://raw.githubusercontent.com/LemmyNet/lemmy/master/ansible/templates/nginx.conf), could be setup with:
+To make Lemmy available outside the server, you need to setup a reverse proxy, like Nginx. [A sample nginx config](https://raw.githubusercontent.com/LemmyNet/lemmy/main/ansible/templates/nginx.conf), could be setup with:
 
 ```bash
-wget https://raw.githubusercontent.com/LemmyNet/lemmy/master/ansible/templates/nginx.conf
+wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/ansible/templates/nginx.conf
 # Replace the {{ vars }}
 sudo mv nginx.conf /etc/nginx/sites-enabled/lemmy.conf
 ```
@@ -36,6 +36,6 @@ You will also need to setup TLS, for example with [Let's Encrypt](https://letsen
 To update to the newest version, you can manually change the version in `docker-compose.yml`. Alternatively, fetch the latest version from our git repo:
 
 ```bash
-wget https://raw.githubusercontent.com/LemmyNet/lemmy/master/docker/prod/docker-compose.yml
+wget https://raw.githubusercontent.com/LemmyNet/lemmy/main/docker/prod/docker-compose.yml
 docker-compose up -d
 ```