Merge pull request #575 from AllenInstitute/feature/switch-to-main-as-default-branch

Switch default branch to main

Author: t-b

Packages/MIES/MIES_Menu.ipf

@@ -118,7 +118,7 @@ Function OpenAboutDialog()
 	Notebook $nb text="\r"
 	Notebook $nb text="License: "
 	NotebookAction/W=$nb name=Action0, title="2-clause BSD license plus a third clause", ignoreErrors=1
-	NotebookAction/W=$nb name=Action0, commands="BrowseURL(\"https://github.com/AllenInstitute/MIES/blob/master/LICENSE\")"
+	NotebookAction/W=$nb name=Action0, commands="BrowseURL(\"https://github.com/AllenInstitute/MIES/blob/main/LICENSE\")"
 	Notebook $nb text="\r"
 	Notebook $nb text="\r"
 	Notebook $nb text="Sponsors: "

Packages/doc/developers.rst

@@ -4,7 +4,7 @@ Developer
 Getting MIES
 ------------
 
-Latest development version from master branch
+Latest development version from main branch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -  ``git clone https://github.com/AllenInstitute/MIES``
@@ -159,7 +159,7 @@ data acquisition is blocked.
 Cutting a new release
 ~~~~~~~~~~~~~~~~~~~~~
 
--  Checkout the master branch
+-  Checkout the main branch
 -  Check that MIES compiles
 -  Check that doxygen/sphinx/breathe returns neither errors nor warnings
 -  Paste the contents of ``Packages\doc\releasenotes_template.rst`` to
@@ -253,7 +253,7 @@ perform the followings steps:
 Documentation building
 ~~~~~~~~~~~~~~~~~~~~~~
 
-The documentation for the master branch is automatically built and
+The documentation for the main branch is automatically built and
 uploaded by `this <http://bamboo.corp.alleninstitute.org/browse/MIES-CM>`__ bamboo job.
 
 Setting up a continous integration server (Linux)

tools/deploy_documentation.sh

@@ -54,14 +54,14 @@ fi
 branch=$(git rev-parse --abbrev-ref HEAD)
 
 case "$branch" in
-  master)
+  main)
     tag=latest
 
     cd $public_mies_repo
 
     git stash || true
     git fetch --all
-    git tag --force ${tag} origin/master
+    git tag --force ${tag} origin/main
     git push --force origin ${tag}
 
     cd $top_level