rename master to main

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 034a61c8cb4906d162af039ac46120e30e9fb115..1842a662b4f2a18ba17e1add13093bbf71f1ec53 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 ## Branches and issues
 - Whenever possible, one commit per feature.
 - If feature/pull-request branches have only one developer, please regularly
-  rebase them onto master until they are merged in.
+  rebase them onto main until they are merged in.
 - Don't merge branches with meaningless commit messages; always squash them
   instead.
 - Wait for discussion of big changes. Your branches will still be here

diff --git a/README.md b/README.md
index 575bd1a5b51919c6f1955609669211231e1d5adc..994e53072d24b722b50eaf6babf3742d9f6dc745 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# web-7.0 [![Build Status](https://travis-ci.org/freenode/web-7.0.svg?branch=master)](https://travis-ci.org/freenode/web-7.0) [![irc: #freenode-website](https://img.shields.io/badge/irc-%23freenode--website-brightgreen.svg)](https://webchat.freenode.net/?channels=freenode-website)
+# web-7.0 [![Build Status](https://travis-ci.org/freenode/web-7.0.svg?branch=main)](https://travis-ci.org/freenode/web-7.0) [![irc: #freenode-website](https://img.shields.io/badge/irc-%23freenode--website-brightgreen.svg)](https://webchat.freenode.net/?channels=freenode-website)
 
 A shiny replacement for http://freenode.net.
 
@@ -33,7 +33,7 @@ from any directory, you can also use `cms7 -c /path/to/config.yml`.
 
 - Whenever possible, one commit per feature.
 - If feature/pull-request branches have only one developer, please regularly
-  rebase them onto master until they are merged in.
+  rebase them onto main until they are merged in.
 - Don't merge branches with meaningless commit messages; always squash them
   instead.
 - Wait for discussion of big changes. Your branches will still be here

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 488c37e6d895654689d7ef5d2d3bde7d83ce3958..ab623ed46ca4e84189cd52e59e487e79f9fa3f18 100755 (executable)
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -6,7 +6,7 @@ if [ -z "$TRAVIS_BRANCH" ]; then exit; fi
 BRANCH_DIR="$TRAVIS_BRANCH"
 
 if [ "$TRAVIS_PULL_REQUEST" != false ]; then
-    if [ "$TRAVIS_BRANCH" != master ]; then exit; fi
+    if [ "$TRAVIS_BRANCH" != main ]; then exit; fi
 
     BRANCH_DIR="pull-$TRAVIS_PULL_REQUEST"
 fi
@@ -26,7 +26,7 @@ git commit -m "travis: $TRAVIS_COMMIT"
 git push || exit 1
 cd ../..
 
-if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false ]; then
+if [ "$TRAVIS_BRANCH" = main -a "$TRAVIS_PULL_REQUEST" = false ]; then
     rm -rf .deploy
     export SSH_KEYFILE="$(readlink -f deploy/key2)"
     export GIT_SSH="$(readlink -f deploy/ssh.sh)"