diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html index 7892c9ff8a..85b0cf81ad 100644 --- a/djangoproject/templates/releases/roadmap.html +++ b/djangoproject/templates/releases/roadmap.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load date_format %} +{% load date_format fundraising_extras %} {% block sectionid %}roadmap{% endblock %} {% block title %}Django {{ series }} Roadmap{% endblock %} @@ -31,6 +31,19 @@

What features will be in Django {{ series }}?

by mergers.

+
+

How you can help

+

Community effort is key. You can help by:

+ +
+

Schedule

@@ -65,56 +78,49 @@

Schedule

-
+
+

Process

+

Any features not completed by the feature freeze date won't make it into {{ series }}.

+

The release manager will keep the schedule updated and ensure efficient + routing of issues and reminders for deadlines.

-
-

Process

-

Any features not completed by the feature freeze date won't make it into {{ series }}.

-

The release manager will keep the schedule updated and ensure efficient - routing of issues and reminders for deadlines.

+
+

Feature freeze / Alpha 1

+

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/{{ series }}.x from main.

+

After the alpha, non-release blocking bug fixes may be backported at the + mergers' discretion.

+
-
-

Feature freeze / Alpha 1

-

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/{{ series }}.x from main.

-

After the alpha, non-release blocking bug fixes may be backported at the - mergers' discretion.

-
+
+

Beta 1

+

Beta 1 marks the end of changes that aren't release blocking bugs. Only release + blocking bug fixes will be allowed to be backported after the beta.

+
-
-

Beta 1

-

Beta 1 marks the end of changes that aren't release blocking bugs. Only release - blocking bug fixes will be allowed to be backported after the beta.

-
+
+

RC 1

+

If release blockers are still coming in at the planned release candidate date, + we'll release beta 2 to encourage further testing. RC 1 marks the freeze for + translation strings; translators will have two weeks to submit updates. Release + blocking bug fixes may continue to be backported.

+
-
-

RC 1

-

If release blockers are still coming in at the planned release candidate date, - we'll release beta 2 to encourage further testing. RC 1 marks the freeze for - translation strings; translators will have two weeks to submit updates. Release - blocking bug fixes may continue to be backported.

-
- -
-

Final

-

Django {{ series }} final will ideally ship two weeks after the last RC. If no major bugs - are found by then, {{ series }} final will be issued; otherwise, the timeline will be - adjusted as needed.

-
- -
-

How you can help

-

Community effort is key. You can help by:

- +
+

Final

+

Django {{ series }} final will ideally ship two weeks after the last RC. If no major bugs + are found by then, {{ series }} final will be issued; otherwise, the timeline will be + adjusted as needed.

+
{% endblock %} + +{% block content-related %} +
+

Additional Information

+ {% donation_snippet %} +
+{% endblock %}