diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:35:32 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-10 07:35:32 -0700 |
| commit | 97046e811c738a21e0c4badbb5bab146b6adf6c8 (patch) | |
| tree | 4a10f7fc7e8ab2df291eb6fff2d5e19eb4bbb15c /CONTRIBUTE | |
| parent | 314f3972bf864a527494db043f01d603b0eef522 (diff) | |
| parent | 4b347fe5368aedc161e172bd110e05e2f7f37463 (diff) | |
| download | emacs-97046e811c738a21e0c4badbb5bab146b6adf6c8.tar.gz | |
Merge from origin/emacs-25
4b347fe Clarify that doc fixes are okay in feature freeze
01669ad Avoid crashes when setting the cursor
f2144ee Restore 'command-debug-status' functionality
ec6e4b9 ; Minor addition to CONTRIBUTE
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 9d5d775a5e0..8aba424b744 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -189,7 +189,13 @@ 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 by the gitmerge function. -However, if you know that the change will be difficult to merge to the +Documentation fixes (in doc strings, in manuals, and in comments) +should always go to the release branch, if the documentation to be +fixed exists and is relevant to the release-branch codebase. Doc +fixes are always considered "safe" -- even when a release branch is in +feature freeze, it can still receive doc fixes. + +When you know that the change will be difficult to merge to the master (e.g., because the code on master has changed a lot), you can apply the change to both master and branch yourself. It could also happen that a change is cherry-picked from master to the release |