Update branch references (#646)

.github/workflows/check-release.yml

@@ -1,7 +1,7 @@
 name: Check Release
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
     branches: ["*"]
 

.github/workflows/codeql-analysis.yml

@@ -14,10 +14,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches: ["main"]
   schedule:
     - cron: "25 18 * * 4"
 

.github/workflows/integration-tests.yml

@@ -1,7 +1,7 @@
 name: Jupyter Server Integration Tests [Linux]
 on:
   push:
-    branches: "master"
+    branches: "main"
   pull_request:
     branches: "*"
 jobs:

.github/workflows/python-linux.yml

@@ -1,7 +1,7 @@
 name: Jupyter Server Tests [Linux]
 on:
   push:
-    branches: "master"
+    branches: "main"
   pull_request:
     branches: "*"
 jobs:

.github/workflows/python-macos.yml

@@ -1,7 +1,7 @@
 name: Jupyter Server Tests [Mac OS]
 on:
   push:
-    branches: "master"
+    branches: "main"
   pull_request:
     branches: "*"
 jobs:

.github/workflows/python-windows.yml

@@ -1,7 +1,7 @@
 name: Jupyter Server Tests [Windows]
 on:
   push:
-    branches: "master"
+    branches: "main"
   pull_request:
     branches: "*"
 jobs:

CONTRIBUTING.rst

@@ -32,7 +32,7 @@ steps::
 If you are using a system-wide Python installation and you only want to install the server for you,
 you can add ``--user`` to the install commands.
 
-Once you have done this, you can launch the master branch of Jupyter server
+Once you have done this, you can launch the main branch of Jupyter server
 from any directory in your system with::
 
     jupyter server

README.md

@@ -1,6 +1,6 @@
 # Jupyter Server
 
-[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3Amaster++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3Amaster++)
+[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3Amain++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3Amain++)
 [![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
 
 The Jupyter Server provides the backend (i.e. the core services, APIs, and REST endpoints) for Jupyter web applications like Jupyter notebook, JupyterLab, and Voila.
@@ -20,9 +20,9 @@ Jupyter Server currently supports Python>=3.6 on Linux, OSX and Windows.
 
 If Jupyter Server is a dependency of your project/application, it is important that you pin it to a version that works for your application. Currently, Jupyter Server only has minor and patch versions. Different minor versions likely include API-changes while patch versions do not change API.
 
-When a new minor version is released on PyPI, a branch for that version will be created in this repository, and the version of the master branch will be bumped to the next minor version number. That way, the master branch always reflects the latest un-released version.
+When a new minor version is released on PyPI, a branch for that version will be created in this repository, and the version of the main branch will be bumped to the next minor version number. That way, the main branch always reflects the latest un-released version.
 
-To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/master/CHANGELOG.md).
+To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/main/CHANGELOG.md).
 
 ## Usage - Running Jupyter Server
 
@@ -34,7 +34,7 @@ Launch with:
 
 ### Testing
 
-See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/master/CONTRIBUTING.rst#running-tests).
+See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/main/CONTRIBUTING.rst#running-tests).
 
 ## Contributing
 

docs/source/developers/extensions.rst

@@ -5,7 +5,7 @@ Server Extensions
 A Jupyter Server extension is typically a module or package that extends to Server’s REST API/endpoints—i.e. adds extra request handlers to Server’s Tornado Web Application.
 
 You can check some simple examples on the `examples folder
-<https://github.com/jupyter/jupyter_server/tree/master/examples/simple>`_ in the GitHub jupyter_server repository.
+<https://github.com/jupyter/jupyter_server/tree/main/examples/simple>`_ in the GitHub jupyter_server repository.
 
 Authoring a basic server extension
 ==================================

docs/source/index.rst

@@ -19,7 +19,7 @@ Jupyter Server is the backend—the core services, APIs, and `REST endpoints`_
 
 .. _Tornado: https://www.tornadoweb.org/en/stable/
 .. _Jupyter Notebook: https://github.com/jupyter/notebook
-.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/master/jupyter_server/services/api/api.yaml
+.. _REST endpoints: https://petstore.swagger.io/?url=https://raw.githubusercontent.com/jupyter/jupyter_server/main/jupyter_server/services/api/api.yaml
 
 Who's this for?
 ---------------

jupyter_server/serverapp.py

@@ -285,7 +285,7 @@ def init_settings(
         env.install_gettext_translations(nbui, newstyle=False)
 
         if sys_info["commit_source"] == "repository":
-            # don't cache (rely on 304) when working from master
+            # don't cache (rely on 304) when working from default branch
             version_hash = ""
         else:
             # reset the cache on server restart