diff --git a/DEVELOPING.rst b/DEVELOPING.rst index 19d9482b..51c54ffb 100644 --- a/DEVELOPING.rst +++ b/DEVELOPING.rst @@ -24,7 +24,7 @@ from the root of the project here is what you do:: # Commit and push new docs git commit -a -m "Updated docs" git push - # Return to master branch - git checkout master + # Return to main branch + git checkout main diff --git a/docs/source/mayavi/data.rst b/docs/source/mayavi/data.rst index c5ea3867..8d09e798 100644 --- a/docs/source/mayavi/data.rst +++ b/docs/source/mayavi/data.rst @@ -515,7 +515,7 @@ objects or data files for Mayavi and TVTK. * Presentation on TVTK and Mayavi2 for course at IIT Bombay - https://github.com/enthought/mayavi/raw/master/docs/pdf/tvtk_mayavi2.pdf + https://github.com/enthought/mayavi/raw/main/docs/pdf/tvtk_mayavi2.pdf This presentation provides information on graphics in general, 3D data representation, creating VTK data files, creating datasets diff --git a/docs/source/mayavi/misc.rst b/docs/source/mayavi/misc.rst index d325f6a8..1733988a 100644 --- a/docs/source/mayavi/misc.rst +++ b/docs/source/mayavi/misc.rst @@ -111,9 +111,9 @@ workflow: 1. Fork the Repo on github. 2. If you are adding functionality or fixing a bug, please add a test! -3. Push to your fork and submit a **pull request to the master branch**. +3. Push to your fork and submit a **pull request to the main branch**. -The **master** branch is a 100% stable (should be). The pull request is merged +The **main** branch is a 100% stable (should be). The pull request is merged only after it is certain that things are working out, which means that `Travis`_ and `Appveyor`_ tests pass. @@ -156,7 +156,7 @@ Translating the documentation The recommended way for new contributors to translate mayavi reference is to join the translation team on Transifex. -There is a `mayavi translation page`_ for mayavi (master) documentation. +There is a `mayavi translation page`_ for mayavi (main) documentation. 1. Login to transifex_ service. 2. Go to `mayavi translation page`_. diff --git a/docs/source/mayavi/tips.rst b/docs/source/mayavi/tips.rst index 837dc2d0..8c963b0d 100644 --- a/docs/source/mayavi/tips.rst +++ b/docs/source/mayavi/tips.rst @@ -33,7 +33,7 @@ This feature was first introduced in Mayavi-4.8.0. .. _itkwidgets: https://github.com/InsightSoftwareConsortium/itkwidgets A simple example notebook demonstrating the notebook interface is -available here: https://github.com/enthought/mayavi/blob/master/examples/mayavi/mayavi_jupyter.ipynb +available here: https://github.com/enthought/mayavi/blob/main/examples/mayavi/mayavi_jupyter.ipynb There are two other backends, the simplest one is the ``'png'`` backend which produces images that can be embedded in the notebook.