mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

[3.2.x] Updated Git branch "master" to "main".

Browse Source 
This change follows a long discussion on django-develops:

https://groups.google.com/g/django-developers/c/tctDuKUGosc/

Backport of d9a266d657 from main
This commit is contained in:
Markus Holtermann
2021-02-25 10:52:48 +01:00
committed by Mariusz Felisiak
parent 3fd83c48db
commit e078747290
15 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/intro/contributing.txt
View File

@@ -243,12 +243,12 @@ to Django's code, the entire test suite **should** pass. If you get failures or
errors make sure you've followed all of the previous steps properly. See
:ref:`running-unit-tests` for more information.
Note that the latest Django master may not always be stable. When developing
against master, you can check `Django's continuous integration builds`__ to
determine if the failures are specific to your machine or if they are also
present in Django's official builds. If you click to view a particular build,
you can view the "Configuration Matrix" which shows failures broken down by
Python version and database backend.
Note that the latest Django "main" branch may not always be stable. When
developing against "main", you can check `Django's continuous integration
builds`__ to determine if the failures are specific to your machine or if they
are also present in Django's official builds. If you click to view a particular
build, you can view the "Configuration Matrix" which shows failures broken down
by Python version and database backend.
__ https://djangoci.com

6
docs/intro/whatsnext.txt
View File

@@ -139,7 +139,7 @@ If you're using an official release of Django, the zipped package (tarball) of
the code includes a ``docs/`` directory, which contains all the documentation
for that release.
If you're using the development version of Django (aka the master branch), the
If you're using the development version of Django (aka the main branch), the
``docs/`` directory contains all of the documentation. You can update your
Git checkout to get the latest changes.
@@ -191,7 +191,7 @@ __ https://www.gnu.org/software/make/
Differences between versions
============================
The text documentation in the master branch of the Git repository contains the
The text documentation in the main branch of the Git repository contains the
"latest and greatest" changes and additions. These changes include
documentation of new features targeted for Django's next :term:`feature
release <Feature release>`. For that reason, it's worth pointing out our policy
@@ -200,7 +200,7 @@ to highlight recent changes and additions to Django.
We follow this policy:
* The development documentation at https://docs.djangoproject.com/en/dev/ is
from the master branch. These docs correspond to the latest feature release,
from the main branch. These docs correspond to the latest feature release,
plus whatever features have been added/changed in the framework since then.
* As we add features to Django's development version, we update the