rename "master" to "main"

9 files changed, 14 insertions, 12 deletions

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 96c7e20..90526ea 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -1,10 +1,10 @@
 name: Build and test
 
 on:
-    # Only on pushes to master or one of the release branches we build on push
+    # Only on pushes to main or one of the release branches we build on push
     push:
         branches:
-            - master
+            - main
             - "[0-9].[0-9]+-branch"
         tags:
             - "*"
diff --git a/CHANGES.txt b/CHANGES.txt
index a8617e5..686579f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
 Unreleased
 ----------
 
+- Rename "master" git branch to "main"
+
 Feature
 ~~~~~~~
 
diff --git a/HISTORY.txt b/HISTORY.txt
index 070cddc..639ca09 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -26,7 +26,7 @@ Backwards Incompatibilities
   GSoC, the Python Software Foundation for organising and a huge thanks to Ira
   for completing the work. See https://github.com/Pylons/webob/pull/338 and
   https://github.com/Pylons/webob/pull/335. Documentation is available at
-  https://docs.pylonsproject.org/projects/webob/en/master/api/webob.html
+  https://docs.pylonsproject.org/projects/webob/en/main/api/webob.html
 
 - When calling a ``@wsgify`` decorated function, the default arguments passed
   to ``@wsgify`` are now used when called with the request, and not as a
diff --git a/README.rst b/README.rst
index caa85ad..52e9d86 100644
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 WebOb
 =====
 
-.. image:: https://travis-ci.com/Pylons/webob.png?branch=master
+.. image:: https://travis-ci.com/Pylons/webob.png?branch=main
         :target: https://travis-ci.com/Pylons/webob
 
 .. image:: https://readthedocs.org/projects/webob/badge/?version=stable
diff --git a/contributing.md b/contributing.md
index de4caf1..4d8e7da 100644
--- a/contributing.md
+++ b/contributing.md
@@ -22,7 +22,7 @@ Git Branches
 Git branches and their purpose and status at the time of this writing are
 listed below.
 
-* [master](https://github.com/Pylons/webob/) - The branch on which further
+* [main](https://github.com/Pylons/webob/) - The branch on which further
 development takes place. The default branch on GitHub.
 * [1.6-branch](https://github.com/Pylons/webob/tree/1.6-branch) - The branch
 classified as "stable" or "latest". Actively maintained. 
@@ -92,7 +92,7 @@ pull request.
     workflow](https://help.github.com/articles/what-is-a-good-git-workflow/).
     Start by pulling from the upstream to get the most current changes.
 
-         git pull upstream master
+         git pull upstream main
 
 7.  Make a branch, make changes to the docs, and rebuild them as indicated in
     step 5.  To speed up the build process, you can omit `clean` from the above
diff --git a/docs/comment-example.txt b/docs/comment-example.txt
index 62824a4..42fb741 100644
--- a/docs/comment-example.txt
+++ b/docs/comment-example.txt
@@ -16,7 +16,7 @@ Code
 
 The finished code for this is available in
 `docs/comment-example-code/example.py
-<https://github.com/Pylons/webob/blob/master/docs/comment-example-code/example.py>`_
+<https://github.com/Pylons/webob/blob/main/docs/comment-example-code/example.py>`_
 -- you can run that file as a script to try it out.
 
 Instantiating Middleware
diff --git a/docs/conf.py b/docs/conf.py
index db67971..22c28ff 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@ source_suffix = [".txt", ".rst"]
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
-# The master toctree document.
+# The main toctree document.
 master_doc = "index"
 
 # General information about the project.
diff --git a/docs/jsonrpc-example.txt b/docs/jsonrpc-example.txt
index 68db47b..b4c2e52 100644
--- a/docs/jsonrpc-example.txt
+++ b/docs/jsonrpc-example.txt
@@ -25,7 +25,7 @@ Code
 
 The finished code for this is available in
 `docs/json-example-code/jsonrpc.py
-<https://github.com/Pylons/webob/blob/master/docs/jsonrpc-example-code/jsonrpc.py>`_
+<https://github.com/Pylons/webob/blob/main/docs/jsonrpc-example-code/jsonrpc.py>`_
 -- you can run that file as a script to try it out, or import it.
 
 Concepts
@@ -537,9 +537,9 @@ Using Them Together
 Good programmers start with tests.  But at least we'll end with a
 test.  We'll use :py:mod:`doctest` for our
 tests.  The test is in `docs/json-example-code/test_jsonrpc.txt
-<https://github.com/Pylons/webob/blob/master/docs/jsonrpc-example-code/test_jsonrpc.txt>`_
+<https://github.com/Pylons/webob/blob/main/docs/jsonrpc-example-code/test_jsonrpc.txt>`_
 and you can run it with `docs/json-example-code/test_jsonrpc.py
-<https://github.com/Pylons/webob/blob/master/docs/jsonrpc-example-code/test_jsonrpc.py>`_,
+<https://github.com/Pylons/webob/blob/main/docs/jsonrpc-example-code/test_jsonrpc.py>`_,
 which looks like:
 
 .. code-block:: python
diff --git a/docs/wiki-example.txt b/docs/wiki-example.txt
index bacd751..f5e83c9 100644
--- a/docs/wiki-example.txt
+++ b/docs/wiki-example.txt
@@ -26,7 +26,7 @@ Code
 
 The finished code for this is available in
 `docs/wiki-example-code/example.py
-<https://github.com/Pylons/webob/blob/master/docs/wiki-example-code/example.py>`_
+<https://github.com/Pylons/webob/blob/main/docs/wiki-example-code/example.py>`_
 -- you can run that file as a script to try it out.
 
 Creating an Application