aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Leake2014-12-23 17:38:57 -0600
committerStephen Leake2014-12-23 17:38:57 -0600
commitb4161ac70e4206cc00263e0c1f765b4cf95dfd33 (patch)
tree9821df3d8d219428e696a317660c26eaffb70333
parentfcb978e24023e9af4e465ac98222543990c70ffc (diff)
downloademacs-b4161ac70e4206cc00263e0c1f765b4cf95dfd33.tar.gz
emacs-b4161ac70e4206cc00263e0c1f765b4cf95dfd33.zip
* CONTRIBUTE: add Savannah url, cleanup announcing freeze.
-rw-r--r--CONTRIBUTE11
-rw-r--r--ChangeLog4
2 files changed, 9 insertions, 6 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index a190bd982fc..3bc49cf3ea3 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -8,7 +8,8 @@ http://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
8 8
9An "Emacs Developer" is someone who contributes a lot of code or 9An "Emacs Developer" is someone who contributes a lot of code or
10documentation to the Emacs repository. Generally, they have write 10documentation to the Emacs repository. Generally, they have write
11access to the Emacs git repository on Savannah. 11access to the Emacs git repository on Savannah
12https://savannah.gnu.org/git/?group=emacs.
12 13
13** Write access to the Emacs repository. 14** Write access to the Emacs repository.
14 15
@@ -123,15 +124,13 @@ Development is discussed on the emacs-devel mailing list.
123Sometime before the release of a new major version of Emacs a "feature 124Sometime before the release of a new major version of Emacs a "feature
124freeze" is imposed on the trunk, to prepare for creating a release 125freeze" is imposed on the trunk, to prepare for creating a release
125branch. No new features may be added to the trunk after this point, 126branch. No new features may be added to the trunk after this point,
126until the release branch is created. This freeze is announced on the 127until the release branch is created. Announcements about the freeze
127emacs-devel mailing list, and not anywhere else. 128(and other important events) are made on the info-gnu-emacs mailing
129list, and not anywhere else.
128 130
129The trunk branch is named "master" in git; release branches are named 131The trunk branch is named "master" in git; release branches are named
130"emacs-nn" where "nn" is the major version. 132"emacs-nn" where "nn" is the major version.
131 133
132Announcements about the freeze (and other important events) are made
133on the info-gnu-emacs mailing list.
134
135If you are fixing a bug that exists in the current release, be sure to 134If you are fixing a bug that exists in the current release, be sure to
136commit it to the release branch; it will be merged to the master 135commit it to the release branch; it will be merged to the master
137branch later. 136branch later.
diff --git a/ChangeLog b/ChangeLog
index 30fae4d4bf6..a380abdc0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-12-23 Stephen Leake <stephen_leake@stephe-leake.org>
2
3 * CONTRIBUTE: add Savannah url, cleanup announcing freeze.
4
12014-12-19 Stephen Leake <stephen_leake@stephe-leake.org> 52014-12-19 Stephen Leake <stephen_leake@stephe-leake.org>
2 6
3 Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi 7 Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi