Skip to content

Commit e5c7822

Browse files
authored
PEPs 1, 426, 512, 545, 8001, 8002, 8016: rename master to main (#2179)
1 parent 54e9bd0 commit e5c7822

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

pep-0001.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ The standard PEP workflow is:
221221

222222
Once the review process is complete, and the PEP editors approve it (note that
223223
this is *not* the same as accepting your PEP!), they will squash commit your
224-
pull request onto master.
224+
pull request onto main.
225225

226226
The PEP editors will not unreasonably deny publication of a PEP. Reasons for
227227
denying PEP status include duplication of effort, being technically unsound,
@@ -791,7 +791,7 @@ References and Footnotes
791791

792792
.. [6] More details on the PEP rendering and publication process can be found
793793
in the PEPs repo README at
794-
https://github.com/python/peps/blob/master/README.rst
794+
https://github.com/python/peps/blob/main/README.rst
795795

796796
.. [7] `CODEOWNERS` documentation
797797
(https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners)

pep-0426.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ A string containing a full URL where the source for this specific version of
658658
the distribution can be downloaded.
659659

660660
Source URLs MUST be unique within each project. This means that the URL
661-
can't be something like ``"https://github.com/pypa/pip/archive/master.zip"``,
661+
can't be something like ``"https://github.com/pypa/pip/archive/main.zip"``,
662662
but instead must be ``"https://github.com/pypa/pip/archive/1.3.1.zip"``.
663663

664664
The source URL MUST reference either a source archive or a tag or specific

pep-0512.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ Required:
739739
- Message #python-dev for each commit (PR or direct)
740740
(https://github.com/python/cpython/settings/hooks/new?service=irc)
741741
- Get docs built from git
742-
(https://github.com/python/docsbuild-scripts/blob/master/build_docs.py already
742+
(https://github.com/python/docsbuild-scripts/blob/main/build_docs.py already
743743
updated; https://github.com/python/psf-salt/pull/91 to switch)
744744
- Migrate buildbots to be triggered and pull from GitHub
745745

pep-0545.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ The three currently stable branches that will be translated are [12]_:
115115
branches needs to be modified to support translation [12]_, whereas
116116
these branches now only accept security-only fixes.
117117

118-
The development branch (master) should have a lower translation priority
118+
The development branch (main) should have a lower translation priority
119119
than stable branches. But docsbuild-scripts should build it anyway so
120120
it is possible for a team to work on it to be ready for the next
121121
release.

pep-8001.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,13 @@ Description of the poll::
156156

157157
Candidates (note: linebreaks are significant here)::
158158

159-
<a href="https://www.python.org/dev/peps/pep-8010/">PEP 8010: The Technical Leader Governance Model</a> (Warsaw) (<a href="/python/peps/commits/master/pep-8010.rst">changelog</a>)
160-
<a href="https://www.python.org/dev/peps/pep-8011/">PEP 8011: Python Governance Model Lead by Trio of Pythonistas</a> (Mariatta, Warsaw) (<a href="/python/peps/commits/master/pep-8011.rst">changelog</a>)
161-
<a href="https://www.python.org/dev/peps/pep-8012/">PEP 8012: The Community Governance Model</a> (Langa) (<a href="/python/peps/commits/master/pep-8012.rst">changelog</a>)
162-
<a href="https://www.python.org/dev/peps/pep-8013/">PEP 8013: The External Council Governance Model</a> (Dower) (<a href="/python/peps/commits/master/pep-8013.rst">changelog</a>)
163-
<a href="https://www.python.org/dev/peps/pep-8014/">PEP 8014: The Commons Governance Model</a> (Jansen) (<a href="/python/peps/commits/master/pep-8014.rst">changelog</a>)
164-
<a href="https://www.python.org/dev/peps/pep-8015/">PEP 8015: Organization of the Python community</a> (Stinner) (<a href="/python/peps/commits/master/pep-8015.rst">changelog</a>)
165-
<a href="https://www.python.org/dev/peps/pep-8016/">PEP 8016: The Steering Council Model</a> (Smith, Stufft) (<a href="/python/peps/commits/master/pep-8016.rst">changelog</a>)
159+
<a href="https://www.python.org/dev/peps/pep-8010/">PEP 8010: The Technical Leader Governance Model</a> (Warsaw) (<a href="/python/peps/commits/main/pep-8010.rst">changelog</a>)
160+
<a href="https://www.python.org/dev/peps/pep-8011/">PEP 8011: Python Governance Model Lead by Trio of Pythonistas</a> (Mariatta, Warsaw) (<a href="/python/peps/commits/main/pep-8011.rst">changelog</a>)
161+
<a href="https://www.python.org/dev/peps/pep-8012/">PEP 8012: The Community Governance Model</a> (Langa) (<a href="/python/peps/commits/main/pep-8012.rst">changelog</a>)
162+
<a href="https://www.python.org/dev/peps/pep-8013/">PEP 8013: The External Council Governance Model</a> (Dower) (<a href="/python/peps/commits/main/pep-8013.rst">changelog</a>)
163+
<a href="https://www.python.org/dev/peps/pep-8014/">PEP 8014: The Commons Governance Model</a> (Jansen) (<a href="/python/peps/commits/main/pep-8014.rst">changelog</a>)
164+
<a href="https://www.python.org/dev/peps/pep-8015/">PEP 8015: Organization of the Python community</a> (Stinner) (<a href="/python/peps/commits/main/pep-8015.rst">changelog</a>)
165+
<a href="https://www.python.org/dev/peps/pep-8016/">PEP 8016: The Steering Council Model</a> (Smith, Stufft) (<a href="/python/peps/commits/main/pep-8016.rst">changelog</a>)
166166
Further discussion
167167

168168
Options::

pep-8002.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ Controversial decision process
532532
The Technical Board occasionally approves Django
533533
Enhancement Proposals (DEPs) but those are rare. The DEP process is
534534
roughly modeled after PEPs and documented in `DEP 1
535-
<https://github.com/django/deps/blob/master/final/0001-dep-process.rst>`_.
535+
<https://github.com/django/deps/blob/main/final/0001-dep-process.rst>`_.
536536
DEPs are mostly used to design major new features, but also for
537537
information on general guidelines and process.
538538

@@ -594,7 +594,7 @@ TypeScript
594594

595595
The governance structure is not externally documented besides the
596596
`CONTRIBUTING.md
597-
<https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md>`_
597+
<https://github.com/Microsoft/TypeScript/blob/main/CONTRIBUTING.md>`_
598598
document in the main TypeScript repository.
599599

600600
Key people and their functions

pep-8016.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ Copyright
359359
=========
360360

361361
Text copied from Django used under `their license
362-
<https://github.com/django/django/blob/master/LICENSE>`__. The rest of
362+
<https://github.com/django/django/blob/main/LICENSE>`__. The rest of
363363
this document has been placed in the public domain.
364364

365365

0 commit comments

Comments
 (0)