[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 4b347fe: Clarify that doc fixes are okay in featu
From: |
Karl Fogel |
Subject: |
[Emacs-diffs] emacs-25 4b347fe: Clarify that doc fixes are okay in feature freeze |
Date: |
Tue, 4 Oct 2016 21:03:30 +0000 (UTC) |
branch: emacs-25
commit 4b347fe5368aedc161e172bd110e05e2f7f37463
Author: Karl Fogel <address@hidden>
Commit: Karl Fogel <address@hidden>
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.
---
CONTRIBUTE | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTE b/CONTRIBUTE
index a02acad..c12f0cc 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 4b347fe: Clarify that doc fixes are okay in feature freeze,
Karl Fogel <=