[Python-checkins] devguide: Minor fixes to last update

[nick.coghlan]

http://hg.python.org/devguide/rev/52f7c8db1d45
changeset:   458:52f7c8db1d45
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Oct 23 21:28:13 2011 +1000
summary:
  Minor fixes to last update

files:
  committing.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -64,7 +64,7 @@
   change has been reverted (e.g. when a feature is released in an alpha and
   then cut prior to the first beta)
 
-* If a change is a fix or other adjustment to an earlier unreleased change
+* If a change is a fix (or other adjustment) to an earlier unreleased change
   and the original NEWS entry remains valid, then no additional entry is
   needed.
 
@@ -210,7 +210,7 @@
 
 Note that this policy applies only within a major version - the ``2.7`` branch
 is an independent thread of development, and should *never* be merged to any
-of the ``3.x`` branches of ``default``. If a bug fix applies to both ``2.x``
+of the ``3.x`` branches or ``default``. If a bug fix applies to both ``2.x``
 and ``3.x``, the two additions are handled as separate commits. It doesn't
 matter which is updated first, but any associated tracker issues should be
 closed only after all affected versions have been modified in the main

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