Touch-ups for PEP 101 (directions for RMs).

Author: larryhastings

pep-0101.txt

@@ -61,7 +61,7 @@ Here's a hopefully-complete list.
   and ``docs.nyc1.psf.io``, the server that hosts the documentation.
   You'll be uploading files directly here.
 
-* Admin access to ``https://github.com/python/cpython``
+* Administrator access to ``https://github.com/python/cpython``.
 
 * An administrator account on www.python.org, including an "API key".
 
@@ -513,25 +513,16 @@ to perform some manual editing steps.
 If green, it's time to merge the release engineering branch back into
 the main repo.
 
-- If the branch is not yet in "security fixes only mode", temporarily
-  disable others' pushes to the branch in the main cpython
-  repo and bypass the normal status checks.  Go to the
-  Settings -> Branches page:
+- In order to push your changes to Github, you'll have to temporarily
+  disable branch protection for administrators.  Go to the
+  ``Settings | Branches`` page:
 
   https://github.com/python/cpython/settings/branches/
 
-  and choose the Edit button for the branch you are working on.
-  On the Branch Protection page, check the "Restrict who can push to
-  this branch" box and add yourself.  Also, uncheck the "Include
-  administrators" box and save changes.
-
-  (This step isn't necessary for branches already in "security fixes mode".
-  However, the next step is!)
-
-- While you're editing the settings for your branch, you'll also need to
-  uncheck "Require status checks to pass before merging".  This temporarily
-  disables requiring CI status checks (Travis, AppVeyor, etc) be run and
-  passed before a revision may be pushed.
+  "Edit" the settings for the branch you're releasing on.
+  This will load the settings page for that branch.
+  Uncheck the "Include administrators" box and press the
+  "Save changes" button at the bottom.
 
 - Merge your release clone into the main development repo::
 
@@ -617,7 +608,7 @@ the main repo.
       may be incorrect due to the initial midstream change to ``blurb``
       that propagates from release to release!  Help break the cycle: if
       necessary make the following change::
-      
+
           - For full details, see the :source:`Misc/NEWS` file.
           + For full details, see the :ref:`changelog <changelog>`.
 
@@ -676,24 +667,16 @@ the main repo.
   Also, add a ``needs backport to X.Y`` label to the Github repo.
   https://github.com/python/cpython/labels
 
-- For all releases, if you made temporary changes to the permissions
-  for the branch on GitHub, undo those temporary changes now.
-  https://github.com/python/cpython/settings/branches/
-
-  A reminder of changes you may have made:
-
-  - Uncheck the "Restrict who can push to this branch".  (Only necessary
-    if the branch is not in "security-fixes-only mode".)
+- You can now re-enable enforcement of branch settings against administrators
+  on Github.  Go back to the ``Settings | Branch`` page:
 
-  - Check the "Include administrators" box.  (Only necessary
-    if the branch is not in "security-fixes-only mode".)
-
-  - Check the "Require status checks to pass before merging" box.  (Always needed.)
+  https://github.com/python/cpython/settings/branches/
 
-  Save your changes.
+  "Edit" the settings for the branch you're releasing on.
+  Re-check the "Include administrators" box and press the
+  "Save changes" button at the bottom.
 
-Now it's time to twiddle the web site.  None of this is automated by release.py
-at the moment, sorry.
+Now it's time to twiddle the web site.  Almost none of this is automated, sorry.
 
 To do these steps, you must have the permission to edit the website.  If you
 don't have that, ask someone on [email protected] for the proper