Skip to content

Commit e4f4b21

Browse files
hugovkMariatta
andauthored
Prefer 'core team' in documentation/ and getting-started/ (#1616)
Co-authored-by: Mariatta <[email protected]>
1 parent 7120882 commit e4f4b21

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

documentation/translations/coordinating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ We recommend two or three coordinators, though you may begin with one.
106106
Here are some general suggestions.
107107

108108
- Coordinator requests are to be public on the `translation mailing list <translation_ml_>`_.
109-
- If the given language has a native core dev, the core dev has input
109+
- If the given language has a native core team member, they have input
110110
on the coordinator request.
111111
- Anyone who wants to become coordinator for their native language and shows
112112
motivation by translating and building a community will be named

getting-started/getting-help.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Where to get help
55
=================
66

77
If you are working on Python it is very possible you will come across an issue
8-
where you need some assistance to solve it (this happens to core developers
8+
where you need some assistance to solve it (this happens to the core team
99
all the time).
1010

1111
Should you require help, there are a :ref:`variety of options available
@@ -42,7 +42,7 @@ Ask #python-dev
4242

4343
If you are comfortable with IRC you can try asking on ``#python-dev`` (on
4444
the `Libera.Chat`_ network). Typically there are a number of experienced
45-
developers, ranging from triagers to core developers, who can answer
45+
contributors, ranging from triagers to the core team, who can answer
4646
questions about developing for Python. As with the mailing lists,
4747
``#python-dev`` is for questions involving the development *of* Python
4848
whereas ``#python`` is for questions concerning development *with* Python.
@@ -60,7 +60,7 @@ Core mentorship
6060
If you are interested in improving Python and contributing to its development,
6161
but don’t yet feel entirely comfortable with the public channels mentioned
6262
above, `Python Mentors`_ are here to help you. Python is fortunate to have a
63-
community of volunteer core developers willing to mentor anyone wishing to
63+
community of volunteer core team members willing to mentor anyone wishing to
6464
contribute code, work on bug fixes or improve documentation. Everyone is
6565
welcomed and encouraged to contribute.
6666

getting-started/pull-request-lifecycle.rst

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ You should have already :ref:`set up your system <setup>`,
131131
git commit -m '<message>'
132132
git push origin <branch-name>
133133

134-
* If a core developer reviewing your PR pushed one or more commits to your
134+
* If a core team member reviewing your PR pushed one or more commits to your
135135
PR branch, then after checking out your branch and before editing, run::
136136

137137
git pull origin <branch-name> # pull = fetch + merge
@@ -204,7 +204,7 @@ should do to help ensure that your pull request is accepted.
204204

205205
#. **Make sure to follow Python's style guidelines.** For Python code you
206206
should follow :PEP:`8`, and for C code you should follow :PEP:`7`. If you have
207-
one or two discrepancies those can be fixed by the core developer who merges
207+
one or two discrepancies those can be fixed by the core team member who merges
208208
your pull request. But if you have systematic deviations from the style guides
209209
your pull request will be put on hold until you fix the formatting issues.
210210

@@ -324,7 +324,7 @@ Furthermore, the first line should not end in a period.
324324

325325
If this is not enough detail for a commit, a new paragraph(s) can be added
326326
to explain in proper depth what has happened (detail should be good enough
327-
that a core developer reading the commit message understands the
327+
that a core team member reading the commit message understands the
328328
justification for the change).
329329

330330
Check :ref:`the Git bootcamp <accepting-and-merging-a-pr>` for further
@@ -447,7 +447,7 @@ to ask for someone to review your pull request.
447447

448448
When someone does manage to find the time to look at your pull request
449449
they will most likely make comments about how it can be improved
450-
(don't worry, even core developers of Python have their pull requests sent
450+
(don't worry, even core team members of Python have their pull requests sent
451451
back to them for changes). It is then expected that you update your
452452
pull request to address these comments, and the review process will
453453
thus iterate until a satisfactory solution has emerged.
@@ -514,11 +514,13 @@ Instead of simply "approving" the pull request, leave comments. For example:
514514
#. Look at any failures in CI on the current PR. See :ref:`"Keeping CI green"
515515
<keeping-ci-green>` below for simple things you can do to help move the PR forward.
516516

517-
Dismissing review from another core developer
518-
---------------------------------------------
517+
.. _dismissing-review-from-another-core-developer:
519518

520-
A core developer can dismiss another core developer's review if they confirmed
521-
that the requested changes have been made. When a core developer has assigned
519+
Dismissing review from another core team member
520+
-----------------------------------------------
521+
522+
A core team member can dismiss another team member's review if they confirmed
523+
that the requested changes have been made. When a core team member has assigned
522524
the PR to themselves, then it is a sign that they are actively looking after
523525
the PR, and their review should not be dismissed.
524526

@@ -589,7 +591,7 @@ Python is tricky and we simply cannot accept everyone's contributions.
589591
But if your pull request is merged it will then go into Python's
590592
:abbr:`VCS (version control system)` to be released
591593
with the next feature release of Python. It may also be backported to older
592-
versions of Python as a bugfix if the core developer doing the merge believes
594+
versions of Python as a bugfix if the core team member doing the merge believes
593595
it is warranted.
594596

595597

@@ -598,7 +600,7 @@ Crediting
598600

599601
Non-trivial contributions are credited in the ``Misc/ACKS`` file (and, most
600602
often, in a contribution's news entry as well). You may be
601-
asked to make these edits on the behalf of the core developer who
603+
asked to make these edits on the behalf of the core team member who
602604
accepts your pull request.
603605

604606
.. _issue tracker: https://github.com/python/cpython/issues

0 commit comments

Comments
 (0)