diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-06-08 11:26:22 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-06-08 11:26:22 +0200 |
| commit | 329bb9296f402c6e7d7b648937b72b13a6f5756c (patch) | |
| tree | deccdef6822d7439c086860a7ae712f18fa1e65f /docs/internals/release-process.txt | |
| parent | 23d230f05833a63e951b8f451ff6c9f570eb3208 (diff) | |
Proof-read the new contributing guide.
Many thanks to Daniele Procida.
Diffstat (limited to 'docs/internals/release-process.txt')
| -rw-r--r-- | docs/internals/release-process.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt index b998a7d3d5..97adb4a3f6 100644 --- a/docs/internals/release-process.txt +++ b/docs/internals/release-process.txt @@ -198,15 +198,15 @@ and an rc complete with string freeze two weeks before the end of the schedule. Bug-fix releases ---------------- -After a minor release (e.g. 1.1), the previous release will go into bug-fix +After a minor release (e.g. 1.1), the previous release will go into bugfix mode. A branch will be created of the form ``branches/releases/1.0.X`` to track -bug-fixes to the previous release. Critical bugs fixed on trunk must -*also* be fixed on the bug-fix branch; this means that commits need to cleanly +bugfixes to the previous release. Critical bugs fixed on trunk must +*also* be fixed on the bugfix branch; this means that commits need to cleanly separate bug fixes from feature additions. The developer who commits a fix to -trunk will be responsible for also applying the fix to the current bug-fix -branch. Each bug-fix branch will have a maintainer who will work with the +trunk will be responsible for also applying the fix to the current bugfix +branch. Each bugfix branch will have a maintainer who will work with the committers to keep them honest on backporting bug fixes. How this all fits together |