aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTE
diff options
context:
space:
mode:
authorKarl Fogel2016-10-04 16:03:27 -0500
committerKarl Fogel2016-10-04 16:03:27 -0500
commit4b347fe5368aedc161e172bd110e05e2f7f37463 (patch)
treea4eb629a58ae269c2ec4dcb497862599d659b3c3 /CONTRIBUTE
parent01669ad9a67af27101decc387e44407e0a08bcf2 (diff)
downloademacs-4b347fe5368aedc161e172bd110e05e2f7f37463.tar.gz
emacs-4b347fe5368aedc161e172bd110e05e2f7f37463.zip
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--CONTRIBUTE6
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.
191 191
192Documentation fixes (in doc strings, in manuals, and in comments) 192Documentation fixes (in doc strings, in manuals, and in comments)
193should always go to the release branch, if the documentation to be 193should always go to the release branch, if the documentation to be
194fixed exists and is relevant to the release-branch codebase. 194fixed exists and is relevant to the release-branch codebase. Doc
195fixes are always considered "safe" -- even when a release branch is in
196feature freeze, it can still receive doc fixes.
195 197
196However, if you know that the change will be difficult to merge to the 198When you know that the change will be difficult to merge to the
197master (e.g., because the code on master has changed a lot), you can 199master (e.g., because the code on master has changed a lot), you can
198apply the change to both master and branch yourself. It could also 200apply the change to both master and branch yourself. It could also
199happen that a change is cherry-picked from master to the release 201happen that a change is cherry-picked from master to the release