diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2016-10-04 16:03:27 -0500 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2016-10-04 16:03:27 -0500 |
| commit | 4b347fe5368aedc161e172bd110e05e2f7f37463 (patch) | |
| tree | a4eb629a58ae269c2ec4dcb497862599d659b3c3 /CONTRIBUTE | |
| parent | 01669ad9a67af27101decc387e44407e0a08bcf2 (diff) | |
| download | emacs-4b347fe5368aedc161e172bd110e05e2f7f37463.tar.gz | |
Clarify that doc fixes are okay in feature freeze
* CONTRIBUTE (branches): Explain that doc fixes are always safe, even
on a release branch in feature freeze. Tweak wording of paragraph
after that to avoid a misleading contrast.
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index a02acadc73f..c12f0cc08db 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -191,9 +191,11 @@ branch later by the gitmerge function. 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. +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. -However, if you know that the change will be difficult to merge to the +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 |