Skip to content

Commit bca89cd

Browse files
committed
Rename master branch to main
1 parent 413d54a commit bca89cd

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

README.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Deform
22
======
33

4-
.. image:: https://github.com/Pylons/deform/workflows/Build%20and%20test/badge.svg?branch=master
5-
:target: https://github.com/Pylons/deform/actions?query=workflow%3A%22Build+and+test%22+branch%3Amaster
4+
.. image:: https://github.com/Pylons/deform/workflows/Build%20and%20test/badge.svg?branch=main
5+
:target: https://github.com/Pylons/deform/actions?query=workflow%3A%22Build+and+test%22+branch%3Amain
66

7-
.. image:: https://readthedocs.org/projects/deform/badge/?version=master
8-
:target: https://docs.pylonsproject.org/projects/deform/en/master/
7+
.. image:: https://readthedocs.org/projects/deform/badge/?version=main
8+
:target: https://docs.pylonsproject.org/projects/deform/en/main/
99
:alt: Master Documentation Status
1010

1111
.. image:: https://readthedocs.org/projects/deform/badge/?version=latest
@@ -63,7 +63,7 @@ Example
6363
`See all widget examples <https://deformdemo.pylonsproject.org>`_. Below is a sample
6464
form loop using the `Pyramid <https://trypyramid.com/>`_ web framework.
6565

66-
.. image:: https://github.com/Pylons/deform/raw/master/docs/example.png
66+
.. image:: https://github.com/Pylons/deform/raw/main/docs/example.png
6767
:width: 400px
6868

6969
Example code:

RELEASING.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Prepare new release branch
2121

2222
- Align the release number with deformdemo (setup.py, README.rst, CHANGES.txt).
2323

24-
- Do any necessary branch merges (e.g., master to branch, branch to master).
24+
- Do any necessary branch merges (e.g., main to branch, branch to main).
2525

2626
- On release branch:
2727

@@ -48,7 +48,7 @@ Prepare new release branch
4848
- For major version releases, in contributing.md, update branch descriptions.
4949

5050
- For major version releases, in docs/conf.py, update values under
51-
html_theme_options for in_progress and outdated across master, releasing
51+
html_theme_options for in_progress and outdated across main, releasing
5252
branch, and previously released branch. Also in the previously released
5353
branch only, uncomment the sections to enable pylons_sphinx_latesturl.
5454

contributing.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Contributing
22

3-
You are working on the `master` branch. Development of new features takes place on the `master` branch. The latest, stable release branch is `2.0-branch`.
3+
You are working on the `main` branch. Development of new features takes place on the `main` branch. The latest, stable release branch is `2.0-branch`.
44

55
All projects under the Pylons Projects, including this one, follow the guidelines established at [How to Contribute](https://pylonsproject.org/community-how-to-contribute.html), [Coding Style and Standards](https://pylonsproject.org/community-coding-style-standards.html), and [Pylons Project Documentation Style Guide](https://docs.pylonsproject.org/projects/docs-style-guide/).
66

77
You can contribute to this project in several ways.
88

99
* [File an Issue on GitHub](https://github.com/Pylons/deform/issues).
10-
* Fork this project and create a branch with your suggested change. When ready, submit a pull request for consideration. [GitHub Flow](https://guides.github.com/introduction/flow/index.html) describes the workflow process and why it's a good practice. When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/deform/blob/master/CONTRIBUTORS.txt) if you have not yet done so. Also update [CHANGES.txt](https://github.com/Pylons/deform/blob/master/CHANGES.txt) with a change log entry.
10+
* Fork this project and create a branch with your suggested change. When ready, submit a pull request for consideration. [GitHub Flow](https://guides.github.com/introduction/flow/index.html) describes the workflow process and why it's a good practice. When submitting a pull request, sign [CONTRIBUTORS.txt](https://github.com/Pylons/deform/blob/main/CONTRIBUTORS.txt) if you have not yet done so. Also update [CHANGES.txt](https://github.com/Pylons/deform/blob/main/CHANGES.txt) with a change log entry.
1111
* Join the [IRC channel #pyramid on irc.freenode.net](https://webchat.freenode.net/?channels=pyramid).
1212
* Join the [Pylons team on Keybase](https://keybase.io/team/pylons).
1313

@@ -106,7 +106,7 @@ We use the following for running functional tests.
106106

107107
See [Preparing a functional testing environment](#preparing-a-functional-testing-environment) before trying to run functional tests.
108108

109-
For functional tests, `tox` runs the shell script [run-selenium-tests.bash](https://github.com/Pylons/deform/blob/master/run-selenium-tests.bash), located at the root of the Deform repository.
109+
For functional tests, `tox` runs the shell script [run-selenium-tests.bash](https://github.com/Pylons/deform/blob/main/run-selenium-tests.bash), located at the root of the Deform repository.
110110
See its comments for a description.
111111

112112
To run functional tests.

docs/retail.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Live example
2525

2626
`See pop-up example on Deform demo site <https://deformdemo.pylonsproject.org/popup/>`_.
2727

28-
`Source code <https://github.com/Pylons/deformdemo/blob/master/deformdemo/__init__.py>`_ (search for "popup").
28+
`Source code <https://github.com/Pylons/deformdemo/blob/main/deformdemo/__init__.py>`_ (search for "popup").
2929

3030
A Basic Example
3131
---------------

0 commit comments

Comments
 (0)