Replace bpo- with gh- (#830)

Co-authored-by: Jelle Zijlstra <[email protected]>

Author: methane

committing.rst

@@ -114,19 +114,19 @@ manually. The ``Misc/NEWS.d`` directory contains a sub-directory named
 ``next``, which contains various sub-directories representing classifications
 for what was affected (e.g. ``Misc/NEWS.d/next/Library`` for changes relating
 to the standard library). The file name itself should be in the format
-``<datetime>.bpo-<issue-number>.<nonce>.rst``:
+``<datetime>.gh-issue-<issue-number>.<nonce>.rst``:
 
 * ``<datetime>`` is today's date joined with a hyphen (``-``) to the current
   time, in the ``YYYY-MM-DD-hh-mm-ss`` format (e.g. ``2017-05-27-16-46-23``).
 * ``<issue-number>`` is the issue number the change is for (e.g. ``12345``
-  for ``bpo-12345``).
+  for ``gh-issue-12345``).
 * ``<nonce>`` is a unique string to guarantee that the file name is
   unique across branches (e.g. ``Yl4gI2``). It is typically six characters
   long, but it can be any length of letters and numbers. Its uniqueness
   can be satisfied by typing random characters on your keyboard.
 
 As a result, a file name can look something like
-``Misc/NEWS.d/next/Library/2017-05-27-16-46-23.bpo-12345.Yl4gI2.rst``.
+``Misc/NEWS.d/next/Library/2017-05-27-16-46-23.gh-issue-12345.Yl4gI2.rst``.
 
 The contents of a ``NEWS`` file should be valid reStructuredText. An 80 character
 column width should be used. There is no indentation or leading marker in the
@@ -216,8 +216,10 @@ hashes and their first line of the commit, use the following command::
 You can prefix the backport pull request with the branch, and reference
 the pull request number from ``main``. Here is an example::
 
-   [3.9] bpo-12345: Fix the Spam Module (GH-NNNN)
+   [3.9] gh-12345: Fix the Spam Module (GH-NNNN)
 
+Here "gh-12345" is the GitHub *issue* number, and "GH-NNNN" is the
+number of the original *pull request*.
 Note that cherry_picker.py_ adds the branch prefix automatically.
 
 Once the backport pull request has been created, remove the
@@ -242,9 +244,9 @@ Always include the reason for reverting the commit to help others
 understand why it was done. The reason should be included as part of
 the commit message. Here is an example::
 
-   Revert bpo-NNNN: Fix Spam Module (GH-111)
+   Revert gh-NNNN: Fix Spam Module (GH-111)
 
    Reverts python/cpython#111.
    Reason: This commit broke the buildbot.
 
-.. _issue tracker: https://github.com/python/cpython/issues
+.. _issue tracker: https://github.com/python/cpython/issues

gitbootcamp.rst

@@ -200,7 +200,7 @@ Staging and Committing Files
 
    .. code-block:: bash
 
-      git commit -m "bpo-XXXX: This is the commit message."
+      git commit -m "gh-XXXX: This is the commit message."
 
 Reverting Changes
 -----------------
@@ -441,14 +441,14 @@ Pull requests can be accepted and merged by a Python Core Developer.
 
    Example of good commit message::
 
-      bpo-12345: Improve the spam module (GH-777)
+      gh-12345: Improve the spam module (GH-777)
 
       * Add method A to the spam module
       * Update the documentation of the spam module
 
    Example of bad commit message::
 
-      bpo-12345: Improve the spam module (#777)
+      gh-12345: Improve the spam module (#777)
 
       * Improve the spam module
       * merge from main
@@ -487,17 +487,17 @@ commands:
 .. code-block:: bash
 
    git fetch upstream
-   git rev-parse ":/bpo-12345"
+   git rev-parse ":/gh-12345"
 
 The above commands will print out the hash of the commit containing
-``"bpo-12345"`` as part of the commit message.
+``"gh-12345"`` as part of the commit message.
 
 When formatting the commit message for a backport commit: leave the original
 one as is and delete the number of the backport pull request.
 
 Example of good backport commit message::
 
-    bpo-12345: Improve the spam module (GH-777)
+    gh-12345: Improve the spam module (GH-777)
 
     * Add method A to the spam module
     * Update the documentation of the spam module
@@ -506,7 +506,7 @@ Example of good backport commit message::
 
 Example of bad backport commit message::
 
-    bpo-12345: Improve the spam module (GH-777) (#888)
+    gh-12345: Improve the spam module (GH-777) (#888)
 
     * Add method A to the spam module
     * Update the documentation of the spam module

index.rst

@@ -61,10 +61,10 @@ instructions please see the :ref:`setup guide <setup>`.
    everything is ok, commit.
 
 7. Push the branch on your fork on GitHub and :doc:`create a pull request
-   <pullrequest>`.  Include the issue number using ``bpo-NNNN`` in the
+   <pullrequest>`.  Include the issue number using ``gh-NNNN`` in the
    pull request description.  For example::
 
-      bpo-12345: Fix some bug in spam module
+      gh-12345: Fix some bug in spam module
 
 8. Add a News entry into the ``Misc/NEWS.d`` directory as individual file. The
    news entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/>`_,

pullrequest.rst

@@ -268,7 +268,7 @@ and for each pull request there may be several commits.  In particular:
 
 Commit messages should follow the following structure::
 
-   bpo-42: Make the spam module more spammy (GH-NNNN)
+   gh-42: Make the spam module more spammy (GH-NNNN)
 
    The spam module sporadically came up short on spam. This change
    raises the amount of spam in the module by making it more spammy.
@@ -346,7 +346,7 @@ Now you want to
 <https://help.github.com/articles/creating-a-pull-request-from-a-fork/>`_.
 If this is a pull request in response to a pre-existing issue on the
 `issue tracker`_, please make sure to reference the issue number using
-``bpo-NNNN`` in the pull request title or message.
+``gh-NNNN`` in the pull request title or message.
 
 If this is a pull request for an unreported issue (assuming you already
 performed a search on the issue tracker for a pre-existing issue), create a
@@ -498,4 +498,4 @@ often, in a contribution's news entry as well).  You may be
 asked to make these edits on the behalf of the core developer who
 accepts your pull request.
 
-.. _issue tracker: https://github.com/python/cpython/issues
+.. _issue tracker: https://github.com/python/cpython/issues