master->main in README and docs

Author: harpolea

README.md

@@ -1,4 +1,4 @@
-[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2) [![Documentation Status](https://readthedocs.org/projects/pyro2/badge/?version=latest)](https://pyro2.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/python-hydro/pyro2/master?filepath=examples%2Fexamples.ipynb) [![JOSS status](http://joss.theoj.org/papers/6d8b2f94e6d08a7b5d65e98a948dcad7/status.svg)](http://joss.theoj.org/papers/6d8b2f94e6d08a7b5d65e98a948dcad7) [![DOI](https://zenodo.org/badge/20570861.svg)](https://zenodo.org/badge/latestdoi/20570861)
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=main)](https://travis-ci.com/python-hydro/pyro2) [![Documentation Status](https://readthedocs.org/projects/pyro2/badge/?version=latest)](https://pyro2.readthedocs.io/en/latest/?badge=latest) [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/python-hydro/pyro2/main?filepath=examples%2Fexamples.ipynb) [![JOSS status](http://joss.theoj.org/papers/6d8b2f94e6d08a7b5d65e98a948dcad7/status.svg)](http://joss.theoj.org/papers/6d8b2f94e6d08a7b5d65e98a948dcad7) [![DOI](https://zenodo.org/badge/20570861.svg)](https://zenodo.org/badge/latestdoi/20570861)
 
 
 
@@ -92,12 +92,12 @@ https://pyro2.readthedocs.io/
 The main data structures that describe the grid and the data the lives
 on the grid are described in a jupyter notebook:
 
-https://github.com/python-hydro/pyro2/blob/master/mesh/mesh-examples.ipynb
+https://github.com/python-hydro/pyro2/blob/main/mesh/mesh-examples.ipynb
 
 Many of the methods here rely on multigrid.  The multigrid solver is
 demonstrated in the juputer notebook:
 
-https://github.com/python-hydro/pyro2/blob/master/multigrid/multigrid-examples.ipynb
+https://github.com/python-hydro/pyro2/blob/main/multigrid/multigrid-examples.ipynb
 
 
 ## Solvers

docs/source/conf.py

@@ -57,8 +57,8 @@
 # see https://github.com/phn/pytpm/issues/3#issuecomment-12133978
 numpydoc_show_class_members = False
 
-# The master toctree document.
-master_doc = 'index'
+# The main toctree document.
+main_doc = 'index'
 
 # General information about the project.
 project = 'pyro'
@@ -161,7 +161,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'pyro.tex', 'pyro Documentation',
+    (main_doc, 'pyro.tex', 'pyro Documentation',
      'pyro development team', 'manual'),
 ]
 
@@ -171,7 +171,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'pyro', 'pyro Documentation',
+    (main_doc, 'pyro', 'pyro Documentation',
      [author], 1)
 ]
 
@@ -182,7 +182,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'pyro', 'pyro Documentation',
+    (main_doc, 'pyro', 'pyro Documentation',
      author, 'pyro', 'One line description of project.',
      'Miscellaneous'),
 ]

docs/source/help.rst

@@ -29,7 +29,7 @@ Pull Requests
 
 *Any contributions that have the potential to change answers should be
 done via pull requests.* A pull request should be generated from your
-fork of pyro and target the `master` branch.
+fork of pyro and target the `main` branch.
 
 The unit and regression tests will run automatically once the PR is
 submitted, and then one of the pyro developers will review the PR and

docs/source/index.rst

@@ -1,4 +1,4 @@
-.. pyro documentation master file, created by
+.. pyro documentation main file, created by
    sphinx-quickstart on Mon Dec 25 18:42:54 2017.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.