# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1271352127 25200
# Node ID afb992a317bd822b49c4c66b6a109d6a263e95b3
# Parent  8fb2953d73a12b96567891d734b2ac74692141fb
* admin/notes/BRANCH: Defer to emacs-devel.

diff -r 8fb2953d73a1 -r afb992a317bd admin/notes/BRANCH
--- a/admin/notes/BRANCH	Thu Apr 15 10:14:10 2010 -0700
+++ b/admin/notes/BRANCH	Thu Apr 15 10:22:07 2010 -0700
@@ -17,9 +17,8 @@
 For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
 23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
 
-Traditionally only bug-fixes were allowed in minor releases.
-Recently (22.x, 23.2), self-contained new features were allowed on a
-case-by-case basis.
+Consult emacs-devel for exactly what kinds of changes are allowed
+on what branch at any time.
 
 If you are looking at this file in a branch other than the trunk,
 there may be some branch-specific documentation below this line.