diff options
| -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. | |||
| 191 | 191 | ||
| 192 | Documentation fixes (in doc strings, in manuals, and in comments) | 192 | Documentation fixes (in doc strings, in manuals, and in comments) |
| 193 | should always go to the release branch, if the documentation to be | 193 | should always go to the release branch, if the documentation to be |
| 194 | fixed exists and is relevant to the release-branch codebase. | 194 | fixed exists and is relevant to the release-branch codebase. Doc |
| 195 | fixes are always considered "safe" -- even when a release branch is in | ||
| 196 | feature freeze, it can still receive doc fixes. | ||
| 195 | 197 | ||
| 196 | However, if you know that the change will be difficult to merge to the | 198 | When you know that the change will be difficult to merge to the |
| 197 | master (e.g., because the code on master has changed a lot), you can | 199 | master (e.g., because the code on master has changed a lot), you can |
| 198 | apply the change to both master and branch yourself. It could also | 200 | apply the change to both master and branch yourself. It could also |
| 199 | happen that a change is cherry-picked from master to the release | 201 | happen that a change is cherry-picked from master to the release |