From d7eb1120ad049806b32041fcc301bf95f95423bc Mon Sep 17 00:00:00 2001
From: David Mitchell <davem@iabyn.com>
Date: Tue, 4 Aug 2009 23:08:59 +0100
Subject: [PATCH] release_managers_guide: add patchlevel.h stuff

---
 Porting/release_managers_guide.pod | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/Porting/release_managers_guide.pod b/Porting/release_managers_guide.pod
index 38f2fcd..17315dd 100644
--- a/Porting/release_managers_guide.pod
+++ b/Porting/release_managers_guide.pod
@@ -421,7 +421,7 @@ is listed in the section entitled C<THE KEEPERS OF THE PUMPKIN>.
 
 Be sure to commit your changes:
 
-    $ git commit -m 'Updating perlhist in preparation for release of 5.x.y pod/perlhist.pod
+    $ git commit -m 'Updating perlhist in preparation for release of 5.x.y' pod/perlhist.pod
 
 
 =item *
@@ -445,13 +445,6 @@ formatting, e.g.
 
 I<You MUST SKIP this step for SNAPSHOT>
 
-Update patchlevel.h to add a C<-RC1>-or-whatever string; or, if this is a
-final release, remove it.  [ XXX how now?? see 34813 for old way ]
-
-=item *
-
-I<You MUST SKIP this step for SNAPSHOT>
-
 Update C<Module::Corelist>.
 
 Note that if this is a maint release, you should run the following actions
@@ -521,6 +514,22 @@ Build perl, then make sure it passes its own test suite, and installs:
 
 =item *
 
+I<You MUST SKIP this step for SNAPSHOT>
+
+Update patchlevel.h to add a C<-RC1>-or-whatever string; or, if this is a
+final release, remove it. For example:
+
+     static const char * const local_patches[] = {
+             NULL
+    +        ,"RC1"
+             PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
+
+Be sure to commit your change:
+
+    $ git commit -m 'bump version to RCnnn' patchlevel.h
+
+=item *
+
 Create a tarball. Use the C<-s> option to specify a suitable suffix for
 the tarball and directory name:
 
@@ -643,7 +652,17 @@ created.
 
 I<You MUST SKIP this step for SNAPSHOT>
 
-Disarm the patchlevel.h change [ XXX expand ]
+Disarm the patchlevel.h change; for example,
+
+     static const char * const local_patches[] = {
+             NULL
+    -        ,"RC1"
+             PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */
+
+Be sure to commit your change:
+
+    $ git commit -m 'disarm RCnnn bump' patchlevel.h
+
 
 =item *
 
-- 
2.7.4