Changes between Version 1 and Version 2 of Version3.2Roadmap

Timestamp:

May 13, 2020, 8:54:55 AM (5 years ago)

Author:

Adam Johnson

Comment:

s/commit/merge/

Version3.2Roadmap

@@ -11 +11 @@
 =====================================
 
-Whatever gets committed by the alpha feature freeze!
+Whatever gets merged by the alpha feature freeze!
 
-Django 3.2 will be a time-based release. Any features completed and committed
+Django 3.2 will be a time-based release. Any features completed and merged
 to master by the alpha feature freeze deadline noted below will be included.
 Any that miss the deadline won't.
@@ -22 +22 @@
 shepherd for your feature.
 
-Minor features and bug fixes will be committed as they are completed. If you
+Minor features and bug fixes will be merged as they are completed. If you
 have submitted a patch, be sure the flags on the Trac ticket are correct such
 that it appears in the "Patches needing review" filter of the `Django
 Development Dashboard <https://dashboard.djangoproject.com/>`_. Better yet,
 find someone to review your patch and mark the ticket as "Ready for checkin".
-Tickets marked "Ready for checkin" are regularly reviewed by committers.
+Tickets marked "Ready for checkin" are regularly reviewed by mergers.
 
 Schedule
@@ -58 +58 @@
 ------------------------
 
-All major and minor features must be committed by the Alpha 1 deadline. Any
+All major and minor features must be merged by the Alpha 1 deadline. Any
 features not done by this point will be deferred or dropped. At this time, we
 will fork ``stable/3.2.x`` from ``master``.
 
 After the alpha, non-release blocking bug fixes may be backported at the
-committer's discretion.
+merger's discretion.
 
 Beta 1