diff --git a/djangoproject/templates/aggregator/ecosystem.html b/djangoproject/templates/aggregator/ecosystem.html index 91b6296cd7..77c9872353 100644 --- a/djangoproject/templates/aggregator/ecosystem.html +++ b/djangoproject/templates/aggregator/ecosystem.html @@ -1,5 +1,5 @@ {% extends "base_community.html" %} -{% load i18n %} +{% load i18n hosts %} {% block content %} @@ -139,7 +139,7 @@

@@ -152,10 +152,10 @@

Django-powered sites
  • - Show your support with badges + Show your support with badges
  • - Download official logos + Download official logos
    • diff --git a/djangoproject/templates/aggregator/index.html b/djangoproject/templates/aggregator/index.html index 461fed46b5..527351e443 100644 --- a/djangoproject/templates/aggregator/index.html +++ b/djangoproject/templates/aggregator/index.html @@ -39,7 +39,7 @@

    {% translate "Package Ecosystem" %}

    {% translate "Get Involved" %}

    - +
    {% include "svg_logos/bug.html" %} @@ -47,7 +47,7 @@

    {% translate "Get Involved" %}

    {% translate "Report an issue" %}

     - +
    {% include "svg_logos/notepad.html" %} diff --git a/djangoproject/templates/base_community.html b/djangoproject/templates/base_community.html index fa76161a11..848fad59a0 100644 --- a/djangoproject/templates/base_community.html +++ b/djangoproject/templates/base_community.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras i18n %} +{% load fundraising_extras i18n hosts %} {% block og_title %}{% translate "Django Community" %}{% endblock %} {% block og_description %}{% translate "Building the Django Community. Come join us!" %}{% endblock %} @@ -45,7 +45,7 @@

    {% translate "Dive In" %}

    {% translate "Ticket System" %}
    {% translate "View and update bug reports" %}
    -
    {% translate "Development Dashboard" %}
    +
    {% translate "Development Dashboard" %}
    {% translate "Statistics about Django development" %}
    {% translate "django-updates Mailing List" %}
    {% translate "Get updated for each code and ticket change" %}
    @@ -57,9 +57,9 @@

    {% translate "More Links" %}

    {% translate "Find third-party packages to supercharge your project" %}
    {% translate "Django-powered Sites" %}
    {% translate "Add your site to the list" %}
    -
    {% translate "Django Badges" %}
    +
    {% translate "Django Badges" %}
    {% translate "Show your support (or wish longingly)" %}
    -
    {% translate "Django Logos" %}
    +
    {% translate "Django Logos" %}
    {% translate "Download official logos" %}
    diff --git a/djangoproject/templates/base_foundation.html b/djangoproject/templates/base_foundation.html index 3925eb316c..e178749093 100644 --- a/djangoproject/templates/base_foundation.html +++ b/djangoproject/templates/base_foundation.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras meetings i18n %} +{% load fundraising_extras meetings i18n hosts %} {% block og_title %}Django Software Foundation{% endblock %} @@ -19,11 +19,11 @@

    {% translate "Additional Informatio

    About the foundation

    {% translate "Latest DSF meeting minutes" %}

    {% translate "The minutes from May 2025 onwards are stored in the repo" %} diff --git a/djangoproject/templates/base_weblog.html b/djangoproject/templates/base_weblog.html index dc672dc2a3..08c975e719 100644 --- a/djangoproject/templates/base_weblog.html +++ b/djangoproject/templates/base_weblog.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras i18n weblog %} +{% load fundraising_extras i18n weblog hosts %} {% block layout_class %}sidebar-right{% endblock %} {% block title %}{% translate "News & Events" %}{% endblock %} @@ -34,7 +34,7 @@

    {% translate "Upcoming Events" %}

    {% endfor %} {% endif %} -

    {% translate "Want your event listed here?" %}

    +

    {% translate "Want your event listed here?" %}

    {% comment %} {# tags not implemented in backend yet #} diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html index b7eaf1c390..19f980eba1 100644 --- a/djangoproject/templates/conduct/base.html +++ b/djangoproject/templates/conduct/base.html @@ -11,7 +11,7 @@

    {% translate "Django Community Code of Conduct" %}

    • {% translate "Code of Conduct" %}
      • -
    • {% translate "Committee" %}
      • +
    • {% translate "Code of Conduct working group" %}
    • {% translate "Frequently Asked Questions" %}
    • {% translate "Reporting Guide" %}
    • {% translate "Enforcement Manual" %}
      • diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html index a954aa8147..024870aa6b 100644 --- a/djangoproject/templates/conduct/changes.html +++ b/djangoproject/templates/conduct/changes.html @@ -17,7 +17,7 @@

      {% translate "Change control process" %}

      associated documents the same way we track changes to code. All changes will be proposed via a pull request to the djangoproject.com repository - on GitHub. Changes will be reviewed by the conduct committee first, and then + on GitHub. Changes will be reviewed by the conduct working group first, and then sent to the DSF and the Django community for comment. We'll hold a comment period of at least one week, then the DSF board will vote on the change. Approved changes will be merged, published, and noted below.{% endblocktranslate %}

      diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html index 414d1b39a9..5605d92885 100644 --- a/djangoproject/templates/conduct/enforcement.html +++ b/djangoproject/templates/conduct/enforcement.html @@ -4,7 +4,7 @@ {% block title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %} -{% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct Committee" %}{% endblock %} +{% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct working group" %}{% endblock %} {% block content %}

      {% translate "Django Code of Conduct - Enforcement Manual" %}

      @@ -12,34 +12,35 @@

      {% translate "Django Code of Conduct - Enforcement Manual" %}

      {% blocktranslate trimmed %} This is the enforcement manual followed by Django's Code of - Conduct Committee. It's used when we respond to an issue to make sure we're + Conduct working group. It's used when we respond to an issue to make sure we're consistent and fair. It should be considered an internal document, but we're publishing it publicly in the interests of transparency. {% endblocktranslate %}

      -

      {% translate "The Code of Conduct Committee" %}

      +

      {% translate "The Code of Conduct Working Group" %}

      + {% url 'members:teams' as teams_url %} {% blocktranslate trimmed %} - All responses to reports of conduct violations will be managed by a - Code of Conduct Committee ("the committee"). + All responses to reports of conduct violations will be managed by the + Code of Conduct working group. {% endblocktranslate %}

      {% blocktranslate trimmed %} The Django Software Foundation's Board of Directors ("the board") will establish - this committee, comprised of at least three members. One member will be - designated chair of the committee and will be responsible for all reports back to + this working group, comprised of at least three members. One member will be + designated chair of the working group and will be responsible for all reports back to the board. The board will review membership on a regular basis. {% endblocktranslate %}

      -

      {% translate "How the committee will respond to reports" %}

      +

      {% translate "How the working group will respond to reports" %}

      {% blocktranslate trimmed %} - When a report is sent to the committee they will immediately reply to the + When a report is sent to the working group they will immediately reply to the report to confirm receipt. This reply must be sent within 24 hours, and the - committee should strive to respond much quicker than that. + working group should strive to respond much quicker than that. {% endblocktranslate %}

      {% url 'conduct_reporting' as conduct_reporting %} @@ -47,12 +48,12 @@

      {% translate "How the committee will respond to reports" %}

      {% blocktranslate trimmed %} See the reporting guidelines for details of what reports should contain. If a report doesn't contain enough information, the - committee will obtain all relevant data before acting. The committee is + working group will obtain all relevant data before acting. The working group is empowered to act on the DSF's behalf in contacting any individuals involved to get a more complete account of events. {% endblocktranslate %}

      -

      {% translate "The committee will then review the incident and determine, to the best of their ability:" %} +

      {% translate "The working group will then review the incident and determine, to the best of their ability:" %}

      • {% translate "what happened" %}
      • {% translate "whether this event constitutes a code of conduct violation" %}
        • @@ -64,14 +65,14 @@

        {% translate "How the committee will respond to reports" %}

        {% blocktranslate trimmed %} This information will be collected in writing, and whenever possible the - committee's deliberations will be recorded and retained (i.e. chat transcripts, email + working group's deliberations will be recorded and retained (i.e. chat transcripts, email discussions, recorded voice conversations, etc). {% endblocktranslate %}

        {% blocktranslate trimmed %} - The committee should aim to have a resolution agreed upon within one week. - In the event that a resolution can't be determined in that time, the committee will + The working group should aim to have a resolution agreed upon within one week. + In the event that a resolution can't be determined in that time, the working group will respond to the reporter(s) with an update and projected timeline for resolution. {% endblocktranslate %}

        @@ -80,30 +81,30 @@

        {% translate "Acting Unilaterally" %}

        {% blocktranslate trimmed %} If the act is ongoing (such as someone engaging in harassment on the forum), or involves - a threat to anyone's safety (e.g. threats of violence), any committee member + a threat to anyone's safety (e.g. threats of violence), any working group member may act immediately (before reaching consensus) to end the situation. In ongoing situations, any member may at their discretion employ any of the tools available - to the committee, including bans and blocks. + to the working group, including bans and blocks. {% endblocktranslate %}

        {% blocktranslate trimmed %} - If the incident involves physical danger, any member of the committee may -- + If the incident involves physical danger, any member of the working group may -- and should -- act unilaterally to protect safety. This can include contacting law enforcement (or other local personnel) and speaking on behalf of the DSF. {% endblocktranslate %}

        {% blocktranslate trimmed %} - In situations where an individual committee member acts unilaterally, they must - report their actions to the committee for review within 24 hours.{% endblocktranslate %}

        + In situations where an individual working group member acts unilaterally, they must + report their actions to the working group for review within 24 hours.{% endblocktranslate %}

        {% translate "Resolutions" %}

        {% blocktranslate trimmed %} - The committee must agree on a resolution by consensus. If the committee cannot - reach consensus and deadlocks for over a week, the committee will turn the matter + The working group must agree on a resolution by consensus. If the working group cannot + reach consensus and deadlocks for over a week, the working group will turn the matter over to the board for resolution.{% endblocktranslate %}

        {% translate "Possible responses may include:" %} @@ -111,55 +112,55 @@

        {% translate "Resolutions" %}

      • {% translate "Taking no further action (if we determine no violation occurred)." %}
      • {% blocktranslate trimmed %} - A private reprimand from the committee to the individual(s) involved. - In this case, a committee member will deliver that reprimand to the individual(s) - over email, cc'ing the committee.{% endblocktranslate %}
        • + A private reprimand from the working group to the individual(s) involved. + In this case, a working group member will deliver that reprimand to the individual(s) + over email, cc'ing the working group.{% endblocktranslate %}
      • {% blocktranslate trimmed %} - A public reprimand. In this case, a committee member will deliver that reprimand + A public reprimand. In this case, a working group member will deliver that reprimand in the same venue that the violation occurred (i.e. in the forum for a forum violation; - email for an email violation, etc.). The committee may choose to publish this message + email for an email violation, etc.). The working group may choose to publish this message elsewhere for posterity.{% endblocktranslate %}
      • {% blocktranslate trimmed %} An imposed vacation (i.e. asking someone to "take a week off" from the forum). - A committee member will communicate this "vacation" to the individual(s). + A working group member will communicate this "vacation" to the individual(s). They'll be asked to take this vacation voluntarily, but if they don't agree then a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}
      • {% blocktranslate trimmed %} A permanent or temporary ban from some or all Django spaces (the forum, - etc.). The committee will maintain records of all such bans so that they may be + etc.). The working group will maintain records of all such bans so that they may be reviewed in the future, extended to new Django fora, or otherwise maintained. {% endblocktranslate %}
      • {% blocktranslate trimmed %} - A request for a public or private apology. a committee member will deliver this request. - The committee may, if it chooses, attach "strings" to this request: for example, - the committee may ask a violator to apologize in order to retain his or her membership + A request for a public or private apology. a working group member will deliver this request. + The working group may, if it chooses, attach "strings" to this request: for example, + the working group may ask a violator to apologize in order to retain his or her membership on the forum.{% endblocktranslate %}

      {% blocktranslate trimmed %} - Once a resolution is agreed upon, but before it is enacted, the committee + Once a resolution is agreed upon, but before it is enacted, the working group will contact the original reporter and any other affected parties and explain - the proposed resolution. The committee will ask if this resolution is - acceptable, and must note feedback for the record. However, the committee is + the proposed resolution. The working group will ask if this resolution is + acceptable, and must note feedback for the record. However, the working group is not required to act on this feedback. {% endblocktranslate %}

      {% blocktranslate trimmed %} - Finally the committee will make a report for the DSF board. In case the - incident or report involves a current member of the board, the committee will + Finally the working group will make a report for the DSF board. In case the + incident or report involves a current member of the board, the working group will provide the report only to the other board members. {% endblocktranslate %}

      {% blocktranslate trimmed %} - The committee will never publicly discuss the issue; all public statements + The working group will never publicly discuss the issue; all public statements will be made by the DSF board. {% endblocktranslate %}

      @@ -167,11 +168,11 @@

      {% translate "Conflicts of Interest" %}

      {% url 'conduct_reporting' as url%}

      {% blocktranslate trimmed %} - In the event of any conflict of interest a committee member must immediately + In the event of any conflict of interest a working group member must immediately notify the other members, and recuse themselves if necessary. If a report concerns - a possible violation by a current committee member, this member should be + a possible violation by a current working group member, this member should be excluded from the response process. For these cases, anyone can make a report - directly to any of the committee chairs, as documented in the + directly to any of the working group chairs, as documented in the reporting guidelines. {% endblocktranslate %}

      diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index 277978481c..b4852a3cbf 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -103,26 +103,27 @@

      {% translate "What happens after you file a report?" %}

      Finally, the Working Group will make a report on the situation to the DSF board. The board may choose to a public report of the incident.{% endblocktranslate %}

      -

      {% translate "What if your report concerns a possible violation by a committee member?" %}

      +

      {% translate "What if your report concerns a possible violation by a working group member?" %}

      {% blocktranslate trimmed %} - If your report concerns a current member of the Code of Conduct committee, you - may not feel comfortable sending your report to the committee, as all members will + If your report concerns a current member of the Code of Conduct working group, you + may not feel comfortable sending your report to the working group, as all members will see the report.{% endblocktranslate %}

      + {% url 'members:teams' as teams_url %} {% blocktranslate trimmed %} In that case, you can make a report directly to any or all of the current - (vice/co) chairs of the Code of Conduct committee. Their e-mail addresses are - listed on the Code of Conduct Committee - page. The chairs will follow the usual enforcement process with the other - members, but will exclude the member(s) that the report concerns from any - discussion or decision making.{% endblocktranslate %}

      + (vice/co) chairs of the Code of Conduct working group. Their e-mail addresses are + listed on the Code of + Conduct working group page. The chairs will follow the usual enforcement + process with the other members, but will exclude the member(s) that the report + concerns from any discussion or decision making.{% endblocktranslate %}

      {% blocktranslate trimmed %} - If your report concerns all current (vice/co) chairs of the committee, please + If your report concerns all current (vice/co) chairs of the working group, please send your report directly to the DSF board at foundation@djangoproject.com instead.{% endblocktranslate %}

      @@ -132,7 +133,7 @@

      {% translate "Reconsideration" %}

      {% blocktranslate trimmed %} Any of the parties directly involved or affected can request reconsideration - of the committee’s decision. To make such a request, contact the DSF Board at + of the working group’s decision. To make such a request, contact the DSF Board at foundation@djangoproject.com with your request and motivation and the DSF board will review the case.{% endblocktranslate %}

      diff --git a/djangoproject/templates/fundraising/index.html b/djangoproject/templates/fundraising/index.html index c470f15537..fe3d19e428 100644 --- a/djangoproject/templates/fundraising/index.html +++ b/djangoproject/templates/fundraising/index.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load fundraising_extras humanize i18n static %} +{% load fundraising_extras humanize i18n static hosts %} {% block title %}{% translate "Support Django" %}{% endblock %} {% block layout_class %}full-width{% endblock %} @@ -42,8 +42,9 @@

      {% translate "Other ways to give" %}

    • {% translate "Sponsor Django via GitHub Sponsors" %}.
    • + {% url 'fundraising:index' as fundraising_url %} {% blocktranslate trimmed %} - Benevity Workplace Giving + Benevity Workplace Giving Program - If your employer participates, you can make donations to the DSF via payroll deduction. {% endblocktranslate %} @@ -89,7 +90,7 @@

      {% translate "Why give to the Django Software Foundation?" %}<

      {% blocktranslate trimmed %} - Still curious? See our Frequently Asked Questions + Still curious? See our Frequently Asked Questions about donations. {% endblocktranslate %}

      @@ -118,12 +119,13 @@

      {% translate "Django Fellowship Program" %}

      + {% host_url 'homepage' host 'www' as base_url %} {% blocktranslate trimmed %} For more details, you can read retrospectives for the - first three + first three months of the program, - 2015, and - 2016. + 2015, and + 2016. {% endblocktranslate %}

      @@ -144,7 +146,7 @@

      {% translate "Django Fellowship Program" %}

      {% blocktranslate trimmed %} If you use Django on a daily basis and care about the development of Django - itself, you should donate today (may be tax deductible). + itself, you should donate today (may be tax deductible). Only with your support can we make sure that the web framework you base your work on can grow to be even better in the coming years. {% endblocktranslate %} @@ -249,15 +251,16 @@

      {% translate "DSF Supporters" %}

      {% translate "What is the Django Software Foundation?" %}

      + {% host_url 'homepage' host 'www' as base_url %}

      {% blocktranslate trimmed %} Development of Django is supported by an independent foundation established as a 501(c)(3) non-profit. Like most open-source foundations, - the goal of the Django Software Foundation + the goal of the Django Software Foundation is to promote, support, and advance the Django web framework. If you're interested in how the Django Software Foundation supports the Django web framework, we published a - + Summary of 2014. {% endblocktranslate %} @@ -274,7 +277,7 @@

      {% translate "Who are the Django Fellows?" % team since 2021 and a core committer to Python projects such as music21, pylint, and Arches. Jacob - + began as a full-time Fellow in August 2025. {% endblocktranslate %}

      @@ -285,7 +288,7 @@

      {% translate "Who are the Django Fellows?" % (2024-present) - an active community member, co-creator of Djangonaut Space and a member of Django's review and triage team since 2023. Sarah - + began as a full-time Fellow in April 2024. {% endblocktranslate %}

      @@ -297,7 +300,7 @@

      {% translate "Who are the Django Fellows?" % experience in architecting, building, and maintaining scalable web services, as well as leading new feature design and development. Natalia - + began as a part-time Fellow in April 2023. {% endblocktranslate %}

      diff --git a/djangoproject/templates/homepage.html b/djangoproject/templates/homepage.html index 3b1ad6b62e..ea2b39cbff 100644 --- a/djangoproject/templates/homepage.html +++ b/djangoproject/templates/homepage.html @@ -1,5 +1,5 @@ {% extends "base_3col.html" %} -{% load fundraising_extras i18n weblog %} +{% load fundraising_extras i18n weblog hosts %} {% block sectionid %}homepage{% endblock %} {% block body_class %}homepage{% endblock %} @@ -141,7 +141,7 @@

      {% translate "Get involved" %}

      {% translate "Report bugs and make feature requests" %}
      -
      {% translate "Development dashboard" %}
      +
      {% translate "Development dashboard" %}
      {% translate "see what's currently being worked on" %}
      @@ -163,20 +163,20 @@

      {% translate "Get Help" %}

      {% translate "The Django Software Foundation" %}

      -
      {% translate "About the Foundation" %}
      +
      {% translate "About the Foundation" %}
      {% translate "Our non-profit supports the project" %}
      -
      {% translate "Support Django" %}
      +
      {% translate "Support Django" %}
      {% translate "Your contribution makes Django stronger" %}
      -
      {% translate "Contact the Django Software Foundation" %}
      +
      {% translate "Contact the Django Software Foundation" %}
      - {% translate "More about the DSF" %} + {% translate "More about the DSF" %} {% comment %}

      Upcoming Events

      diff --git a/djangoproject/templates/includes/footer.html b/djangoproject/templates/includes/footer.html index ba995ba26b..12d613fdc4 100644 --- a/djangoproject/templates/includes/footer.html +++ b/djangoproject/templates/includes/footer.html @@ -60,9 +60,9 @@

      Follow Us

      Support Us

      @@ -82,9 +82,9 @@

      Support Us

      & andrevv

    © 2005-{% now "Y" %} - Django Software + Django Software Foundation and individual contributors. Django is a - registered + registered trademark of the Django Software Foundation.

    diff --git a/djangoproject/templates/members/corporate_member_badges.html b/djangoproject/templates/members/corporate_member_badges.html index 5751065609..b4268a3abe 100644 --- a/djangoproject/templates/members/corporate_member_badges.html +++ b/djangoproject/templates/members/corporate_member_badges.html @@ -30,8 +30,9 @@ {% block content %}

    {% translate "Corporate member badges" %}

    + {% url 'members:corporate-members' as corporate_members_url %} {% blocktranslate trimmed %} - Corporate members of the Django Software Foundation may display + Corporate members of the Django Software Foundation may display these badges on their site to show their support. {% endblocktranslate %}

    diff --git a/djangoproject/templates/members/corporatemember_list.html b/djangoproject/templates/members/corporatemember_list.html index 6085ca1877..e8c9b24124 100644 --- a/djangoproject/templates/members/corporatemember_list.html +++ b/djangoproject/templates/members/corporatemember_list.html @@ -7,10 +7,11 @@ {% block content %}

    {% translate "Corporate members" %}

    + {% url 'members:corporate-members' as corporate_members_url %} {% blocktranslate trimmed %} The following organizations are corporate members of the Django Software Foundation. If you are interested in becoming a corporate member of the - DSF, you can find out more on our + DSF, you can find out more on our corporate membership page. {% endblocktranslate %}

    diff --git a/djangoproject/templates/members/team_list.html b/djangoproject/templates/members/team_list.html index acb43e4f59..5f06a4cd7b 100644 --- a/djangoproject/templates/members/team_list.html +++ b/djangoproject/templates/members/team_list.html @@ -15,6 +15,7 @@

    {% translate "Teams" %}

    + {% url 'document-detail' lang='en' version='dev' url='internals/organization' host 'docs' as organization_url %} {% blocktranslate trimmed %} The following teams are groups of people who support the Django project and the Django Software Foundation. Apart from the Django Fellows, who @@ -24,7 +25,7 @@

    {% translate "Teams" %}

    individuals with elevated permissions rather than formal teams. For an overview of how the Django Project is organized and the principles that guide it, see the - + organization and principles page. {% endblocktranslate %} diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html index 21d31c81a2..52c8355ccc 100644 --- a/djangoproject/templates/releases/download.html +++ b/djangoproject/templates/releases/download.html @@ -71,7 +71,7 @@

    Supported Versions

    Certain feature releases will be designated as long-term support (LTS) releases. These releases will get security and data loss fixes applied for a guaranteed period of time, typically three years.

    -

    See the +

    See the supported versions policy for detailed guidelines about what fixes will be backported.

    Django release roadmap diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html index 42095cbe77..20214392c5 100644 --- a/djangoproject/templates/releases/roadmap.html +++ b/djangoproject/templates/releases/roadmap.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load date_format fundraising_extras %} +{% load date_format fundraising_extras hosts %} {% block sectionid %}roadmap{% endblock %} {% block title %}Django {{ series }} Roadmap{% endblock %} @@ -21,11 +21,11 @@

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

    that miss the deadline won't.

    If you have a major feature you'd like to contribute, please propose it on new feature ideas GitHub project and review the - requesting features documentation.

    + requesting features documentation.

    Minor features and bug fixes will be merged as they are completed. If you have submitted a patch, ensure the flags on the Trac ticket are correct so it appears in the "Patches needing review" filter of the - Django Development Dashboard. + Django Development Dashboard. 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 mergers.

    @@ -35,9 +35,9 @@

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

    How you can help

    Community effort is key. You can help by: