@@ -878,25 +878,37 @@ If you choose to create a patch-level release, follow these steps:
878878 mailinglist.
879879
880880
881- # # Feature freeze
881+ # # Soft feature freeze
882882
883- A major/minor version [ feature freeze][] occurs with the first beta release.
884- Specifically, it occurs when the first beta release is packaged, which means the
885- feature freeze occurs two days before the first beta release .
883+ A major/minor version soft feature freeze occurs with the first beta release.
884+ This is a soft feature freeze because features can still be merged with RM
885+ approval .
886886
887- The feature freeze for ` php-src` means that we will not accept any new features
888- after the date of the feature freeze. For any RFCs to be included in the new
889- version, they should be discussed and have the voting polls closed no later than
890- the feature freeze date. However, this does not mean the new feature must have a
891- complete implementation by this date.
892-
893- Following the feature freeze, the focus of work for the new version will be on
894- fixing bugs, writing tests, and completing/polishing all accepted features.
887+ For any RFCs to be included in the new release, they should be discussed and
888+ have their voting polls closed no later than when the first beta is released.
889+ However, this does not mean the new feature must have a complete implementation
890+ by this date. Such implementation can be merged only with RM approval and must
891+ be done before the hard feature freeze.
895892
896893As a courtesy to the community, the release managers should remind others about
897- the upcoming feature freeze by posting reminders to [email protected] at 898- 4-weeks, 3-weeks, 2-weeks, and 1-week prior to the feature freeze. This is a
899- recommendation and the intervals may vary based on work load.
894+ the upcoming soft feature freeze by posting reminders to
895+ [email protected] at 5 weeks, 4 weeks, 3 weeks, 2 weeks, and 1 week prior896+ to this feature freeze. This is a recommendation and the intervals may vary
897+ based on workload. The reminder should also contain a note with dates for
898+ the last allowed RFC to start voting.
899+
900+ # # Hard feature freeze
901+
902+ A major/minor version hard [feature freeze][] occurs with the first RC release.
903+ Specifically, it occurs when the first RC release is packaged, which means the
904+ hard feature freeze occurs two days before the first RC release.
905+
906+ The hard feature freeze for php-src means that we will not accept any new
907+ features after the date of the hard feature freeze.
908+
909+ Following the hard feature freeze, the focus of work for the new version will
910+ be on fixing bugs, writing tests, and preparing documentation for all accepted
911+ features.
900912
901913
902914# # Forking a new version branch
0 commit comments