[Python-checkins] devguide: Clarify policy for security branches. List RMs for active branches.

[georg.brandl]

http://hg.python.org/devguide/rev/3b30c415c9a5
changeset:   616:3b30c415c9a5
user:        Georg Brandl <georg at python.org>
date:        Sun Mar 31 19:46:14 2013 +0200
summary:
  Clarify policy for security branches. List RMs for active branches.

files:
  devcycle.rst |  19 +++++++++++++------
  1 files changed, 13 insertions(+), 6 deletions(-)


diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -93,10 +93,13 @@
 
 The only changes made to a security branch are those fixing issues exploitable
 by attackers such as crashes, privilege escalation and, optionally, other
-issues such as denial of service attacks.  Other behavioral issues are
+issues such as denial of service attacks.  Any other changes are
 **not** considered a security risk and thus not backported to a security branch.
-Any release made from a security branch is source-only and done only when
-actual security patches have been applied to the branch.
+
+Commits to security branches are to be coordinated with the release manager
+for the corresponding feature version, as listed below in the Summary_.
+Any release made from a security branch is source-only and done only when actual
+security patches have been applied to the branch.
 
 
 .. _listbranch:
@@ -104,16 +107,20 @@
 Summary
 -------
 
-There are 6 open branches right now in the Mercurial repository:
+There are 6 active branches right now in the Mercurial repository:
 
 - the ``default`` branch holds the future 3.4 version and descends from ``3.3``
+  (future RM: Larry Hastings)
 - the ``3.3`` branch holds bug fixes for future 3.3.x maintenance releases
-  and descends from ``3.2``
+  and descends from ``3.2`` (RM: Georg Brandl)
 - the ``3.2`` branch holds security fixes for future 3.2.x security releases
+  (RM: Georg Brandl)
 - the ``3.1`` branch holds security fixes for future 3.1.x security releases
+  (RM: Benjamin Peterson)
 - the ``2.7`` branch holds bug fixes for future 2.7.x maintenance releases and
-  descends from ``2.6``
+  descends from ``2.6`` (RM: Benjamin Peterson)
 - the ``2.6`` branch holds security fixes for future 2.6.x security releases
+  (RM: Barry Warsaw)
 
 
 .. _stages:

-- 
Repository URL: http://hg.python.org/devguide