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