summaryrefslogtreecommitdiff
path: root/pod/perlpolicy.pod
diff options
context:
space:
mode:
authorDavid Golden <dagolden@cpan.org>2012-11-08 14:24:20 -0500
committerDavid Golden <dagolden@cpan.org>2012-11-08 14:24:20 -0500
commite566981e5a5b2c2716eea4363106c4ed7620e5bb (patch)
tree4b991d82b49b384d119edd6e36055ac604d0837f /pod/perlpolicy.pod
parente1ad1ca3b482f0c1794077b510414b489091e4c7 (diff)
downloadperl-e566981e5a5b2c2716eea4363106c4ed7620e5bb.tar.gz
perlpolicy: remove 5.12 references from maint cherry pick policy
Diffstat (limited to 'pod/perlpolicy.pod')
-rw-r--r--pod/perlpolicy.pod8
1 files changed, 4 insertions, 4 deletions
diff --git a/pod/perlpolicy.pod b/pod/perlpolicy.pod
index 1387b4567f..ed02fca885 100644
--- a/pod/perlpolicy.pod
+++ b/pod/perlpolicy.pod
@@ -311,12 +311,12 @@ talk to a pumpking.)
=head2 Getting changes into a maint branch
Historically, only the pumpking cherry-picked changes from bleadperl
-into maintperl. This has...scaling problems. At the same time,
+into maintperl. This has scaling problems. At the same time,
maintenance branches of stable versions of Perl need to be treated with
-great care. To that end, we're going to try out a new process for
-maint-5.12.
+great care. To that end, as of Perl 5.12, we have a new process for
+maint branches.
-Any committer may cherry-pick any commit from blead to maint-5.12 if
+Any committer may cherry-pick any commit from blead to a maint branch if
they send mail to perl5-porters announcing their intent to cherry-pick
a specific commit along with a rationale for doing so and at least two
other committers respond to the list giving their assent. (This policy