|
1 | 1 | {% extends "base.html" %} |
2 | | -{% load date_format %} |
| 2 | +{% load date_format fundraising_extras %} |
3 | 3 |
|
4 | 4 | {% block sectionid %}roadmap{% endblock %} |
5 | 5 | {% block title %}Django {{ series }} Roadmap{% endblock %} |
@@ -31,6 +31,19 @@ <h2>What features will be in Django {{ series }}?</h2> |
31 | 31 | by mergers.</p> |
32 | 32 | </section> |
33 | 33 |
|
| 34 | + <section id="how-to-help"> |
| 35 | + <h2>How you can help</h2> |
| 36 | + <p>Community effort is key. You can help by:</p> |
| 37 | + <ul> |
| 38 | + <li>Reading the <a href="http://docs.djangoproject.com/en/dev/internals/contributing/">guide to contributing</a> |
| 39 | + and <a href="http://docs.djangoproject.com/en/dev/internals/release-process/">Django's release process</a>.</li> |
| 40 | + <li>Working on patches and <a href="https://docs.djangoproject.com/en/dev/internals/contributing/triaging-tickets/">triaging tickets</a>.</li> |
| 41 | + <li>Attending sprints.</li> |
| 42 | + <li>Testing release snapshots (alphas, betas) against your code and reporting bugs.</li> |
| 43 | + <li>Providing as many testers as possible to ensure a bug-free release.</li> |
| 44 | + </ul> |
| 45 | + </section> |
| 46 | + |
34 | 47 | <section id="schedule"> |
35 | 48 | <h2>Schedule</h2> |
36 | 49 | <p> |
@@ -65,56 +78,49 @@ <h2>Schedule</h2> |
65 | 78 | </tbody> |
66 | 79 | </table> |
67 | 80 | </div> |
68 | | - </section> |
| 81 | + <section id="process"> |
| 82 | + <h3>Process</h3> |
| 83 | + <p>Any features not completed by the feature freeze date won't make it into {{ series }}.</p> |
| 84 | + <p>The release manager will keep the schedule updated and ensure efficient |
| 85 | + routing of issues and reminders for deadlines.</p> |
69 | 86 |
|
70 | | - <section id="process"> |
71 | | - <h2>Process</h2> |
72 | | - <p>Any features not completed by the feature freeze date won't make it into {{ series }}.</p> |
73 | | - <p>The release manager will keep the schedule updated and ensure efficient |
74 | | - routing of issues and reminders for deadlines.</p> |
| 87 | + <section id="feature-freeze-alpha-1"> |
| 88 | + <h4>Feature freeze / Alpha 1</h4> |
| 89 | + <p>All major and minor features must be merged by the Alpha 1 deadline. Any |
| 90 | + features not done by this point will be deferred or dropped. At this time, we |
| 91 | + will fork <code>stable/{{ series }}.x</code> from <code>main</code>.</p> |
| 92 | + <p>After the alpha, non-release blocking bug fixes may be backported at the |
| 93 | + mergers' discretion.</p> |
| 94 | + </section> |
75 | 95 |
|
76 | | - <section id="feature-freeze-alpha-1"> |
77 | | - <h3>Feature freeze / Alpha 1</h3> |
78 | | - <p>All major and minor features must be merged by the Alpha 1 deadline. Any |
79 | | - features not done by this point will be deferred or dropped. At this time, we |
80 | | - will fork <code>stable/{{ series }}.x</code> from <code>main</code>.</p> |
81 | | - <p>After the alpha, non-release blocking bug fixes may be backported at the |
82 | | - mergers' discretion.</p> |
83 | | - </section> |
| 96 | + <section id="beta-1"> |
| 97 | + <h4>Beta 1</h4> |
| 98 | + <p>Beta 1 marks the end of changes that aren't release blocking bugs. Only release |
| 99 | + blocking bug fixes will be allowed to be backported after the beta.</p> |
| 100 | + </section> |
84 | 101 |
|
85 | | - <section id="beta-1"> |
86 | | - <h3>Beta 1</h3> |
87 | | - <p>Beta 1 marks the end of changes that aren't release blocking bugs. Only release |
88 | | - blocking bug fixes will be allowed to be backported after the beta.</p> |
89 | | - </section> |
| 102 | + <section id="rc-1"> |
| 103 | + <h4>RC 1</h4> |
| 104 | + <p>If release blockers are still coming in at the planned release candidate date, |
| 105 | + we'll release beta 2 to encourage further testing. RC 1 marks the freeze for |
| 106 | + translation strings; translators will have two weeks to submit updates. Release |
| 107 | + blocking bug fixes may continue to be backported.</p> |
| 108 | + </section> |
90 | 109 |
|
91 | | - <section id="rc-1"> |
92 | | - <h3>RC 1</h3> |
93 | | - <p>If release blockers are still coming in at the planned release candidate date, |
94 | | - we'll release beta 2 to encourage further testing. RC 1 marks the freeze for |
95 | | - translation strings; translators will have two weeks to submit updates. Release |
96 | | - blocking bug fixes may continue to be backported.</p> |
97 | | - </section> |
98 | | - |
99 | | - <section id="final"> |
100 | | - <h3>Final</h3> |
101 | | - <p>Django {{ series }} final will ideally ship two weeks after the last RC. If no major bugs |
102 | | - are found by then, {{ series }} final will be issued; otherwise, the timeline will be |
103 | | - adjusted as needed.</p> |
104 | | - </section> |
105 | | - |
106 | | - <section id="how-to-help"> |
107 | | - <h3>How you can help</h3> |
108 | | - <p>Community effort is key. You can help by:</p> |
109 | | - <ul> |
110 | | - <li>Reading the <a href="http://docs.djangoproject.com/en/dev/internals/contributing/">guide to contributing</a> |
111 | | - and <a href="http://docs.djangoproject.com/en/dev/internals/release-process/">Django's release process</a>.</li> |
112 | | - <li>Working on patches and <a href="https://docs.djangoproject.com/en/dev/internals/contributing/triaging-tickets/">triaging tickets</a>.</li> |
113 | | - <li>Attending sprints.</li> |
114 | | - <li>Testing release snapshots (alphas, betas) against your code and reporting bugs.</li> |
115 | | - <li>Providing as many testers as possible to ensure a bug-free release.</li> |
116 | | - </ul> |
| 110 | + <section id="final"> |
| 111 | + <h4>Final</h4> |
| 112 | + <p>Django {{ series }} final will ideally ship two weeks after the last RC. If no major bugs |
| 113 | + are found by then, {{ series }} final will be issued; otherwise, the timeline will be |
| 114 | + adjusted as needed.</p> |
| 115 | + </section> |
117 | 116 | </section> |
118 | 117 | </section> |
119 | 118 |
|
120 | 119 | {% endblock %} |
| 120 | + |
| 121 | +{% block content-related %} |
| 122 | + <div role="complementary"> |
| 123 | + <h2 class="visuallyhidden" id="aside-header">Additional Information</h2> |
| 124 | + {% donation_snippet %} |
| 125 | + </div> |
| 126 | +{% endblock %} |
0 commit comments