summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
An "Emacs Developer" is someone who contributes a lot of code or
documentation to the Emacs repository. Generally, they have write
-access to the Emacs git repository on Savannah.
+access to the Emacs git repository on Savannah
+https://savannah.gnu.org/git/?group=emacs.
** Write access to the Emacs repository.
@@ -123,15 +124,13 @@ Development is discussed on the emacs-devel mailing list.
Sometime before the release of a new major version of Emacs a "feature
freeze" is imposed on the trunk, to prepare for creating a release
branch. No new features may be added to the trunk after this point,
-until the release branch is created. This freeze is announced on the
-emacs-devel mailing list, and not anywhere else.
+until the release branch is created. Announcements about the freeze
+(and other important events) are made on the info-gnu-emacs mailing
+list, and not anywhere else.
The trunk branch is named "master" in git; release branches are named
"emacs-nn" where "nn" is the major version.
-Announcements about the freeze (and other important events) are made
-on the info-gnu-emacs mailing list.
-
If you are fixing a bug that exists in the current release, be sure to
commit it to the release branch; it will be merged to the master
branch later.
diff --git a/ChangeLog b/ChangeLog
index 30fae4d4bf6..a380abdc0b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-23 Stephen Leake <stephen_leake@stephe-leake.org>
+
+ * CONTRIBUTE: add Savannah url, cleanup announcing freeze.
+
2014-12-19 Stephen Leake <stephen_leake@stephe-leake.org>
Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi