Skip to content

Commit

Permalink
Renamed development branch from master to main (#1142)
Browse files Browse the repository at this point in the history
  • Loading branch information
smithdc1 committed Apr 11, 2021
1 parent 6f86591 commit 425b918
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ django-crispy-forms
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/psf/black

.. image:: http://codecov.io/github/django-crispy-forms/django-crispy-forms/coverage.svg?branch=master
:target: http://codecov.io/github/django-crispy-forms/django-crispy-forms?branch=master
.. image:: http://codecov.io/github/django-crispy-forms/django-crispy-forms/coverage.svg?branch=main
:target: http://codecov.io/github/django-crispy-forms/django-crispy-forms?branch=main

The best way to have Django_ DRY forms. Build programmatic reusable layouts out of components, having full control of the rendered HTML without writing HTML in templates. All this without breaking the standard way of doing things in Django, so it plays nice with any other form application.

Expand Down
8 changes: 4 additions & 4 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ submitted to an issue tracker.

Also since GitHub pegs and syncs a pull request to a specific branch, it is the
**ONLY** way that you can submit more than one fix at a time. If you submit
a pull from your master branch, you can't make any more commits to your master
a pull from your main branch, you can't make any more commits to your main branch
without those getting added to the pull.

To create a topic branch, its easiest to use the convenient ``-b`` argument to ``git
Expand All @@ -72,7 +72,7 @@ checkout``::

You should use a verbose enough name for your branch so it is clear what it is
about. Now you can commit your changes and regularly merge in the upstream
master as described below.
main branch as described below.

When you are ready to generate a pull request, either for preliminary review,
or for consideration of merging into the project you must first push your local
Expand Down Expand Up @@ -106,11 +106,11 @@ To pull in upstream changes::

Check the log to be sure that you actually want the changes, before merging::

git log ..django-crispy-forms/master
git log ..django-crispy-forms/main

Then merge the changes that you fetched::

git merge django-crispy-forms/master
git merge django-crispy-forms/main

For more info, see https://help.github.com/fork-a-repo/

Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. django-crispy-forms documentation master file, created by
.. django-crispy-forms documentation file, created by
sphinx-quickstart on Tue Nov 1 19:01:02 2011.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down Expand Up @@ -33,8 +33,8 @@ Get the most out of django-crispy-forms
* See who's contributed to the project at `crispy-forms contributors`_
* You can find a detailed history of the project in `Github's CHANGELOG`_

.. _`crispy-forms contributors`: https://github.com/django-crispy-forms/django-crispy-forms/blob/master/CONTRIBUTORS.txt
.. _`Github's CHANGELOG`: https://github.com/django-crispy-forms/django-crispy-forms/blob/master/CHANGELOG.md
.. _`crispy-forms contributors`: https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CONTRIBUTORS.txt
.. _`Github's CHANGELOG`: https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CHANGELOG.md

API documentation
~~~~~~~~~~~~~~~~~
Expand All @@ -58,5 +58,5 @@ Think this is awesome and want to make it better? Read our contribution page, ma

contributing

.. _contributors: https://github.com/django-crispy-forms/django-crispy-forms/blob/master/CONTRIBUTORS.txt
.. _contributors: https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CONTRIBUTORS.txt
.. _Django: https://djangoproject.com
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ Install latest stable version into your python environment using pip::

If you want to install development version (unstable), you can do so doing::

pip install git+git://github.com/django-crispy-forms/django-crispy-forms.git@master#egg=django-crispy-forms
pip install git+git://github.com/django-crispy-forms/django-crispy-forms.git@main#egg=django-crispy-forms

Or, if you'd like to install the development version as a git repository (so
you can ``git pull`` updates), use the ``-e`` flag with ``pip install``, like
so::

pip install -e git+git://github.com/django-crispy-forms/django-crispy-forms.git@master#egg=django-crispy-forms
pip install -e git+git://github.com/django-crispy-forms/django-crispy-forms.git@main#egg=django-crispy-forms

Once installed add ``crispy_forms`` to your ``INSTALLED_APPS`` in settings.py::

Expand Down

0 comments on commit 425b918

Please sign in to comment.