Merge branch 'master' into pr/3034

1 files changed, 18 insertions, 2 deletions

diff --git a/RELEASING.txt b/RELEASING.txt
index 58ebb2fb3..9f7db457e 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -38,6 +38,14 @@ Prepare new release branch
 
   $ ./scaffoldtests.sh
 
+- For each ``pyramid-cookiecutter-*``, make a new branch off "master" with the
+  same name to align with the new Pyramid release branch name.
+
+- In the docs, update the ``cookiecutter`` command with the new branch name,
+  for example, ``cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout
+  x.y-branch``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-``
+  should return all instances to be updated.
+
 - Ensure all features of the release are documented (audit CHANGES.txt or
   communicate with contributors).
 
@@ -48,8 +56,8 @@ Prepare new release branch
   include a link under "Bug Fix Releases" to the minor feature
   changes in CHANGES.txt.
 
-- Update README.rst to use correct versions of badges and URLs according to
-  each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch".
+- Update README.rst to use correct versions of badges, URLs, and ALT option
+  according to the new release branch name.
 
 - Update whatsnew-X.X.rst in docs to point at change log entries for individual
   releases if applicable.
@@ -96,6 +104,14 @@ Prepare master for further development (major releases only)
 
 - Change setup.py version to the next version number.
 
+- Update README.rst to use correct versions of badges, URLs, and ALT option
+  for "master" instead of the major release version.
+
+- In the docs, update the ``cookiecutter`` command with ``master``,
+  for example, ``cookiecutter gh:Pylons/pyramid-cookiecutter-starter --checkout
+  master``. A search for ``cookiecutter gh:Pylons/pyramid-cookiecutter-``
+  should return all instances to be updated.
+
 Update previous version (final releases only)
 ---------------------------------------------