From 18bf657d18b461309650978dc0ecf29567f5d1f6 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 15 Apr 2010 10:22:07 -0700 Subject: [PATCH] * admin/notes/BRANCH: Defer to emacs-devel. --- admin/notes/BRANCH | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH index 5caa9e5905f..53f3d9603ca 100644 --- a/admin/notes/BRANCH +++ b/admin/notes/BRANCH @@ -17,9 +17,8 @@ trunk is then free for development. 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. -- 2.39.5