Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,18 @@
# Advanced Tools was renamed Development Tools in gh-1149
"advanced-tools/clang.rst": "development-tools/clang.rst",
"advanced-tools/gdb.rst": "development-tools/gdb.rst",
# Core Developers
"coredev.rst": "core-developers/become-core-developer.rst",
"committing.rst": "core-developers/committing.rst",
"developers.rst": "core-developers/developer-log.rst",
"experts.rst": "core-developers/experts.rst",
"motivations.rst": "core-developers/motivations.rst",
# Core team
"coredev.rst": "core-team/join-team.rst",
"committing.rst": "core-team/committing.rst",
"developers.rst": "core-team/developer-log.rst",
"experts.rst": "core-team/experts.rst",
"motivations.rst": "core-team/motivations.rst",
# core-developers/ -> core-team/
"core-developers/become-core-developer.rst": "core-team/join-team.rst",
"core-developers/committing.rst": "core-team/committing.rst",
"core-developers/developer-log.rst": "core-team/developer-log.rst",
"core-developers/experts.rst": "core-team/experts.rst",
"core-developers/motivations.rst": "core-team/motivations.rst",
# Developer Workflow
"c-api.rst": "developer-workflow/c-api.rst",
"communication.rst": "developer-workflow/communication-channels.rst",
Expand Down
2 changes: 1 addition & 1 deletion contrib/core-team/committing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[This is the existing core developers :ref:`committing` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]

.. include:: ../../core-developers/committing.rst
.. include:: ../../core-team/committing.rst
2 changes: 1 addition & 1 deletion contrib/core-team/developer-log.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[This is the existing core developers :ref:`developer-log` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]

.. include:: ../../core-developers/developer-log.rst
.. include:: ../../core-team/developer-log.rst
2 changes: 1 addition & 1 deletion contrib/core-team/experts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[This is the existing core developers :ref:`experts` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]

.. include:: ../../core-developers/experts.rst
.. include:: ../../core-team/experts.rst
4 changes: 2 additions & 2 deletions contrib/core-team/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
|purpose|


.. _c_coreteam:
.. _c_core-team:

=========
Core team
=========

[This is mostly re-organized from the :ref:`core-dev` section of the devguide,
[This is mostly re-organized from the :ref:`core-team` section of the devguide,
but with "core developer" language changed to "core team" where possible.]

.. toctree::
Expand Down
9 changes: 2 additions & 7 deletions contrib/core-team/join-team.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
|purpose|


[This is the existing core developers :ref:`become-core-developer` page from the devguide with the title changed. We'll
[This is the existing core developers :ref:`join-core-team` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to change this adjustment statement, since this PR is making a number of these adjustments?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it can stay, because there are still other adjustments in the prose to make in followups, such as "and become a core developer of Python" -> "and join the Python core team".


=========================
How to join the core team
=========================

.. include:: ../../core-developers/become-core-developer.rst
:start-line: 7
.. include:: ../../core-team/join-team.rst
2 changes: 1 addition & 1 deletion contrib/core-team/motivations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[This is the existing core developers :ref:`motivations` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]

.. include:: ../../core-developers/motivations.rst
.. include:: ../../core-team/motivations.rst
2 changes: 1 addition & 1 deletion contrib/core-team/responsibilities.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
[This is the existing core developers :ref:`responsibilities` page from the devguide. We'll
adjust "core developer" to "core team" where appropriate.]

.. include:: ../../core-developers/responsibilities.rst
.. include:: ../../core-team/responsibilities.rst
2 changes: 1 addition & 1 deletion contrib/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ major section at the top of each column.]*
* :ref:`gh-faq`
* :ref:`triage-team`

Core team members will find guidance in the :ref:`c_coreteam` section.
Core team members will find guidance in the :ref:`c_core-team` section.

Contents
========
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 5 additions & 4 deletions core-developers/index.rst → core-team/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.. _core-dev:
.. _core-team:

===============
Core developers
===============
=========
Core team
=========

.. toctree::
:maxdepth: 5
Expand All @@ -12,5 +13,5 @@ Core developers
experts
developer-log
motivations
become-core-developer
join-team
memorialization
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.. _become-core-developer:
.. _coredev:
.. _join-core-team:

==============================
How to become a core developer
==============================
=========================
How to join the core team
=========================

What it takes
=============
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ python.org admin
devguide.python.org
-------------------

* The user is marked as deceased in `developers.csv <https://github.com/python/devguide/blob/main/core-developers/developers.csv>`_;
* The user is removed from the `Experts Index <https://github.com/python/devguide/blob/main/core-developers/experts.rst>`_.
* The user is marked as deceased in `developers.csv <https://github.com/python/devguide/blob/main/core-team/developers.csv>`_;
* The user is removed from the `experts index <https://github.com/python/devguide/blob/main/core-team/experts.rst>`_.

bugs.python.org
---------------
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Core developers and contributors alike will find the following guides useful:
Guide for contributing to Python:

======================== =================== ======================= =======================
Contributors Documentarians Triagers Core Developers
Contributors Documentarians Triagers Core team
======================== =================== ======================= =======================
:ref:`setup` :ref:`docquality` :ref:`tracker` :ref:`responsibilities`
:ref:`help` :ref:`documenting` :ref:`triaging` :ref:`developers`
Expand Down Expand Up @@ -314,7 +314,7 @@ Full table of contents
documentation/index
testing/index
development-tools/index
core-developers/index
core-team/index
internals/index
versions
contrib/index
Expand Down
Loading