Rename master branch to main

DEPENDENCIES.rst

@@ -41,7 +41,7 @@ of pip-licenses_.
 +----------------------------+------------------------------------------------------------------------------------+------------------------------------------------------------+
 | django-csp                 | BSD                                                                                | http://github.com/mozilla/django-csp                       |
 +----------------------------+------------------------------------------------------------------------------------+------------------------------------------------------------+
-| django-filter              | BSD                                                                                | https://github.com/carltongibson/django-filter/tree/master |
+| django-filter              | BSD                                                                                | https://github.com/carltongibson/django-filter/            |
 +----------------------------+------------------------------------------------------------------------------------+------------------------------------------------------------+
 | django-formset-js-improved | BSD                                                                                | https://github.com/pretix/django-formset-js                |
 +----------------------------+------------------------------------------------------------------------------------+------------------------------------------------------------+

README.rst

@@ -98,10 +98,10 @@ If you want to look at conferences using pretalx, head over to the wiki for a
 `list of events`_. And if you use pretalx for your event, please add it to the
 list (or tell us about it, and we'll add it)!
 
-.. |logo| image:: https://raw.githubusercontent.com/pretalx/pretalx/master/assets/logo.png
+.. |logo| image:: https://raw.githubusercontent.com/pretalx/pretalx/main/assets/logo.png
    :alt: pretalx logo
    :target: https://pretalx.com
-.. |screenshots| image:: https://raw.githubusercontent.com/pretalx/pretalx/master/assets/screenshots.png
+.. |screenshots| image:: https://raw.githubusercontent.com/pretalx/pretalx/main/assets/screenshots.png
    :target: https://pretalx.com/p/features
    :alt: Screenshots of pretalx pages
 .. _issues: https://github.com/pretalx/pretalx/issues/
@@ -112,7 +112,7 @@ list (or tell us about it, and we'll add it)!
 .. _active development: https://github.com/pretalx/pretalx/pulse
 .. _changelog: https://docs.pretalx.org/en/latest/changelog.html
 .. _PyPI: https://pypi.python.org/pypi/pretalx
-.. _DEPENDENCIES.rst: https://github.com/pretalx/pretalx/blob/master/DEPENDENCIES.rst
+.. _DEPENDENCIES.rst: https://github.com/pretalx/pretalx/blob/main/DEPENDENCIES.rst
 .. _list of plugin ideas: https://github.com/pretalx/pretalx/wiki/Plugin-ideas
 .. _list of events: https://github.com/pretalx/pretalx/wiki/Events
 .. _many events: https://github.com/pretalx/pretalx/wiki/Events

doc/administrator/maintenance.rst

@@ -49,10 +49,10 @@ Installing a commit or a branch version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you're sure that you know what you're doing, you can also install a specific
-commit or branch of pretalx. You can replace ``master`` with a short or long
+commit or branch of pretalx. You can replace ``main`` with a short or long
 commit ID for a specific commit::
 
-    $ pip3 install --user -U "git+git://github.com/pretalx/pretalx.git@master#egg=pretalx&subdirectory=src"
+    $ pip3 install --user -U "git+git://github.com/pretalx/pretalx.git@main#egg=pretalx&subdirectory=src"
 
 
 Backups

doc/conf.py

@@ -134,7 +134,7 @@
     "display_github": True, # Integrate GitHub
     "github_user": "pretalx", # Username
     "github_repo": "pretalx", # Repo name
-    "github_version": "master", # Version
+    "github_version": "main", # Version
     "conf_py_path": "/doc/", # Path in the checkout to the docs root
 }
 

doc/maintainer/release.rst

@@ -22,7 +22,7 @@ System checks
 1. Are you in the branch and commit you think you are in?
 2. Are all tests passing? (On Travis, or locally if you're willing to check all databases or are under time pressure.)
 3. Have you deployed the release-ready commit to an instance? Did the upgrade work?
-4. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release. ``git shortlog -ns vx.y.z..master``.
+4. Have you written (and not pushed) a blog post? It should contain at least major features and all contributors involved in the release. ``git shortlog -ns vx.y.z..main``.
 5. Have you communicated your intentions and release time line to the team?
 6. Is your virtualenv active?
 7. Run ``check-manifest`` **locally**.
@@ -45,6 +45,6 @@ Take-off and landing
 13. Add the release on `GitHub <https://github.com/pretalx/pretalx/releases>`_ (upload the archive you uploaded to PyPI, and add a link to the correct section of the :ref:`changelog`)
 14. Push the blog post.
 15. Upgrade `the docker repository <https://github.com/pretalx/pretalx-docker>`_ to the current commit **and tag the commit as vx.y.z**.
-16. Switch to master branch
+16. Switch to ``main`` branch
 17. Copy release note to changelog and increment version number.
 18. Update version numbers in update checker and deploy.

src/setup.py

@@ -104,19 +104,19 @@ def run(self):
         "django-compressor~=2.4.0",  # https://django-compressor.readthedocs.io/en/latest/changelog/
         "django-context-decorator",
         "django-countries~=7.0",  # https://github.com/SmileyChris/django-countries/blob/master/CHANGES.rst
-        "django-csp~=3.7.0",  # https://github.com/mozilla/django-csp/blob/master/CHANGES
-        "django-filter==21.1",  # https://github.com/carltongibson/django-filter/blob/master/CHANGES.rst
+        "django-csp~=3.7.0",  # https://github.com/mozilla/django-csp/blob/main/CHANGES
+        "django-filter==21.1",  # https://github.com/carltongibson/django-filter/blob/main/CHANGES.rst
         "django-formset-js-improved==0.5.0.2",  # no changelog, https://github.com/pretix/django-formset-js
         "django-formtools~=2.3.0",
         "django-hierarkey~=1.0.0",  # no changelog, https://github.com/raphaelm/django-hierarkey
         "django-i18nfield~=1.9.0",  # 2020-06, no changelog, https://github.com/raphaelm/django-i18nfield/
-        "django-libsass~=0.8",  # inactive, https://github.com/torchbox/django-libsass/blob/master/CHANGELOG.txt
+        "django-libsass~=0.8",  # inactive, https://github.com/torchbox/django-libsass/blob/main/CHANGELOG.txt
         "django-scopes~=1.2.0",  # https://github.com/raphaelm/django-scopes/releases
         "djangorestframework~=3.12.0",  # http://www.django-rest-framework.org/community/release-notes/
         "inlinestyler~=0.2.0",  # https://github.com/dlanger/inlinestyler/blob/master/CHANGELOG
         "libsass~=0.21.0",  # https://sass.github.io/libsass-python/changes.html
         "Markdown~=3.3.0",  # https://python-markdown.github.io/change_log/
-        "Pillow~=8.4.0",  # https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst
+        "Pillow~=8.4.0",  # https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst
         "publicsuffixlist~=0.7.0",
         "python-dateutil~=2.8.0",  # https://dateutil.readthedocs.io/en/stable/changelog.html
         "pytz",