summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2021-02-25 10:52:48 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-03-09 08:48:32 +0100
commitd9a266d657f66b8c4fa068408002a4e3709ee669 (patch)
treeb10eff95f3bef9840753d72609c4658001de9b22 /docs/intro
parenta124365de80bd633e24f692e7ecaa5c84c12182d (diff)
Updated Git branch "master" to "main".
This change follows a long discussion on django-develops: https://groups.google.com/g/django-developers/c/tctDuKUGosc/
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/contributing.txt12
-rw-r--r--docs/intro/whatsnext.txt6
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 707fb82920..c61500357f 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -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
diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
index 578f725ed3..f08ed3b943 100644
--- a/docs/intro/whatsnext.txt
+++ b/docs/intro/whatsnext.txt
@@ -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