Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
stevepiercy committed Jan 19, 2021
1 parent 413d54a commit bca89cd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Deform
======

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

.. image:: https://readthedocs.org/projects/deform/badge/?version=master
:target: https://docs.pylonsproject.org/projects/deform/en/master/
.. image:: https://readthedocs.org/projects/deform/badge/?version=main
:target: https://docs.pylonsproject.org/projects/deform/en/main/
:alt: Master Documentation Status

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

.. image:: https://github.com/Pylons/deform/raw/master/docs/example.png
.. image:: https://github.com/Pylons/deform/raw/main/docs/example.png
:width: 400px

Example code:
Expand Down
4 changes: 2 additions & 2 deletions RELEASING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Prepare new release branch

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

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

- On release branch:

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

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

Expand Down
6 changes: 3 additions & 3 deletions contributing.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Contributing

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`.
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`.

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/).

You can contribute to this project in several ways.

* [File an Issue on GitHub](https://github.com/Pylons/deform/issues).
* 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.
* 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.
* Join the [IRC channel #pyramid on irc.freenode.net](https://webchat.freenode.net/?channels=pyramid).
* Join the [Pylons team on Keybase](https://keybase.io/team/pylons).

Expand Down Expand Up @@ -106,7 +106,7 @@ We use the following for running functional tests.

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

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.
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.
See its comments for a description.

To run functional tests.
Expand Down
2 changes: 1 addition & 1 deletion docs/retail.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Live example

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

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

A Basic Example
---------------
Expand Down

0 comments on commit bca89cd

Please sign in to comment.