discourse/discourse moved from master to main

diff --git a/README.md b/README.md
index be05ba87a18c2e55a51755dcbf3674ab67c40024..fc6ca2950762a820ea7cc35fb7c9544794668b29 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 The simplest way to get started is via the **standalone** template, which can be installed in 30 minutes or less. For detailed install instructions, see
 
-https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md
+https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md
 
 ### Directory Structure
 

diff --git a/image/README.md b/image/README.md
index 007f1f37ebc5c66aacfd9c6cab538ea57646947f..d291588379316937106fc8c08762f14ffc5ea158 100644 (file)
--- a/image/README.md
+++ b/image/README.md
@@ -21,7 +21,7 @@ All of the dependencies for running Discourse.  This includes runit, postgres, n
 
 ### discourse_dev ([discourse/discourse_dev](https://hub.docker.com/r/discourse/discourse_dev/))
 
-Adds redis and postgres just like the "standalone" template for Discourse in order to have an all-in-one container for development.  Note that you are expected to mount your local discourse source directory to `/src`.  See [the README in GitHub's discourse/bin/docker](https://github.com/discourse/discourse/tree/master/bin/docker/) for utilities that help with this.
+Adds redis and postgres just like the "standalone" template for Discourse in order to have an all-in-one container for development.  Note that you are expected to mount your local discourse source directory to `/src`.  See [the README in GitHub's discourse/bin/docker](https://github.com/discourse/discourse/tree/main/bin/docker/) for utilities that help with this.
 
 Note that the discourse user is granted "sudo" permission without asking for a password in the discourse_dev image.  This is to facilitate the command-line Docker tools in discourse proper that run commands as the discourse user.
 

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 83b84b21dd41d2127c684c49035f9afd976e92c1..04d16524224e4a86269921de439d344b33f1ded7 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -88,7 +88,7 @@ run:
       cmd:
         - git reset --hard
         - git clean -f
-        - git remote set-branches --add origin master
+        - git remote set-branches --add origin main
         - git remote set-branches origin $version
         - git fetch --depth 1 origin $version
         - git checkout $version