masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-13 07:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clarify that doc fixes are okay in feature freeze

Browse source 
* 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.
This commit is contained in:
Karl Fogel 2016-10-04 16:03:27 -05:00
parent 01669ad9a6
commit 4b347fe536
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTE
View file

@ -191,9 +191,11 @@ branch later by the gitmerge function.
Documentation fixes (in doc strings, in manuals, and in comments) Documentation fixes (in doc strings, in manuals, and in comments)
should always go to the release branch, if the documentation to be 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 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 apply the change to both master and branch yourself. It could also
happen that a change is cherry-picked from master to the release happen that a change is cherry-picked from master to the release