diff options
| author | Eli Zaretskii | 2016-10-04 08:59:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2016-10-04 08:59:37 +0300 |
| commit | ec6e4b9d1e5a215d9dfe1026730dbb23f1935615 (patch) | |
| tree | 38e60063a78637f13491bc89fc6364bf269a9af2 | |
| parent | e1b2918c7cdecdde093390adc2fa26713554da02 (diff) | |
| download | emacs-ec6e4b9d1e5a215d9dfe1026730dbb23f1935615.tar.gz emacs-ec6e4b9d1e5a215d9dfe1026730dbb23f1935615.zip | |
; Minor addition to CONTRIBUTE
* CONTRIBUTE (http): Mention that doc fixes should always go to
the release branch.
| -rw-r--r-- | CONTRIBUTE | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index a70682f29ab..a02acadc73f 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE | |||
| @@ -189,6 +189,10 @@ If you are fixing a bug that exists in the current release, be sure to | |||
| 189 | commit it to the release branch; it will be merged to the master | 189 | commit it to the release branch; it will be merged to the master |
| 190 | branch later by the gitmerge function. | 190 | branch later by the gitmerge function. |
| 191 | 191 | ||
| 192 | Documentation fixes (in doc strings, in manuals, and in comments) | ||
| 193 | should always go to the release branch, if the documentation to be | ||
| 194 | fixed exists and is relevant to the release-branch codebase. | ||
| 195 | |||
| 192 | However, if you know that the change will be difficult to merge to the | 196 | However, if you know that the change will be difficult to merge to the |
| 193 | master (e.g., because the code on master has changed a lot), you can | 197 | master (e.g., because the code on master has changed a lot), you can |
| 194 | apply the change to both master and branch yourself. It could also | 198 | apply the change to both master and branch yourself. It could also |