diff --git a/docs/contributing/release_process.rst b/docs/contributing/release_process.rst index 398dcda1d6..c44965b442 100644 --- a/docs/contributing/release_process.rst +++ b/docs/contributing/release_process.rst @@ -31,9 +31,9 @@ issued from those branches. .. glossary:: Feature release - Feature releases (A.B, A.B+1, etc.) will happen roughly every two months + Feature releases (A.B, A.B+1, etc.) happen every three months -- see `release process <#release-process>`__ for details. These releases will contain new - features, improvements to existing features, and such. + features and improvements to existing features. Patch release Patch releases (A.B.C, A.B.C+1, etc.) will be issued as needed, to fix @@ -159,7 +159,8 @@ Wagtail 1.4 will still support only Django 1.8 (LTS) and 1.9. Release process =============== -Wagtail uses a time-based release schedule, with feature releases every two months or so. +Wagtail uses a time-based release schedule, with feature releases every +`three months `_. After each feature release, the release manager will announce a timeline for the next feature release. @@ -220,4 +221,4 @@ The branch for the previous feature release (e.g. ``stable/A.B-1.x``) will include bugfixes. Critical bugs fixed on master 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 master will be -responsible for also applying the fix to the current bugfix branch. \ No newline at end of file +responsible for also applying the fix to the current bugfix branch.