[Emacs-diffs] /srv/bzr/emacs/trunk r99908: * admin/notes/BRANCH: Defer to emacs-devel.

[Glenn Morris]

------------------------------------------------------------
revno: 99908
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-15 10:22:07 -0700
message:
  * admin/notes/BRANCH: Defer to emacs-devel.
modified:
  admin/notes/BRANCH

=== modified file 'admin/notes/BRANCH'
--- a/admin/notes/BRANCH        2010-04-15 02:10:20 +0000
+++ b/admin/notes/BRANCH        2010-04-15 17:22:07 +0000
@@ -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.