Skip to content

Commit afd64f8

Browse files
committed
Remove remaining master from docs
1 parent 4ab4b17 commit afd64f8

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

docs/source/contributing/contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Read the [next section](#guidelines-to-getting-a-pull-request-merged) for guidel
6464
6. Wait for a community member to merge your changes.
6565
Remember that **someone else must merge your pull request**.
6666
That goes for new contributors and long term maintainers alike.
67-
Because `master` is continuously deployed to mybinder.org it is essential
68-
that `master` is always in a deployable state.
67+
Because `main` is continuously deployed to mybinder.org it is essential
68+
that `main` is always in a deployable state.
6969
7. (optional) Deploy a new version of repo2docker to mybinder.org by [following these steps](http://mybinder-sre.readthedocs.io/en/latest/deployment/how.html)
7070

7171
## Guidelines to getting a Pull Request merged

docs/source/contributing/roadmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ creating the environment in which a piece of software can be executed.
6060

6161
The "Now" items are being actively worked on by the project:
6262
* reduce documentation typos and syntax errors
63-
* increase test coverage to 80% (see https://codecov.io/gh/jupyterhub/repo2docker/tree/master/repo2docker for low coverage files)
63+
* increase test coverage to 80% (see https://codecov.io/gh/jupyterhub/repo2docker/tree/main/repo2docker for low coverage files)
6464
* mounting repository contents in locations that is not `/home/jovyan`
6565
* investigate options for pinning repo2docker versions ([#490](https://github.com/jupyterhub/repo2docker/issues/490))
6666

docs/source/contributing/tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ test to prevent the bug from coming back/the feature breaking in the future.
115115
116116
## Creating a Release
117117
118-
We make a release of whatever is on `master` every month. We use "calendar versioning".
118+
We make a release of whatever is on `main` every month. We use "calendar versioning".
119119
Monthly releases give users a predictable pattern for when releases are going to
120120
happen and prevents locking up improvements for fixes for long periods of time.
121121
@@ -135,7 +135,7 @@ V=YYYY.MM.0; git tag -am "release $V" $V
135135
> If you need to make a second (or third) release in a month increment the
136136
> trailing 0 of the version to 1 (or 2).
137137
138-
Then push this change up to the master repository
138+
Then push this change up to the main repository
139139

140140
```
141141
git push origin --tags

docs/source/howto/user_interface.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For example, the following Binder URL will open the
3030
`pyTudes repository <https://github.com/norvig/pytudes>`_
3131
and begin a JupyterLab session in the ``ipynb`` folder:
3232

33-
https://mybinder.org/v2/gh/norvig/pytudes/master?urlpath=lab/tree/ipynb
33+
https://mybinder.org/v2/gh/norvig/pytudes/HEAD?urlpath=lab/tree/ipynb
3434

3535
The ``/tree/ipynb`` above is how JupyterLab directs you to a specific file
3636
or folder.
@@ -61,7 +61,7 @@ For example, the following Binder URL will open the
6161
`pyTudes repository <https://github.com/norvig/pytudes>`_
6262
and begin an nteract session in the ``ipynb`` folder:
6363

64-
https://mybinder.org/v2/gh/norvig/pytudes/master?urlpath=nteract/tree/ipynb
64+
https://mybinder.org/v2/gh/norvig/pytudes/HEAD?urlpath=nteract/tree/ipynb
6565

6666
The ``/tree/ipynb`` above is how nteract directs you to a specific file
6767
or folder.
@@ -83,7 +83,7 @@ RStudio will be accessible by appending ``/rstudio`` to the URL, like so:
8383
For example, the following Binder link will open an RStudio session in
8484
the `R demo repository <https://github.com/binder-examples/r>`_.
8585

86-
http://mybinder.org/v2/gh/binder-examples/r/master?urlpath=rstudio
86+
http://mybinder.org/v2/gh/binder-examples/r/HEAD?urlpath=rstudio
8787

8888

8989
Shiny
@@ -106,7 +106,7 @@ a Shiny app.
106106
For example, the following Binder link will open a Shiny session in
107107
the `R demo repository <https://github.com/binder-examples/r>`_.
108108

109-
http://mybinder.org/v2/gh/binder-examples/r/master?urlpath=shiny/bus-dashboard/
109+
http://mybinder.org/v2/gh/binder-examples/r/HEAD?urlpath=shiny/bus-dashboard/
110110

111111

112112
Stencila

docs/source/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ We recommend installing ``repo2docker`` with the ``pip`` tool::
4848

4949
for the latest release. To install the most recent code from the upstream repository, run::
5050

51-
python3 -m pip install https://github.com/jupyterhub/repo2docker/archive/master.zip
51+
python3 -m pip install https://github.com/jupyterhub/repo2docker/archive/main.zip
5252

5353
For information on using ``repo2docker``, see :ref:`usage`.
5454

hooks/post_push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# when building jupyter/repo2docker:master
3+
# when building jupyter/repo2docker:main
44
# also push jupyter/repo2docker:1.2.3-3.abcd1234 (replace + with -)
55
version=$(docker run $DOCKER_REPO:$DOCKER_TAG jupyter-repo2docker --version | sed s@+@-@)
66
VERSION_IMAGE="$DOCKER_REPO:$version"

0 commit comments

Comments
 (0)