[Python-checkins] devguide: Update devguide now that the 2.6 branch has been closed.

[ezio.melotti]

http://hg.python.org/devguide/rev/43665646b92a
changeset:   650:43665646b92a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Oct 30 20:21:38 2013 +0200
summary:
  Update devguide now that the 2.6 branch has been closed.

files:
  devcycle.rst |   4 +---
  faq.rst      |  11 +++++------
  2 files changed, 6 insertions(+), 9 deletions(-)


diff --git a/devcycle.rst b/devcycle.rst
--- a/devcycle.rst
+++ b/devcycle.rst
@@ -107,7 +107,7 @@
 Summary
 -------
 
-There are 6 active branches right now in the Mercurial repository:
+There are 5 open 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)
@@ -119,8 +119,6 @@
   (RM: Benjamin Peterson)
 - the ``2.7`` branch holds bug fixes for future 2.7.x maintenance releases and
   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:
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -269,12 +269,11 @@
 Typing ``hg branches`` displays the open branches in your local repository::
 
    $ hg branches
-   default                    79844:2d53f92ed54c
-   2.7                        79839:422a0175bbf5
-   3.3                        79843:25722e983ada (inactive)
-   3.2                        79840:d459a9576d6c (inactive)
-   3.1                        76255:5a6fa1b8767f (inactive)
-   2.6                        76213:f130ce67387d (inactive)
+   default                    86781:52ec6a3eeda5
+   2.7                        86776:dd12639b82bf
+   3.3                        86779:544b654d000c (inactive)
+   3.2                        86778:dda1a32748e0 (inactive)
+   3.1                        86777:b1ddcb220a7f (inactive)
 
 Why are some branches marked "inactive"?
 ''''''''''''''''''''''''''''''''''''''''

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