diff options
| -rw-r--r-- | CONTRIBUTE | 11 | ||||
| -rw-r--r-- | ChangeLog | 4 |
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 | ||
| 9 | An "Emacs Developer" is someone who contributes a lot of code or | 9 | An "Emacs Developer" is someone who contributes a lot of code or |
| 10 | documentation to the Emacs repository. Generally, they have write | 10 | documentation to the Emacs repository. Generally, they have write |
| 11 | access to the Emacs git repository on Savannah. | 11 | access to the Emacs git repository on Savannah |
| 12 | https://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. | |||
| 123 | Sometime before the release of a new major version of Emacs a "feature | 124 | Sometime before the release of a new major version of Emacs a "feature |
| 124 | freeze" is imposed on the trunk, to prepare for creating a release | 125 | freeze" is imposed on the trunk, to prepare for creating a release |
| 125 | branch. No new features may be added to the trunk after this point, | 126 | branch. No new features may be added to the trunk after this point, |
| 126 | until the release branch is created. This freeze is announced on the | 127 | until the release branch is created. Announcements about the freeze |
| 127 | emacs-devel mailing list, and not anywhere else. | 128 | (and other important events) are made on the info-gnu-emacs mailing |
| 129 | list, and not anywhere else. | ||
| 128 | 130 | ||
| 129 | The trunk branch is named "master" in git; release branches are named | 131 | The 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 | ||
| 132 | Announcements about the freeze (and other important events) are made | ||
| 133 | on the info-gnu-emacs mailing list. | ||
| 134 | |||
| 135 | If you are fixing a bug that exists in the current release, be sure to | 134 | If you are fixing a bug that exists in the current release, be sure to |
| 136 | commit it to the release branch; it will be merged to the master | 135 | commit it to the release branch; it will be merged to the master |
| 137 | branch later. | 136 | branch later. |
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-12-23 Stephen Leake <stephen_leake@stephe-leake.org> | ||
| 2 | |||
| 3 | * CONTRIBUTE: add Savannah url, cleanup announcing freeze. | ||
| 4 | |||
| 1 | 2014-12-19 Stephen Leake <stephen_leake@stephe-leake.org> | 5 | 2014-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 |