Skip to content

Commit 8cadd69

Browse files
authored
master -> main (#333)
1 parent a69e478 commit 8cadd69

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ script:
4141
# github-token: $GITHUB_TOKEN
4242
# keep-history: true
4343
# on:
44-
# branch: master
44+
# branch: main

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/starkiller-astro/Microphysics.svg?branch=master)](https://travis-ci.org/starkiller-astro/Microphysics) [![DOI](https://zenodo.org/badge/33425497.svg)](https://zenodo.org/badge/latestdoi/33425497)
1+
[![Build Status](https://travis-ci.org/starkiller-astro/Microphysics.svg?branch=main)](https://travis-ci.org/starkiller-astro/Microphysics) [![DOI](https://zenodo.org/badge/33425497.svg)](https://zenodo.org/badge/latestdoi/33425497)
22

33
# Microphysics
44

@@ -90,13 +90,13 @@ Development generally follows the following ideas:
9090
change (or if they do, that the changes were expected).
9191

9292
If a change is critical, we can cherry-pick the commit from
93-
`development` to `master`.
93+
`development` to `main`.
9494

9595
* Contributions are welcomed from anyone. *Any contributions that
9696
have the potential to change answers should be done via pull
9797
requests.* A pull request should be generated from your fork of
9898
`Microphysics` and target the `development` branch. (If you mistakenly
99-
target `master`, we can change it for you.)
99+
target `main`, we can change it for you.)
100100

101101
Please add a line to `CHANGES` summarizing your change if it
102102
is a bug fix or new feature. Reference the PR or issue as
@@ -114,14 +114,14 @@ Development generally follows the following ideas:
114114
since these will be used for a squashed commit message.*
115115

116116
* On the first workday of each month, we perform a merge of
117-
`development` into `master`, in coordination with `AMReX`,
117+
`development` into `main`, in coordination with `AMReX`,
118118
`Maestro`, and `Microphysics`. For this merge to take place, we
119119
need to be passing the regression tests.
120120

121121
To accommodate this need, we close the merge window into
122122
`development` a few days before the merge day. While the merge
123123
window is closed, only bug fixes should be pushed into
124-
`development`. Once the merge from `development` -> `master` is
124+
`development`. Once the merge from `development` -> `main` is
125125
done, the merge window reopens.
126126

127127

sphinx_docs/source/conf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ def get_version():
7474
# see https://github.com/phn/pytpm/issues/3#issuecomment-12133978
7575
numpydoc_show_class_members = False
7676

77-
# The master toctree document.
78-
master_doc = 'index'
77+
# The main toctree document.
78+
main_doc = 'index'
7979

8080
# General information about the project.
8181
project = 'StarKiller Microphysics'
@@ -192,7 +192,7 @@ def get_version():
192192
# (source start file, target name, title,
193193
# author, documentclass [howto, manual, or own class]).
194194
latex_documents = [
195-
(master_doc, 'StarKillerMicrophysics.tex', 'StarKiller Microphysics Documentation',
195+
(main_doc, 'StarKillerMicrophysics.tex', 'StarKiller Microphysics Documentation',
196196
'StarKiller Development Team', 'manual'),
197197
]
198198

@@ -202,7 +202,7 @@ def get_version():
202202
# One entry per manual page. List of tuples
203203
# (source start file, name, description, authors, manual section).
204204
man_pages = [
205-
(master_doc, 'starkillermicrophysics', 'StarKiller Microphysics Documentation',
205+
(main_doc, 'starkillermicrophysics', 'StarKiller Microphysics Documentation',
206206
[author], 1)
207207
]
208208

@@ -213,7 +213,7 @@ def get_version():
213213
# (source start file, target name, title, author,
214214
# dir menu entry, description, category)
215215
texinfo_documents = [
216-
(master_doc, 'StarKillerMicrophysics', 'StarKiller Microphysics Documentation',
216+
(main_doc, 'StarKillerMicrophysics', 'StarKiller Microphysics Documentation',
217217
author, 'StarKillerMicrophysics', 'One line description of project.',
218218
'Miscellaneous'),
219219
]

sphinx_docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. StarKiller documentation master file.
1+
.. StarKiller documentation main file.
22
You can adapt this file completely to your liking, but it should at least
33
contain the root `toctree` directive.
44

0 commit comments

Comments
 (0)