Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de
[bpt/emacs.git] / admin / notes / BRANCH
1 You can view the available Emacs branches at
2
3 http://bzr.savannah.gnu.org/r/emacs/
4
5 Development normally takes places on the trunk.
6 Sometimes specialized features are developed on separate branches
7 before possibly being merged to the trunk.
8
9 Development is discussed on the emacs-devel mailing list.
10
11 Sometime before the release of a new major version of Emacs (eg 23.2),
12 a "feature freeze" is imposed on the trunk. No new features may be
13 added after this point. This is usually some months before the release.
14
15 Shortly before the release, a release branch is created, and the
16 trunk is then free for development.
17 For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
18 23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
19
20 Consult emacs-devel for exactly what kinds of changes are allowed
21 on what branch at any time.
22
23 If you are looking at this file in a branch other than the trunk,
24 there may be some branch-specific documentation below this line.
25 ________________________________________________________________________
26
27 * elpa
28
29 This branch does not contain a copy of Emacs, but of the Emacs Lisp
30 package archive (elpa.gnu.org). See admin/notes/elpa for further
31 explanation, and the README file in the branch for usage
32 instructions.