[Python-checkins] devguide: Clarify that only the latest maintenance branches are rebuilt (issue #16528).

[chris.jerdonek]

http://hg.python.org/devguide/rev/31bb42754962
changeset:   574:31bb42754962
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Nov 23 10:38:06 2012 -0800
summary:
  Clarify that only the latest maintenance branches are rebuilt (issue #16528).

files:
  devcycle.rst   |   9 ++++++---
  docquality.rst |  13 +++++++------
  2 files changed, 13 insertions(+), 9 deletions(-)


diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -65,7 +65,8 @@
 --------------------
 
 A branch for a previous feature release, currently being maintained for bug
-fixes.  There are currently two of them in activity: one for Python 3.x and
+fixes.  There are usually two maintenance branches at any given time: one for
+Python 3.x and
 one for Python 2.x.  At some point in the future, Python 2.x will be closed
 for bug fixes and there will be only one maintenance branch left.
 
@@ -75,8 +76,8 @@
 etc.).  For both rules, only rare exceptions are accepted and **must** be
 discussed first.
 
-When a new maintenance branch is created (after a new *minor version* is
-released), the old maintenance branch on that major version (e.g. 3.2.x
+Sometime after a new maintenance branch is created (after a new *minor version*
+is released), the old maintenance branch on that major version (e.g. 3.2.x
 after 3.3 gets released) will go into :ref:`security mode <secbranch>`,
 usually after one last maintenance release at the discretion of the
 release manager.
@@ -96,6 +97,8 @@
 actual security patches have been applied to the branch.
 
 
+.. _listbranch:
+
 Summary
 -------
 
diff --git a/docquality.rst b/docquality.rst
--- a/docquality.rst
+++ b/docquality.rst
@@ -10,13 +10,14 @@
 
 :ref:`Documenting Python <documenting>` covers the details of how Python's documentation works.
 It includes an explanation of the markup used (although you can figure a lot
-out simply by looking at pre-existing documentation) and how to build the
-documentation (which allows you to see how your changes will look along with
-validating that your new markup is correct).
+out simply by looking at pre-existing documentation) and :ref:`how to build
+<building-doc>` the documentation (which allows you to see how your changes
+will look along with validating that your new markup is correct).
 
-The current in-development version of the documentation can be viewed at
-http://docs.python.org/dev/. This version is regenerated from source once
-a day.
+The documentation built from the :ref:`in-development <indevbranch>` and
+:ref:`maintenance <maintbranch>` branches can be viewed from
+http://docs.python.org/dev/.  The in-development and most recent 2.x and 3.x
+maintenance :ref:`branches <listbranch>` are rebuilt once per day.
 
 If you would like a technical documentation style guide, the `Apple
 Publications Style Guide

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