Commit 4b347fe5 authored by Karl Fogel's avatar Karl Fogel

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.
parent 01669ad9
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment